diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 000000000..2eb781397
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,36 @@
+---
+Checks: '*, -abseil-*, -altera-*, -android-*, -fuchsia-*, -google-*, -llvm*, -modernize-use-trailing-return-type,
+  -zircon-*, -readability-else-after-return, -readability-static-accessed-through-instance,
+  -readability-avoid-const-params-in-decls, -cppcoreguidelines-non-private-member-variables-in-classes,
+  -misc-non-private-member-variables-in-classes, -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -hicpp-no-array-decay, -readability-identifier-length'
+WarningsAsErrors: ''
+HeaderFilterRegex: subprojects/**
+FormatStyle: file
+CheckOptions:
+  - key: readability-identifier-naming.VariableCase
+    value: camelBack
+  - key: readability-identifier-naming.GlobalConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.FunctionCase
+    value: camelBack
+  - key: readability-identifier-naming.ClassCase
+    value: CamelCase
+  - key: readability-identifier-naming.MethodCase
+    value: camelBack
+  - key: readability-identifier-naming.ParameterCase
+    value: camelBack
+  - key: readability-identifier-naming.MemberCase
+    value: camelBack
+  - key: readability-identifier-naming.StructCase
+    value: CamelCase
+  - key: readability-identifier-naming.StructIgnoredRegexp
+    value: .*_t$
+  - key: readability-identifier-naming.TypedefCase
+    value: CamelCase
+  - key: readability-identifier-naming.TypedefIgnoredRegexp
+    value: .*_t$
+  - key: readability-identifier-naming.TypedefCase
+    value: CamelCase
+  - key: readability-identifier-naming.TypedefIgnoredRegexp
+    value: .*_t$
diff --git a/.conan/conan.lock b/.conan/conan.lock
index e1b6f4dcb..9488cb433 100644
--- a/.conan/conan.lock
+++ b/.conan/conan.lock
@@ -1,15 +1,16 @@
 {
     "version": "0.5",
     "requires": [
-        "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337",
+        "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1777558780.503",
         "openssl/3.6.1#2e0be4a996c7ca91feb31b7fe65117b9%1769599203.736",
         "nlohmann_json/3.10.2#f7dd8a726eb4ae419cab43476be84ed1%1700513007.299",
-        "metee/6.0.0#a4a1918ceb5d5b2f4d0dc8e126fbeed6%1772475347.8847659",
+        "metee/6.0.0#a4a1918ceb5d5b2f4d0dc8e126fbeed6%1779892754.9902008",
         "libcurl/8.5.0#9117c8494e898cf70bbd965658a925bc%1745508826.006",
-        "level-zero/1.27.0#168f0bc338b3f1097f4f98209af7f59a%1773056912.6524134",
-        "igsc/0.9.6#88127b6d017a24466f581aa0adc094b5%1772475350.695227",
+        "level-zero/1.27.0#168f0bc338b3f1097f4f98209af7f59a%1779892818.0372772",
+        "igsc/0.9.6#88127b6d017a24466f581aa0adc094b5%1779892761.5102684",
         "hwloc/2.9.3#11acb96cf1e611d293bf90172fadff7d%1717065022.873",
         "doctest/2.4.11#a4211dfc329a16ba9f280f9574025659%1681601797.282",
+        "cli11/2.6.2#312ccb795ff5b571d9f4b1a3637b1eee%1776949795.774",
         "boost-ext-ut/2.1.0#aec3873a3273d96f85093971c6c8b206%1749912871.352"
     ],
     "build_requires": [
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
new file mode 100644
index 000000000..19a080de9
--- /dev/null
+++ b/.github/workflows/docs-deploy.yml
@@ -0,0 +1,73 @@
+name: Deploy Docs to gh-pages
+
+on:
+  push:
+    branches: [main, dev, v1.3.x]
+    paths:
+      - 'docs/sphinx/**'
+      - '.github/workflows/docs-deploy.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+concurrency:
+  group: gh-pages
+  cancel-in-progress: true
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout main/dev branch (2.x docs)
+        uses: actions/checkout@v4
+        with:
+          path: src/2.x
+
+      - name: Checkout v1.3.x branch (1.x docs)
+        id: checkout_1x
+        continue-on-error: true
+        uses: actions/checkout@v4
+        with:
+          ref: v1.3.x
+          path: src/1.x
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install dependencies
+        run: pip install -r src/2.x/docs/sphinx/requirements.txt
+
+      - name: Strip 1.x from version switcher (no v1.3.x branch)
+        if: steps.checkout_1x.outcome != 'success'
+        run: |
+          sed -i "/'<option value=\"1.x\">/d" \
+            src/2.x/docs/sphinx/_templates/layout.html
+
+      - name: Build 2.x docs
+        run: make -C src/2.x/docs/sphinx build
+        # Output: src/2.x/docs/sphinx/_build/html/2.0/
+
+      - name: Build 1.x docs
+        if: steps.checkout_1x.outcome == 'success'
+        run: make -C src/1.x/docs/sphinx build
+        # Output: src/1.x/docs/sphinx/_build/html/1.x/
+
+      - name: Assemble combined site
+        run: |
+          mkdir -p _site
+          cp -r src/2.x/docs/sphinx/_build/html/2.0  _site/2.0
+          if [ -d src/1.x/docs/sphinx/_build/html/1.x ]; then
+            cp -r src/1.x/docs/sphinx/_build/html/1.x  _site/1.x
+          fi
+          cp src/2.x/docs/sphinx/root_index.html      _site/index.html
+          touch _site/.nojekyll
+
+      - name: Deploy to gh-pages branch
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: _site
+          publish_branch: gh-pages
+          force_orphan: true
diff --git a/.github/workflows/merge-simulation-checks.yml b/.github/workflows/merge-simulation-checks.yml
index d6112f28b..92a165fd0 100644
--- a/.github/workflows/merge-simulation-checks.yml
+++ b/.github/workflows/merge-simulation-checks.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ fromJson(vars.RUNS_ON) }}
     steps:
       - name: Checkout base branch (simulating post-merge state)
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.base_ref }}
           fetch-depth: 0
@@ -73,7 +73,7 @@ jobs:
       contains(github.event.pull_request.files.*.filename, 'meson.build')
     steps:
       - name: Checkout base branch
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.base_ref }}
           fetch-depth: 0
@@ -105,7 +105,7 @@ jobs:
       contains(github.event.pull_request.files.*.filename, 'go.sum')
     steps:
       - name: Checkout base branch
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.base_ref }}
           fetch-depth: 0
diff --git a/.github/workflows/xpumd-ci-checks-go-bindings.yml b/.github/workflows/xpumd-ci-checks-go-bindings.yml
index 00ac76187..45e13a058 100644
--- a/.github/workflows/xpumd-ci-checks-go-bindings.yml
+++ b/.github/workflows/xpumd-ci-checks-go-bindings.yml
@@ -24,11 +24,11 @@ jobs:
           - events-sysman
     steps:
     - name: Check out code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
     - name: Build examples
-      uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+      uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
       with:
-        context: ./xpumd/receiver/internal/level-zero-go
-        file: ./xpumd/receiver/internal/level-zero-go/examples/Dockerfile
+        context: ./xpumd/level-zero-go
+        file: ./xpumd/level-zero-go/examples/Dockerfile
         build-args: APP=${{ matrix.app }}
diff --git a/.github/workflows/xpumd-ci-checks.yml b/.github/workflows/xpumd-ci-checks.yml
index 130adc9f1..88ccbc9da 100644
--- a/.github/workflows/xpumd-ci-checks.yml
+++ b/.github/workflows/xpumd-ci-checks.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ fromJson(vars.RUNS_ON) }}
     steps:
     - name: Check out code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
     - name: Check modfiles
       run: ./xpumd/scripts/make-dockerized.sh check-modfiles
@@ -43,11 +43,11 @@ jobs:
     runs-on: ${{ fromJson(vars.RUNS_ON) }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Run Trivy Fs Scan
         continue-on-error: true
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         with:
           exit-code: 1
           scan-type: fs
@@ -58,7 +58,7 @@ jobs:
           output: trivy-report.json
 
       - name: Print Trivy report in human-readable format
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         with:
           scan-type: convert
           scanners: vuln,secret
@@ -66,7 +66,7 @@ jobs:
           format: table
 
       - name: Convert Trivy report to CSV format
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         with:
           scan-type: convert
           image-ref: trivy-report.json
@@ -84,7 +84,7 @@ jobs:
     runs-on: ${{ fromJson(vars.RUNS_ON) }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Set up Go
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
@@ -95,7 +95,7 @@ jobs:
         run: ./xpumd/scripts/trivy-warmup.sh
 
       - name: Run Trivy License Scan
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         env:
           TRIVY_IGNORED_LICENSES: MPL-2.0
         with:
diff --git a/.github/workflows/xpumd-image.yml b/.github/workflows/xpumd-image.yml
index c306e465f..5b7d3f26d 100644
--- a/.github/workflows/xpumd-image.yml
+++ b/.github/workflows/xpumd-image.yml
@@ -26,23 +26,19 @@ permissions:
 
 jobs:
   build-and-push:
-    runs-on: ${{ fromJson(vars.RUNS_ON) }}
+    runs-on: ${{ fromJson(vars.RUNS_ON_BUILD_AND_PUSH || vars.RUNS_ON) }}
     permissions:
       contents: read
       packages: write
       id-token: write
     steps:
     - name: Check out code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
     - name: Install cosign
-      if: github.event_name == 'push'
       uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
-      with:
-        cosign-release: 'v2.6.1'
 
     - name: Setup Helm
-      if: github.event_name == 'push'
       uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
 
     - name: Docker login
@@ -71,19 +67,30 @@ jobs:
         echo "CHART_APP_VERSION=${tag}" >> $GITHUB_ENV
 
     - name: Set up Docker Buildx
-      if: vars.NO_SETUP_BUILDX != 'true'
-      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+      if: vars.NO_SETUP_BUILDX_BUILD_AND_PUSH != 'true'
+      uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+      with:
+        driver-opts: |
+          "env.http_proxy=${{ vars.HTTP_PROXY }}"
+          "env.https_proxy=${{ vars.HTTPS_PROXY }}"
+          "env.no_proxy=${{ vars.NO_PROXY }}"
+
 
     - name: Build and push image
       id: build_and_push
-      uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+      uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
       with:
         context: ./xpumd
         file: ./xpumd/Dockerfile
         push: ${{ github.event_name == 'push' }}
+        load: ${{ github.event_name == 'pull_request' }}
         tags: ${{ env.IMAGE_TAG }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
+        build-args: |
+          http_proxy=${{ vars.HTTP_PROXY }}
+          https_proxy=${{ vars.HTTPS_PROXY }}
+          no_proxy=${{ vars.NO_PROXY }}
 
     - name: Sign image
       if: ${{ github.event_name == 'push' }}
@@ -92,7 +99,7 @@ jobs:
       run: cosign sign --yes ${{ env.IMAGE_TAG }}@${{ steps.build_and_push.outputs.digest }}
 
     - name: Run Trivy image scan
-      uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+      uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
       with:
         image-ref: ${{ env.IMAGE_TAG }}
         list-all-pkgs: true
@@ -100,14 +107,14 @@ jobs:
         output: trivy-report.json
 
     - name: Print Trivy report in human-readable format
-      uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+      uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
       with:
         scan-type: convert
         image-ref: trivy-report.json
         format: table
 
     - name: Convert Trivy report to CSV format
-      uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+      uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
       with:
         scan-type: convert
         image-ref: trivy-report.json
@@ -121,6 +128,19 @@ jobs:
         name: trivy-xpumd-image-report
         path: trivy-xpumd-image-report.csv
 
+    - name: Generate SBOM
+      uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+      with:
+        image-ref: ${{ env.IMAGE_TAG }}
+        format: cyclonedx
+        output: sbom-xpumd-image.cdx.json
+
+    - name: Upload SBOM as artifact
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      with:
+        name: sbom-xpumd-image
+        path: sbom-xpumd-image.cdx.json
+
     - name: Helm login
       if: github.event_name == 'push'
       run: echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
@@ -133,3 +153,46 @@ jobs:
     - name: Push Helm chart
       if: github.event_name == 'push'
       run: helm push xpumd-*.tgz oci://ghcr.io/${{ github.repository }}/charts/
+
+  integration-test:
+    runs-on: ${{ fromJson(vars.RUNS_ON_INTEGRATION_TEST || vars.RUNS_ON) }}
+    timeout-minutes: 20
+    steps:
+    - name: Check out code
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+
+    - name: Set up Docker Buildx
+      if: vars.NO_SETUP_BUILDX_INTEGRATION_TEST != 'true'
+      uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+      with:
+        driver-opts: |
+          "env.http_proxy=${{ vars.HTTP_PROXY }}"
+          "env.https_proxy=${{ vars.HTTPS_PROXY }}"
+          "env.no_proxy=${{ vars.NO_PROXY }}"
+
+    - name: Build image
+      uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+      with:
+        context: ./xpumd
+        file: ./xpumd/Dockerfile
+        load: true
+        tags: xpumd:integration-test
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        build-args: |
+          http_proxy=${{ vars.HTTP_PROXY }}
+          https_proxy=${{ vars.HTTPS_PROXY }}
+          no_proxy=${{ vars.NO_PROXY }}
+
+    - name: Set up Go
+      uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+      with:
+        go-version-file: xpumd/test/integration/go.mod
+
+    - name: Run integration tests
+      working-directory: xpumd
+      run: |
+        scripts/run-integration-tests.sh \
+          --image-repository=xpumd \
+          --image-tag=integration-test \
+          --kind-load-image
diff --git a/.gitignore b/.gitignore
index d91a6e8ef..da4064943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 *.a
 .vscode
 *.vs
-xpu-smi
-xpumcli
+/xpu-smi
+/xpumcli
 tags
 release
 x64
@@ -20,4 +20,5 @@ subprojects/level-zero
 **/compile_commands.json
 **/.conan
 **__pycache__/
-**/*.pyc
\ No newline at end of file
+**/*.pyc
+docs/sphinx/_build/
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 000000000..d4df19ca1
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,11 @@
+version: 2
+
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.12"
+  commands:
+    - pip install -r docs/sphinx/requirements.txt
+    - make -C docs/sphinx all
+    - mkdir -p $READTHEDOCS_OUTPUT/html
+    - cp -r docs/sphinx/_build/html/. $READTHEDOCS_OUTPUT/html/
diff --git a/BUILDING.md b/BUILDING.md
index 0c6e03b4d..75725069a 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -142,6 +142,7 @@ Alternatively, the following dependencies can be manually cloned, built, and ins
 1. https://github.com/intel/igsc
 2. https://github.com/intel/metee
 3. https://github.com/oneapi-src/level-zero
+4. https://github.com/CLIUtils/CLI11 (v2.6.2 or later)
 
 ### Build steps (using Conan)
 
diff --git a/README.md b/README.md
index 0b961e6c9..f91615cee 100644
--- a/README.md
+++ b/README.md
@@ -37,10 +37,6 @@ Intel(R) XPU System Management Interface (XPU-SMI) is a command line interface (
 	* GPU telemetry – utilization, power, frequency, temperature, fabric speed, memory throughput, errors
 	* GPU health – memory, power, temperature, fabric port
 	* [GPU metric exporter daemon](xpumd/README.md)
-* Diagnostics:
-	* 3 levels of GPU diagnostic tests
-	* Pre-check GPU hardware and driver critical issues
-	* GPU log collection for the issue investigation
 * Configuration:
 	* GPU Settings - GPU power limits, frequency range, standby mode, scheduler mode, ECC On/Off, fabric port status
  
@@ -149,6 +145,7 @@ Dependency releases:
  - [LevelZero Loader](https://github.com/oneapi-src/level-zero/releases) (v1.27.0 or later) and [Intel Graphics Compute Runtime](https://github.com/intel/compute-runtime/releases)
  - [meetee](https://github.com/intel/metee/releases)
  - [IGSC](https://github.com/intel/igsc/releases)
+ - [CLI11](https://github.com/CLIUtils/CLI11/releases) (v2.6.2 or later)
 
  System packages:
 
diff --git a/THIRD_PARTY_LICENSES/cli11/LICENSE b/THIRD_PARTY_LICENSES/cli11/LICENSE
new file mode 100644
index 000000000..dc6d29f41
--- /dev/null
+++ b/THIRD_PARTY_LICENSES/cli11/LICENSE
@@ -0,0 +1,25 @@
+CLI11 2.6.2 Copyright (c) 2017-2026 University of Cincinnati, developed by Henry
+Schreiner under NSF AWARD 1414736. All rights reserved.
+
+Redistribution and use in source and binary forms of CLI11, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/THIRD_PARTY_LICENSES/zlib/LICENSE b/THIRD_PARTY_LICENSES/zlib/LICENSE
index cb5ae03d1..b7a69d058 100644
--- a/THIRD_PARTY_LICENSES/zlib/LICENSE
+++ b/THIRD_PARTY_LICENSES/zlib/LICENSE
@@ -1,7 +1,6 @@
- zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.3.1, January 22nd, 2024
+Copyright notice:
 
-  Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
+ (C) 1995-2026 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -21,8 +20,3 @@
 
   Jean-loup Gailly        Mark Adler
   jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
diff --git a/conanfile.py b/conanfile.py
index 4ce2c65d4..2ee583134 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -38,6 +38,7 @@ def requirements(self):
         self.requires("nlohmann_json/3.10.2")
         self.requires("hwloc/2.9.3")  # Cross-platform topology library
         self.requires("libcurl/8.5.0")
+        self.requires("cli11/2.6.2")
 
     def build_requirements(self):
         self.tool_requires("meson/1.3.2")
diff --git a/docs/sphinx/Makefile b/docs/sphinx/Makefile
new file mode 100644
index 000000000..06d51456f
--- /dev/null
+++ b/docs/sphinx/Makefile
@@ -0,0 +1,19 @@
+SPHINXBUILD  ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build/html
+
+.PHONY: help build clean
+
+help:
+	@echo "Usage:"
+	@echo "  make build  build 2.0 docs"
+	@echo "  make clean  remove build output"
+
+build:
+	$(SPHINXBUILD) -b html \
+		-c $(SOURCEDIR) \
+		$(SOURCEDIR) \
+		$(BUILDDIR)/2.0
+
+clean:
+	rm -rf $(BUILDDIR)
diff --git a/docs/sphinx/_templates/layout.html b/docs/sphinx/_templates/layout.html
new file mode 100644
index 000000000..666a041f0
--- /dev/null
+++ b/docs/sphinx/_templates/layout.html
@@ -0,0 +1,63 @@
+{% extends "!layout.html" %}
+{% block extrahead %}
+{{ super() }}
+<style>
+  .version-switcher-bar {
+    background: #2980b9;
+    color: #fff;
+    padding: 6px 14px;
+    font-size: 0.85em;
+    border-bottom: 2px solid #1a5276;
+    position: sticky;
+    top: 0;
+    z-index: 9999;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  .version-switcher-bar label { font-weight: bold; }
+  .version-switcher-bar select {
+    background: #1a5276;
+    color: #fff;
+    border: 1px solid #aed6f1;
+    padding: 2px 8px;
+    font-size: 0.9em;
+    cursor: pointer;
+    border-radius: 3px;
+  }
+</style>
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+  function docRoot() {
+    var parts = window.location.pathname.replace(/\\/g, '/').split('/');
+    var idx = parts.indexOf('2.0');
+    if (idx === -1) idx = parts.indexOf('1.x');
+    if (idx === -1) return './';
+    return parts.slice(0, idx).join('/') + '/';
+  }
+
+  // Only inject switcher when served under a versioned path (2.0/ or 1.x/)
+  var parts = window.location.pathname.replace(/\\/g, '/').split('/');
+  if (parts.indexOf('2.0') === -1 && parts.indexOf('1.x') === -1) { return; }
+
+  var bar = document.createElement('div');
+  bar.className = 'version-switcher-bar';
+  bar.innerHTML = '<label>Version:</label>'
+    + '<select id="vsw-select">'
+    + '<option value="2.0" selected>2.0 (latest)</option>'
+    + '<option value="1.x">1.x (legacy)</option>'
+    + '</select>';
+
+  var wrap = document.querySelector('.wy-nav-content-wrap');
+  if (wrap) {
+    wrap.insertBefore(bar, wrap.firstChild);
+  } else {
+    document.body.insertBefore(bar, document.body.firstChild);
+  }
+
+  document.getElementById('vsw-select').addEventListener('change', function() {
+    window.location = docRoot() + this.value + '/index.html';
+  });
+});
+</script>
+{% endblock %}
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
new file mode 100644
index 000000000..fadd4a3f8
--- /dev/null
+++ b/docs/sphinx/conf.py
@@ -0,0 +1,23 @@
+project = "Intel XPU Manager"
+# Intentional shadow of built-in — standard Sphinx idiom
+copyright = "2026, Intel Corporation"  # noqa: A001
+author = "Intel Corporation"
+version = "2.0"
+release = "2.0"
+language = "en"
+
+extensions = [
+    "myst_parser",
+]
+
+templates_path = ["_templates"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+
+html_theme = "sphinx_rtd_theme"
+html_static_path = []
+html_title = "Intel XPU Manager 2.0"
+
+html_theme_options = {
+    "navigation_depth": 4,
+    "titles_only": False,
+}
diff --git a/docs/sphinx/index.rst b/docs/sphinx/index.rst
new file mode 100644
index 000000000..a495bacf7
--- /dev/null
+++ b/docs/sphinx/index.rst
@@ -0,0 +1,22 @@
+Intel(R) XPU Manager Documentation
+====================================
+
+Intel(R) XPU Manager is a tool for monitoring and managing Intel Data Center GPUs.
+It provides a command-line interface (``xpu-smi``) for local GPU management.
+
+.. toctree::
+   :maxdepth: 2
+   :caption: xpu-smi Command Reference
+
+   xpu-smi/overview
+   xpu-smi/discovery
+   xpu-smi/topology
+   xpu-smi/stats
+   xpu-smi/dump
+   xpu-smi/health
+   xpu-smi/config
+   xpu-smi/updatefw
+   xpu-smi/amc
+   xpu-smi/vgpu
+   xpu-smi/ps
+   xpu-smi/log
diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
new file mode 100644
index 000000000..580455236
--- /dev/null
+++ b/docs/sphinx/requirements.txt
@@ -0,0 +1,3 @@
+sphinx>=7.0,<10.0
+sphinx-rtd-theme>=2.0,<4.0
+myst-parser>=2.0,<5.0
diff --git a/docs/sphinx/root_index.html b/docs/sphinx/root_index.html
new file mode 100644
index 000000000..a98839d50
--- /dev/null
+++ b/docs/sphinx/root_index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Intel XPU Manager Documentation</title>
+  <meta http-equiv="refresh" content="0; url=2.0/index.html">
+  <link rel="canonical" href="2.0/index.html">
+</head>
+<body>
+  <p>Redirecting to <a href="2.0/index.html">Intel XPU Manager 2.0 documentation</a>...</p>
+</body>
+</html>
diff --git a/docs/sphinx/xpu-smi/amc.rst b/docs/sphinx/xpu-smi/amc.rst
new file mode 100644
index 000000000..2cd9b8082
--- /dev/null
+++ b/docs/sphinx/xpu-smi/amc.rst
@@ -0,0 +1,133 @@
+AMC
+===
+
+AMC (Add-in Card Management Controller) operations. Supports GPU resets via AMC,
+reading real-time sensor data, and retrieving files from the GPU.
+
+.. note::
+
+   This command is supported on Linux only. Some operations may require
+   root privileges.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi amc --gpureset
+   xpu-smi amc --gpureset -y
+   xpu-smi amc --gpureset -d [deviceId]
+   xpu-smi amc --gpureset --device [deviceId]
+   xpu-smi amc --gpureset --device [deviceId] -y
+   xpu-smi amc --sensor --device [deviceId] -s [sensorId]
+   xpu-smi amc --sensor --device [deviceId] -s [sensorId] -j
+   xpu-smi amc --file --device [deviceId] --filetype [fileType] --filename [outputFile]
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   Specify the device ID or PCI BDF address.
+
+.. option:: --gpureset
+
+   Reset GPU(s) via AMC. If ``--device`` is not specified, all GPUs are reset.
+
+.. option:: --sensor
+
+   Read real-time sensor readings from the AMC. Requires ``-s`` to specify
+   which sensor to read.
+
+.. option:: -s <sensorId>, --sensorid <sensorId>
+
+   Specify the sensor ID to read. Valid sensor IDs:
+
+   .. list-table::
+      :widths: 10 90
+      :header-rows: 1
+
+      * - ID
+        - Sensor
+      * - 1
+        - Temperature Sensor 0 from Add-In-Card
+      * - 2
+        - Temperature Sensor 1 from Add-In-Card
+      * - 3
+        - VR Voltage from Add-In-Card
+      * - 4
+        - VR Current from Add-In-Card
+      * - 5
+        - VR Power from Add-In-Card
+      * - 6
+        - VR Temperature Sensor
+      * - 7
+        - Total Board Power
+
+.. option:: --file
+
+   Read a file from the GPU via AMC. Requires ``--filetype`` and optionally
+   ``--filename``.
+
+.. option:: --filetype <id>
+
+   Specify the type of file to retrieve. Valid file type IDs:
+
+   .. list-table::
+      :widths: 10 90
+      :header-rows: 1
+
+      * - ID
+        - Description
+      * - 0
+        - GPU logs
+
+.. option:: --filename <path>
+
+   Output file path for the retrieved file. If not specified, defaults to
+   ``amc_file_<timestamp>.txt``.
+
+.. option:: -y, --yes
+
+   Skip the confirmation prompt.
+
+Examples
+--------
+
+Reset all GPUs via AMC (with confirmation):
+
+.. code-block:: shell
+
+   xpu-smi amc --gpureset
+
+Reset GPU on device 0 via AMC without confirmation:
+
+.. code-block:: shell
+
+   xpu-smi amc --gpureset --device 0 -y
+
+Read total board power sensor for device 0:
+
+.. code-block:: shell
+
+   xpu-smi amc --sensor --device 0 -s 7
+
+Read temperature sensor 0 and output as JSON:
+
+.. code-block:: shell
+
+   xpu-smi amc --sensor --device 0 -s 1 -j
+
+Retrieve GPU logs from device 0:
+
+.. code-block:: shell
+
+   xpu-smi amc --file --device 0 --filetype 0 --filename gpu_logs.txt
diff --git a/docs/sphinx/xpu-smi/config.rst b/docs/sphinx/xpu-smi/config.rst
new file mode 100644
index 000000000..dbf2ff52f
--- /dev/null
+++ b/docs/sphinx/xpu-smi/config.rst
@@ -0,0 +1,216 @@
+Config
+======
+
+Get and change GPU device settings, including frequency range, power limits,
+standby mode, scheduler mode, ECC state, fan control, and reset operations.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi config -d [deviceId]
+   xpu-smi config --device [deviceId]
+   xpu-smi config --device [deviceId] --frequencyrange [minFrequency,maxFrequency]
+   xpu-smi config --device [deviceId] --powerlimit [powerValue]
+   xpu-smi config --device [deviceId] --powerlimit [powerValue] --powertype [sustain|peak|burst]
+   xpu-smi config --device [deviceId] --standby [standbyMode]
+   xpu-smi config --device [deviceId] --scheduler [schedulerMode]
+   xpu-smi config --device [deviceId] --memoryecc [0|1]
+   xpu-smi config --device [deviceId] --pciedowngrade [0|1]
+   xpu-smi config --device [deviceId] --fanspeed [percent|default]
+   xpu-smi config --device [deviceId] --fanid [id] --fanspeed [percent|default]
+   xpu-smi config --device [deviceId] --fancurve [temp:speed,...]
+   xpu-smi config --device [deviceId] --fanid [id] --fancurve [temp:speed,...]
+   xpu-smi config --device [deviceId] --fancurve-rpm [temp:rpm,...]
+   xpu-smi config --device [deviceId] --fanid [id] --fancurve-rpm [temp:rpm,...]
+   xpu-smi config --device [deviceId] --reset
+   xpu-smi config --device [pciBdfAddress] --coldreset
+   xpu-smi config --device [deviceId] --clear-ras-errors
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   The device ID or PCI BDF address to configure.
+
+.. option:: --frequencyrange <minFreq,maxFreq>
+
+   Set the GPU tile-level core frequency range in MHz. Provide the minimum and
+   maximum frequencies separated by a comma.
+
+.. option:: --powerlimit <watts>
+
+   Set the device-level power limit in watts.
+
+.. option:: --powertype <type>
+
+   Device-level power limit type. Must be combined with ``--powerlimit``.
+   Valid values: ``sustain``, ``peak``, ``burst``.
+
+.. option:: --standby <mode>
+
+   Set the tile-level standby mode. Valid values: ``default``, ``never``.
+
+   .. note::
+
+      Standby mode support varies by GPU platform. Not all modes may be
+      available on every device.
+
+.. option:: --scheduler <mode>
+
+   Set the tile-level scheduler mode. Accepted formats:
+
+   - ``timeout,<watchdogTimeout>`` — Watchdog timeout mode; ``watchdogTimeout`` in microseconds.
+   - ``timeslice,<interval>,<yieldTimeout>`` — Timeslice mode; both values in microseconds.
+   - ``exclusive`` — Exclusive mode; no additional arguments.
+
+   The valid range for all time values (us) is ``5000`` to ``100,000,000``.
+
+   .. note::
+
+      Scheduler mode support varies by GPU platform. On Intel Xe GPUs,
+      ``timeslice`` is the most commonly supported mode. Not all modes may
+      be available on every device.
+
+.. option:: --memoryecc <0|1>
+
+   Enable or disable memory ECC. ``0`` = disable, ``1`` = enable. A device reboot
+   may be required for the change to take effect.
+
+.. option:: --pciedowngrade <0|1>
+
+   Enable or disable PCIe generation downgrade. ``0`` = disable, ``1`` = enable.
+
+.. option:: --fanspeed <value>
+
+   Set the fan speed percentage (``0``–``100``) or ``default`` for automatic control.
+
+   Examples::
+
+      --fanspeed 50
+      --fanspeed 50%
+      --fanspeed default
+      --fanid 1 --fanspeed 50
+
+.. option:: --fancurve <temp:speed,...>
+
+   Set a fan curve in percent. Provide comma-separated ``temperature:speed`` pairs.
+
+   Examples::
+
+      --fancurve 40:25,60:50,80:90
+      --fancurve 40:25%,60:50%,80:90%
+
+.. option:: --fancurve-rpm <temp:rpm,...>
+
+   Set a fan curve in RPM. Provide comma-separated ``temperature:rpm`` pairs.
+
+   Examples::
+
+      --fancurve-rpm 40:1200,70:2800
+      --fancurve-rpm 40:1200rpm,70:2800rpm
+
+.. option:: --fanid <id>
+
+   Fan target: ``-1`` for all fans (default), or ``0``..``N-1`` for a specific fan.
+
+.. option:: --reset
+
+   Reset the device using Secondary Bus Reset (SBR).
+
+   .. note::
+
+      For Intel Max Series GPUs with SR-IOV enabled, ensure virtual functions are
+      removed before performing a reset.
+
+.. option:: --coldreset
+
+   Perform a cold reset of the device via PCIe slot power cycle.
+
+   .. important::
+
+      The device **must** be addressed by PCI BDF address (e.g., ``0000:4d:00.0``),
+      not by device ID. By default, xpu-smi will refuse to cold-reset if other
+      PCI devices share the same PCIe slot. Use ``--force-reset-gpus`` to override
+      this check and reset regardless of other devices on the slot.
+
+.. option:: --ignore-gpu-user-processes
+
+   Proceed with ``--coldreset`` even if processes currently have the GPU open.
+
+.. option:: --force-reset-gpus
+
+   Override the safety check and proceed with ``--coldreset`` even if other PCI
+   devices share the PCIe slot.
+
+.. option:: --clear-ras-errors
+
+   Clear all RAS (Reliability, Availability, Serviceability) error counters for
+   the device.
+
+Examples
+--------
+
+Show current configuration for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0
+
+Set frequency range for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --frequencyrange 300,1200
+
+Set power limit to 250W for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --powerlimit 250
+
+Enable memory ECC on device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --memoryecc 1
+
+Set standby mode to never for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --standby never
+
+Set fan speed to 75% for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --fanspeed 75
+
+Set a fan curve for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --fancurve 40:25,60:50,80:90
+
+Cold reset device at PCI BDF 0000:4d:00.0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0000:4d:00.0 --coldreset
+
+Clear RAS error counters for device 0:
+
+.. code-block:: shell
+
+   xpu-smi config --device 0 --clear-ras-errors
diff --git a/docs/sphinx/xpu-smi/discovery.rst b/docs/sphinx/xpu-smi/discovery.rst
new file mode 100644
index 000000000..593332a84
--- /dev/null
+++ b/docs/sphinx/xpu-smi/discovery.rst
@@ -0,0 +1,187 @@
+Discovery
+=========
+
+Discover the GPU devices installed on this machine and provide device information.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi discovery
+   xpu-smi discovery -d [deviceId]
+   xpu-smi discovery --device [deviceId]
+   xpu-smi discovery --device [pciBdfAddress]
+   xpu-smi discovery --device [deviceId] -j
+   xpu-smi discovery --dump [propertyIds]
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   Device ID or PCI BDF address to query. When specified, displays more detailed
+   information about the given device.
+
+.. option:: --pf, --physicalFunction
+
+   Display the physical functions only.
+
+.. option:: --vf, --virtualFunction
+
+   Display the virtual functions only.
+
+.. option:: --dump <propertyIds>
+
+   Dump one or more device properties in CSV format. Accepts a comma-separated list
+   of property IDs. Use ``-1`` to dump all properties.
+
+   .. list-table:: Property IDs
+      :widths: 10 90
+      :header-rows: 1
+
+      * - ID
+        - Property
+      * - 1
+        - Device ID
+      * - 2
+        - Device Name
+      * - 3
+        - Vendor Name
+      * - 4
+        - SOC UUID
+      * - 5
+        - Serial Number
+      * - 6
+        - Core Clock Rate
+      * - 7
+        - Stepping
+      * - 8
+        - Driver Version
+      * - 9
+        - GFX Firmware Version
+      * - 10
+        - GFX Data Firmware Version
+      * - 11
+        - PCI BDF Address
+      * - 12
+        - PCI Slot
+      * - 13
+        - PCIe Generation
+      * - 14
+        - PCIe Max Link Width
+      * - 15
+        - OAM Socket ID
+      * - 16
+        - Memory Physical Size
+      * - 17
+        - Number of Memory Channels
+      * - 18
+        - Memory Bus Width
+      * - 19
+        - Number of EUs
+      * - 20
+        - Number of Media Engines
+      * - 21
+        - Number of Media Enhancement Engines
+      * - 22
+        - GFX Firmware Status
+      * - 23
+        - PCI Vendor ID
+      * - 24
+        - PCI Device ID
+      * - 25
+        - Number of Tiles
+      * - 26
+        - Number of Slices
+      * - 27
+        - Number of Sub-slices per Slice
+      * - 28
+        - Number of EUs per Sub-slice
+      * - 29
+        - Number of Threads per EU
+      * - 30
+        - Physical EU SIMD Width
+      * - 31
+        - Max Command Queue Priority
+      * - 32
+        - Max Hardware Contexts
+      * - 33
+        - Max Memory Alloc Size
+      * - 34
+        - Memory Free Size
+      * - 35
+        - Memory ECC State
+      * - 36
+        - Kernel Version
+      * - 37
+        - DRM Device
+      * - 38
+        - Device Type
+      * - 39
+        - SKU Type
+      * - 40
+        - PCIe Max Bandwidth
+      * - 41
+        - AMC Firmware Name
+      * - 42
+        - AMC Firmware Version
+      * - 43
+        - OPROM Code Firmware Name
+      * - 44
+        - OPROM Code Firmware Version
+      * - 45
+        - OPROM Data Firmware Name
+      * - 46
+        - OPROM Data Firmware Version
+
+.. option:: --listamcversions
+
+   Show all AMC firmware versions.
+
+Examples
+--------
+
+List all GPUs:
+
+.. code-block:: shell
+
+   xpu-smi discovery
+
+Show detailed info for device 0:
+
+.. code-block:: shell
+
+   xpu-smi discovery --device 0
+
+Show detailed info in JSON format:
+
+.. code-block:: shell
+
+   xpu-smi discovery --device 0 -j
+
+Dump device name and PCI BDF for all devices in CSV format:
+
+.. code-block:: shell
+
+   xpu-smi discovery --dump 2,11
+
+Dump all properties in CSV format:
+
+.. code-block:: shell
+
+   xpu-smi discovery --dump -1
+
+List all AMC firmware versions:
+
+.. code-block:: shell
+
+   xpu-smi discovery --listamcversions
diff --git a/docs/sphinx/xpu-smi/dump.rst b/docs/sphinx/xpu-smi/dump.rst
new file mode 100644
index 000000000..4dd01040f
--- /dev/null
+++ b/docs/sphinx/xpu-smi/dump.rst
@@ -0,0 +1,200 @@
+Dump
+====
+
+Dump device statistics data continuously at a configurable interval. Suitable for
+time-series data collection and high-frequency sampling.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi dump -d [deviceIds] --metrics [metricsSpec] --interval [seconds] --number [count]
+   xpu-smi dump --device [deviceIds] --metrics [metricsSpec] --interval [seconds] --number [count]
+   xpu-smi dump --device [deviceIds] --metrics [metricsSpec] --file [filename] --loop-ms [milliseconds] --time [seconds]
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceIds>, --device <deviceIds>, --id <deviceIds>
+
+   Device IDs or PCI BDF addresses to query. Use ``-1`` to select all devices.
+   Multiple IDs can be separated by a comma.
+
+.. option:: --metrics <metricsSpec>, --select <metricsSpec>
+
+   Metrics to collect. Accepts any of the following forms, or a comma-separated mix:
+
+   - **Legacy numeric IDs**: ``0``, ``1``, ``0,1,2`` (see Metrics Reference below)
+   - **Group names**: ``POWER``, ``UTILIZATION``, ``TEMPERATURE``, ``MEMORY``, ``CLOCK``, ``PCI``, ``ECC``, ``EU_ARRAY``, ``FAN``, ``ALL``
+   - **Single-char shortcuts**: ``p`` (Power + Temperature), ``u`` (Utilization), ``m`` (Memory), ``c`` (Clock), ``t`` (PCI), ``e`` (ECC), ``x`` (EU_ARRAY), ``f`` (Fan)
+   - **Multi-char combos**: ``pu`` (Power + Temperature + Utilization), ``pum`` (Power + Temperature + Utilization + Memory)
+
+   .. note::
+
+      Dot-notation field names (e.g. ``temperature.gpu``) are not accepted by ``--metrics``.
+      Use ``--query-gpu`` at the top level for field-name queries.
+
+.. option:: --interval <seconds>, --delay <seconds>, --loop <seconds>
+
+   Sampling interval in seconds between dumps. Default: ``1``. Maximum: ``20``.
+
+.. option:: --number <count>, --count <count>
+
+   Number of samples to dump. If omitted, dumps continuously until the user
+   terminates the operation (Ctrl-C).
+
+.. option:: --loop-ms <milliseconds>
+
+   Millisecond-precision sampling interval. Overrides ``--interval`` when present.
+   Use for sub-second sampling. Recommend pairing with ``--file``.
+
+   .. note::
+
+      A warning is emitted when ``--loop-ms`` is below 50 ms and power metrics are selected,
+      as the power measurement window may be too short for accurate readings.
+
+.. option:: --file <filename>, -f <filename>
+
+   Write output to a file instead of stdout.
+
+.. option:: --time <seconds>
+
+   Total dump duration in seconds. Cannot be combined with ``--number``.
+
+.. option:: --date
+
+   Include date (``YYYY/MM/DD``) prefix in each timestamp column.
+
+.. option:: --format <spec>
+
+   Output format for CSV output. Comma-separated flags:
+
+   - ``csv`` — CSV output (default when ``--file`` is used)
+   - ``noheader`` — suppress the header row
+   - ``nounits`` — omit unit suffixes (e.g. ``(W)``, ``(C)``) from headers
+
+   Example: ``--format csv,noheader,nounits``
+
+Metrics Reference
+-----------------
+
+.. list-table::
+   :widths: 8 92
+   :header-rows: 1
+
+   * - ID
+     - Metric
+   * - 0
+     - GPU Utilization (%), per tile or device. Device-level is the average value of tiles for multi-tile devices.
+   * - 1
+     - GPU Power (W), per tile or device
+   * - 2
+     - GPU Frequency (MHz), per tile or device
+   * - 3
+     - GPU Core Temperature (Celsius), per tile or device
+   * - 4
+     - GPU Memory Temperature (Celsius), per tile or device
+   * - 5
+     - GPU Memory Utilization (%), per tile or device
+   * - 6
+     - GPU Memory Read (kB/s), per tile or device
+   * - 7
+     - GPU Memory Write (kB/s), per tile or device
+   * - 8
+     - GPU Energy Consumed (J), per tile or device
+   * - 9
+     - GPU EU Array Active (%), per tile or device. At least one thread is active. Device-level is the average value of tiles for multi-tile devices.
+   * - 10
+     - GPU EU Array Stall (%), per tile or device. At least one thread is loaded but the EU is stalled. Device-level is the average value of tiles for multi-tile devices.
+   * - 11
+     - GPU EU Array Idle (%), per tile or device. Device-level is the average value of tiles for multi-tile devices.
+   * - 12
+     - Reset Counter
+   * - 13
+     - Programming Errors
+   * - 14
+     - Driver Errors
+   * - 15
+     - Cache Errors Correctable
+   * - 16
+     - Cache Errors Uncorrectable
+   * - 17
+     - GPU Memory Bandwidth Utilization (%), per tile or device. Device-level is the average value of tiles for multi-tile devices.
+   * - 18
+     - GPU Memory Used (MiB), per tile or device
+   * - 19
+     - PCIe Read (kB/s), per device
+   * - 20
+     - PCIe Write (kB/s), per device
+   * - 21
+     - Compute engine utilizations (%), per tile
+   * - 22
+     - Render engine utilizations (%), per tile
+   * - 23
+     - Media decoder engine utilizations (%), per tile
+   * - 24
+     - Media encoder engine utilizations (%), per tile
+   * - 25
+     - Copy engine utilizations (%), per tile
+   * - 26
+     - Media enhancement engine utilizations (%), per tile
+   * - 27
+     - 3D engine utilizations (%), per tile
+   * - 28
+     - GPU Memory Errors Correctable. Device-level is the sum value of tiles for multi-tile devices.
+   * - 29
+     - GPU Memory Errors Uncorrectable. Device-level is the sum value of tiles for multi-tile devices.
+   * - 30
+     - Compute Engine Group Utilization (%), per tile
+   * - 31
+     - Render Engine Group Utilization (%), per tile
+   * - 32
+     - Media Engine Group Utilization (%), per tile
+   * - 33
+     - Copy Engine Group Utilization (%), per tile
+   * - 34
+     - Throttle reason, per tile
+   * - 35
+     - Media Engine Frequency (MHz), per tile or device
+
+Examples
+--------
+
+Dump GPU utilization and power for all devices every second, 10 times:
+
+.. code-block:: shell
+
+   xpu-smi dump --device -1 --metrics 0,1 --interval 1 --number 10
+
+Dump using group name shortcuts:
+
+.. code-block:: shell
+
+   xpu-smi dump --device 0 --metrics pu --interval 1
+
+Dump frequency and temperature for device 0 every 2 seconds:
+
+.. code-block:: shell
+
+   xpu-smi dump --device 0 --metrics CLOCK,TEMPERATURE --interval 2
+
+Millisecond-precision dump to file:
+
+.. code-block:: shell
+
+   xpu-smi dump --device 0 --metrics POWER,UTILIZATION --file metrics.csv --loop-ms 100 --time 60
+
+Dump with date in timestamp, CSV with no header or units:
+
+.. code-block:: shell
+
+   xpu-smi dump --device 0 --metrics 0,1 --date --format csv,noheader,nounits
diff --git a/docs/sphinx/xpu-smi/health.rst b/docs/sphinx/xpu-smi/health.rst
new file mode 100644
index 000000000..d0e2b9321
--- /dev/null
+++ b/docs/sphinx/xpu-smi/health.rst
@@ -0,0 +1,98 @@
+Health
+======
+
+Check GPU hardware component health. Reports the status of key GPU subsystems
+(temperature, power, memory, frequency) and indicates whether they are operating
+within normal parameters.
+
+.. note::
+
+   This command is supported on Linux only.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi health -l
+   xpu-smi health -l -j
+   xpu-smi health -d [deviceId]
+   xpu-smi health --device [deviceId]
+   xpu-smi health --device [pciBdfAddress]
+   xpu-smi health --device [deviceId] -j
+   xpu-smi health --device [pciBdfAddress] -j
+   xpu-smi health --device [deviceId] -c [componentTypeId]
+   xpu-smi health --device [pciBdfAddress] -c [componentTypeId] -j
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -l, --list
+
+   Display health information for all detected GPU devices.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   The device ID or PCI BDF address to query.
+
+.. option:: -c <componentTypeId>, --component <componentTypeId>
+
+   Filter health status to a specific component type. Valid component IDs:
+
+   .. list-table::
+      :widths: 10 90
+      :header-rows: 1
+
+      * - ID
+        - Component
+      * - 1
+        - GPU Core Temperature
+      * - 2
+        - GPU Memory Temperature
+      * - 3
+        - GPU Power
+      * - 4
+        - GPU Memory
+      * - 6
+        - GPU Frequency
+
+Examples
+--------
+
+List health status for all devices:
+
+.. code-block:: shell
+
+   xpu-smi health -l
+
+List health in JSON format:
+
+.. code-block:: shell
+
+   xpu-smi health -l -j
+
+Show all component health for device 0:
+
+.. code-block:: shell
+
+   xpu-smi health --device 0
+
+Show only GPU Core Temperature health for device 0:
+
+.. code-block:: shell
+
+   xpu-smi health --device 0 -c 1
+
+Show memory health for device addressed by PCI BDF:
+
+.. code-block:: shell
+
+   xpu-smi health --device 0000:4d:00.0 -c 4
diff --git a/docs/sphinx/xpu-smi/log.rst b/docs/sphinx/xpu-smi/log.rst
new file mode 100644
index 000000000..7b6b9f637
--- /dev/null
+++ b/docs/sphinx/xpu-smi/log.rst
@@ -0,0 +1,68 @@
+Log
+===
+
+Collect GPU diagnostic logs and write them to a file. Gathers a comprehensive
+snapshot of system and GPU state useful for troubleshooting and bug reports.
+
+.. note::
+
+   This command is supported on Linux only.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi log -f [fileName]
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -f <fileName>, --file <fileName>
+
+   The output file to write all collected diagnostic data into.
+
+Collected Information
+---------------------
+
+The log command collects the following information:
+
+**System snapshots** (from ``/proc``):
+
+- CPU info, interrupt table, memory info, loaded modules, kernel version
+
+**OS and kernel logs**:
+
+- ``/var/log/syslog``, ``kern*.log`` files, kernel messages (dmesg)
+
+**GPU driver info**:
+
+- Kernel version, ``xe`` graphics driver module path and load status
+
+**DRM and debugfs**:
+
+- Files from ``/sys/class/drm`` and ``/sys/kernel/debug/dri`` (if available)
+
+**Intel package inventory**:
+
+- Installed Intel GPU stack packages (``dpkg`` on Debian/Ubuntu, ``rpm`` on RHEL/SUSE)
+
+**System command outputs** (where tools are available):
+
+- ``lspci -v -xxx``, ``dmidecode``, ``lsusb``
+- ``xpu-smi discovery``
+- ``clinfo`` (OpenCL platform info)
+- ``vainfo`` (video acceleration info)
+
+Examples
+--------
+
+Collect diagnostic logs to a file:
+
+.. code-block:: shell
+
+   xpu-smi log -f gpu_debug.log
diff --git a/docs/sphinx/xpu-smi/overview.rst b/docs/sphinx/xpu-smi/overview.rst
new file mode 100644
index 000000000..a7c91229f
--- /dev/null
+++ b/docs/sphinx/xpu-smi/overview.rst
@@ -0,0 +1,375 @@
+Overview
+========
+
+``xpu-smi`` is the command-line interface for Intel(R) XPU Manager.
+It is built on top of the Intel Level-Zero driver stack and provides local GPU
+management for Intel(R) Arc Pro Series GPUs.
+
+Global Options
+--------------
+
+These options are available at the top level (without a subcommand):
+
+.. option:: -h, --help
+
+   Print the help message and exit.
+
+.. option:: -v, --version
+
+   Display version information, including CLI version, build ID, and Level Zero version.
+
+.. option:: --list-gpus
+
+   Print one line per GPU (index, name, UUID) and exit.
+
+.. option:: --query-gpu=<fields>
+
+   Single-shot or looping per-field query. ``<fields>`` is a comma-separated list of
+   field names (e.g. ``temperature.gpu,power.draw``). Run ``xpu-smi --query-gpu`` with
+   no fields to list all available field names.
+
+   Related options used with ``--query-gpu``:
+
+   .. option:: --id <n>, --device <n>
+
+      Select GPU by index or PCI BDF address.
+
+   .. option:: --loop[=<sec>]
+
+      Repeat query every ``<sec>`` seconds (default: ``1``).
+
+   .. option:: --loop-ms=<ms>
+
+      Repeat query every ``<ms>`` milliseconds. Takes precedence over ``--loop``.
+
+   .. option:: --count=<n>, -c <n>
+
+      Cap the number of loop iterations. Default: infinite.
+
+   .. option:: --format=<spec>
+
+      Output format: ``csv[,noheader][,nounits]``.
+
+   .. option:: -f <path>, --file=<path>
+
+      Redirect output to a file instead of stdout.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi [Options]
+   xpu-smi -v
+   xpu-smi -h
+   xpu-smi --list-gpus
+   xpu-smi --query-gpu=<fields> [--id <n>] [--loop[=<sec>]|--loop-ms=<ms>] [--count=<n>] [--format=csv[,...]]
+   xpu-smi <command> [command-options]
+
+Running ``xpu-smi`` with no arguments displays a GPU status summary of all detected devices.
+
+Command Categories
+------------------
+
+.. list-table::
+   :widths: 20 15 15 50
+   :header-rows: 1
+
+   * - Command
+     - Linux
+     - Windows
+     - Description
+   * - :doc:`discovery`
+     - Yes
+     - Yes
+     - Discover GPU devices and display device properties
+   * - :doc:`topology`
+     - Yes
+     - Yes
+     - Display system topology and CPU/GPU connectivity
+   * - :doc:`stats`
+     - Yes
+     - Yes
+     - Display GPU performance statistics
+   * - :doc:`dump`
+     - Yes
+     - Yes
+     - Continuously dump raw GPU telemetry to stdout or file
+   * - :doc:`health`
+     - Yes
+     - No
+     - Check GPU component health status
+   * - :doc:`config`
+     - Yes
+     - Yes
+     - Get and change GPU settings
+   * - :doc:`updatefw`
+     - Yes
+     - Yes
+     - Update GPU firmware (GFX, FDO, GFX_DATA, OP_CODE, OP_DATA, AMC)
+   * - :doc:`amc`
+     - Yes
+     - No
+     - AMC (Add-in Card Management Controller) operations
+   * - :doc:`vgpu`
+     - Yes
+     - No
+     - Create and manage virtual GPUs (SR-IOV)
+   * - :doc:`ps`
+     - Yes
+     - No
+     - List processes using GPU resources
+   * - :doc:`log`
+     - Yes
+     - No
+     - Collect GPU debug logs
+
+Output Formats
+--------------
+
+Most commands support two output formats:
+
+- **Text** (default): Human-readable tabular output
+- **JSON** (``-j`` / ``--json``): Machine-readable JSON, suitable for scripting and automation
+- **XML** (``topology -f <file>``): System topology exported as an XML file (see :doc:`topology`)
+
+Device Identification
+---------------------
+
+Most commands accept a device identifier via ``-d`` / ``--device`` / ``--id`` (subcommands) or ``--device`` / ``--id`` (``--query-gpu``). Devices can be
+addressed by either:
+
+- **Device ID**: An integer index assigned by the driver (e.g., ``0``, ``1``)
+- **PCI BDF address**: Bus/Device/Function notation (e.g., ``0000:4d:00.0``)
+
+--query-gpu Field Reference
+----------------------------
+
+``--query-gpu`` accepts a comma-separated list of field names. Fields are grouped by
+metric category. Run ``xpu-smi --query-gpu`` with no argument to print the live list.
+
+**Metric Groups (for** ``--metrics`` **)**
+
+.. list-table::
+   :widths: 18 10 72
+   :header-rows: 1
+
+   * - Group Name
+     - Shortcut
+     - Description
+   * - ``IDENTITY``
+     - —
+     - Device identity fields (name, index, UUID, serial, driver/vbios version, PCI IDs)
+   * - ``MEMORY``
+     - ``m``
+     - Memory total/used/free, read/write bandwidth, bandwidth utilization
+   * - ``UTILIZATION``
+     - ``u``
+     - GPU, compute, render, media, copy engine utilization (%)
+   * - ``TEMPERATURE``
+     - ``p``
+     - GPU core and memory temperatures. Shortcut ``p`` also enables POWER.
+   * - ``POWER``
+     - ``p``
+     - Power draw, per-tile power, energy consumed, power limits. Shortcut ``p`` also enables TEMPERATURE.
+   * - ``CLOCK``
+     - ``c``
+     - Current and max graphics/media clock frequencies, throttle reason
+   * - ``PCI``
+     - ``t``
+     - PCIe link gen/width (max and current), TX/RX throughput, replay counter
+   * - ``ECC``
+     - ``e``
+     - ECC mode, corrected/uncorrected error counts, RAS error categories
+   * - ``EU_ARRAY``
+     - ``x``
+     - EU active/stall/idle percentages (Intel Xe only)
+   * - ``FAN``
+     - ``f``
+     - Fan speed (%)
+   * - ``ALL``
+     - —
+     - All metrics from all groups
+
+Multi-char combos expand character-by-character (e.g. ``pu`` = POWER + TEMPERATURE + UTILIZATION, ``put`` adds PCI, ``pum`` adds MEMORY).
+
+**Available Field Names**
+
+.. list-table::
+   :widths: 42 12 46
+   :header-rows: 1
+
+   * - Field
+     - Unit
+     - Description
+   * - ``timestamp``
+     - —
+     - Sample timestamp
+   * - ``name`` (alias: ``gpu_name``)
+     - —
+     - GPU device name
+   * - ``index``
+     - —
+     - GPU device index
+   * - ``uuid``
+     - —
+     - GPU UUID
+   * - ``serial``
+     - —
+     - Serial number
+   * - ``driver_version``
+     - —
+     - Driver version string
+   * - ``vbios_version``
+     - —
+     - VBIOS version string
+   * - ``pci.bus_id``
+     - —
+     - PCI BDF address
+   * - ``pci.device_id``
+     - —
+     - PCI device ID
+   * - ``pci.sub_device_id``
+     - —
+     - PCI sub-device ID
+   * - ``temperature.gpu``
+     - C
+     - GPU core temperature
+   * - ``temperature.memory``
+     - C
+     - Memory temperature
+   * - ``power.draw``
+     - W
+     - Total GPU power draw
+   * - ``power.draw.gpu``
+     - W
+     - Per-tile GPU power draw
+   * - ``power.limit``
+     - W
+     - Current power limit
+   * - ``power.max_limit``
+     - W
+     - Maximum power limit
+   * - ``energy.consumed``
+     - J
+     - Total energy consumed
+   * - ``utilization.gpu``
+     - %
+     - Overall GPU utilization
+   * - ``utilization.compute``
+     - %
+     - Compute engine utilization
+   * - ``utilization.render``
+     - %
+     - Render engine utilization
+   * - ``utilization.media``
+     - %
+     - Media engine utilization
+   * - ``utilization.copy``
+     - %
+     - Copy engine utilization
+   * - ``utilization.memory``
+     - %
+     - Memory bandwidth utilization
+   * - ``memory.total``
+     - MiB
+     - Total memory
+   * - ``memory.used``
+     - MiB
+     - Used memory
+   * - ``memory.free``
+     - MiB
+     - Free memory
+   * - ``memory.read.bandwidth``
+     - kB/s
+     - Memory read bandwidth
+   * - ``memory.write.bandwidth``
+     - kB/s
+     - Memory write bandwidth
+   * - ``memory.bandwidth.utilization``
+     - %
+     - Memory bandwidth utilization
+   * - ``clocks.current.graphics`` (alias: ``clocks.current.sm``)
+     - MHz
+     - Current graphics/SM clock
+   * - ``clocks.current.media`` (alias: ``clocks.current.video``)
+     - MHz
+     - Current media/video clock
+   * - ``clocks.max.graphics`` (alias: ``clocks.max.sm``)
+     - MHz
+     - Max graphics clock
+   * - ``clocks.max.media`` (alias: ``clocks.max.video``)
+     - MHz
+     - Max media clock
+   * - ``clocks.throttle.reason``
+     - —
+     - Active clock throttle reason flags
+   * - ``pcie.link.gen.max``
+     - —
+     - Maximum PCIe generation
+   * - ``pcie.link.gen.current``
+     - —
+     - Current PCIe generation
+   * - ``pcie.link.width.max``
+     - —
+     - Maximum PCIe link width
+   * - ``pcie.link.width.current``
+     - —
+     - Current PCIe link width
+   * - ``pcie.tx.throughput``
+     - MB/s
+     - PCIe transmit throughput
+   * - ``pcie.rx.throughput``
+     - MB/s
+     - PCIe receive throughput
+   * - ``pcie.tx.throughput.kbs``
+     - kB/s
+     - PCIe transmit throughput (kB/s)
+   * - ``pcie.rx.throughput.kbs``
+     - kB/s
+     - PCIe receive throughput (kB/s)
+   * - ``pcie.replay.counter``
+     - —
+     - PCIe replay error counter
+   * - ``ecc.mode.current``
+     - —
+     - ECC mode (enabled/disabled)
+   * - ``ecc.errors.corrected.aggregate.total``
+     - —
+     - Total corrected ECC errors
+   * - ``ecc.errors.uncorrected.aggregate.total``
+     - —
+     - Total uncorrected ECC errors
+   * - ``ecc.errors.aggregate.total``
+     - —
+     - Total ECC errors (corrected + uncorrected)
+   * - ``ras.reset``
+     - —
+     - RAS reset error counter
+   * - ``ras.programming.errors``
+     - —
+     - RAS programming error counter
+   * - ``ras.driver.errors``
+     - —
+     - RAS driver error counter
+   * - ``ras.cache.errors.correctable``
+     - —
+     - RAS correctable cache error counter
+   * - ``ras.cache.errors.uncorrectable``
+     - —
+     - RAS uncorrectable cache error counter
+   * - ``ras.non_compute.errors.total``
+     - —
+     - RAS non-compute (memory) error counter
+   * - ``eu.active``
+     - %
+     - EU array active percentage (Intel Xe only)
+   * - ``eu.stall``
+     - %
+     - EU array stall percentage (Intel Xe only)
+   * - ``eu.idle``
+     - %
+     - EU array idle percentage (Intel Xe only)
+   * - ``fan.speed``
+     - %
+     - Fan speed percentage
diff --git a/docs/sphinx/xpu-smi/ps.rst b/docs/sphinx/xpu-smi/ps.rst
new file mode 100644
index 000000000..db2985149
--- /dev/null
+++ b/docs/sphinx/xpu-smi/ps.rst
@@ -0,0 +1,75 @@
+PS
+==
+
+List status of processes currently using GPU resources.
+
+.. note::
+
+   This command is supported on Linux only.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi ps
+   xpu-smi ps -d [deviceId]
+   xpu-smi ps --device [deviceId]
+   xpu-smi ps --device [deviceId] -j
+
+Output Columns
+--------------
+
+.. list-table::
+   :widths: 15 85
+   :header-rows: 1
+
+   * - Column
+     - Description
+   * - PID
+     - Process ID
+   * - Command
+     - Process command name
+   * - DeviceID
+     - Device ID the process is using
+   * - SHR
+     - Size of shared device memory mapped into the process, in kB (may not be available on all platforms)
+   * - MEM
+     - Device memory allocated by this process, in kB (may not be available on all platforms)
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   The device ID or PCI BDF address. If not specified, processes from all GPUs
+   are listed.
+
+Examples
+--------
+
+List all processes using any GPU:
+
+.. code-block:: shell
+
+   xpu-smi ps
+
+List processes using device 0:
+
+.. code-block:: shell
+
+   xpu-smi ps --device 0
+
+List processes using device 0 in JSON format:
+
+.. code-block:: shell
+
+   xpu-smi ps --device 0 -j
diff --git a/docs/sphinx/xpu-smi/stats.rst b/docs/sphinx/xpu-smi/stats.rst
new file mode 100644
index 000000000..d1a2360de
--- /dev/null
+++ b/docs/sphinx/xpu-smi/stats.rst
@@ -0,0 +1,148 @@
+Stats
+=====
+
+List GPU device statistics. Displays a snapshot of current performance metrics
+including utilization, power, frequency, temperature, memory, and error counters.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi stats
+   xpu-smi stats -d [deviceId]
+   xpu-smi stats --device [deviceId]
+   xpu-smi stats --device [pciBdfAddress]
+   xpu-smi stats --device [deviceId] -j
+   xpu-smi stats --device [deviceId] -e
+   xpu-smi stats --device [deviceId] -e -j
+   xpu-smi stats --device [deviceId] -r
+   xpu-smi stats --device [deviceId] -r -j
+   xpu-smi stats --device [deviceId] --samples [count] --interval [milliseconds]
+   xpu-smi stats --device [deviceId] --list-offline-pages
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   The device ID or PCI BDF address to query. If omitted, statistics for all
+   detected devices are displayed.
+
+.. option:: -e, --eu
+
+   Show EU (Execution Unit) array metrics: Active, Stall, and Idle percentages.
+
+.. option:: -r, --ras
+
+   Show RAS (Reliability, Availability, Serviceability) error metrics, including
+   correctable and uncorrectable error counters per category.
+
+.. option:: --list-offline-pages
+
+   List offline memory pages. This option is exclusive — no other stats are
+   shown when it is used.
+
+.. option:: --samples <count>
+
+   Number of samples to collect before computing the displayed statistics.
+   Default: ``2``.
+
+.. option:: --interval <milliseconds>
+
+   Sampling interval in milliseconds between samples. Default: ``100``.
+
+Output Metrics
+--------------
+
+The following metrics are reported per device and per tile where applicable:
+
+.. list-table::
+   :widths: 40 60
+   :header-rows: 1
+
+   * - Metric
+     - Notes
+   * - GPU Utilization (%)
+     - Per tile; device average for multi-tile
+   * - Compute / Render / Media / Copy Engine Utilization (%)
+     - Per tile
+   * - EU Array Active / Stall / Idle (%)
+     - Per tile; shown with ``-e``
+   * - GPU Power (W)
+     - Per tile and device
+   * - GPU Frequency (MHz)
+     - Per tile and device
+   * - Media Frequency (MHz)
+     - Per tile and device
+   * - GPU Core Temperature (°C)
+     - Per tile
+   * - GPU Memory Temperature (°C)
+     - Per tile
+   * - GPU VR Temperature (°C)
+     - Per tile (voltage regulator)
+   * - Fan Speed (%)
+     - Per fan
+   * - GPU Memory Read / Write (kB/s)
+     - Per tile
+   * - GPU Memory Bandwidth (%)
+     - Per tile
+   * - GPU Memory Used (MiB)
+     - Per tile
+   * - PCIe Read / Write (kB/s)
+     - Device level
+   * - Fabric RX / TX (kB/s)
+     - Device level; shown when fabric ports present
+   * - RAS Error Counters
+     - Per category (Reset, Programming, Driver, Cache, Mem); shown with ``-r``
+   * - Energy Consumed (J)
+     - Device level (total over measurement window)
+   * - Offline Memory Pages
+     - Count; shown with ``--list-offline-pages``
+
+Examples
+--------
+
+Show stats for all GPUs:
+
+.. code-block:: shell
+
+   xpu-smi stats
+
+Show stats for device 0:
+
+.. code-block:: shell
+
+   xpu-smi stats --device 0
+
+Show stats including EU metrics in JSON format:
+
+.. code-block:: shell
+
+   xpu-smi stats --device 0 -e -j
+
+Show RAS error counters for device 0:
+
+.. code-block:: shell
+
+   xpu-smi stats --device 0 -r
+
+List offline memory pages:
+
+.. code-block:: shell
+
+   xpu-smi stats --device 0 --list-offline-pages
+
+Collect 10 samples at 200ms intervals:
+
+.. code-block:: shell
+
+   xpu-smi stats --device 0 --samples 10 --interval 200
diff --git a/docs/sphinx/xpu-smi/topology.rst b/docs/sphinx/xpu-smi/topology.rst
new file mode 100644
index 000000000..0ae3228b1
--- /dev/null
+++ b/docs/sphinx/xpu-smi/topology.rst
@@ -0,0 +1,89 @@
+Topology
+========
+
+Get the system topology, showing how GPUs are interconnected and connected to the CPU.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi topology -d [deviceId]
+   xpu-smi topology --device [deviceId]
+   xpu-smi topology --device [pciBdfAddress]
+   xpu-smi topology --device [deviceId] -j
+   xpu-smi topology -f [filename]
+   xpu-smi topology -m
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   The device ID or PCI BDF address to query.
+
+.. option:: -f <filename>, --file <filename>
+
+   Generate the system topology with GPU info and write it to an XML file.
+
+.. option:: -m, --matrix
+
+   Print the CPU/GPU topology matrix showing interconnect types between all devices.
+
+   The matrix uses the following symbols:
+
+   .. list-table::
+      :widths: 15 85
+      :header-rows: 1
+
+      * - Symbol
+        - Meaning
+      * - S
+        - Self
+      * - MDF
+        - Connected with Multi-Die Fabric Interface
+      * - PIX
+        - Connected via PCIe switch (≥3 common bridge ancestors)
+      * - PXB
+        - Connected via multiple PCIe bridges (2 common ancestors)
+      * - PHB
+        - Connected via PCIe host bridge (1 common ancestor)
+      * - NODE
+        - Connected with PCIe within a NUMA node
+      * - SYS
+        - Connected with PCIe between NUMA nodes
+
+Examples
+--------
+
+Show topology for device 0:
+
+.. code-block:: shell
+
+   xpu-smi topology --device 0
+
+Show topology in JSON format:
+
+.. code-block:: shell
+
+   xpu-smi topology --device 0 -j
+
+Export topology to XML file:
+
+.. code-block:: shell
+
+   xpu-smi topology -f system_topology.xml
+
+Print the full CPU/GPU interconnect matrix:
+
+.. code-block:: shell
+
+   xpu-smi topology -m
diff --git a/docs/sphinx/xpu-smi/updatefw.rst b/docs/sphinx/xpu-smi/updatefw.rst
new file mode 100644
index 000000000..f1b74d504
--- /dev/null
+++ b/docs/sphinx/xpu-smi/updatefw.rst
@@ -0,0 +1,102 @@
+UpdateFW
+========
+
+Update GPU firmware. Supports direct GPU firmware types (GFX, GFX_DATA, FDO,
+OP_CODE, OP_DATA) as well as AMC (Add-in card Management Controller) firmware
+on supported server platforms.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi updatefw -d [deviceId] -t GFX -f [imageFilePath]
+   xpu-smi updatefw --device [deviceId] -t GFX -f [imageFilePath]
+   xpu-smi updatefw --device [pciBdfAddress] -t GFX -f [imageFilePath]
+   xpu-smi updatefw --device [deviceId] -t FDO -f [imageFilePath]
+   xpu-smi updatefw -t AMC -f [imageFilePath]
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   The device ID or PCI BDF address to update. If not specified, the firmware
+   image is applied to all compatible devices.
+
+.. option:: -t <type>, --type <type>
+
+   The firmware type to update. Valid values:
+
+   .. list-table::
+      :widths: 20 80
+      :header-rows: 1
+
+      * - Type
+        - Description
+      * - ``GFX``
+        - Graphics firmware
+      * - ``GFX_DATA``
+        - Graphics data firmware
+      * - ``FDO``
+        - Field-deployable firmware
+      * - ``AMC``
+        - Add-in card Management Controller firmware
+      * - ``OP_CODE``
+        - Option ROM code
+      * - ``OP_DATA``
+        - Option ROM data
+
+.. option:: -f <path>, --file <path>
+
+   Path to the firmware image file on the local filesystem.
+
+.. option:: -y, --assumeyes
+
+   Assume yes to all confirmation prompts (non-interactive mode).
+
+.. option:: --force
+
+   Force the GFX firmware update even if the existing firmware is up to date.
+   This option applies to GFX firmware only.
+
+Examples
+--------
+
+Update GFX firmware on device 0:
+
+.. code-block:: shell
+
+   xpu-smi updatefw --device 0 -t GFX -f /path/to/gfx_firmware.bin
+
+Update GFX firmware on device addressed by PCI BDF:
+
+.. code-block:: shell
+
+   xpu-smi updatefw --device 0000:4d:00.0 -t GFX -f /path/to/gfx_firmware.bin
+
+Update FDO firmware on device 0 without confirmation:
+
+.. code-block:: shell
+
+   xpu-smi updatefw --device 0 -t FDO -f /path/to/fdo_firmware.bin -y
+
+Update AMC firmware on all compatible devices:
+
+.. code-block:: shell
+
+   xpu-smi updatefw -t AMC -f /path/to/amc_firmware.bin
+
+Force GFX firmware update even if up to date:
+
+.. code-block:: shell
+
+   xpu-smi updatefw --device 0 -t GFX -f /path/to/gfx_firmware.bin --force
diff --git a/docs/sphinx/xpu-smi/vgpu.rst b/docs/sphinx/xpu-smi/vgpu.rst
new file mode 100644
index 000000000..74fa4a387
--- /dev/null
+++ b/docs/sphinx/xpu-smi/vgpu.rst
@@ -0,0 +1,105 @@
+vGPU
+====
+
+Create and remove virtual GPUs in SR-IOV (Single Root I/O Virtualization)
+configuration. Allows partitioning a physical GPU into multiple virtual GPU
+instances for use in virtualized environments.
+
+.. note::
+
+   This command is supported on Linux only.
+
+Synopsis
+--------
+
+.. code-block:: text
+
+   xpu-smi vgpu --precheck
+   xpu-smi vgpu -d [deviceId] -c -n [vGpuNumber] --lmem [vGpuMemorySize]
+   xpu-smi vgpu --device [deviceId] -c -n [vGpuNumber] --lmem [vGpuMemorySize]
+   xpu-smi vgpu --device [pciBdfAddress] -c -n [vGpuNumber] --lmem [vGpuMemorySize]
+   xpu-smi vgpu --device [deviceId] -r
+   xpu-smi vgpu --device [pciBdfAddress] -r
+   xpu-smi vgpu --device [deviceId] -l
+   xpu-smi vgpu --device [pciBdfAddress] -l
+   xpu-smi vgpu --device [deviceId] -s
+   xpu-smi vgpu --device [pciBdfAddress] -s
+
+Options
+-------
+
+.. option:: -h, --help
+
+   Print this help message and exit.
+
+.. option:: -j, --json
+
+   Print result in JSON format.
+
+.. option:: -d <deviceId>, --device <deviceId>, --id <deviceId>
+
+   Device ID or PCI BDF address of the physical GPU to operate on.
+
+.. option:: --precheck
+
+   Check whether BIOS settings are configured correctly and the system is ready
+   to create virtual GPUs. Run this before attempting to create vGPUs.
+
+.. option:: -c, --create
+
+   Create virtual GPUs on the specified physical GPU. Requires ``-n`` and ``--lmem``.
+
+.. option:: -n <count>, --number <count>
+
+   The number of virtual GPUs to create.
+
+.. option:: --lmem <MiB>
+
+   The local memory size (in MiB) to allocate to each virtual GPU.
+
+   Example: ``--lmem 500``
+
+.. option:: -r, --remove
+
+   Remove all virtual GPUs on the specified physical GPU.
+
+.. option:: -l, --list
+
+   List all virtual GPUs on the specified physical GPU.
+
+.. option:: -s, --stats
+
+   Show statistics data for all virtual GPUs on the specified physical GPU.
+
+Examples
+--------
+
+Check system readiness for vGPU creation:
+
+.. code-block:: shell
+
+   xpu-smi vgpu --precheck
+
+Create 4 virtual GPUs on device 0, each with 500 MiB of local memory:
+
+.. code-block:: shell
+
+   xpu-smi vgpu --device 0 -c -n 4 --lmem 500
+
+List all virtual GPUs on device 0:
+
+.. code-block:: shell
+
+   xpu-smi vgpu --device 0 -l
+
+Show statistics for all virtual GPUs on device 0:
+
+.. code-block:: shell
+
+   xpu-smi vgpu --device 0 -s
+
+Remove all virtual GPUs from device 0:
+
+.. code-block:: shell
+
+   xpu-smi vgpu --device 0 -r
diff --git a/hal/amc/amclib.cpp b/hal/amc/amclib.cpp
index a07d9272c..d893dcea2 100644
--- a/hal/amc/amclib.cpp
+++ b/hal/amc/amclib.cpp
@@ -480,7 +480,7 @@ int amclib::amcGpuReset(uint32_t cardNum)
  * @note The function handles multipart transfers for large files and ensures proper assembly of data
  * @note The caller is responsible for providing a valid device index and file PDR ID
  */
-int amclib::amcReadFile(int deviceIndex, uint32_t filePdrId, std::vector<uint8_t> &fileData)
+int amclib::amcReadFile(int deviceIndex, uint16_t filePdrId, std::vector<uint8_t> &fileData)
 {
 	TRACING();
 
diff --git a/hal/amc/amclib.h b/hal/amc/amclib.h
index 90ae75d25..46cb2cd50 100644
--- a/hal/amc/amclib.h
+++ b/hal/amc/amclib.h
@@ -50,7 +50,7 @@ class LIBXPUM_API amclib
 	int amcGetSerialNumber(uint8_t card_num, char *serialNumber, size_t *bufferSize);
 	int amcGetVersion(uint8_t card_num, char *amc_version, size_t *bufferSize);
 	int amcGpuReset(uint32_t cardNum);
-	int amcReadFile(int deviceIndex, uint32_t filePdrId, std::vector<uint8_t> &fileData);
+	int amcReadFile(int deviceIndex, uint16_t filePdrId, std::vector<uint8_t> &fileData);
 };
 
 #endif
diff --git a/hal/amc/pldm.h b/hal/amc/pldm.h
index 099dafbdc..030cfdc96 100644
--- a/hal/amc/pldm.h
+++ b/hal/amc/pldm.h
@@ -292,7 +292,7 @@ class pldm : public mctp
 	uint8_t pldmDfOpenCommand(uint16_t fileIdentifier, uint16_t &fileDescriptor);
 	uint8_t pldmDfCloseCommand(uint16_t fileDescriptor);
 	uint8_t pldmMultipartReceiveCommand(uint16_t fileDescriptor, std::vector<uint8_t> &fileData);
-	const PdrRecord *getFilePdrById(uint32_t filePdrId);
+	const PdrRecord *getFilePdrById(uint16_t filePdrId);
 
 public:
 	pldm(const std::string &devpath, int cardnum)
@@ -310,7 +310,7 @@ class pldm : public mctp
 	int fwupd(const char *pkgFilePath);
 	uint8_t getSensorInfoById(uint16_t sensorId);
 	uint8_t getSensorInfoByUnit(sensorUnits unit);
-	uint8_t getFile(uint32_t filePdrId, std::vector<uint8_t> &fileData);
+	uint8_t getFile(uint16_t filePdrId, std::vector<uint8_t> &fileData);
 	std::vector<pldmSensorInfo> &getSensorInfoList() { return mSensorInfoList; }
 	uint8_t oemVrsyncCmd(uint8_t cmd);
 	int fwupdProgress() { return mProgPercent; }
diff --git a/hal/amc/pldm_file_transfer.cpp b/hal/amc/pldm_file_transfer.cpp
index 0fc2b8df7..31401b5a4 100644
--- a/hal/amc/pldm_file_transfer.cpp
+++ b/hal/amc/pldm_file_transfer.cpp
@@ -761,79 +761,79 @@ uint8_t pldm::pldmMultipartReceiveCommand(uint16_t fileDescriptor, std::vector<u
 }
 
 /**
- * @brief Retrieves the PLDM file descriptor PDR for a given file PDR ID.
+ * @brief Retrieves the PLDM file descriptor PDR for a given file identifier.
  *
- * This function searches through the PDR records to find the file descriptor PDR corresponding to the provided file PDR
- * ID.
+ * This function searches through the PDR records to find the file descriptor PDR whose
+ * fileIdentifier field matches the provided filePdrId.
  *
- * @param[in] filePdrId The index of the file PDR to retrieve
- * @return const PdrRecord* Pointer to the file descriptor PDR if found, nullptr on failure
+ * @param[in] filePdrId The file identifier to match against PDR records
+ * @return const PdrRecord* Pointer to the matching file descriptor PDR, nullptr if not found
  */
-const PdrRecord *pldm::getFilePdrById(uint32_t filePdrId)
+const PdrRecord *pldm::getFilePdrById(uint16_t filePdrId)
 {
 	TRACING();
 
-	std::vector<const PdrRecord *> filePdrs{};
+	const size_t minFilePdrSize = sizeof(struct pldmFileDescriptorPdr) - 1;
 	for (const auto &pdr : mPdrManager.getPdrRecords()) {
-		if (pdr.header.type == PLDM_FILE_DESCRIPTOR_PDR) {
-			filePdrs.push_back(&pdr);
+		if (pdr.header.type != PLDM_FILE_DESCRIPTOR_PDR) {
+			continue;
+		}
+		if (pdr.data.size() < minFilePdrSize) {
+			ERR("PLDM File Transfer: Skipping malformed file PDR: buffer size {} < {}\n", pdr.data.size(),
+				minFilePdrSize);
+			continue;
+		}
+		const auto *fileDescPdr = reinterpret_cast<const struct pldmFileDescriptorPdr *>(pdr.data.data());
+		DBG("Checking file PDR with identifier 0x{:04x}\n", fileDescPdr->fileIdentifier);
+		if (fileDescPdr->fileIdentifier == filePdrId) {
+			DBG("Found matching file PDR with identifier 0x{:04x}\n", filePdrId);
+			return &pdr;
 		}
 	}
 
-	if (filePdrId >= filePdrs.size()) {
-		ERR("PLDM File Transfer: Invalid file PDR ID {}\n", filePdrId);
-		return nullptr;
-	}
-
-	const PdrRecord *filePdr = filePdrs[filePdrId];
-	const size_t minFilePdrSize = sizeof(struct pldmFileDescriptorPdr) - 1;
-	if (filePdr->data.size() < minFilePdrSize) {
-		ERR("PLDM File Transfer: Invalid file PDR size ({})\n", filePdr->data.size());
-		return nullptr;
-	}
-
-	return filePdr;
+	ERR("PLDM File Transfer: File PDR with identifier 0x{:04x} not found\n", filePdrId);
+	return nullptr;
 }
 
 /**
- * @brief Reads a file using PLDM file transfer commands based on a given file PDR ID.
+ * @brief Reads a file using PLDM file transfer commands based on a given file PDR identifier.
  *
  * This function initializes the platform monitoring, retrieves the file descriptor PDR, opens the file, and reads its
  * contents using multipart receive if necessary.
  *
- * @param[in] filePdrId The index of the file PDR to read
+ * @param[in] filePdrId The identifier of the file PDR to read
  * @param[out] fileData The vector to store the read file data
  * @return uint8_t PLDM_SUCCESS on success, PLDM_ERROR on failure
  */
-uint8_t pldm::getFile(uint32_t filePdrId, std::vector<uint8_t> &fileData)
+uint8_t pldm::getFile(uint16_t filePdrId, std::vector<uint8_t> &fileData)
 {
 	TRACING();
 
-	INFO("PLDM File Transfer: Initiating file read for file PDR ID {}\n", filePdrId);
+	DBG("PLDM File Transfer: Initiating file read for file PDR identifier {}\n", filePdrId);
 	uint8_t ret = pfMonCtrlInitialize();
 	if (ret != PLDM_SUCCESS) {
 		ERR("PLDM File Transfer: Failed to initialize platform monitoring\n");
 		return ret;
 	}
-	INFO("PLDM File Transfer: Platform monitoring initialized successfully\n");
+	DBG("PLDM File Transfer: Platform monitoring initialized successfully\n");
 
 	const PdrRecord *filePdr = getFilePdrById(filePdrId);
 	if (filePdr == nullptr) {
-		ERR("PLDM File Transfer: Failed to retrieve file PDR with ID {}\n", filePdrId);
+		ERR("PLDM File Transfer: Failed to retrieve file PDR with identifier {}\n", filePdrId);
 		return PLDM_ERROR;
 	}
 
 	const auto *fileDescPdr = reinterpret_cast<const struct pldmFileDescriptorPdr *>(filePdr->data.data());
 	uint16_t fileIdentifier = fileDescPdr->fileIdentifier;
-	INFO("PLDM File Transfer: Found file PDR with ID {}, file identifier=0x{:04x}\n", filePdrId, fileIdentifier);
+	DBG("PLDM File Transfer: Found file PDR with identifier {}, file identifier=0x{:04x}\n", filePdrId, fileIdentifier);
 
 	uint16_t fileDescriptor = 0;
 	ret = pldmDfOpenCommand(fileIdentifier, fileDescriptor);
 	if (ret != PLDM_SUCCESS) {
 		return ret;
 	}
-	INFO("PLDM File Transfer: Opened file identifier 0x{:04x} with descriptor 0x{:04x}\n", fileIdentifier,
-		 fileDescriptor);
+	DBG("PLDM File Transfer: Opened file identifier 0x{:04x} with descriptor 0x{:04x}\n", fileIdentifier,
+		fileDescriptor);
 
 	fileData.clear();
 	ret = pldmMultipartReceiveCommand(fileDescriptor, fileData);
@@ -845,7 +845,7 @@ uint8_t pldm::getFile(uint32_t filePdrId, std::vector<uint8_t> &fileData)
 			ret = closeRet;
 		}
 	}
-	INFO("PLDM File Transfer: Closed file descriptor 0x{:04x}\n", fileDescriptor);
+	DBG("PLDM File Transfer: Closed file descriptor 0x{:04x}\n", fileDescriptor);
 
 	if (ret == PLDM_SUCCESS) {
 		INFO("PLDM File Transfer: File read completed, total bytes={}\n", fileData.size());
diff --git a/hal/core/debug.h b/hal/core/debug.h
index 6adc34a78..5238a855b 100644
--- a/hal/core/debug.h
+++ b/hal/core/debug.h
@@ -40,32 +40,32 @@ extern int dbgLvl;
 #define ERR(fmt, ...)                                                                                                  \
 	do {                                                                                                               \
 		if (dbgLvl >= ERR) {                                                                                           \
-			printf("[Error] ");                                                                                        \
-			printf(fmt, ##__VA_ARGS__);                                                                                \
-			fflush(stdout);                                                                                            \
+			fprintf(stderr, "[Error] ");                                                                               \
+			fprintf(stderr, fmt, ##__VA_ARGS__);                                                                       \
+			fflush(stderr);                                                                                            \
 		}                                                                                                              \
 	} while (0)
 #define INFO(fmt, ...)                                                                                                 \
 	do {                                                                                                               \
 		if (dbgLvl >= INFO) {                                                                                          \
-			printf("[Info] ");                                                                                         \
-			printf(fmt, ##__VA_ARGS__);                                                                                \
-			fflush(stdout);                                                                                            \
+			fprintf(stderr, "[Info] ");                                                                                \
+			fprintf(stderr, fmt, ##__VA_ARGS__);                                                                       \
+			fflush(stderr);                                                                                            \
 		}                                                                                                              \
 	} while (0)
 #define DBG(fmt, ...)                                                                                                  \
 	do {                                                                                                               \
 		if (dbgLvl >= DBG) {                                                                                           \
-			printf("[DBG] ");                                                                                          \
-			printf(fmt, ##__VA_ARGS__);                                                                                \
-			fflush(stdout);                                                                                            \
+			fprintf(stderr, "[DBG] ");                                                                                 \
+			fprintf(stderr, fmt, ##__VA_ARGS__);                                                                       \
+			fflush(stderr);                                                                                            \
 		}                                                                                                              \
 	} while (0)
 #define TRACE(fmt, ...)                                                                                                \
 	do {                                                                                                               \
 		if (dbgLvl >= TRACE) {                                                                                         \
-			printf(fmt, ##__VA_ARGS__);                                                                                \
-			fflush(stdout);                                                                                            \
+			fprintf(stderr, fmt, ##__VA_ARGS__);                                                                       \
+			fflush(stderr);                                                                                            \
 		}                                                                                                              \
 	} while (0)
 #define TRACING()
diff --git a/hal/core/device.cpp b/hal/core/device.cpp
index 019719e4c..c61cea70b 100644
--- a/hal/core/device.cpp
+++ b/hal/core/device.cpp
@@ -707,7 +707,6 @@ std::vector<sysman *> device::zesFunctionTable()
 		// clang-format off
 		&pciInstance,
 		&processInstance,
-		&diagnosticInstance,
 		&eccInstance,
 		&enginegroupInstance,
 		&fabricInstance,
@@ -715,7 +714,6 @@ std::vector<sysman *> device::zesFunctionTable()
 		firmwareInstance,
 		&frequencyInstance,
 		&memoryInstance,
-		&performanceInstance,
 		&powerInstance,
 		&rasInstance,
 		&schedulerInstance,
@@ -878,7 +876,11 @@ ze_result_t device::smDevInit(zes_driver_handle_t zesDri, zes_device_handle_t ze
 	result = pageOfflineInstance.init(zesDri, zesDev);
 	if (result != ZE_RESULT_SUCCESS) {
 		ERR("Failed to initialize page offline module with sysman device context.\n");
-		// Don't fail initialization, continue with other modules
+	}
+
+	// Initialize Power experimental instance and check if it's supported
+	if (powerExpInstance.init(zesDriver, zesDevice) != ZE_RESULT_SUCCESS) {
+		ERR("Failed to initialize Power experimental instance.\n");
 	}
 
 	return ZE_RESULT_SUCCESS;
diff --git a/hal/core/device.h b/hal/core/device.h
index 5a6dd29c4..ff7ea3804 100644
--- a/hal/core/device.h
+++ b/hal/core/device.h
@@ -12,7 +12,6 @@
 #include <mutex>
 #include "sysman.h"
 #include "pci.h"
-#include "diagnostic.h"
 #include "ecc.h"
 #include "enginegroup.h"
 #include "fabric.h"
@@ -21,7 +20,6 @@
 #include "memory.h"
 #include "metric.h"
 #include "pci.h"
-#include "performance.h"
 #include "power.h"
 #include "sysprocess.h"
 #include "ras.h"
@@ -31,6 +29,7 @@
 #include "vf.h"
 #include "rasexp.h"
 #include "offline_page.h"
+#include "powerexp.h"
 
 struct devProps
 {
@@ -93,7 +92,6 @@ class LIBXPUM_API device
 
 	pci pciInstance;
 	process processInstance;
-	diagnostic diagnosticInstance;
 	ecc eccInstance;
 	enginegroup enginegroupInstance;
 	fabric fabricInstance;
@@ -101,7 +99,6 @@ class LIBXPUM_API device
 	firmware *firmwareInstance;
 	frequency frequencyInstance;
 	memory memoryInstance;
-	performance performanceInstance;
 	power powerInstance;
 	ras rasInstance;
 	scheduler schedulerInstance;
@@ -111,6 +108,7 @@ class LIBXPUM_API device
 	metric metricInstance;
 	rasExp rasExpInstance;
 	pageOffline pageOfflineInstance;
+	powerExp powerExpInstance;
 
 public:
 	device();
@@ -158,7 +156,6 @@ class LIBXPUM_API device
 
 	pci *getPCI() { return &pciInstance; }
 	process *getProcess() { return &processInstance; }
-	diagnostic *getDiagnostic() { return &diagnosticInstance; }
 	ecc *getECC() { return &eccInstance; }
 	enginegroup *getEngineGroup() { return &enginegroupInstance; }
 	fabric *getFabric() { return &fabricInstance; }
@@ -166,7 +163,6 @@ class LIBXPUM_API device
 	firmware *getFirmware() { return firmwareInstance; }
 	frequency *getFrequency() { return &frequencyInstance; }
 	memory *getMemory() { return &memoryInstance; }
-	performance *getPerformance() { return &performanceInstance; }
 	power *getPower() { return &powerInstance; }
 	ras *getRAS() { return &rasInstance; }
 	scheduler *getScheduler() { return &schedulerInstance; }
@@ -175,6 +171,7 @@ class LIBXPUM_API device
 	vf *getVF() { return &vfInstance; }
 	rasExp *getRASExp() { return &rasExpInstance; }
 	pageOffline *getPageOffline() { return &pageOfflineInstance; }
+	powerExp *getPowerExp() { return &powerExpInstance; }
 
 	void getBDF(bdfID &bdf) const;
 	std::string getBDFStr();
diff --git a/hal/core/diagnostic.cpp b/hal/core/diagnostic.cpp
deleted file mode 100644
index ea3ca61ad..000000000
--- a/hal/core/diagnostic.cpp
+++ /dev/null
@@ -1,1882 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include <device.h>
-#include <vector>
-#include <fstream>
-#include <algorithm>
-#include <filesystem>
-#include <thread>
-#include <cmath>
-#include <chrono>
-#include "diagnostic.h"
-#include "file_io.h"
-
-/**
- * @brief Destructor for the diagnostic class
- *
- * This destructor performs cleanup operations for the diagnostic management
- * object, releasing allocated memory for diagnostic test suite handles and
- * ensuring proper resource deallocation when the diagnostic object is destroyed.
- */
-diagnostic::~diagnostic()
-{
-	if (testSuites) {
-		delete[] testSuites;
-		testSuites = nullptr;
-	}
-}
-
-/**
- * @brief Enumerates available diagnostic test suites for a device
- *
- * This function discovers and catalogs all diagnostic test suites available on
- * the specified device. Diagnostic test suites provide comprehensive hardware
- * validation and health checking capabilities for GPU components.
- *
- * @param[in] device Handle to the Level Zero Sysman device
- * @return ze_result_t ZE_RESULT_SUCCESS on successful enumeration, error code otherwise
- */
-ze_result_t diagnostic::enumDiag(zes_device_handle_t device)
-{
-	// Enumerate diagnostic test suites
-	ze_result_t result = zesDeviceEnumDiagnosticTestSuites(device, &testSuiteCount, nullptr);
-	if (result != ZE_RESULT_SUCCESS || testSuiteCount == 0) {
-		ERR("Failed to enumerate diagnostic test suites or no test suites found: 0x{:X} ({})\n", result,
-			l0_error_to_string(result));
-		return result;
-	}
-
-	testSuites = new zes_diag_handle_t[testSuiteCount];
-	result = zesDeviceEnumDiagnosticTestSuites(device, &testSuiteCount, testSuites);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get diagnostic test suite handles: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	DBG("  - Device has {} diagnostic test suites:\n", testSuiteCount);
-	return result;
-}
-
-/**
- * @brief Gets properties for a specific diagnostic test suite
- *
- * This function retrieves detailed properties and characteristics for a
- * specific diagnostic test suite, including suite name, type, test availability,
- * and subdevice association information for comprehensive diagnostic analysis.
- *
- * @param[in] testSuite Handle to the specific diagnostic test suite
- * @return ze_result_t ZE_RESULT_SUCCESS on successful property retrieval, error code otherwise
- */
-ze_result_t diagnostic::getProperties(zes_diag_handle_t testSuite)
-{
-	ze_result_t result = ZE_RESULT_SUCCESS;
-	zes_diag_properties_t diagProperties = {};
-	result = zesDiagnosticsGetProperties(testSuite, &diagProperties);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get diagnostic test suite properties: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-	DBG("    - Test Suite Name: {}\n", diagProperties.name);
-	DBG("    - Type : {}\n", diagProperties.stype);
-	DBG("    - have Tests : {}\n", diagProperties.haveTests);
-	DBG("    - onSubDevice : {}\n", diagProperties.onSubdevice);
-	DBG("    - subdeviceId : {}\n", diagProperties.subdeviceId);
-	return result;
-}
-
-/**
- * @brief Calculates bandwidth in GBPS from timing measurements
- *
- * This utility function computes bandwidth in gigabytes per second based on
- * execution period and total throughput measurements. It provides performance
- * calculation capabilities for diagnostic bandwidth tests.
- *
- * @param[in] period Execution time period in appropriate units
- * @param[in] total_gbps Total throughput measurement
- * @return long double Calculated bandwidth in GBPS, or maximum value if period is near zero
- */
-long double calculateGbps(long double period, long double totalGbps)
-{
-	constexpr auto ep = std::numeric_limits<long double>::epsilon();
-	if ((period * 10e3) > (ep * 10e3))
-		return totalGbps / period;
-	else {
-		return std::numeric_limits<long double>::max();
-	}
-}
-
-/**
- * @brief Calculates bandwidth and latency from timing measurements.
- *
- * This utility function computes bandwidth (in gigabytes per second) and latency (in microseconds)
- * based on execution time and total data transfer measurements. It is used for diagnostic
- * bandwidth and latency tests.
- *
- * @param[in]  totalTimeNsec      Total execution time in nanoseconds.
- * @param[in]  totalDataTransfer  Total data transferred in bytes.
- * @param[out] totalBandwidth     Calculated bandwidth in gigabytes per second.
- * @param[out] totalLatency       Calculated latency in microseconds.
- * @param[in]  numberIterations   Number of iterations executed.
- * @return Calculated bandwidth and latency
- */
-void calculateBandwidthLatency(long double totalTimeNsec, long double totalDataTransfer, long double &totalBandwidth,
-							   long double &totalLatency, std::size_t numberIterations)
-{
-	long double totalTimeS;
-	totalTimeS = totalTimeNsec / 1e9; /* Units in Seconds */
-	totalDataTransfer /= 1e9L;		  /* Units in Gigabytes */
-
-	totalBandwidth = totalDataTransfer / totalTimeS;
-	totalLatency = totalTimeNsec / (1e3 * static_cast<double>(numberIterations));
-}
-
-/**
- * @brief Performs a computation test on a device to evaluate its floating-point performance.
- *
- * This function executes a single-precision floating-point computation test on the specified device
- * using Level Zero APIs. It loads and executes a shader program ("ze_sp_compute.spv") that performs
- * intensive floating-point calculations, then measures the performance in GFLOPS.
- *
- * The test:
- * 1. Retrieves device properties
- * 2. Loads the shader binary file
- * 3. Creates necessary memory allocations
- * 4. Sets up command lists and queues
- * 5. Configures workgroups based on device capabilities
- * 6. Executes the kernel and measures performance
- * 7. Cleans up resources
- *
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @param[in] flops_per_work_item std::size_t value for flops per work item
- * @param[in] srcPtr pointer to a specific data type
- * @param[in] srcSize source size for a specific data type
- * @param[in] fileName, reference  to a specific data type based SPV file
- * @param[in] moduleName, reference to a related kernel module name
- * @param[out] out_gflops, reference to a related output long double flops value
- * @param[in] functionalCheck, Boolean flag: true for functional testing, false for performance measurement
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::computationTest(devInfo *d, std::size_t flopsPerWorkItem, void *srcPtr, size_t srcSize,
-										const std::string &fileName, const std::string &moduleName,
-										long double &outGflops, bool functionalCheck)
-{
-	TRACING();
-	ze_device_properties_t zeDevProp = {};
-	ze_device_compute_properties_t zeComputeProp = {};
-	ze_result_t result;
-	ze_context_handle_t context = d->dev->getContext();
-	std::vector<long double> allGflops;
-
-	result = d->dev->getDevProps(d->deviceHdl, &zeDevProp);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get device properties: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	result = d->dev->getComputeProps(d->deviceHdl, &zeComputeProp);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get device properties: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	long double timed;
-	std::vector<uint8_t> binaryFile;
-	ze_result_t ret = loadBinaryFile(fileName, &binaryFile);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to load binary file: {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-	ze_module_handle_t moduleHandle;
-	ret = moduleCreate(context, d->deviceHdl, binaryFile, &moduleHandle);
-	if (ret != ZE_RESULT_SUCCESS) {
-		return ret;
-	}
-
-	uint64_t maxWorkItems = (uint64_t)zeDevProp.numSlices * zeDevProp.numSubslicesPerSlice *
-							zeDevProp.numEUsPerSubslice * zeComputeProp.maxGroupCountX * 2048;
-	uint64_t maxNumberOfAllocatedItems = zeDevProp.maxMemAllocSize / srcSize;
-	uint64_t numberOfWorkItems = std::min(maxNumberOfAllocatedItems, (maxWorkItems * srcSize));
-	ZeWorkGroups workgroupInfo;
-	numberOfWorkItems = setWorkgroups(&zeComputeProp, numberOfWorkItems, &workgroupInfo);
-
-	void *deviceInputValue;
-	ret = memoryAlloc(context, d->deviceHdl, srcSize, 1, &deviceInputValue);
-	if (ret != ZE_RESULT_SUCCESS) {
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	void *deviceOutputBuffer;
-	ret = memoryAlloc(context, d->deviceHdl, static_cast<std::size_t>(numberOfWorkItems * srcSize), 1,
-					  &deviceOutputBuffer);
-	if (ret != ZE_RESULT_SUCCESS) {
-		memoryFree(context, deviceInputValue);
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	ze_command_list_handle_t commandList;
-	ret = commandListCreate(context, d->deviceHdl, 0, &commandList, ZE_COMMAND_LIST_FLAG_EXPLICIT_ONLY);
-	if (ret != ZE_RESULT_SUCCESS) {
-		memoryFree(context, deviceInputValue);
-		memoryFree(context, deviceOutputBuffer);
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	ze_command_queue_handle_t commandQueue;
-	ret = commandQueueCreate(context, d->deviceHdl, 0, 0, &commandQueue, ZE_COMMAND_QUEUE_FLAG_EXPLICIT_ONLY);
-	if (ret != ZE_RESULT_SUCCESS) {
-		memoryFree(context, deviceInputValue);
-		memoryFree(context, deviceOutputBuffer);
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	ret = zeCommandListAppendMemoryCopy(commandList, deviceOutputBuffer, srcPtr, srcSize, nullptr, 0, nullptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't append memory copy: {}\n", l0_error_to_string(ret));
-		memoryFree(context, deviceInputValue);
-		memoryFree(context, deviceOutputBuffer);
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	ret = zeCommandListAppendBarrier(commandList, nullptr, 0, nullptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't append barrier: {}\n", l0_error_to_string(ret));
-		memoryFree(context, deviceInputValue);
-		memoryFree(context, deviceOutputBuffer);
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	ret = zeCommandListClose(commandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't close command list: {}\n", l0_error_to_string(ret));
-		memoryFree(context, deviceInputValue);
-		memoryFree(context, deviceOutputBuffer);
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-
-	commandQueueExecuteCommandLists(commandQueue, commandList);
-	commandQueueSynchronize(commandQueue);
-
-	commandListReset(commandList);
-	ze_kernel_handle_t computeSpV1;
-	setupFunction(moduleHandle, computeSpV1, moduleName, deviceInputValue, deviceOutputBuffer);
-
-	timed = 0;
-	// Vector width 1
-	timed = runKernel(commandQueue, commandList, computeSpV1, workgroupInfo, functionalCheck);
-	if (!functionalCheck) {
-		outGflops = calculateGbps(timed, (long double)numberOfWorkItems * flopsPerWorkItem);
-	}
-	//	all_gflops[i] = std::max(all_gflops[i], current);
-	ret = zeKernelDestroy(computeSpV1);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-	}
-
-	ret = zeCommandListDestroy(commandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error destroying command list: {}\n", l0_error_to_string(ret));
-	}
-
-	ret = zeCommandQueueDestroy(commandQueue);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error destroying command queue: {}\n", l0_error_to_string(ret));
-	}
-
-	memoryFree(context, deviceInputValue);
-	memoryFree(context, deviceOutputBuffer);
-	moduleDestroy(moduleHandle);
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Creates a Level Zero module from SPIR-V binary data
- *
- * This function creates a GPU compute module from compiled SPIR-V binary code,
- * enabling kernel execution on the target device. It configures the module
- * descriptor and handles module creation for diagnostic compute operations.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] ze_device Device handle for the target GPU device
- * @param[in] binary_file Vector containing the SPIR-V binary data
- * @param[out] module_handle Pointer to receive the created module handle
- * @return ze_result_t ZE_RESULT_SUCCESS on successful module creation, error code otherwise
- */
-ze_result_t diagnostic::moduleCreate(const ze_context_handle_t &contextHandle, ze_device_handle_t zeDevice,
-									 std::vector<uint8_t> binaryFile, ze_module_handle_t *moduleHandle)
-{
-	ze_module_desc_t moduleDescription = {};
-	moduleDescription.stype = ZE_STRUCTURE_TYPE_MODULE_DESC;
-	moduleDescription.pNext = nullptr;
-	moduleDescription.format = ZE_MODULE_FORMAT_IL_SPIRV;
-	moduleDescription.inputSize = static_cast<uint32_t>(binaryFile.size());
-	moduleDescription.pInputModule = binaryFile.data();
-	moduleDescription.pBuildFlags = nullptr;
-	ze_result_t ret;
-
-	ret = zeModuleCreate(contextHandle, zeDevice, &moduleDescription, moduleHandle, nullptr);
-
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't create module: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Destroys a Level Zero module and releases its resources
- *
- * This function properly destroys a GPU compute module created earlier,
- * releasing all associated resources and handles. It provides cleanup
- * functionality for diagnostic operations using GPU modules.
- *
- * @param[in] hModule Handle to the module to be destroyed
- */
-void diagnostic::moduleDestroy(ze_module_handle_t hModule)
-{
-	ze_result_t ret = zeModuleDestroy(hModule);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't destroy module: {}\n", l0_error_to_string(ret));
-	}
-}
-
-/**
- * @brief Allocates device memory for GPU operations
- *
- * This function allocates memory on the GPU device for diagnostic operations,
- * configuring memory allocation parameters and handling device-specific
- * memory requirements for compute kernels and data buffers.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] ze_device Device handle for the target GPU device
- * @param[in] size Size of memory to allocate in bytes
- * @param[in] alignment Memory alignment requirement in bytes
- * @param[out] ptr Pointer to receive the allocated memory address
- * @return ze_result_t ZE_RESULT_SUCCESS on successful allocation, error code otherwise
- */
-ze_result_t diagnostic::memoryAlloc(const ze_context_handle_t contextHandle, ze_device_handle_t zeDevice, size_t size,
-									size_t alignment, void **ptr)
-{
-	ze_device_mem_alloc_desc_t deviceDesc = {};
-	deviceDesc.stype = ZE_STRUCTURE_TYPE_DEVICE_MEM_ALLOC_DESC;
-	deviceDesc.pNext = nullptr;
-	deviceDesc.ordinal = 0;
-	deviceDesc.flags = 0;
-	ze_result_t ret;
-	ret = zeMemAllocDevice(contextHandle, &deviceDesc, size, alignment, zeDevice, ptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't allocate memory: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Allocates host memory for GPU operations
- *
- * This function allocates memory on the GPU device for diagnostic operations,
- * configuring memory allocation parameters and handling host specific
- * memory requirements for compute kernels and data buffers.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] size Size of memory to allocate in bytes
- * @param[in] alignment Memory alignment requirement in bytes
- * @param[out] ptr Pointer to receive the allocated memory address
- * @return ze_result_t ZE_RESULT_SUCCESS on successful allocation, error code otherwise
- */
-ze_result_t diagnostic::memoryAllocHost(const ze_context_handle_t contextHandle, size_t size, size_t alignment,
-										void **ptr)
-{
-	ze_host_mem_alloc_desc_t hostDesc = {};
-	hostDesc.stype = ZE_STRUCTURE_TYPE_HOST_MEM_ALLOC_DESC;
-	hostDesc.pNext = nullptr;
-	hostDesc.flags = 0;
-	ze_result_t ret;
-
-	ret = zeMemAllocHost(contextHandle, &hostDesc, size, alignment, ptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't allocate memory: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Allocates shared memory for GPU operations
- *
- * This function allocates shared memory on the GPU device for diagnostic operations,
- * configuring memory allocation parameters and handling both device and host specific
- * shared memory requirements for compute kernels and data buffers.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] zeDevice Device handle for the target GPU device
- * @param[in] size Size of memory to allocate in bytes
- * @param[in] alignment Memory alignment requirement in bytes
- * @param[out] ptr Pointer to receive the allocated memory address
- * @return ze_result_t ZE_RESULT_SUCCESS on successful allocation, error code otherwise
- */
-ze_result_t diagnostic::memoryAllocShared(const ze_context_handle_t &context, ze_device_handle_t zeDevice, size_t size,
-										  size_t alignment, void **ptr)
-{
-	ze_device_mem_alloc_desc_t deviceDescOutput = {};
-	deviceDescOutput.stype = ZE_STRUCTURE_TYPE_DEVICE_MEM_ALLOC_DESC;
-	deviceDescOutput.ordinal = 0;
-	deviceDescOutput.flags = 0;
-	deviceDescOutput.pNext = nullptr;
-
-	ze_host_mem_alloc_desc_t hostDescOutput = {};
-	hostDescOutput.stype = ZE_STRUCTURE_TYPE_HOST_MEM_ALLOC_DESC;
-	hostDescOutput.flags = 0;
-	hostDescOutput.pNext = nullptr;
-	ze_result_t ret;
-
-	ret = zeMemAllocShared(context, &deviceDescOutput, &hostDescOutput, size, alignment, zeDevice, ptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't allocate memory: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Creates a Level Zero command list for GPU operations
- *
- * This function creates a command list that will contain GPU commands for
- * diagnostic operations. Command lists are used to batch and submit GPU
- * operations efficiently for kernel execution and memory operations.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] ze_device Device handle for the target GPU device
- * @param[in] command_queue_group_ordinal Ordinal of the command queue group
- * @param[out] phCommandList Pointer to receive the created command list handle
- * @param[in] flags Command list creation flags
- * @return ze_result_t ZE_RESULT_SUCCESS on successful creation, error code otherwise
- */
-ze_result_t diagnostic::commandListCreate(const ze_context_handle_t contextHandle, ze_device_handle_t zeDevice,
-										  uint32_t commandQueueGroupOrdinal, ze_command_list_handle_t *phCommandList,
-										  uint32_t flags)
-{
-	ze_command_list_desc_t commandListDescription{};
-	commandListDescription.stype = ZE_STRUCTURE_TYPE_COMMAND_LIST_DESC;
-	commandListDescription.commandQueueGroupOrdinal = commandQueueGroupOrdinal;
-	commandListDescription.pNext = nullptr;
-	commandListDescription.flags = flags;
-	ze_result_t ret;
-	ret = zeCommandListCreate(contextHandle, zeDevice, &commandListDescription, phCommandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't create command list: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Creates a Level Zero command queue for GPU operation submission
- *
- * This function creates a command queue that will be used to submit command
- * lists to the GPU for execution. Command queues manage the execution of
- * GPU operations and provide synchronization capabilities for diagnostic tests.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] ze_device Device handle for the target GPU device
- * @param[in] command_queue_group_ordinal Ordinal of the command queue group
- * @param[in] command_queue_index Index within the command queue group
- * @param[out] phCommandQueue Pointer to receive the created command queue handle
- * @param[in] flags Command queue creation flags
- * @return ze_result_t ZE_RESULT_SUCCESS on successful creation, error code otherwise
- */
-ze_result_t diagnostic::commandQueueCreate(const ze_context_handle_t contextHandle, ze_device_handle_t zeDevice,
-										   const uint32_t commandQueueGroupOrdinal, const uint32_t commandQueueIndex,
-										   ze_command_queue_handle_t *phCommandQueue, uint32_t flags)
-{
-	ze_command_queue_desc_t commandQueueDescription{.stype = ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC,
-													.pNext = nullptr,
-													.ordinal = commandQueueGroupOrdinal,
-													.index = commandQueueIndex,
-													.flags = flags,
-													.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS,
-													.priority = ZE_COMMAND_QUEUE_PRIORITY_NORMAL};
-
-	ze_result_t ret;
-	ret = zeCommandQueueCreate(contextHandle, zeDevice, &commandQueueDescription, phCommandQueue);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't create command queue: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Configures work group parameters for GPU kernel execution
- *
- * This function calculates optimal work group dimensions and counts based on
- * device compute properties and requested work items. It ensures work group
- * configuration stays within device limits while maximizing GPU utilization.
- *
- * @param[in] device_compute_properties Pointer to device compute properties structure
- * @param[in] total_work_items_requested Total number of work items requested for execution
- * @param[out] workgroup_info Pointer to work group structure to be populated
- * @return uint64_t Actual number of work items that will be executed
- */
-uint64_t diagnostic::setWorkgroups(ze_device_compute_properties_t *deviceComputeProperties,
-								   const uint64_t totalWorkItemsRequested, struct ZeWorkGroups *workgroupInfo)
-{
-	auto groupSizeX =
-		std::clamp(totalWorkItemsRequested, uint64_t(1), uint64_t(deviceComputeProperties->maxGroupSizeX));
-	auto groupSizeY = 1;
-	auto groupSizeZ = 1;
-	auto groupSize = groupSizeX * groupSizeY * groupSizeZ;
-
-	auto groupCountX = totalWorkItemsRequested / groupSize;
-	groupCountX = std::clamp(groupCountX, uint64_t(1), uint64_t(deviceComputeProperties->maxGroupCountX));
-	auto remainingItems = totalWorkItemsRequested - groupCountX * groupSize;
-
-	uint64_t groupCountY = remainingItems / (groupCountX * groupSize);
-	groupCountY = std::clamp(groupCountY, uint64_t(1), uint64_t(deviceComputeProperties->maxGroupCountY));
-	remainingItems = totalWorkItemsRequested - groupCountX * groupCountY * groupSize;
-
-	uint64_t groupCountZ = remainingItems / (groupCountX * groupCountY * groupSize);
-	groupCountZ = std::clamp(groupCountZ, uint64_t(1), uint64_t(deviceComputeProperties->maxGroupCountZ));
-
-	auto finalWorkItems = groupCountX * groupCountY * groupCountZ * groupSize;
-	remainingItems = totalWorkItemsRequested - finalWorkItems;
-
-	workgroupInfo->group_size_x = static_cast<uint32_t>(groupSizeX);
-	workgroupInfo->group_size_y = static_cast<uint32_t>(groupSizeY);
-	workgroupInfo->group_size_z = static_cast<uint32_t>(groupSizeZ);
-	workgroupInfo->group_count_x = static_cast<uint32_t>(groupCountX);
-	workgroupInfo->group_count_y = static_cast<uint32_t>(groupCountY);
-	workgroupInfo->group_count_z = static_cast<uint32_t>(groupCountZ);
-
-	return finalWorkItems;
-}
-
-/**
- * @brief Loads SPIR-V binary file for GPU kernel execution
- *
- * This function reads a compiled SPIR-V binary file from the resources directory
- * and loads it into memory for module creation. It provides kernel loading
- * capabilities for diagnostic compute operations.
- *
- * @param[in] filePath Path to the SPIR-V binary file relative to kernels directory
- * @param[out] binary_file Pointer to vector that will contain the loaded binary data
- * @return ze_result_t ZE_RESULT_SUCCESS on successful file loading, error code otherwise
- */
-ze_result_t diagnostic::loadBinaryFile(const std::string &filePath, std::vector<uint8_t> *binaryFile)
-{
-	std::string folder = FINDRESOURCEFILE(std::string(XPUM_RESOURCES_DIR) + std::string("kernels/"));
-	if (!fileExists(folder)) {
-		ERR("Kernel folder does not exist: {}\n", folder.c_str());
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	std::string absoluteFilePath = folder + filePath;
-	std::ifstream stream(absoluteFilePath, std::ios::in | std::ios::binary);
-
-	if (!stream.good()) {
-		ERR("Failed to open kernel file: {}\n", absoluteFilePath.c_str());
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	size_t length = 0;
-	stream.seekg(0, stream.end);
-	length = static_cast<size_t>(stream.tellg());
-	stream.seekg(0, stream.beg);
-	binaryFile->resize(length);
-	stream.read(reinterpret_cast<char *>(binaryFile->data()), length);
-	stream.close();
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes command lists on a GPU command queue
- *
- * This function submits a command list to the specified command queue for
- * execution on the GPU. It provides the mechanism to trigger GPU operations
- * that have been recorded in command lists for diagnostic tests.
- *
- * @param[in] hCommandQueue Handle to the command queue for execution
- * @param[in] hCommandList Handle to the command list to execute
- */
-ze_result_t diagnostic::commandQueueExecuteCommandLists(ze_command_queue_handle_t hCommandQueue,
-														ze_command_list_handle_t hCommandList)
-{
-	ze_result_t ret = zeCommandQueueExecuteCommandLists(hCommandQueue, 1, &hCommandList, nullptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't execute command lists: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Synchronizes with GPU command queue completion
- *
- * This function waits for all commands in the specified command queue to
- * complete execution. It provides synchronization between CPU and GPU
- * operations, ensuring diagnostic tests complete before proceeding.
- *
- * @param[in] hCommandQueue Handle to the command queue to synchronize with
- */
-ze_result_t diagnostic::commandQueueSynchronize(ze_command_queue_handle_t hCommandQueue)
-{
-	ze_result_t ret = zeCommandQueueSynchronize(hCommandQueue, UINT64_MAX);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't synchronize command queue: {}\n", l0_error_to_string(ret));
-	}
-
-	return ret;
-}
-
-/**
- * @brief Resets a command list for reuse
- *
- * This function resets a command list to its initial state, allowing it to
- * be reused for recording new GPU commands. It provides efficient command
- * list management for iterative diagnostic operations.
- *
- * @param[in] hCommandList Handle to the command list to reset
- */
-ze_result_t diagnostic::commandListReset(ze_command_list_handle_t hCommandList)
-{
-	ze_result_t ret = zeCommandListReset(hCommandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't reset command list: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Creates a GPU kernel from a module
- *
- * This function creates a kernel object from a compiled module, allowing
- * specific kernel functions to be executed on the GPU. It provides the
- * foundation for running compute operations in diagnostic tests.
- *
- * @param[in] hModule Handle to the module containing the kernel
- * @param[in] name String name of the kernel function to create
- * @param[out] hKernel Pointer to receive the created kernel handle
- * @return ze_result_t ZE_RESULT_SUCCESS on successful kernel creation, error code otherwise
- */
-ze_result_t diagnostic::kernelCreate(ze_module_handle_t hModule, std::string name, ze_kernel_handle_t *hKernel)
-{
-	ze_kernel_desc_t testFunctionDescription = {};
-	testFunctionDescription.stype = ZE_STRUCTURE_TYPE_KERNEL_DESC;
-	testFunctionDescription.pNext = nullptr;
-	testFunctionDescription.flags = 0;
-	testFunctionDescription.pKernelName = name.c_str();
-
-	ze_result_t ret = zeKernelCreate(hModule, &testFunctionDescription, hKernel);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error creating kernel: {}\n", l0_error_to_string(ret));
-	}
-	return ret;
-}
-
-/**
- * @brief Frees GPU device memory
- *
- * This function releases device memory that was previously allocated for
- * GPU operations. It provides proper cleanup and resource management
- * for diagnostic tests that use GPU memory buffers.
- *
- * @param[in] context Level Zero context handle
- * @param[in] ptr Pointer to the device memory to free
- */
-ze_result_t diagnostic::memoryFree(const ze_context_handle_t &contextHandle, const void *ptr)
-{
-	ze_result_t ret = zeMemFree(contextHandle, const_cast<void *>(ptr));
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error freeing memory: {}\n", l0_error_to_string(ret));
-	}
-
-	return ret;
-}
-
-/**
- * @brief Configures a kernel function with input and output parameters
- *
- * This function sets up a kernel for execution by creating the kernel object
- * and configuring its arguments with input and output memory buffers.
- * It prepares kernels for diagnostic compute operations.
- *
- * @param[in] module_handle Handle to the module containing the kernel
- * @param[out] function Reference to kernel handle to be created and configured
- * @param[in] name Name of the kernel function to set up
- * @param[in] input Pointer to input data buffer
- * @param[in] output Pointer to output data buffer
- */
-ze_result_t diagnostic::setupFunction(ze_module_handle_t moduleHandle, ze_kernel_handle_t &function,
-									  const std::string &name, void *input, void *output)
-{
-	ze_result_t ret = kernelCreate(moduleHandle, name, &function);
-	if (ret != ZE_RESULT_SUCCESS) {
-		return ret;
-	}
-
-	ret = zeKernelSetArgumentValue(function, 0, sizeof(input), &input);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error setting kernel argument value: {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-	ret = zeKernelSetArgumentValue(function, 1, sizeof(output), &output);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error setting kernel argument value: {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-	return ret;
-}
-
-/**
- * @brief Appends a kernel launch command to a command list
- *
- * This function records a kernel launch operation in the specified command
- * list with the given launch parameters. It provides the mechanism to
- * schedule kernel execution as part of GPU command sequences.
- *
- * @param[in] hCommandList Handle to the command list
- * @param[in] hKernel Handle to the kernel to launch
- * @param[in] pLaunchFuncArgs Pointer to launch function arguments containing work group configuration
- */
-void diagnostic::commandListAppendLaunchKernel(ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel,
-											   const ze_group_count_t *pLaunchFuncArgs)
-{
-	ze_result_t ret = zeCommandListAppendLaunchKernel(hCommandList, hKernel, pLaunchFuncArgs, nullptr, 0, nullptr);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error appending launch kernel: {}\n", l0_error_to_string(ret));
-	}
-}
-
-/**
- * @brief Executes a GPU kernel with timing and performance measurement
- *
- * This function runs a GPU kernel with the specified work group configuration,
- * measures execution time, and optionally performs performance analysis.
- * It supports both functional testing and performance benchmarking modes.
- *
- * @param[in] command_queue Handle to the command queue for kernel execution
- * @param[in] command_list Handle to the command list containing kernel commands
- * @param[in,out] function Reference to the kernel function to execute
- * @param[in] workgroup_info Work group configuration parameters
- * @param[in] checkOnly Boolean flag: true for functional testing, false for performance measurement
- * @return long double Execution time in nanoseconds, or -1 on error
- */
-long double diagnostic::runKernel(ze_command_queue_handle_t commandQueue, ze_command_list_handle_t commandList,
-								  ze_kernel_handle_t &function, struct ZeWorkGroups &workgroupInfo, bool checkOnly)
-{
-	long double timed = 0;
-
-	ze_result_t ret = zeKernelSetGroupSize(function, workgroupInfo.group_size_x, workgroupInfo.group_size_y,
-										   workgroupInfo.group_size_z);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Error setting kernel group size: {}\n", l0_error_to_string(ret));
-		return -1;
-	}
-
-	ze_group_count_t threadGroupDimensions;
-	threadGroupDimensions.groupCountX = workgroupInfo.group_count_x;
-	threadGroupDimensions.groupCountY = workgroupInfo.group_count_y;
-	threadGroupDimensions.groupCountZ = workgroupInfo.group_count_z;
-	commandListAppendLaunchKernel(commandList, function, &threadGroupDimensions);
-
-	ret = zeCommandListClose(commandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Couldn't close command list: {}\n", l0_error_to_string(ret));
-		return -1;
-	}
-
-	// 1 round is good enough if it is not perf diag
-	if (checkOnly == true) {
-		commandQueueExecuteCommandLists(commandQueue, commandList);
-		commandQueueSynchronize(commandQueue);
-		return 0;
-	}
-	// Consistent with ze_peak
-	uint32_t warmupIterations = 5;
-	uint32_t iters = 20;
-	for (uint32_t i = 0; i < warmupIterations; i++) {
-		commandQueueExecuteCommandLists(commandQueue, commandList);
-		commandQueueSynchronize(commandQueue);
-	}
-
-	std::chrono::high_resolution_clock::time_point timeStart, timeEnd;
-	timeStart = std::chrono::high_resolution_clock::now();
-	for (uint32_t i = 0; i < iters; i++) {
-		commandQueueExecuteCommandLists(commandQueue, commandList);
-		commandQueueSynchronize(commandQueue);
-	}
-
-	timeEnd = std::chrono::high_resolution_clock::now();
-	timed = std::chrono::duration<long double, std::chrono::nanoseconds::period>(timeEnd - timeStart).count();
-	commandListReset(commandList);
-	return (timed / static_cast<long double>(iters));
-}
-
-/**
- * @brief calculate Power Consumption on a device
- *
- * This function calculate Power Consumption test on the specified device using Level Zero APIs.
- *
- * The test:
- * 1. Retrieves device power, power domain count ad related power handles
- * 2. For each power domain, takes two power measurements.
- * 3. calculate summary of all the device and sub device domain power values.
- * 4. Return the maximum of them
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @param[out] totalPowerValue indicate the power value for the device
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::calculatePowerConsumption(devInfo *d, int &totalPowerValue)
-{
-	ze_result_t ret;
-	zes_power_properties_t props = {};
-	zes_power_ext_properties_t extProps = {};
-	props.pNext = &extProps;
-	props.stype = ZES_STRUCTURE_TYPE_POWER_PROPERTIES;
-	extProps.stype = ZES_STRUCTURE_TYPE_POWER_EXT_PROPERTIES;
-	zes_power_energy_counter_t snap1, snap2;
-	int value;
-	uint32_t powerDomainCount;
-	zes_pwr_handle_t *powerHandles;
-	int currentDevicePowerValueSum = 0;
-	int currentSubDevicePowerValueSum = 0;
-
-	power *pwr = d->dev->getPower();
-	if (pwr == nullptr) {
-		ERR("Error: Power pointer not found.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	powerDomainCount = pwr->getPowerCount();
-	powerHandles = pwr->getPowerHandles();
-	for (uint32_t i = 0; i < powerDomainCount; ++i) {
-		ret = pwr->getProperties(powerHandles[i], &props, &extProps);
-		if (ret != ZE_RESULT_SUCCESS) {
-			continue;
-		}
-
-		if (extProps.domain != ZES_POWER_DOMAIN_PACKAGE)
-			continue;
-
-		ret = pwr->getEnergyCounter(powerHandles[i], &snap1);
-		if (ret == ZE_RESULT_SUCCESS) {
-			std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-			ret = pwr->getEnergyCounter(powerHandles[i], &snap2);
-			if (ret == ZE_RESULT_SUCCESS) {
-				value = static_cast<int>(std::ceil(static_cast<double>(snap2.energy - snap1.energy) * 1.0 /
-												   static_cast<double>(snap2.timestamp - snap1.timestamp)));
-				if (!props.onSubdevice) {
-					currentDevicePowerValueSum += value;
-				} else {
-					currentSubDevicePowerValueSum += value;
-				}
-			}
-		}
-	}
-	totalPowerValue = std::max(currentDevicePowerValueSum, currentSubDevicePowerValueSum);
-	DBG("update peak power value: {}\n", totalPowerValue);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Performs a pcie Bandwidth test on a device.
- *
- * This function executes Command Queue Groups test on the specified device using Level Zero APIs.
- * It loads and executes that performs the command queue lists in each copy Engine Group in iteration way,
- * then measures the pcie bandwidth & Latency.
- * The test:
- * 1. Retrieves device command queue group properties
- * 2. For each group item, creates necessary memory allocations
- * 3. For each group item, sets up command lists and queues
- * 4. For each group item, execute Command Lists in iteration way
- * 5. For each group item, measures pcie Bandwidth & Latency
- * 6. Cleans up resources
- * 7. repeat the same setup and measure for all the group item and
- *    get the total bandwidth & Latency
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @param[out] totalBandwidth  long double for the device pcie total bandwidth information
- * @param[out] totalLatency long double for the device pcie total latency information
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::pcieBandwidthTest(devInfo *d, long double &totalBandwidth, long double &totalLatency)
-{
-	TRACING();
-
-	uint32_t cmdQueuePropsCount;
-	ze_result_t ret;
-	ze_context_handle_t context = d->dev->getContext();
-	long double tBandwidth = 0.0;
-	long double tLatency = 0.0;
-	long double allBandwidth = 0.0;
-	long double allLatency = 0.0;
-
-	cmdQueuePropsCount = d->dev->getCmdQueuePropsCount();
-	if (cmdQueuePropsCount == 0) {
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	for (uint32_t copyEngineGroupId = 0; copyEngineGroupId < cmdQueuePropsCount; ++copyEngineGroupId) {
-		ze_command_list_handle_t commandList;
-		ret = commandListCreate(context, d->deviceHdl, copyEngineGroupId, &commandList,
-								ZE_COMMAND_LIST_FLAG_EXPLICIT_ONLY);
-		if (ret != ZE_RESULT_SUCCESS) {
-			return ret;
-		}
-
-		ze_command_queue_handle_t commandQueue;
-
-		ret = commandQueueCreate(context, d->deviceHdl, copyEngineGroupId, 0, &commandQueue,
-								 ZE_COMMAND_QUEUE_FLAG_EXPLICIT_ONLY);
-		if (ret != ZE_RESULT_SUCCESS) {
-			return ret;
-		}
-
-		std::size_t size = 1 << 28;
-		void *deviceBuffer;
-		void *hostBuffer;
-
-		ret = memoryAlloc(context, d->deviceHdl, size, 1, &deviceBuffer);
-		if (ret != ZE_RESULT_SUCCESS) {
-			return ret;
-		}
-		ret = memoryAllocHost(context, size, 1, &hostBuffer);
-		if (ret != ZE_RESULT_SUCCESS) {
-			return ret;
-		}
-
-		uint32_t nIterations = 500;
-		long double totalTimeNsec = 0.0;
-		std::size_t elementSize = sizeof(uint8_t);
-		std::size_t bufferSize = elementSize * size;
-		ret = zeCommandListAppendMemoryCopy(commandList, deviceBuffer, hostBuffer, bufferSize, nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Couldn't append memory copy: {}\n", l0_error_to_string(ret));
-			memoryFree(context, deviceBuffer);
-			memoryFree(context, hostBuffer);
-			return ret;
-		}
-
-		ret = zeCommandListClose(commandList);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Couldn't close command list: {}\n", l0_error_to_string(ret));
-			memoryFree(context, deviceBuffer);
-			memoryFree(context, hostBuffer);
-			return ret;
-		}
-
-		std::chrono::high_resolution_clock::time_point timeStart, timeEnd;
-		timeStart = std::chrono::high_resolution_clock::now();
-		for (uint32_t i = 0; i < nIterations; i++) {
-			commandQueueExecuteCommandLists(commandQueue, commandList);
-			commandQueueSynchronize(commandQueue);
-		}
-		timeEnd = std::chrono::high_resolution_clock::now();
-		totalTimeNsec =
-			std::chrono::duration<long double, std::chrono::nanoseconds::period>(timeEnd - timeStart).count();
-
-		ret = zeCommandListDestroy(commandList);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying command list: {}\n", l0_error_to_string(ret));
-		}
-		ret = zeCommandQueueDestroy(commandQueue);
-		memoryFree(context, deviceBuffer);
-		memoryFree(context, hostBuffer);
-		calculateBandwidthLatency(totalTimeNsec, static_cast<long double>(size * nIterations), tBandwidth, tLatency,
-								  nIterations);
-		allBandwidth = allBandwidth + tBandwidth;
-		allLatency = allLatency + tLatency;
-	}
-	totalBandwidth = allBandwidth;
-	totalLatency = allLatency;
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Performs a memory test on a device to evaluate memory allocation related features based on the number Of
- * dispatch This function. It loads and executes a shader program (.spv file) that performs intensive integer
- * calculations based on each dispatch, then test memory allocation related features.
- *
- * The test for each dispatch:
- * 1. Create the kernel module, group size and arguments
- * 2. Sets up command lists and queues
- * 3. Creates necessary memory allocations and fills the values and copy the memory
- * 4. Executes command lists and queues
- * 5. Cleans up resources
- *
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @param[in] module, a specific ze module handle
- * @param[in] srcAllocations pointer to a source uint8_t vector
- * @param[in] dstAllocations pointer to a destination uint8_t vector
- * @param[in] dataOut reference to a data out uint8_t vector
- * @param[in] testKernelNames, reference to a related kernel module name
- * @param[in] numberOfDispatch, a uint64_t total dispatch number
- * @param[in] allocationCount, a uint64_t one Case allocation count
- * @param[in] context, a device application context
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::dispatchKernelsForMemoryTest(
-	devInfo *d, ze_module_handle_t module, std::vector<uint8_t *> srcAllocations, std::vector<uint8_t *> dstAllocations,
-	std::vector<std::vector<uint8_t>> &dataOut, const std::vector<std::string> &testKernelNames,
-	uint64_t numberOfDispatch, uint64_t allocationCount, ze_context_handle_t context)
-{
-	ze_result_t ret;
-	std::vector<ze_kernel_handle_t> testFunctions;
-	uint32_t workgroupSizeX = 8;
-	uint8_t initValue2 = 0xAA; // 1010 1010
-	uint8_t initValue3 = 0x55; // 0101 0101
-
-	ze_command_list_handle_t commandList = nullptr;
-	ret = commandListCreate(context, d->deviceHdl, 0, &commandList, 0);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to create command list : {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-	for (uint64_t dispatchId = 0; dispatchId < numberOfDispatch; dispatchId++) {
-		uint8_t *srcAllocation = srcAllocations[static_cast<unsigned int>(dispatchId)];
-		uint8_t *dstAllocation = dstAllocations[static_cast<unsigned int>(dispatchId)];
-
-		ze_kernel_handle_t testFunction = nullptr;
-		kernelCreate(module, testKernelNames[static_cast<unsigned int>(dispatchId)], &testFunction);
-		ret = zeKernelSetGroupSize(testFunction, workgroupSizeX, 1, 1);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to set kernel group size: {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-		ret = zeKernelSetArgumentValue(testFunction, 0, sizeof(srcAllocation), &srcAllocation);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to set kernel argument value : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-		ret = zeKernelSetArgumentValue(testFunction, 1, sizeof(dstAllocation), &dstAllocation);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to set kernel argument value : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-		uint32_t groupCountX = static_cast<uint32_t>(allocationCount / workgroupSizeX);
-		ze_group_count_t threadGroupDimensions = {groupCountX, 1, 1};
-
-		ret =
-			zeCommandListAppendMemoryFill(commandList, srcAllocation, &initValue2, sizeof(uint8_t),
-										  static_cast<size_t>(allocationCount) * sizeof(uint8_t), nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to fill command list append memory : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		ret = zeCommandListAppendBarrier(commandList, nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to append command list barrier: {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		ret =
-			zeCommandListAppendMemoryFill(commandList, dstAllocation, &initValue3, sizeof(uint8_t),
-										  static_cast<size_t>(allocationCount) * sizeof(uint8_t), nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to fill command list append memory : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		ret = zeCommandListAppendBarrier(commandList, nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to append command list barrier : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		commandListAppendLaunchKernel(commandList, testFunction, &threadGroupDimensions);
-		ret = zeCommandListAppendBarrier(commandList, nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to append command list barrier: {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		ret = zeCommandListAppendMemoryCopy(
-			commandList, dataOut[static_cast<unsigned int>(dispatchId)].data(), dstAllocation,
-			dataOut[static_cast<unsigned int>(dispatchId)].size() * sizeof(uint8_t), nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to copy command list append memory : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		ret = zeCommandListAppendBarrier(commandList, nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to append command list barrier : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		testFunctions.push_back(testFunction);
-	}
-	ret = zeCommandListClose(commandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to close command list : {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-
-	ze_command_queue_handle_t commandQueue;
-	ret = commandQueueCreate(context, d->deviceHdl, 0, 0, &commandQueue, ZE_COMMAND_QUEUE_FLAG_EXPLICIT_ONLY);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to create command queue : {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-
-	commandQueueExecuteCommandLists(commandQueue, commandList);
-	commandQueueSynchronize(commandQueue);
-	ret = zeCommandQueueDestroy(commandQueue);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to destroy command queue  : {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-
-	ret = zeCommandListDestroy(commandList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to destroy command list : {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-
-	for (uint64_t dispatchId = 0; dispatchId < testFunctions.size(); dispatchId++) {
-		ret = zeKernelDestroy(testFunctions[static_cast<unsigned int>(dispatchId)]);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to run kernel destroy : {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-	}
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief free buffer and module resources
- *
- * This function properly frees input & output buffer and module resources.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] inputAllocations pointer to the input buffers to be freed
- * @param[in] outputAllocations pointer to the output buffers to be freed
- * @param[in] moduleHandle Handle to the module to be destroyed
- */
-void diagnostic::freeResources(ze_context_handle_t context, std::vector<uint8_t *> &inputAllocations,
-							   std::vector<uint8_t *> &outputAllocations, ze_module_handle_t moduleHandle)
-{
-	for (auto eachAllocation : inputAllocations) {
-		memoryFree(context, eachAllocation);
-	}
-	for (auto eachAllocation : outputAllocations) {
-		memoryFree(context, eachAllocation);
-	}
-	if (moduleHandle != NULL) {
-		moduleDestroy(moduleHandle);
-	}
-}
-/**
- * @brief performance memory allocation
- *
- * This function performance memory allocation test on the specified device using Level Zero APIs.
- *
- * The test:
- * 1. Retrieves target test memory size from device maxMemAllocSize and real host memory size.
- * 2. based on each memory usage, allocation sizes, and memory Types, calculate the requested allocation size and number
- * Of dispatch based on max allocation size
- * 3. allocate the memory for each dispatch's memory Input, memory output and setup the test Kernel name and module.
- * 4. run the memory test for all the dispatch and settings by using spv file.
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::peformanceMemoryAllocation(devInfo *d)
-{
-	ze_result_t ret;
-	uint64_t oneMB = 1024UL * 1024UL;
-	uint64_t oneGB = 1UL * 1024UL * 1024UL * 1024UL;
-	uint32_t numberOfKernelArgs = 2;
-	uint32_t numberOfKernelsInModule = 10;
-
-	constexpr float memoryUse = 0.1f;
-	std::vector<uint64_t> allocateSizes = {oneMB, oneGB};
-	std::vector<std::string> memoryTypes = {"DEVICE", "SHARED"};
-	ze_device_properties_t zeDevProp = {};
-	ze_context_handle_t context = d->dev->getContext();
-
-	for (auto &allocateSize : allocateSizes) {
-		for (auto &memoryType : memoryTypes) {
-			ret = d->dev->getDevProps(d->deviceHdl, &zeDevProp);
-			if (ret != ZE_RESULT_SUCCESS) {
-				ERR("Failed to get device properties : {}\n", l0_error_to_string(ret));
-				return ret;
-			}
-			uint64_t targetTestMemorySize = zeDevProp.maxMemAllocSize;
-			uint64_t hostMemorySize;
-
-			if (CHECKHOSTMEMORYSIZE(&hostMemorySize)) {
-				if (targetTestMemorySize > hostMemorySize) {
-					targetTestMemorySize = hostMemorySize;
-				}
-			}
-			uint64_t maxAllocationSize = static_cast<uint64_t>(static_cast<float>(targetTestMemorySize) * memoryUse);
-			uint64_t oneCaseRequestedAllocationSize = allocateSize * numberOfKernelArgs;
-
-			if (oneCaseRequestedAllocationSize > maxAllocationSize) {
-				oneCaseRequestedAllocationSize = maxAllocationSize;
-			}
-			if (oneCaseRequestedAllocationSize == 0) {
-				return ZE_RESULT_ERROR_INVALID_SIZE;
-			}
-			std::size_t allocationCount =
-				static_cast<size_t>(oneCaseRequestedAllocationSize / numberOfKernelArgs) * sizeof(uint8_t);
-			std::uint64_t numberOfDispatch = maxAllocationSize / oneCaseRequestedAllocationSize;
-			std::vector<uint8_t *> inputAllocations;
-			std::vector<uint8_t *> outputAllocations;
-			std::vector<std::vector<uint8_t>> dataOutVector;
-			std::vector<std::string> testKernelNames;
-
-			for (uint64_t dispatchId = 0; dispatchId < numberOfDispatch; dispatchId++) {
-				uint8_t *inputAllocation;
-				uint8_t *outputAllocation;
-				if (memoryType == "HOST") {
-					void *memoryInput = nullptr;
-					ret = memoryAllocHost(context, allocationCount, 8, &memoryInput);
-					if (ret != ZE_RESULT_SUCCESS) {
-						freeResources(context, inputAllocations, outputAllocations, NULL);
-						return ret;
-					}
-					inputAllocation = (uint8_t *)memoryInput;
-					void *memoryOutput = nullptr;
-					ret = memoryAllocHost(context, allocationCount, 8, &memoryOutput);
-					if (ret != ZE_RESULT_SUCCESS) {
-						memoryFree(context, inputAllocation);
-						freeResources(context, inputAllocations, outputAllocations, NULL);
-						return ret;
-					}
-					outputAllocation = (uint8_t *)memoryOutput;
-
-				} else if (memoryType == "DEVICE") {
-					void *memoryInput = nullptr;
-					ret = memoryAlloc(context, d->deviceHdl, allocationCount, 8, &memoryInput);
-					if (ret != ZE_RESULT_SUCCESS) {
-						freeResources(context, inputAllocations, outputAllocations, NULL);
-						return ret;
-					}
-					inputAllocation = (uint8_t *)memoryInput;
-					void *memoryOutput = nullptr;
-					ret = memoryAlloc(context, d->deviceHdl, allocationCount, 8, &memoryOutput);
-					if (ret != ZE_RESULT_SUCCESS) {
-						memoryFree(context, inputAllocation);
-						freeResources(context, inputAllocations, outputAllocations, NULL);
-						return ret;
-					}
-					outputAllocation = (uint8_t *)memoryOutput;
-				} else {
-					void *memoryInput = nullptr;
-					ret = memoryAllocShared(context, d->deviceHdl, allocationCount, 8, &memoryInput);
-					if (ret != ZE_RESULT_SUCCESS) {
-						freeResources(context, inputAllocations, outputAllocations, NULL);
-						return ret;
-					}
-					inputAllocation = (uint8_t *)memoryInput;
-					void *memoryOutput = nullptr;
-					ret = memoryAllocShared(context, d->deviceHdl, allocationCount, 8, &memoryOutput);
-					if (ret != ZE_RESULT_SUCCESS) {
-						memoryFree(context, inputAllocation);
-						freeResources(context, inputAllocations, outputAllocations, NULL);
-						return ret;
-					}
-					outputAllocation = (uint8_t *)memoryOutput;
-				}
-				inputAllocations.push_back(inputAllocation);
-				outputAllocations.push_back(outputAllocation);
-				std::vector<uint8_t> dataOut(allocationCount, 0);
-				dataOutVector.push_back(dataOut);
-				std::string kernelName;
-				kernelName = "test_device_memory" + std::to_string((dispatchId % numberOfKernelsInModule) + 1);
-				testKernelNames.push_back(kernelName);
-			}
-
-			std::vector<uint8_t> binaryFile;
-			ret = loadBinaryFile("test_multiple_memory_allocations.spv", &binaryFile);
-			if (ret != ZE_RESULT_SUCCESS) {
-				ERR("Failed to load binary file: {}\n", l0_error_to_string(ret));
-				freeResources(context, inputAllocations, outputAllocations, NULL);
-				return ret;
-			}
-			ze_module_handle_t moduleHandle = nullptr;
-			ret = moduleCreate(context, d->deviceHdl, binaryFile, &moduleHandle);
-			if (ret != ZE_RESULT_SUCCESS) {
-				ERR("Failed to run memory allocation test : {}\n", l0_error_to_string(ret));
-				freeResources(context, inputAllocations, outputAllocations, NULL);
-				return ret;
-			}
-			ret = dispatchKernelsForMemoryTest(d, moduleHandle, inputAllocations, outputAllocations, dataOutVector,
-											   testKernelNames, numberOfDispatch, allocationCount, context);
-			if (ret != ZE_RESULT_SUCCESS) {
-				ERR("Failed to run dispatch kernels for memory test : {}\n", l0_error_to_string(ret));
-				freeResources(context, inputAllocations, outputAllocations, moduleHandle);
-				return ret;
-			}
-			freeResources(context, inputAllocations, outputAllocations, moduleHandle);
-		}
-	}
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief memory error test
- *
- * This function run memory error test on the specified device using Level Zero APIs.
- *
- * The test:
- * 1. Retrieves target test memory size from device max mem allocation size and real host memory size.
- * 2. based on the memory usage, allocation sizes, calculate the requested allocation size and number
- * Of dispatch based on max allocation size
- * 3. allocate the memory for each dispatch's memory Input, memory output and setup the test Kernel name and module.
- * 4. run the memory test for all the dispatch and settings by using spv file.
- * 5. check if the output memory content correct or not.
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::memoryErrorTest(devInfo *d, int &errorCount)
-{
-	ze_result_t ret;
-	constexpr uint64_t oneMB = 1024UL * 1024UL;
-	constexpr uint32_t numberOfKernelArgs = 2;
-	constexpr uint32_t numberOfKernelsInModule = 10;
-	constexpr uint8_t initValue = 0xAA;
-	constexpr float memoryUse = 0.9f;
-
-	ze_device_properties_t zeDevProp = {};
-	ze_context_handle_t context = d->dev->getContext();
-
-	ret = d->dev->getDevProps(d->deviceHdl, &zeDevProp);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get device properties : {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-	// Retrieves target test memory size from device max mem allocation size and real host memory size
-	uint64_t targetTestMemorySize = zeDevProp.maxMemAllocSize;
-	uint64_t hostMemorySize;
-
-	if (CHECKHOSTMEMORYSIZE(&hostMemorySize)) {
-		if (targetTestMemorySize > hostMemorySize) {
-			targetTestMemorySize = hostMemorySize;
-		}
-	}
-	// based on the memory usage, allocation sizes, calculate the requested allocation size and number Of dispatch based
-	// on max allocation size
-	uint64_t maxAllocationSize = static_cast<uint64_t>(static_cast<float>(targetTestMemorySize) * memoryUse);
-
-	uint64_t oneCaseRequestedAllocationSize = oneMB * numberOfKernelArgs;
-
-	if (oneCaseRequestedAllocationSize > maxAllocationSize) {
-		oneCaseRequestedAllocationSize = maxAllocationSize;
-	}
-	// allocate the memory for each dispatch's memory Input, memory output and setup the test Kernel name and module.
-	std::size_t allocationCount =
-		static_cast<std::size_t>(oneCaseRequestedAllocationSize / (numberOfKernelArgs * sizeof(uint8_t)));
-	std::uint64_t numberOfDispatch = maxAllocationSize / oneCaseRequestedAllocationSize;
-	std::vector<uint8_t *> inputAllocations;
-	std::vector<uint8_t *> outputAllocations;
-	std::vector<std::vector<uint8_t>> dataOutVector;
-	std::vector<std::string> testKernelNames;
-
-	for (uint64_t dispatchId = 0; dispatchId < numberOfDispatch; dispatchId++) {
-		uint8_t *inputAllocation;
-		uint8_t *outputAllocation;
-		void *memoryInput = nullptr;
-		memoryAlloc(context, d->deviceHdl, allocationCount, 8, &memoryInput);
-		inputAllocation = (uint8_t *)memoryInput;
-		void *memoryOutput = nullptr;
-		memoryAlloc(context, d->deviceHdl, allocationCount, 8, &memoryOutput);
-		outputAllocation = (uint8_t *)memoryOutput;
-
-		inputAllocations.push_back(inputAllocation);
-		outputAllocations.push_back(outputAllocation);
-		std::vector<uint8_t> dataOut(allocationCount, 0);
-		dataOutVector.push_back(dataOut);
-		std::string kernelName;
-		kernelName = "test_device_memory" + std::to_string((dispatchId % numberOfKernelsInModule) + 1);
-		testKernelNames.push_back(kernelName);
-	}
-	// run the memory test for all the dispatch and settings by using spv file
-	std::vector<uint8_t> binaryFile;
-	ret = loadBinaryFile("test_multiple_memory_allocations.spv", &binaryFile);
-	ze_module_handle_t moduleHandle = nullptr;
-	ret = moduleCreate(context, d->deviceHdl, binaryFile, &moduleHandle);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to run memory allocation test : {}\n", l0_error_to_string(ret));
-		for (auto eachAllocation : inputAllocations) {
-			memoryFree(context, eachAllocation);
-		}
-		for (auto eachAllocation : outputAllocations) {
-			memoryFree(context, eachAllocation);
-		}
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-	ret = dispatchKernelsForMemoryTest(d, moduleHandle, inputAllocations, outputAllocations, dataOutVector,
-									   testKernelNames, numberOfDispatch, allocationCount, context);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to run dispatch kernels for memory test : {}\n", l0_error_to_string(ret));
-		for (auto eachAllocation : inputAllocations) {
-			memoryFree(context, eachAllocation);
-		}
-		for (auto eachAllocation : outputAllocations) {
-			memoryFree(context, eachAllocation);
-		}
-		moduleDestroy(moduleHandle);
-		return ret;
-	}
-	for (auto eachAllocation : inputAllocations) {
-		memoryFree(context, eachAllocation);
-	}
-	for (auto eachAllocation : outputAllocations) {
-		memoryFree(context, eachAllocation);
-	}
-	moduleDestroy(moduleHandle);
-
-	// check if the output memory content correct or not
-	errorCount = 0;
-	for (auto eachDataOut : dataOutVector) {
-		for (uint32_t i = 0; i < allocationCount; i++) {
-			if (initValue != eachDataOut[i]) {
-				errorCount += 1;
-			}
-		}
-	}
-	if (errorCount > 0) {
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief  free all buffer and module handle related resources
- *
- * This function properly free all buffer and module handle related resources,
- * and handles. It provides cleanup functionality for diagnostic operations using GPU modules.
- *
- * @param[in] context Level Zero context handle for the operation
- * @param[in] moduleHandle Handle to the module to be destroyed
- * @param[in] inputBuf pointer to the buffer to be freed
- * @param[in] outputBuf pointer to the buffer to be freed
- */
-void diagnostic::freeResource(ze_context_handle_t context, void *inputBuf, void *outputBuf,
-							  ze_module_handle_t moduleHandle)
-{
-	memoryFree(context, inputBuf);
-	memoryFree(context, outputBuf);
-	moduleDestroy(moduleHandle);
-}
-
-/**
- * @brief calculate Gbps for workGroups
- *
- * This function calculate Gbps for workGroups by running a GPU kernel with the specified work group configuration,
- * measures execution time, and optionally performs performance analysis.
- *
- * @param[in] commandQueue Handle to the command queue for kernel execution
- * @param[in] commandList Handle to the command list containing kernel commands
- * @param[in] function1 Reference to the kernel function1 to execute
- * @param[in] function2 Reference to the kernel function2 to execute
- * @param[in] numItems number of work items that will be executed
- * @param[in] factor  size number that will be executed
- * @param[in] zeComputeProp Reference to device compute properties structure
- * @param[in] workgroupInfo Reference to work group configuration parameters
- * @return long double Execution time in seconds
- */
-long double diagnostic::calculateGbpsForWorkGroups(ze_command_queue_handle_t commandQueue,
-												   ze_command_list_handle_t commandList, ze_kernel_handle_t &function1,
-												   ze_kernel_handle_t &function2, uint64_t numItems, uint64_t factor,
-												   ze_device_compute_properties_t &zeComputeProp,
-												   struct ZeWorkGroups &workgroupInfo)
-{
-	long double timedLo, timedGo, timed, gbps;
-	uint64_t tempGlobalSize;
-
-	timed = 0;
-	timedLo = 0;
-	timedGo = 0;
-	tempGlobalSize = (numItems / factor / 16);
-	tempGlobalSize = setWorkgroups(&zeComputeProp, tempGlobalSize, &workgroupInfo);
-	timedLo = runKernel(commandQueue, commandList, function1, workgroupInfo, false);
-	timedGo = runKernel(commandQueue, commandList, function2, workgroupInfo, false);
-	timed = (timedLo < timedGo) ? timedLo : timedGo;
-	gbps = calculateGbps(timed, static_cast<long double>(numItems * sizeof(float)));
-	return gbps;
-}
-
-/**
- * @brief bandwidth test
- *
- * This function run memory bandwidth test test on the specified device using Level Zero APIs.
- *
- * The test:
- * 1. Retrieves target copy engine group count.
- * 2. based on the copy engine group count, setup the command list and command queue to run the computation test using
- * the ze_global_bw.spv file.
- * 3. calculate the max the bandwidth for each copy engine group item.
- * 4. check if the computation test successful or not
- * 5. calculate and return the final test result
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @param[out] totalGbps reference to the final bandwidth result
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t diagnostic::memoryBandwidthTest(devInfo *d, std::vector<long double> &totalGbps)
-{
-	TRACING();
-	uint32_t cmdQueuePropsCount;
-	ze_result_t ret;
-
-	ze_context_handle_t context = d->dev->getContext();
-
-	cmdQueuePropsCount = d->dev->getCmdQueuePropsCount();
-	if (cmdQueuePropsCount == 0) {
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	for (uint32_t copyEngineGroupId = 0; copyEngineGroupId < cmdQueuePropsCount; ++copyEngineGroupId) {
-
-		struct ZeWorkGroups workgroupInfo;
-		long double gbps, allGbps = 0.0;
-
-		ze_device_properties_t zeDevProp = {};
-		ze_device_compute_properties_t zeComputeProp = {};
-
-		ret = d->dev->getDevProps(d->deviceHdl, &zeDevProp);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to get device properties: 0x{:X} ({})\n", ret, l0_error_to_string(ret));
-			return ret;
-		}
-
-		ret = d->dev->getComputeProps(d->deviceHdl, &zeComputeProp);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to get device properties: 0x{:X} ({})\n", ret, l0_error_to_string(ret));
-			return ret;
-		}
-
-		std::vector<uint8_t> binaryFile;
-		ze_module_handle_t moduleHandle;
-		ret = loadBinaryFile("ze_global_bw.spv", &binaryFile);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Failed to load binary file: {}\n", l0_error_to_string(ret));
-			return ret;
-		}
-
-		moduleCreate(context, d->deviceHdl, binaryFile, &moduleHandle);
-
-		uint64_t maxItems = zeDevProp.maxMemAllocSize / sizeof(float) / 2;
-		uint64_t numItems = std::min(maxItems, (uint64_t)(1 << 29));
-		uint64_t base = (uint64_t)zeComputeProp.maxGroupSizeX * 16 * 16;
-		numItems = (numItems / base) * base;
-
-		std::vector<float> arr(static_cast<uint32_t>(numItems));
-		for (uint32_t i = 0; i < numItems; i++) {
-			arr[i] = static_cast<float>(i);
-		}
-
-		numItems = setWorkgroups(&zeComputeProp, numItems, &workgroupInfo);
-
-		void *inputBuf;
-		ret = memoryAlloc(context, d->deviceHdl, static_cast<size_t>((numItems * sizeof(float))), 1, &inputBuf);
-		if (ret != ZE_RESULT_SUCCESS) {
-			moduleDestroy(moduleHandle);
-			return ret;
-		}
-
-		void *outputBuf;
-		ret = memoryAlloc(context, d->deviceHdl, static_cast<size_t>((numItems * sizeof(float))), 1, &outputBuf);
-		if (ret != ZE_RESULT_SUCCESS) {
-			memoryFree(context, inputBuf);
-			moduleDestroy(moduleHandle);
-			return ret;
-		}
-
-		ze_command_list_handle_t copyCommandList;
-		ret = commandListCreate(context, d->deviceHdl, copyEngineGroupId, &copyCommandList, 0);
-		if (ret != ZE_RESULT_SUCCESS) {
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ze_command_queue_handle_t copyCommandQueue;
-		commandQueueCreate(context, d->deviceHdl, copyEngineGroupId, 0, &copyCommandQueue, 0);
-		if (ret != ZE_RESULT_SUCCESS) {
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandListAppendMemoryCopy(copyCommandList, inputBuf, arr.data(), (arr.size() * sizeof(float)),
-											nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Couldn't append memory copy: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandListAppendBarrier(copyCommandList, nullptr, 0, nullptr);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Couldn't append barrier: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandListClose(copyCommandList);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Couldn't close command list: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		commandQueueExecuteCommandLists(copyCommandQueue, copyCommandList);
-		commandQueueSynchronize(copyCommandQueue);
-		commandListReset(copyCommandList);
-
-		ze_command_list_handle_t commandList;
-		ret = commandListCreate(context, d->deviceHdl, 0, &commandList, 0);
-		if (ret != ZE_RESULT_SUCCESS) {
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ze_command_queue_handle_t commandQueue;
-		ret = commandQueueCreate(context, d->deviceHdl, 0, 0, &commandQueue, 0);
-		if (ret != ZE_RESULT_SUCCESS) {
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ze_kernel_handle_t localOffsetV1;
-		ze_kernel_handle_t localOffsetV2;
-		ze_kernel_handle_t localOffsetV4;
-		ze_kernel_handle_t localOffsetV8;
-		ze_kernel_handle_t localOffsetV16;
-		ze_kernel_handle_t globalOffsetV1;
-		ze_kernel_handle_t globalOffsetV2;
-		ze_kernel_handle_t globalOffsetV4;
-		ze_kernel_handle_t globalOffsetV8;
-		ze_kernel_handle_t globalOffsetV16;
-
-		setupFunction(moduleHandle, localOffsetV1, "global_bandwidth_v1_local_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, globalOffsetV1, "global_bandwidth_v1_global_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, localOffsetV2, "global_bandwidth_v2_local_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, globalOffsetV2, "global_bandwidth_v2_global_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, localOffsetV4, "global_bandwidth_v4_local_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, globalOffsetV4, "global_bandwidth_v4_global_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, localOffsetV8, "global_bandwidth_v8_local_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, globalOffsetV8, "global_bandwidth_v8_global_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, localOffsetV16, "global_bandwidth_v16_local_offset", inputBuf, outputBuf);
-		setupFunction(moduleHandle, globalOffsetV16, "global_bandwidth_v16_global_offset", inputBuf, outputBuf);
-
-		gbps = calculateGbpsForWorkGroups(commandQueue, commandList, localOffsetV1, globalOffsetV1, numItems, 1,
-										  zeComputeProp, workgroupInfo);
-		allGbps = std::max(allGbps, gbps);
-
-		gbps = calculateGbpsForWorkGroups(commandQueue, commandList, localOffsetV2, globalOffsetV2, numItems, 2,
-										  zeComputeProp, workgroupInfo);
-		allGbps = std::max(allGbps, gbps);
-
-		gbps = calculateGbpsForWorkGroups(commandQueue, commandList, localOffsetV4, globalOffsetV4, numItems, 4,
-										  zeComputeProp, workgroupInfo);
-		allGbps = std::max(allGbps, gbps);
-
-		gbps = calculateGbpsForWorkGroups(commandQueue, commandList, localOffsetV8, globalOffsetV8, numItems, 8,
-										  zeComputeProp, workgroupInfo);
-		allGbps = std::max(allGbps, gbps);
-
-		gbps = calculateGbpsForWorkGroups(commandQueue, commandList, localOffsetV16, globalOffsetV16, numItems, 16,
-										  zeComputeProp, workgroupInfo);
-		allGbps = std::max(allGbps, gbps);
-
-		ret = zeKernelDestroy(localOffsetV1);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(globalOffsetV1);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(localOffsetV2);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(globalOffsetV2);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(localOffsetV4);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(globalOffsetV4);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(localOffsetV8);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(globalOffsetV8);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(localOffsetV16);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeKernelDestroy(globalOffsetV16);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying kernel: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandListDestroy(commandList);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying command list: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandQueueDestroy(commandQueue);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying command queue: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandListDestroy(copyCommandList);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying copy command list: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-
-		ret = zeCommandQueueDestroy(copyCommandQueue);
-		if (ret != ZE_RESULT_SUCCESS) {
-			ERR("Error destroying copy command queue: {}\n", l0_error_to_string(ret));
-			freeResource(context, inputBuf, outputBuf, moduleHandle);
-			return ret;
-		}
-		freeResource(context, inputBuf, outputBuf, moduleHandle);
-		if (allGbps <= 0) {
-			return ZE_RESULT_ERROR_UNKNOWN;
-		} else {
-			totalGbps.push_back(allGbps);
-		}
-	}
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Gets available tests within a diagnostic test suite
- *
- * This function retrieves all individual diagnostic tests available within
- * a specific test suite, providing detailed information about test indices
- * and names for comprehensive hardware validation capabilities.
- *
- * @param[in] testSuite Handle to the specific diagnostic test suite
- * @return int Number of test suites available, or 0 on error
- */
-int diagnostic::getTests(zes_diag_handle_t testSuite)
-{
-	uint32_t testCount = 0;
-	// Get tests within the diagnostic test suite
-	ze_result_t result = zesDiagnosticsGetTests(testSuite, &testCount, nullptr);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get diagnostic tests count: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return 0;
-	}
-
-	std::vector<zes_diag_test_t> tests(testCount);
-	result = zesDiagnosticsGetTests(testSuite, &testCount, tests.data());
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get diagnostic tests: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return 0;
-	}
-
-	DBG("    - Test Suite has {} tests:\n", testCount);
-
-	for (const auto &test : tests) {
-		DBG("      - Test Index: {}\n", test.index);
-		DBG("      - Test Name: {}\n", test.name);
-	}
-	return testSuiteCount;
-}
-
-/**
- * @brief Executes diagnostic tests within a test suite
- *
- * This function runs the specified number of diagnostic tests within a test suite,
- * performing comprehensive hardware validation and health checking to ensure
- * device functionality and identify potential issues.
- *
- * @param[in] testSuite Handle to the specific diagnostic test suite
- * @param[in] testCount Number of tests to execute within the suite
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test execution, error code otherwise
- */
-ze_result_t diagnostic::runTests(zes_diag_handle_t testSuite, uint32_t testCount)
-{
-	// Run diagnostic tests
-	ze_result_t result = zesDiagnosticsRunTests(testSuite, 0, testCount, nullptr);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to run diagnostic tests: 0x{:X} ({})\n", result, l0_error_to_string(result));
-	} else {
-		DBG("    - Diagnostic tests run successfully.\n");
-	}
-
-	return result;
-}
-
-/**
- * @brief Performs comprehensive diagnostic runtime operations
- *
- * This function executes a complete diagnostic cycle including test suite
- * enumeration, property retrieval, test discovery, and test execution for
- * thorough hardware validation and device health assessment.
- *
- * @param[in] device Handle to the device for diagnostic operations
- * @return ze_result_t ZE_RESULT_SUCCESS on successful execution, error code otherwise
- */
-ze_result_t diagnostic::zesRun(zes_device_handle_t device)
-{
-	ze_result_t result = enumDiag(device);
-	if (result != ZE_RESULT_SUCCESS)
-		return result;
-
-	// Run diagnostic tests for each test suite
-	for (uint32_t i = 0; i < testSuiteCount; i++) {
-		zes_diag_handle_t testSuite = testSuites[i];
-		getProperties(testSuite);
-		uint32_t testCount = getTests(testSuite);
-		runTests(testSuite, testCount);
-	}
-	return result;
-}
diff --git a/hal/core/diagnostic.h b/hal/core/diagnostic.h
deleted file mode 100644
index 6165a36f7..000000000
--- a/hal/core/diagnostic.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _DIAGNOSTIC_H
-#define _DIAGNOSTIC_H
-
-#include "sysman.h"
-
-// Forward declaration of devInfo struct
-struct devInfo;
-
-class LIBXPUM_API diagnostic : public sysman
-{
-private:
-	uint32_t testSuiteCount;
-	zes_diag_handle_t *testSuites;
-
-public:
-	diagnostic() : testSuiteCount(0), testSuites(nullptr) {}
-	~diagnostic();
-	ze_result_t enumDiag(zes_device_handle_t device);
-	ze_result_t getProperties(zes_diag_handle_t testSuite);
-	ze_result_t computationTest(devInfo *d, std::size_t flops_per_work_item, void *srcPtr, size_t srcSize,
-								const std::string &fileName, const std::string &moduleName, long double &out_gflops,
-								bool functionalCheck);
-	ze_result_t dispatchKernelsForMemoryTest(devInfo *d, ze_module_handle_t module,
-											 std::vector<uint8_t *> srcAllocations,
-											 std::vector<uint8_t *> dstAllocations,
-											 std::vector<std::vector<uint8_t>> &dataOut,
-											 const std::vector<std::string> &testKernelNames, uint64_t numberOfDispatch,
-											 uint64_t oneCaseAllocationCount, ze_context_handle_t context);
-	long double calculateGbpsForWorkGroups(ze_command_queue_handle_t commandQueue, ze_command_list_handle_t commandList,
-										   ze_kernel_handle_t &function1, ze_kernel_handle_t &function2,
-										   uint64_t numItems, uint64_t factor,
-										   ze_device_compute_properties_t &zeComputeProp,
-										   struct ZeWorkGroups &workgroupInfo);
-
-	ze_result_t calculatePowerConsumption(devInfo *d, int &totalPowerValue);
-	ze_result_t pcieBandwidthTest(devInfo *d, long double &totalBandwidth, long double &totalLatency);
-	ze_result_t peformanceMemoryAllocation(devInfo *d);
-	ze_result_t memoryErrorTest(devInfo *d, int &errorCount);
-	ze_result_t memoryBandwidthTest(devInfo *d, std::vector<long double> &totalGbps);
-	int getTests(zes_diag_handle_t testSuite);
-	ze_result_t kernelCreate(ze_module_handle_t hModule, std::string name, ze_kernel_handle_t *hKernel);
-	ze_result_t loadBinaryFile(const std::string &filePath, std::vector<uint8_t> *binary_file);
-	ze_result_t moduleCreate(const ze_context_handle_t &context, ze_device_handle_t ze_device,
-							 std::vector<uint8_t> binary_file, ze_module_handle_t *module_handle);
-	void moduleDestroy(ze_module_handle_t hModule);
-	void freeResource(ze_context_handle_t context, void *inputBuf, void *outputBuf, ze_module_handle_t moduleHandle);
-	uint64_t setWorkgroups(ze_device_compute_properties_t *device_compute_properties,
-						   const uint64_t total_work_items_requested, struct ZeWorkGroups *workgroup_info);
-	ze_result_t memoryAlloc(const ze_context_handle_t context, ze_device_handle_t ze_device, size_t size,
-							size_t alignment, void **ptr);
-	ze_result_t memoryAllocHost(const ze_context_handle_t context, size_t size, size_t alignment, void **ptr);
-	ze_result_t memoryAllocShared(const ze_context_handle_t &context, ze_device_handle_t ze_device, size_t size,
-								  size_t alignment, void **ptr);
-	ze_result_t memoryFree(const ze_context_handle_t &context, const void *ptr);
-	void freeResources(ze_context_handle_t context, std::vector<uint8_t *> &inputAllocations,
-					   std::vector<uint8_t *> &outputAllocations, ze_module_handle_t moduleHandle);
-	void commandListAppendLaunchKernel(ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel,
-									   const ze_group_count_t *pLaunchFuncArgs);
-	ze_result_t commandListCreate(const ze_context_handle_t context, ze_device_handle_t ze_device,
-								  uint32_t command_queue_group_ordinal, ze_command_list_handle_t *phCommandList,
-								  uint32_t flags);
-	ze_result_t commandQueueCreate(const ze_context_handle_t context, ze_device_handle_t ze_device,
-								   const uint32_t command_queue_group_ordinal, const uint32_t command_queue_index,
-								   ze_command_queue_handle_t *phCommandQueue, uint32_t flags);
-
-	ze_result_t commandQueueExecuteCommandLists(ze_command_queue_handle_t hCommandQueue,
-												ze_command_list_handle_t hCommandList);
-	ze_result_t commandQueueSynchronize(ze_command_queue_handle_t hCommandQueue);
-	ze_result_t setupFunction(ze_module_handle_t module_handle, ze_kernel_handle_t &function, const std::string &name,
-							  void *input, void *output);
-	long double runKernel(ze_command_queue_handle_t command_queue, ze_command_list_handle_t command_list,
-						  ze_kernel_handle_t &function, struct ZeWorkGroups &workgroup_info, bool checkOnly);
-	ze_result_t commandListReset(ze_command_list_handle_t hCommandList);
-	ze_result_t runTests(zes_diag_handle_t testSuite, uint32_t testCount);
-	ze_result_t zesRun(zes_device_handle_t device);
-};
-
-#endif
diff --git a/hal/core/ecc.cpp b/hal/core/ecc.cpp
index dc6c25e8c..17fe13483 100644
--- a/hal/core/ecc.cpp
+++ b/hal/core/ecc.cpp
@@ -84,7 +84,12 @@ bool ecc::available(zes_device_handle_t device)
 	ze_bool_t eccAvailable;
 	result = zesDeviceEccAvailable(device, &eccAvailable);
 	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to check ECC availability: 0x{:X} ({})\n", result, l0_error_to_string(result));
+		if (result == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+			// Device simply does not implement ECC; this is benign and expected.
+			DBG("ECC availability query unsupported on this device: 0x{:X}\n", result);
+		} else {
+			ERR("Failed to check ECC availability: 0x{:X} ({})\n", result, l0_error_to_string(result));
+		}
 		return false;
 	}
 	return (bool)eccAvailable;
@@ -105,7 +110,12 @@ bool ecc::configurable(zes_device_handle_t device)
 	ze_bool_t eccConfigurable;
 	result = zesDeviceEccConfigurable(device, &eccConfigurable);
 	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to check ECC configurability: 0x{:X} ({})\n", result, l0_error_to_string(result));
+		if (result == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+			// Device simply does not implement ECC; this is benign and expected.
+			DBG("ECC configurability query unsupported on this device: 0x{:X}\n", result);
+		} else {
+			ERR("Failed to check ECC configurability: 0x{:X} ({})\n", result, l0_error_to_string(result));
+		}
 		return false;
 	}
 	return (bool)eccConfigurable;
diff --git a/hal/core/fabric.cpp b/hal/core/fabric.cpp
index 1509a08c2..68c351bfc 100644
--- a/hal/core/fabric.cpp
+++ b/hal/core/fabric.cpp
@@ -122,7 +122,7 @@ ze_result_t fabric::getFabricPorts(zes_device_handle_t device, std::vector<portI
 		}
 	}
 
-	if (portCount == 0) {
+	if (portCount == 0 || ports == nullptr) {
 		DBG("No fabric ports found\n");
 		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 	}
@@ -204,7 +204,7 @@ ze_result_t fabric::setFabricPorts(zes_device_handle_t device, const portInfoSet
 		}
 	}
 
-	if (portCount == 0) {
+	if (portCount == 0 || ports == nullptr) {
 		ERR("No fabric ports found\n");
 		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 	}
diff --git a/hal/core/frequency.cpp b/hal/core/frequency.cpp
index 152ba02af..d545b8f52 100644
--- a/hal/core/frequency.cpp
+++ b/hal/core/frequency.cpp
@@ -6,6 +6,7 @@
 
 #include "frequency.h"
 #include "device.h"
+#include <ranges>
 #include <vector>
 
 /**
@@ -97,6 +98,45 @@ ze_result_t frequency::getProperties(zes_freq_handle_t frequencyHandle, zes_freq
 	return result;
 }
 
+/**
+ * @brief Gets the maximum frequency for a specific frequency domain
+ *
+ * Scans the enumerated frequency handles to find the one matching the
+ * requested domain and returns its maximum hardware frequency.
+ *
+ * @param domain The frequency domain to query (e.g. ZES_FREQ_DOMAIN_GPU)
+ * @param maxMHz Output parameter filled with the maximum frequency in MHz
+ * @return ze_result_t ZE_RESULT_SUCCESS when found, ZE_RESULT_ERROR_UNSUPPORTED_FEATURE otherwise
+ */
+ze_result_t frequency::getMaxFreqForDomain(zes_freq_domain_t domain, double &maxMHz)
+{
+	auto handles = std::span(frequencyHandles, frequencyCount);
+
+	// Transform handles to properties, filtering out invalid ones
+	auto validProps =
+		handles | std::views::transform([this](const auto &handle) -> std::optional<zes_freq_properties_t> {
+			zes_freq_properties_t props{};
+			props.stype = ZES_STRUCTURE_TYPE_FREQ_PROPERTIES;
+			if (getProperties(handle, &props) == ZE_RESULT_SUCCESS) {
+				return props;
+			}
+			return std::nullopt;
+		}) |
+		std::views::filter([](const auto &opt) { return opt.has_value(); }) |
+		std::views::transform([](const auto &opt) { return *opt; }) |
+		std::views::filter([domain](const auto &props) { return props.type == domain && props.max > 0.0; });
+
+	// Find the maximum frequency
+
+	if (auto maxIt = std::ranges::max_element(validProps, {}, &zes_freq_properties_t::max);
+		maxIt != std::ranges::end(validProps)) {
+		maxMHz = (*maxIt).max;
+		return ZE_RESULT_SUCCESS;
+	}
+
+	return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}
+
 /**
  * @brief Gets available discrete clock frequencies for a frequency domain
  *
@@ -178,27 +218,28 @@ ze_result_t frequency::getCurFreq(double *currentFreq, zes_freq_domain_t domain)
 	TRACING();
 	zes_freq_properties_t properties = {};
 	zes_freq_state_t state = {};
-	ze_result_t result = ZE_RESULT_SUCCESS;
 
 	for (uint32_t i = 0; i < frequencyCount; ++i) {
-		result = getProperties(frequencyHandles[i], &properties);
+		ze_result_t result = getProperties(frequencyHandles[i], &properties);
 		if (result != ZE_RESULT_SUCCESS) {
 			return result;
 		}
 
+		if (properties.type != domain) {
+			continue;
+		}
+
 		result = getState(frequencyHandles[i], &state);
 		if (result != ZE_RESULT_SUCCESS) {
 			return result;
 		}
 
-		if (properties.type == domain) {
-			if (currentFreq) {
-				*currentFreq = state.actual;
-				break;
-			}
+		if (currentFreq) {
+			*currentFreq = state.actual;
 		}
+		return ZE_RESULT_SUCCESS;
 	}
-	return result;
+	return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
 /**
diff --git a/hal/core/frequency.h b/hal/core/frequency.h
index e5d20dba6..1e02293a5 100644
--- a/hal/core/frequency.h
+++ b/hal/core/frequency.h
@@ -41,6 +41,7 @@ class LIBXPUM_API frequency : public sysman
 	ze_result_t getFreqStateForTile(uint32_t tileId, zes_freq_state_t *state, zes_freq_properties_t *props);
 	uint32_t getFrequencyCount() const { return frequencyCount; }
 	std::span<const zes_freq_handle_t> getFrequencyHandles() const { return {frequencyHandles, frequencyCount}; }
+	ze_result_t getMaxFreqForDomain(zes_freq_domain_t domain, double &maxMHz);
 	ze_result_t setSchedulerTimeoutMode(uint32_t subdeviceId, uint64_t watchdogTimeout);
 	ze_result_t setSchedulerTimesliceMode(uint32_t subdeviceId, uint64_t interval, uint64_t yieldTimeout);
 	ze_result_t setSchedulerExclusiveMode(uint32_t subdeviceId);
diff --git a/hal/core/logger/filestream_sink.h b/hal/core/logger/filestream_sink.h
index 3173a57ca..f89ab9379 100644
--- a/hal/core/logger/filestream_sink.h
+++ b/hal/core/logger/filestream_sink.h
@@ -18,6 +18,16 @@
 #include <stdexcept>
 #include <string>
 
+/**
+ * @brief Configuration for FileStreamSink.
+ */
+struct FileStreamSinkConfig
+{
+	bool showTimestamp = true;					 ///< Prepend "[HH:MM:SS.mmm] " to every line
+	bool showThreadId = false;					 ///< Prepend "[<thread-id>] " after the timestamp
+	std::ios::openmode openMode = std::ios::app; ///< File open mode (default: append)
+};
+
 /**
  * @brief Sink that owns a std::ofstream opened at construction.
  *
@@ -27,17 +37,15 @@
  * @code
  *     Logger::instance().setSink(
  *         std::make_shared<FileStreamSink>("/var/log/xpu-smi.log"));
+ *
+ *     // Truncate on open, suppress thread ID:
+ *     Logger::instance().setSink(
+ *         std::make_shared<FileStreamSink>(path, FileStreamSinkConfig{
+ *             .openMode = std::ios::trunc}));
  * @endcode
  *
- * The file is opened in append mode so log lines survive process restarts.
  * emit() and sync() throw std::runtime_error on write/flush failure; the
- * exception is caught by Sink::log() and written directly to stderr
- * (Logger cannot safely be called from inside a sink).
- *
- * @param showTimestamp  Prepend "[HH:MM:SS.mmm] " to every line.
- *                       Default true (production file logging).
- * @param showThreadId   Prepend "[<thread-id>] " after the timestamp.
- *                       Default true (production file logging).
+ * exception is caught by Sink::log() and written directly to stderr.
  */
 class FileStreamSink final : public Sink
 {
@@ -46,12 +54,12 @@ class FileStreamSink final : public Sink
 	bool mShowThreadId;
 
 public:
-	explicit FileStreamSink(const char *path, bool showTimestamp = true, bool showThreadId = true)
-		: file(path, std::ios::app), mShowTimestamp(showTimestamp), mShowThreadId(showThreadId)
+	explicit FileStreamSink(const char *path, FileStreamSinkConfig cfg = {})
+		: file(path, cfg.openMode), mShowTimestamp(cfg.showTimestamp), mShowThreadId(cfg.showThreadId)
 	{}
 
-	explicit FileStreamSink(const std::string &path, bool showTimestamp = true, bool showThreadId = true)
-		: file(path, std::ios::app), mShowTimestamp(showTimestamp), mShowThreadId(showThreadId)
+	explicit FileStreamSink(const std::string &path, FileStreamSinkConfig cfg = {})
+		: file(path, cfg.openMode), mShowTimestamp(cfg.showTimestamp), mShowThreadId(cfg.showThreadId)
 	{}
 
 	[[nodiscard]] bool isOpen() const noexcept { return file.is_open(); }
diff --git a/hal/core/logger/logger.h b/hal/core/logger/logger.h
index 956d30271..198ecbc33 100644
--- a/hal/core/logger/logger.h
+++ b/hal/core/logger/logger.h
@@ -21,28 +21,32 @@
 #include <string_view>
 #include <utility>
 
+namespace detail {
+static constexpr bool DEBUG_ENABLED = true;
+} // namespace detail
+
 /**
- * @brief Singleton logger.  Routes all output through the active Sink.
+ * @brief Singleton logger.  Routes diagnostic output through the active Sink.
+ *
+ * ERR/INFO/DBG/TRACE go through the sink (defaults to stderr).
+ * PRINT() goes through a separate printSink (defaults to stdout).
  *
- * Sink selection (defaults to OStreamSink(std::cout)):
+ * Sink selection (defaults to OStreamSink(std::cerr)):
  * @code
  *     Logger::instance().setSink(
  *         std::make_shared<FileStreamSink>("/var/log/xpu-smi.log"));
  *     Logger::instance().setSink(
- *         std::make_shared<OStreamSink>(std::cerr));
+ *         std::make_shared<OStreamSink>(std::cout));
  * @endcode
  */
 class Logger final
 {
 	std::atomic<std::shared_ptr<Sink>> sink;
+	std::atomic<std::shared_ptr<Sink>> printSink;
 
 	/// Current log level — relaxed ordering is sufficient: a momentarily
 	/// stale read can suppress or emit at most one extra line.
-#ifdef _DEBUG
-	std::atomic<LogLevel> level{LogLevel::DBG};
-#else
 	std::atomic<LogLevel> level{LogLevel::INFO};
-#endif
 
 	/// Active error callback; nullptr → write to stderr.
 	std::atomic<std::shared_ptr<LogErrorCallback>> onError;
@@ -50,9 +54,12 @@ class Logger final
 	/// Policy for std::vformat errors; default is Report.
 	std::atomic<FormatErrorPolicy> fmtPolicy{FormatErrorPolicy::Report};
 
-	// OStreamSink borrows std::cout by reference; std::cout outlives the
+	// OStreamSink borrows std::cerr by reference; std::cerr outlives the
 	// singleton because <iostream> guarantees ios_base::Init construction.
-	Logger() : sink(std::make_shared<OStreamSink>(std::cout)) {}
+	// Diagnostic output (ERR/INFO/DBG/TRACE) goes to stderr so it doesn't
+	// corrupt stdout which carries user-facing data (JSON, CSV, tables).
+	// PRINT() uses a separate stdout-backed sink.
+	Logger() : sink(std::make_shared<OStreamSink>(std::cerr)), printSink(std::make_shared<OStreamSink>(std::cout)) {}
 
 	void invokeOnError(std::string_view what) noexcept
 	{
@@ -96,14 +103,22 @@ class Logger final
 	Logger(const Logger &) = delete;
 	Logger &operator=(const Logger &) = delete;
 
-	/// Atomically replace the active sink; nullptr resets to OStreamSink(cout).
+	/// Atomically replace the active sink; nullptr resets to OStreamSink(cerr).
 	void setSink(std::shared_ptr<Sink> s) noexcept
 	{
-		sink.store(s ? std::move(s) : std::make_shared<OStreamSink>(std::cout));
+		if (s) {
+			printSink.store(s);
+			sink.store(std::move(s));
+		} else {
+			sink.store(std::make_shared<OStreamSink>(std::cerr));
+			printSink.store(std::make_shared<OStreamSink>(std::cout));
+		}
 	}
 
 	std::shared_ptr<Sink> getSink() noexcept { return sink.load(std::memory_order_acquire); }
 
+	std::shared_ptr<Sink> getPrintSink() noexcept { return printSink.load(std::memory_order_acquire); }
+
 	/// Install an error callback; pass LogErrorCallback{} to silence errors.
 	/// @note Must not call Logger — re-entrant use is undefined.
 	void setOnError(LogErrorCallback cb)
@@ -115,7 +130,13 @@ class Logger final
 
 	[[nodiscard]] LogLevel getLevel() const noexcept { return level.load(std::memory_order_relaxed); }
 
-	[[nodiscard]] bool isEnabled(LogLevel lvl) const noexcept { return level.load(std::memory_order_relaxed) >= lvl; }
+	[[nodiscard]] bool isEnabled([[maybe_unused]] LogLevel lvl) const noexcept
+	{
+		if constexpr (!detail::DEBUG_ENABLED) {
+			return false;
+		}
+		return level.load(std::memory_order_relaxed) >= lvl;
+	}
 
 	void setFormatErrorPolicy(FormatErrorPolicy p) noexcept { fmtPolicy.store(p, std::memory_order_relaxed); }
 
@@ -124,10 +145,13 @@ class Logger final
 		return fmtPolicy.load(std::memory_order_relaxed);
 	}
 
+	/// PRINT() output goes to stdout via the printSink.  When a custom sink
+	/// is installed (via setSink), PRINT routes through it too — this allows
+	/// test capture and file redirection while defaulting to stdout.
 	template <typename... Args> void print(std::format_string<Args...> fmt, Args... args) noexcept
 	{
 		try {
-			sink.load(std::memory_order_acquire)
+			printSink.load(std::memory_order_acquire)
 				->log(LogLevel::TRACE, {}, "", std::vformat(fmt.get(), std::make_format_args(args...)));
 		} catch (const std::exception &e) {
 			handleFormatError(e.what(), LogLevel::TRACE, "", {});
diff --git a/hal/core/logger/test/logger_test.cpp b/hal/core/logger/test/logger_test.cpp
index 8618e2f24..68971d952 100644
--- a/hal/core/logger/test/logger_test.cpp
+++ b/hal/core/logger/test/logger_test.cpp
@@ -247,6 +247,8 @@ TEST_CASE("Logger: ERR suppressed when dbgLvl < ERR")
 
 TEST_CASE("Logger: ERR emits at dbgLvl == ERR")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 	auto cap = std::make_shared<CaptureSink>();
 	Logger::instance().setSink(cap);
@@ -271,6 +273,8 @@ TEST_CASE("Logger: INFO suppressed when dbgLvl < INFO")
 
 TEST_CASE("Logger: INFO emits at dbgLvl >= INFO")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 	auto cap = std::make_shared<CaptureSink>();
 	Logger::instance().setSink(cap);
@@ -295,6 +299,8 @@ TEST_CASE("Logger: DBG suppressed when dbgLvl < DBG")
 
 TEST_CASE("Logger: DBG emits at dbgLvl >= DBG")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 	auto cap = std::make_shared<CaptureSink>();
 	Logger::instance().setSink(cap);
@@ -309,6 +315,8 @@ TEST_CASE("Logger: DBG emits at dbgLvl >= DBG")
 
 TEST_CASE("Logger: ERR embeds call-site file name and line number")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 	auto cap = std::make_shared<CaptureSink>();
 	Logger::instance().setSink(cap);
@@ -327,6 +335,8 @@ TEST_CASE("Logger: ERR embeds call-site file name and line number")
 
 TEST_CASE("Logger: format arguments are substituted correctly")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 	auto cap = std::make_shared<CaptureSink>();
 	Logger::instance().setSink(cap);
@@ -343,6 +353,8 @@ TEST_CASE("Logger: format arguments are substituted correctly")
 
 TEST_CASE("Thread safety: concurrent INFO calls are all received")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 
 	constexpr int kThreads = 8;
@@ -405,6 +417,8 @@ TEST_CASE("Thread safety: setSink during concurrent logging does not crash or da
 
 TEST_CASE("Thread safety: mixed levels from multiple threads")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 
 	constexpr int kThreads = 4;
@@ -759,6 +773,8 @@ TEST_CASE("AsyncSink: multiple flushNow() calls are safe")
 
 TEST_CASE("AsyncSink: via Logger integration")
 {
+	if constexpr (!detail::DEBUG_ENABLED)
+		return;
 	LoggerGuard const guard;
 
 	auto backend = std::make_shared<AsyncCaptureSink>();
diff --git a/hal/core/meson.build b/hal/core/meson.build
index 3a9090bd6..2a2b93347 100644
--- a/hal/core/meson.build
+++ b/hal/core/meson.build
@@ -5,7 +5,6 @@
 
 hal_core_sources = files(
   'device.cpp',
-  'diagnostic.cpp',
   'debug.cpp',
   'driver.cpp',
   'ecc.cpp',
@@ -17,7 +16,6 @@ hal_core_sources = files(
   'memory.cpp',
   'metric.cpp',
   'pci.cpp',
-  'performance.cpp',
   'power.cpp',
   'process.cpp',
   'ras.cpp',
@@ -28,12 +26,9 @@ hal_core_sources = files(
   'threading.cpp',
   'vf.cpp',
   'file_io.cpp',
-  # C API
-  '../../ial/api/xpum_api.cpp'
 )
 
 hal_core_inc = include_directories('.')
-api_inc = include_directories('../../ial/api')
 
 # extensions-only sources (dev branch only)
 # These files are only included when building with -Dextensions=true
@@ -46,10 +41,9 @@ if extensions_enabled
   hal_core_sources += hal_core_extension_sources
   extensions_inc_dirs = [hal_core_extension_inc]
 else
-  # External build uses rasexp.cpp (returns base ecc)
   hal_core_sources += files('rasexp.cpp')
-  # External build uses offline_page.cpp
   hal_core_sources += files('offline_page.cpp')
+  hal_core_sources += files('powerexp.cpp')
 endif
 
 # Shared library
@@ -58,15 +52,14 @@ libxpum_shared = shared_library('xpum',
   include_directories : [
     global_inc,
     hal_core_inc,
-    api_inc,
     oal_inc_dirs,
     include_directories('../fwupd'),
     include_directories('../amc'),
     include_directories('../../ial/cli')  # For version.h
   ] + extensions_inc_dirs,
   dependencies : [
-    levelzero_dep, 
-    igsc_dep, 
+    levelzero_dep,
+    igsc_dep,
     oal_dep,
     fwupd_dep,
     nlohmann_json_dep
@@ -83,7 +76,6 @@ libxpum_static = static_library('xpum',
   include_directories : [
     global_inc,
     hal_core_inc,
-    api_inc,
     oal_inc_dirs,
     include_directories('../fwupd'),
     include_directories('../amc'),
@@ -129,65 +121,6 @@ if is_windows and get_option('shared_library')
   )
 endif
 
-# Install headers (optional)
-if get_option('install_headers')
-  hal_headers = files(
-    'debug.h',
-    'device.h',
-    'diagnostic.h',
-    'driver.h',
-    'ecc.h',
-    'enginegroup.h',
-    'fabric.h',
-    'fan.h',
-    'firmware.h',
-    'frequency.h',
-    'jsonwrapper.h',
-    'memory.h',
-    'metric.h',
-    'pci.h',
-    'performance.h',
-    'power.h',
-    'ras.h',
-    'scheduler.h',
-    'standby.h',
-    'sysman.h',
-    'sysprocess.h',
-    'temperature.h',
-    'vf.h',
-    'offline_page.h'
-  )
-  install_headers(hal_headers, subdir : 'xpum')
-
-  logger_headers = files(
-    'logger/log_level.h',
-    'logger/log_record.h',
-    'logger/formatters.h',
-    'logger/sink_base.h',
-    'logger/ostream_sink.h',
-    'logger/filestream_sink.h',
-    'logger/async_sink.h',
-    'logger/logger.h',
-  )
-  install_headers(logger_headers, subdir : 'xpum/logger')
-  
-  c_api_headers = files(
-    '../../ial/api/xpum_api.h',
-    '../../ial/api/xpum_structs.h'
-  )
-  install_headers(c_api_headers, subdir : 'xpum')
-endif
-
-# Generate pkg-config file for C API compatibility
-pkg = import('pkgconfig')
-pkg.generate(
-  libxpum_shared,
-  name: 'xpum_api',
-  description: 'Intel(R) XPU Manager - Unified C/C++ library for GPU management',
-  version: xpum_version,
-  subdirs: 'xpum',
-)
-
 # Unit tests for the Logger (optional — enable with -Dwith_tests=true)
 if get_option('with_tests')
     doctest_dep = dependency('doctest', required: true)
@@ -204,6 +137,19 @@ if get_option('with_tests')
     )
     test('logger_tests', logger_test)
     message('Logger unit tests enabled')
+
+    temperature_test = executable(
+        'temperature_test',
+        files('test/temperature_test.cpp'),
+        include_directories: [global_inc, hal_core_inc, oal_inc_dirs],
+        link_with: libxpum_static,
+        dependencies: [doctest_dep, levelzero_dep, igsc_dep, nlohmann_json_dep],
+        link_args: is_linux ? ['-pie'] : [],
+        build_by_default: true,
+        install: false,
+    )
+    test('temperature_tests', temperature_test)
+    message('Temperature unit tests enabled')
 else
     message('Skipping logger tests (pass -Dwith_tests=true to enable)')
 endif
diff --git a/hal/core/pci.cpp b/hal/core/pci.cpp
index b0c2c6dd0..89cafe641 100644
--- a/hal/core/pci.cpp
+++ b/hal/core/pci.cpp
@@ -88,6 +88,28 @@ ze_result_t pci::getState(zes_device_handle_t device, zes_pci_link_status_t &pci
 	return result;
 }
 
+/**
+ * @brief Gets the current negotiated PCIe link speed for a device
+ *
+ * Retrieves the current PCIe state and returns the speed (generation and
+ * width) of the negotiated link.
+ *
+ * @param device Handle to the device
+ * @param speed Output structure filled with the current link speed
+ * @return ze_result_t ZE_RESULT_SUCCESS on success, error code otherwise
+ */
+ze_result_t pci::getCurrentLinkSpeed(zes_device_handle_t device, zes_pci_speed_t &speed)
+{
+	zes_pci_state_t state{};
+	ze_result_t result = zesDevicePciGetState(device, &state);
+	if (result != ZE_RESULT_SUCCESS) {
+		ERR("Failed to get PCI state for link speed: 0x{:X} ({})\n", result, l0_error_to_string(result));
+		return result;
+	}
+	speed = state.speed;
+	return ZE_RESULT_SUCCESS;
+}
+
 /**
  * @brief Gets PCI Base Address Registers (BARs) information for a device
  *
diff --git a/hal/core/pci.h b/hal/core/pci.h
index 2094dfc1a..010448ec9 100644
--- a/hal/core/pci.h
+++ b/hal/core/pci.h
@@ -48,6 +48,7 @@ class LIBXPUM_API pci : public sysman
 	ze_result_t getProperties(zes_device_handle_t device, zes_pci_properties_t *pciProperties);
 	ze_result_t getBars(zes_device_handle_t device);
 	ze_result_t getState(zes_device_handle_t device, zes_pci_link_status_t &pciLinkStatus);
+	ze_result_t getCurrentLinkSpeed(zes_device_handle_t device, zes_pci_speed_t &speed);
 	ze_result_t getStats(zes_device_handle_t device, zes_pci_stats_t *pciStats);
 	ze_result_t getPciDowngradeState(const zes_device_handle_t &device, PciDowngradeState &state);
 	ze_result_t setPciDowngradeState(const zes_device_handle_t &device, bool enabled, PciDowngradeState &state);
diff --git a/hal/core/performance.cpp b/hal/core/performance.cpp
deleted file mode 100644
index ff1327c59..000000000
--- a/hal/core/performance.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "performance.h"
-
-/**
- * @brief Enumerates available performance factor domains for a device
- *
- * This function discovers and catalogs all performance factor domains available
- * on the specified device. Performance domains represent different execution
- * engines (compute, media, etc.) that can have their performance factors tuned.
- *
- * @param device Handle to the Level Zero Sysman device
- * @return ze_result_t ZE_RESULT_SUCCESS on successful enumeration, error code otherwise
- */
-ze_result_t performance::enumPerformanceFactorDomains(zes_device_handle_t device)
-{
-	uint32_t perfCount = 0;
-	// Get the perfCount of performance factor domains
-	ze_result_t result = zesDeviceEnumPerformanceFactorDomains(device, &perfCount, nullptr);
-	if (result != ZE_RESULT_SUCCESS || perfCount == 0) {
-		ERR("Failed to get performance factor domains perfCount or no domains available. 0x{:X} ({})\n", result,
-			l0_error_to_string(result));
-		return result;
-	}
-
-	perfHandles->clear();
-	perfHandles->resize(perfCount);
-
-	// Retrieve the performance factor domain handles
-	result = zesDeviceEnumPerformanceFactorDomains(device, &perfCount, perfHandles->data());
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to enumerate performance factor domains. 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	DBG("Found {} performance factor domains.\n", perfCount);
-	return result;
-}
-
-/**
- * @brief Gets properties for a specific performance factor domain
- *
- * This function retrieves detailed properties and characteristics for a
- * specific performance factor domain, including supported engines and
- * subdevice association for performance tuning configuration.
- *
- * @param perfHandle Handle to the specific performance factor domain
- * @return ze_result_t ZE_RESULT_SUCCESS on successful property retrieval, error code otherwise
- */
-ze_result_t performance::getProperties(zes_perf_handle_t perfHandle, zes_perf_properties_t *properties)
-{
-	TRACING();
-
-	if (properties == nullptr) {
-		ERR("Invalid properties pointer provided.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	ze_result_t result = zesPerformanceFactorGetProperties(perfHandle, properties);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get properties for performance factor domain 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	DBG("Performance Factor Properties:\n");
-	DBG("  onSubdevice: {}\n", properties->onSubdevice);
-	DBG("  subdeviceId: {}\n", properties->subdeviceId);
-	printEngines(properties->engines);
-
-	return result;
-}
-
-/**
- * @brief Gets the current configuration for a performance factor domain
- *
- * This function retrieves the current performance factor configuration for a
- * specific domain, returning the performance scaling factor that affects
- * execution engine performance characteristics and power consumption.
- *
- * @param perfHandle Handle to the specific performance factor domain
- * @return ze_result_t ZE_RESULT_SUCCESS on successful configuration retrieval, error code otherwise
- */
-ze_result_t performance::getConfig(zes_perf_handle_t perfHandle)
-{
-	double factor = 0.0;
-	ze_result_t result = zesPerformanceFactorGetConfig(perfHandle, &factor);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get config for performance factor domain 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	DBG("Performance Factor Config:\n");
-	DBG("  Factor: {:f}\n", factor);
-
-	return result;
-}
-
-/**
- * @brief Sets the performance factor configuration for a specific engine type
- *
- * This function configures the performance factor for performance domains that match
- * the specified engine type. It validates the factor value and applies the configuration
- * to all matching performance factor domains on the device.
- *
- * @param engineType The engine type flag specifying which execution engines to configure
- * @param factor The performance factor value (0-100) to set for the matching domains
- * @return ze_result_t ZE_RESULT_SUCCESS on successful configuration, error code otherwise
- */
-ze_result_t performance::setConfig(zes_engine_type_flag_t engineType, double factor)
-{
-	TRACING();
-
-	// Assume that this feature is not supported
-	ze_result_t result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-
-	// Validate the factor value
-	if (factor < 0 || factor > 100) {
-		ERR("Invalid performance factor value: {:f}. Must be between 0 and 100.\n", factor);
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	for (uint32_t i = 0; i < perfHandles->size(); ++i) {
-		zes_perf_properties_t properties = {};
-
-		result = getProperties(perfHandles->at(i), &properties);
-		if (result != ZE_RESULT_SUCCESS) {
-			return result;
-		}
-
-		// Check if the engine type matches the properties of the performance factor domain
-		if (properties.engines & engineType) {
-
-			DBG("Setting config for performance factor domain {} with factor {:f}\n", i, factor);
-			// Set the performance factor configuration
-			result = zesPerformanceFactorSetConfig(perfHandles->at(i), factor);
-			if (result != ZE_RESULT_SUCCESS) {
-				ERR("Failed to set config for performance factor domain 0x{:X} ({})\n", result,
-					l0_error_to_string(result));
-				return result;
-			}
-		}
-	}
-	return result;
-}
-
-/**
- * @brief Initializes the performance monitoring subsystem for a device
- *
- * This function performs initialization of the performance monitoring capabilities
- * by enumerating all available performance factor domains on the specified device.
- * This is typically called during device setup to prepare performance tuning functionality.
- *
- * @param device Handle to the Level Zero Sysman device to initialize
- * @return ze_result_t ZE_RESULT_SUCCESS on successful initialization, error code otherwise
- */
-ze_result_t performance::init(zes_device_handle_t device)
-{
-	TRACING();
-	return enumPerformanceFactorDomains(device);
-}
-
-/**
- * @brief Performs comprehensive performance factor monitoring runtime operations
- *
- * This function executes a complete performance factor monitoring cycle including
- * domain enumeration, property retrieval, and configuration checking for all
- * performance domains to provide comprehensive performance tuning analysis.
- *
- * @param device Handle to the device for performance factor operations
- * @return ze_result_t ZE_RESULT_SUCCESS on successful execution, error code otherwise
- */
-ze_result_t performance::zesRun(UNUSED zes_device_handle_t device)
-{
-	ze_result_t result = ZE_RESULT_SUCCESS;
-
-	for (uint32_t i = 0; i < perfHandles->size(); ++i) {
-		zes_perf_properties_t properties = {};
-
-		result = getProperties(perfHandles->at(i), &properties);
-		if (result != ZE_RESULT_SUCCESS) {
-			return result;
-		}
-
-		result = getConfig(perfHandles->at(i));
-		if (result != ZE_RESULT_SUCCESS) {
-			return result;
-		}
-	}
-	return result;
-}
diff --git a/hal/core/performance.h b/hal/core/performance.h
deleted file mode 100644
index 09cab7225..000000000
--- a/hal/core/performance.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _PERFORMANCE_H
-#define _PERFORMANCE_H
-
-#include "sysman.h"
-#include <vector>
-
-class LIBXPUM_API performance : public sysman
-{
-private:
-	std::vector<zes_perf_handle_t> *perfHandles;
-
-public:
-	performance() { perfHandles = new std::vector<zes_perf_handle_t>; }
-	~performance() { delete perfHandles; }
-	ze_result_t enumPerformanceFactorDomains(zes_device_handle_t device);
-	ze_result_t getProperties(zes_perf_handle_t perfHandle, zes_perf_properties_t *properties);
-	ze_result_t getConfig(zes_perf_handle_t perfHandle);
-	ze_result_t setConfig(zes_engine_type_flag_t engineType, double factor);
-
-	ze_result_t init(zes_device_handle_t device) override;
-	ze_result_t zesRun(zes_device_handle_t device);
-};
-
-#endif
\ No newline at end of file
diff --git a/hal/core/power.cpp b/hal/core/power.cpp
index c6c93afa8..fea810b98 100644
--- a/hal/core/power.cpp
+++ b/hal/core/power.cpp
@@ -747,7 +747,7 @@ ze_result_t power::getLimitsExt(std::vector<PowerLimitExt> &limits)
  * @param domainLimits Output map of power domain to power level to limit value in milliwatts
  * @return ze_result_t ZE_RESULT_SUCCESS on successful retrieval, error code otherwise
  */
-ze_result_t power::getDomainLimits(std::map<zes_power_domain_t, std::map<zes_power_level_t, uint32_t>> &domainLimits)
+ze_result_t power::getDomainLimits(std::map<zes_power_domain_t, std::map<zes_power_level_t, int32_t>> &domainLimits)
 {
 	domainLimits.clear();
 	for (uint32_t i = 0; i < powerCount; ++i) {
diff --git a/hal/core/power.h b/hal/core/power.h
index bf634a515..7d2b035d9 100644
--- a/hal/core/power.h
+++ b/hal/core/power.h
@@ -77,7 +77,7 @@ class LIBXPUM_API power : public sysman
 	ze_result_t setPeakLimit(uint32_t limit_ac_mw, uint32_t limit_dc_mw);
 	ze_result_t getLimitsExt(std::vector<PowerLimitExt> &limits);
 	ze_result_t setLimitsExt(int32_t tile_id, zes_power_level_t level, uint32_t limit_mw);
-	ze_result_t getDomainLimits(std::map<zes_power_domain_t, std::map<zes_power_level_t, uint32_t>> &domainLimits);
+	ze_result_t getDomainLimits(std::map<zes_power_domain_t, std::map<zes_power_level_t, int32_t>> &domainLimits);
 	ze_result_t getMaxPowerLimit(std::string &range);
 
 	uint32_t getPowerCount() { return powerCount; }
diff --git a/hal/core/powerexp.cpp b/hal/core/powerexp.cpp
new file mode 100644
index 000000000..1af81273e
--- /dev/null
+++ b/hal/core/powerexp.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "powerexp.h"
+#include "debug.h"
+#include <vector>
+
+/**
+ * @brief Initializes the powerExp class with the given driver and device handles
+ * @param [in] driver The handle to the ZES driver
+ * @param [in] device The handle to the ZES device
+ * @return ze_result_t ZE_RESULT_SUCCESS on successful initialization, error code otherwise
+ */
+ze_result_t powerExp::init(zes_driver_handle_t driver, zes_device_handle_t device)
+{
+	zesDriver = driver;
+	zesDevice = device;
+	powerExpEnabled = false;
+	return ZE_RESULT_SUCCESS;
+}
+
+/**
+ * @brief Retrieves instant and average power usage using the experimental API
+ * This function is a placeholder for the experimental Power Usage API.
+ * It currently returns an unsupported feature error.
+ * @param [out] powerUsages Vector to populate with per-domain power usage entries
+ * @return ze_result_t ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ */
+ze_result_t powerExp::getPowerUsage(UNUSED std::vector<power_usage_exp_t> &powerUsages)
+{
+	TRACING();
+	ze_result_t result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	ERR("Experimental Power Usage API is not implemented yet.\n");
+	return result;
+}
+
+/**
+ * @brief Retrieves power limits using the experimental API
+ * This function is a placeholder for the experimental Power Limits API.
+ * It currently returns an unsupported feature error.
+ * @param [out] powerLimits Vector to populate with per-domain power limit entries
+ * @return ze_result_t ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ */
+ze_result_t powerExp::getPowerLimits(UNUSED std::vector<power_limits_exp_t> &powerLimits)
+{
+	TRACING();
+	ze_result_t result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	ERR("Experimental Power Limits API is not implemented yet.\n");
+	return result;
+}
+
+/**
+ * @brief Sets power limit for a specific power domain using the experimental API
+ * This function is a placeholder for the experimental Power Limits API.
+ * It currently returns an unsupported feature error.
+ * @param [in] limitMw Power limit value in milliwatts
+ * @return ze_result_t ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ */
+ze_result_t powerExp::setPowerLimit(UNUSED uint32_t limitMw)
+{
+	TRACING();
+	ze_result_t result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	ERR("Experimental Set Power Limit API is not implemented yet.\n");
+	return result;
+}
diff --git a/hal/core/powerexp.h b/hal/core/powerexp.h
new file mode 100644
index 000000000..2c6a42a2d
--- /dev/null
+++ b/hal/core/powerexp.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#ifndef POWEREXP_H
+#define POWEREXP_H
+
+#include <os.h>
+#include "zes_api.h"
+#include "debug.h"
+#include <cstdint>
+#include <vector>
+
+struct power_usage_exp_t
+{
+	zes_power_domain_t domain; ///< Power domain type (card, package, stack, etc.)
+	uint32_t instantPower;	   ///< Instantaneous power in milliwatts
+	uint32_t averagePower;	   ///< Time-averaged power in milliwatts
+};
+
+struct power_limits_exp_t
+{
+	zes_power_domain_t domain; ///< Power domain type (card, package, stack, etc.)
+	uint32_t limit;			   ///< Power limit in milliwatts
+};
+
+class LIBXPUM_API powerExp
+{
+private:
+	zes_driver_handle_t zesDriver;
+	zes_device_handle_t zesDevice;
+	zes_pwr_handle_t *powerHandles = nullptr;
+	uint32_t powerCount = 0;
+	bool powerExpEnabled;
+
+public:
+	powerExp() : zesDriver(nullptr), zesDevice(nullptr), powerHandles(nullptr), powerCount(0), powerExpEnabled(false) {}
+	~powerExp()
+	{
+		delete[] powerHandles;
+		powerHandles = nullptr;
+	}
+	ze_result_t init(zes_driver_handle_t driver, zes_device_handle_t device);
+	ze_result_t getPowerUsage(std::vector<power_usage_exp_t> &powerUsages);
+	ze_result_t getPowerLimits(std::vector<power_limits_exp_t> &powerLimits);
+	ze_result_t setPowerLimit(uint32_t limitMw);
+	bool isPowerExpEnabled() const { return powerExpEnabled; }
+};
+
+#endif // POWEREXP_H
\ No newline at end of file
diff --git a/hal/core/scheduler.cpp b/hal/core/scheduler.cpp
index 27a54159f..b9bdd2795 100644
--- a/hal/core/scheduler.cpp
+++ b/hal/core/scheduler.cpp
@@ -246,10 +246,12 @@ ze_result_t scheduler::getTimesliceProperties(zes_sched_handle_t schedulerHandle
  * @param timeoutValue Timeout value in microseconds for watchdog monitoring
  * @return ze_result_t ZE_RESULT_SUCCESS if timeout mode set successfully, error code otherwise
  */
-ze_result_t scheduler::setTimeoutMode(float timeoutValue)
+ze_result_t scheduler::setTimeoutMode(uint64_t timeoutValue)
 {
 	zes_sched_timeout_properties_t timeoutProperties = {};
-	timeoutProperties.watchdogTimeout = static_cast<uint64_t>(timeoutValue);
+	timeoutProperties.stype = ZES_STRUCTURE_TYPE_SCHED_TIMEOUT_PROPERTIES;
+	timeoutProperties.pNext = nullptr;
+	timeoutProperties.watchdogTimeout = timeoutValue;
 	ze_bool_t pNeedReload;
 	ze_result_t result = ZE_RESULT_SUCCESS;
 
@@ -281,11 +283,13 @@ ze_result_t scheduler::setTimeoutMode(float timeoutValue)
  * @param yieldTimeoutValue Yield timeout in microseconds for preemption control
  * @return ze_result_t ZE_RESULT_SUCCESS if timeslice mode set successfully, error code otherwise
  */
-ze_result_t scheduler::setTimesliceMode(float timesliceValue, float yieldTimeoutValue)
+ze_result_t scheduler::setTimesliceMode(uint64_t timesliceValue, uint64_t yieldTimeoutValue)
 {
 	zes_sched_timeslice_properties_t timesliceProperties = {};
-	timesliceProperties.interval = static_cast<uint64_t>(timesliceValue);
-	timesliceProperties.yieldTimeout = static_cast<uint64_t>(yieldTimeoutValue);
+	timesliceProperties.stype = ZES_STRUCTURE_TYPE_SCHED_TIMESLICE_PROPERTIES;
+	timesliceProperties.pNext = nullptr;
+	timesliceProperties.interval = timesliceValue;
+	timesliceProperties.yieldTimeout = yieldTimeoutValue;
 	ze_bool_t pNeedReload;
 	ze_result_t result = ZE_RESULT_SUCCESS;
 
diff --git a/hal/core/scheduler.h b/hal/core/scheduler.h
index 0b9e0f0d8..d32a1fd1d 100644
--- a/hal/core/scheduler.h
+++ b/hal/core/scheduler.h
@@ -33,8 +33,8 @@ class LIBXPUM_API scheduler : public sysman
 	uint32_t getSchedulerCount() const { return schedulerCount; }
 	zes_sched_handle_t *getSchedulerHandles() const { return schedulerHandles; }
 
-	ze_result_t setTimeoutMode(float timeoutValue);
-	ze_result_t setTimesliceMode(float timesliceValue, float yieldTimeoutValue);
+	ze_result_t setTimeoutMode(uint64_t timeoutValue);
+	ze_result_t setTimesliceMode(uint64_t timesliceValue, uint64_t yieldTimeoutValue);
 	ze_result_t setExclusiveMode();
 
 	ze_result_t init(zes_device_handle_t device) override;
diff --git a/hal/core/temperature.cpp b/hal/core/temperature.cpp
index 65285b58d..711f4a2ac 100644
--- a/hal/core/temperature.cpp
+++ b/hal/core/temperature.cpp
@@ -6,8 +6,10 @@
 
 #include "temperature.h"
 #include "debug.h"
+#include <cmath>
 #include <map>
 #include <memory>
+#include <vector>
 
 /**
  * @brief Helper function to parse device ID from hexadecimal string
@@ -111,7 +113,7 @@ temperature::temperature()
 	: temperatureCount(0), temperatureHandles(nullptr), thresholds(new TemperatureThresholds()),
 	  defaultCoreThrottleThreshold(CORE_THROTTLE_THRESHOLD_DEFAULT),
 	  defaultCoreShutdownThreshold(CORE_SHUTDOWN_THRESHOLD_DEFAULT),
-	  defaultMemoryShutdownThreshold(MEMORY_SHUTDOWN_THRESHOLD_DEFAULT)
+	  defaultMemoryShutdownThreshold(MEMORY_SHUTDOWN_THRESHOLD_DEFAULT), hasLpddr5Memory(false)
 {
 	loadTemperatureThresholds();
 }
@@ -343,6 +345,10 @@ ze_result_t temperature::getState(zes_temp_handle_t temperatureHandle, double *t
 ze_result_t temperature::getTemp(zes_temp_sensors_t type, double *temp)
 {
 	TRACING();
+	if (temp == nullptr) {
+		ERR("Temperature output pointer is null\n");
+		return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
+	}
 	ze_result_t result = ZE_RESULT_SUCCESS;
 	zes_temp_properties_t properties;
 	*temp = 0.0; // Default value if no temperature found
@@ -411,6 +417,12 @@ ze_result_t temperature::getTempPerTile(zes_temp_sensors_t type, std::map<uint32
 			continue;
 		}
 
+		// LPDDR5 reports memory temperature as an MR4 thermal code (0..7);
+		// convert to Celsius.
+		if (type == ZES_TEMP_SENSORS_MEMORY && hasLpddr5Memory) {
+			temp = mr4CodeToCelsius(temp);
+		}
+
 		// Filter abnormal temperatures
 		if (temp < MAX_REASONABLE_TEMP_CELSIUS) {
 			tileTemperatures[tileId] = temp;
@@ -451,7 +463,12 @@ ze_result_t temperature::getCoreTemp(double *coreTemp)
 ze_result_t temperature::getMemoryTemp(double *memTemp)
 {
 	TRACING();
-	return getTemp(ZES_TEMP_SENSORS_MEMORY, memTemp);
+	ze_result_t result = getTemp(ZES_TEMP_SENSORS_MEMORY, memTemp);
+	// LPDDR5 reports an MR4 thermal code (0..7); convert to Celsius.
+	if (result == ZE_RESULT_SUCCESS && hasLpddr5Memory && memTemp != nullptr) {
+		*memTemp = mr4CodeToCelsius(*memTemp);
+	}
+	return result;
 }
 
 /**
@@ -528,7 +545,14 @@ ze_result_t temperature::getMemoryThreshold(zes_device_handle_t device, uint32_t
 ze_result_t temperature::init(zes_device_handle_t device)
 {
 	TRACING();
-	return enumTemperatureDomains(device);
+	ze_result_t result = enumTemperatureDomains(device);
+	// Detect LPDDR5 memory so memory-temp getters can convert the MR4 thermal
+	// code reported by the device into a Celsius value. Best-effort: the result
+	// is intentionally ignored so a detection failure does not mask the
+	// enumeration result; on failure the LPDDR5 flag stays false and behavior
+	// is unchanged for non-LPDDR5 devices.
+	(void)detectLpddr5Memory(device);
+	return result;
 }
 
 /**
@@ -560,4 +584,100 @@ ze_result_t temperature::zesRun(UNUSED zes_device_handle_t device)
 	}
 
 	return result;
-}
\ No newline at end of file
+}
+/**
+ * @brief Convert a JEDEC LPDDR5 MR4 thermal refresh code to Celsius.
+ *
+ * LPDDR5 devices expose temperature through Mode Register 4 (MR4) OP[2:0] as
+ * a 3-bit refresh-rate code (0..7) that maps to a temperature range rather
+ * than a single Celsius value. Per the JIRA, the agreed-upon convention for
+ * pcode and the software stack is to report the maximum temperature of the
+ * range associated with each code. This table follows the standard JEDEC
+ * JESD209-5 LPDDR5 MR4 thermal mapping.
+ *
+ *  MR4  Refresh Rate     Range (°C)        Reported (max of range)
+ *  ---  ---------------  ----------------  -----------------------
+ *   0   reserved/low     T < low limit                       0
+ *   1   4x               T <= 45                            45
+ *   2   2x               45 < T <= 85                       85
+ *   3   1x (nominal)     85 < T <= 95                       95
+ *   4   0.5x             95 < T <= 105                     105
+ *   5   0.25x           105 < T <= 110                     110
+ *   6   0.25x + derate  110 < T <= 125                     125
+ *   7   reserved/high    T > high limit                    125
+ *
+ * Values outside [0, LPDDR5_MR4_MAX_CODE] are returned unchanged so that
+ * callers passing an already-converted Celsius value are not double-mapped.
+ *
+ * @param rawValue The raw value returned by zesTemperatureGetState for an
+ *                 LPDDR5 memory sensor.
+ * @return Maximum temperature (Celsius) of the MR4 range, or rawValue if the
+ *         input is not a recognized MR4 code.
+ */
+double temperature::mr4CodeToCelsius(double rawValue)
+{
+	static const double kMr4ToCelsius[LPDDR5_MR4_MAX_CODE + 1] = {
+		0.0,   // 0: low temperature operating limit exceeded
+		45.0,  // 1: 4x refresh
+		85.0,  // 2: 2x refresh
+		95.0,  // 3: 1x refresh (nominal)
+		105.0, // 4: 0.5x refresh
+		110.0, // 5: 0.25x refresh
+		125.0, // 6: 0.25x refresh with derating
+		125.0, // 7: high temperature operating limit exceeded
+	};
+
+	// Only convert values that look like an MR4 code (integer 0..7).
+	if (!std::isfinite(rawValue) || rawValue < 0.0 || rawValue > (double)LPDDR5_MR4_MAX_CODE) {
+		return rawValue;
+	}
+	double rounded = std::round(rawValue);
+	if (std::fabs(rawValue - rounded) > 1e-9) {
+		return rawValue;
+	}
+	uint32_t code = (uint32_t)rounded;
+	return kMr4ToCelsius[code];
+}
+
+/**
+ * @brief Detect whether any memory module on the device is LPDDR5.
+ *
+ * When LPDDR5 memory is present, memory temperature readings arrive as MR4
+ * thermal codes rather than Celsius values and require conversion via
+ * mr4CodeToCelsius().
+ *
+ * @param device Sysman device handle
+ * @return ZE_RESULT_SUCCESS on successful enumeration; the LPDDR5 flag is
+ *         cleared on any failure so behavior remains unchanged for
+ *         non-LPDDR5 devices.
+ */
+ze_result_t temperature::detectLpddr5Memory(zes_device_handle_t device)
+{
+	hasLpddr5Memory = false;
+
+	uint32_t count = 0;
+	ze_result_t result = zesDeviceEnumMemoryModules(device, &count, nullptr);
+	if (result != ZE_RESULT_SUCCESS || count == 0) {
+		DBG("No memory modules to inspect for LPDDR5 (0x{:X})\n", result);
+		return result;
+	}
+
+	std::vector<zes_mem_handle_t> handles(count);
+	result = zesDeviceEnumMemoryModules(device, &count, handles.data());
+	if (result != ZE_RESULT_SUCCESS) {
+		DBG("Failed to retrieve memory module handles (0x{:X})\n", result);
+		return result;
+	}
+
+	for (uint32_t i = 0; i < count; ++i) {
+		zes_mem_properties_t props = {};
+		props.stype = ZES_STRUCTURE_TYPE_MEM_PROPERTIES;
+		if (zesMemoryGetProperties(handles[i], &props) == ZE_RESULT_SUCCESS && props.type == ZES_MEM_TYPE_LPDDR5) {
+			hasLpddr5Memory = true;
+			DBG("LPDDR5 memory detected; MR4 -> Celsius conversion enabled\n");
+			break;
+		}
+	}
+
+	return ZE_RESULT_SUCCESS;
+}
diff --git a/hal/core/temperature.h b/hal/core/temperature.h
index d00e1f040..ce12e65d7 100644
--- a/hal/core/temperature.h
+++ b/hal/core/temperature.h
@@ -49,6 +49,9 @@ class TemperatureThresholds
 	void setShutdownMemoryTemperature(uint32_t deviceId, uint64_t value);
 };
 
+// LPDDR5 MR4 code is a 3-bit value (OP[2:0]); valid raw readings are 0..7.
+#define LPDDR5_MR4_MAX_CODE 7
+
 class LIBXPUM_API temperature : public sysman
 {
 private:
@@ -61,9 +64,15 @@ class LIBXPUM_API temperature : public sysman
 	uint64_t defaultCoreShutdownThreshold;
 	uint64_t defaultMemoryShutdownThreshold;
 
+	// LPDDR5 devices report memory temperature as an MR4 thermal refresh code
+	// (0-7) instead of a value in Celsius. Detected at init and used by the
+	// memory-temperature getters to convert MR4 -> max-of-range Celsius.
+	bool hasLpddr5Memory;
+
 	void loadTemperatureThresholds();
 	void loadThresholdSection(const nlohmann::json &thresholdsJson, const std::string &key,
 							  std::function<void(uint32_t, uint64_t)> setter);
+	ze_result_t detectLpddr5Memory(zes_device_handle_t device);
 
 public:
 	temperature();
@@ -87,5 +96,11 @@ class LIBXPUM_API temperature : public sysman
 
 	// Helper functions for JSON threshold loading
 	static uint32_t parseDeviceId(const std::string &hexKey);
+
+	// Convert a JEDEC LPDDR5 MR4 thermal refresh code (OP[2:0], 0..7) to the
+	// maximum temperature of its associated range, in Celsius. Codes outside
+	// [0, LPDDR5_MR4_MAX_CODE], non-finite values, and non-integer values are
+	// returned unchanged (treated as already-converted Celsius readings).
+	static double mr4CodeToCelsius(double rawValue);
 };
 #endif
\ No newline at end of file
diff --git a/hal/core/test/temperature_test.cpp b/hal/core/test/temperature_test.cpp
new file mode 100644
index 000000000..32ca8439d
--- /dev/null
+++ b/hal/core/test/temperature_test.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include <doctest/doctest.h>
+// doctest defines INFO(expr) for test context; undef it so debug.h (pulled in
+// via temperature.h) can define INFO(fmt, ...) for log-level gating.
+#undef INFO
+
+#include "temperature.h"
+
+#include <cmath>
+#include <limits>
+
+// Tests for temperature::mr4CodeToCelsius(), which converts a JEDEC LPDDR5
+// MR4 thermal refresh code (0..7) to the max-of-range Celsius value. Values
+// outside [0, 7], non-finite values, and non-integer values must be returned
+// unchanged so non-LPDDR5 paths and already-converted readings are not
+// disturbed.
+
+TEST_CASE("mr4CodeToCelsius: maps each MR4 code to JEDEC max-of-range")
+{
+	CHECK(temperature::mr4CodeToCelsius(0.0) == doctest::Approx(0.0));
+	CHECK(temperature::mr4CodeToCelsius(1.0) == doctest::Approx(45.0));
+	CHECK(temperature::mr4CodeToCelsius(2.0) == doctest::Approx(85.0));
+	CHECK(temperature::mr4CodeToCelsius(3.0) == doctest::Approx(95.0));
+	CHECK(temperature::mr4CodeToCelsius(4.0) == doctest::Approx(105.0));
+	CHECK(temperature::mr4CodeToCelsius(5.0) == doctest::Approx(110.0));
+	CHECK(temperature::mr4CodeToCelsius(6.0) == doctest::Approx(125.0));
+	CHECK(temperature::mr4CodeToCelsius(7.0) == doctest::Approx(125.0));
+}
+
+TEST_CASE("mr4CodeToCelsius: values outside [0, 7] pass through unchanged")
+{
+	CHECK(temperature::mr4CodeToCelsius(-1.0) == doctest::Approx(-1.0));
+	CHECK(temperature::mr4CodeToCelsius(8.0) == doctest::Approx(8.0));
+	CHECK(temperature::mr4CodeToCelsius(42.5) == doctest::Approx(42.5));
+	CHECK(temperature::mr4CodeToCelsius(125.0) == doctest::Approx(125.0));
+}
+
+TEST_CASE("mr4CodeToCelsius: non-integer values in [0, 7] pass through unchanged")
+{
+	// An already-converted Celsius reading that happens to fall inside the
+	// MR4 numeric range (e.g. 3.5 C) must not be re-mapped.
+	CHECK(temperature::mr4CodeToCelsius(0.5) == doctest::Approx(0.5));
+	CHECK(temperature::mr4CodeToCelsius(3.5) == doctest::Approx(3.5));
+	CHECK(temperature::mr4CodeToCelsius(6.999) == doctest::Approx(6.999));
+}
+
+TEST_CASE("mr4CodeToCelsius: integers represented with small FP error are still mapped")
+{
+	// Tolerance is 1e-9; values within that of an integer code count as that
+	// code.
+	CHECK(temperature::mr4CodeToCelsius(3.0 + 1e-12) == doctest::Approx(95.0));
+	CHECK(temperature::mr4CodeToCelsius(3.0 - 1e-12) == doctest::Approx(95.0));
+}
+
+TEST_CASE("mr4CodeToCelsius: non-finite inputs pass through unchanged")
+{
+	const double nan = std::numeric_limits<double>::quiet_NaN();
+	const double inf = std::numeric_limits<double>::infinity();
+
+	// NaN compares unequal to itself, so verify with std::isnan / std::isinf
+	// rather than equality (which would also trip -Wfloat-equal).
+	CHECK(std::isnan(temperature::mr4CodeToCelsius(nan)));
+	CHECK(std::isinf(temperature::mr4CodeToCelsius(inf)));
+	CHECK(temperature::mr4CodeToCelsius(inf) > 0.0);
+	CHECK(std::isinf(temperature::mr4CodeToCelsius(-inf)));
+	CHECK(temperature::mr4CodeToCelsius(-inf) < 0.0);
+}
diff --git a/ial/api/examples/c/example.c b/ial/api/examples/c/example.c
deleted file mode 100644
index 3f4fb59fe..000000000
--- a/ial/api/examples/c/example.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "../../xpum_api.h"
-
-int main(void)
-{
-	printf("XPUM C API Example\n");
-	printf("==================\n\n");
-
-	// Initialize XPUM
-	printf("Initializing XPUM...\n");
-	xpum_result_t result = xpumInit();
-	if (result != XPUM_OK) {
-		fprintf(stderr, "Failed to initialize XPUM: %d\n", result);
-		return 1;
-	}
-	printf("XPUM initialized successfully\n\n");
-
-	// Get version info
-	printf("Getting version information...\n");
-	int versionCount = 0;
-	result = xpumVersionInfo(NULL, &versionCount);
-	if (result == XPUM_OK && versionCount > 0) {
-		XpumVersionInfo *versions = malloc(versionCount * sizeof(XpumVersionInfo));
-		result = xpumVersionInfo(versions, &versionCount);
-		if (result == XPUM_OK) {
-			for (int i = 0; i < versionCount; i++) {
-				printf("  Version %d: %s\n", versions[i].version, versions[i].versionString);
-			}
-		}
-		free(versions);
-	}
-	printf("\n");
-
-	// Get device list
-	printf("Enumerating devices...\n");
-	int deviceCount = 0;
-	result = xpumGetDeviceList(NULL, &deviceCount);
-	if (result != XPUM_OK) {
-		fprintf(stderr, "Failed to get device count: %d\n", result);
-		xpumShutdown();
-		return 1;
-	}
-
-	printf("Found %d device(s)\n\n", deviceCount);
-
-	if (deviceCount > 0) {
-		XpumDeviceBasicInfo *devices = malloc(deviceCount * sizeof(XpumDeviceBasicInfo));
-		result = xpumGetDeviceList(devices, &deviceCount);
-
-		if (result == XPUM_OK) {
-			for (int i = 0; i < deviceCount; i++) {
-				printf("Device %d:\n", devices[i].deviceId);
-				printf("  Name: %s\n", devices[i].deviceName);
-			printf("  Vendor: %s\n", devices[i].vendorName);
-			printf("  BDF: %s\n", devices[i].pcibdfAddress);
-				printf("  UUID: %s\n", devices[i].uuid);
-				printf("\n");
-
-				// Get detailed properties
-				xpum_device_properties_t props;
-				result = xpumGetDeviceProperties(devices[i].deviceId, &props);
-				if (result == XPUM_OK) {
-					printf("  Detailed Properties (%d properties):\n", props.propertyLen);
-					for (int j = 0; j < props.propertyLen; j++) {
-						printf("    Property %d: %s\n", props.properties[j].name, props.properties[j].value);
-					}
-					printf("\n");
-				}
-			}
-		}
-
-		free(devices);
-	}
-
-	// Test group creation
-	printf("Testing group management...\n");
-	xpum_group_id_t groupId = 0;
-	result = xpumGroupCreate("test_group", &groupId);
-	if (result == XPUM_OK) {
-		printf("Created group 'test_group' with ID: %u\n", groupId);
-
-		// Add first device to group if available
-		if (deviceCount > 0) {
-			result = xpumGroupAddDevice(groupId, 0);
-			if (result == XPUM_OK) {
-				printf("Added device 0 to group\n");
-			}
-
-			// Get group info
-			xpum_group_info_t groupInfo;
-			result = xpumGroupGetInfo(groupId, &groupInfo);
-			if (result == XPUM_OK) {
-				printf("Group info:\n");
-				printf("  Name: %s\n", groupInfo.groupName);
-				printf("  Device count: %d\n", groupInfo.count);
-			}
-		}
-
-		// Cleanup group
-		result = xpumGroupDestroy(groupId);
-		if (result == XPUM_OK) {
-			printf("Destroyed group\n");
-		}
-	}
-	printf("\n");
-
-	// Shutdown XPUM
-	printf("Shutting down XPUM...\n");
-	result = xpumShutdown();
-	if (result != XPUM_OK) {
-		fprintf(stderr, "Failed to shutdown XPUM: %d\n", result);
-		return 1;
-	}
-
-	printf("XPUM shutdown successfully\n");
-	printf("\nExample completed!\n");
-
-	return 0;
-}
diff --git a/ial/api/examples/go/example.go b/ial/api/examples/go/example.go
deleted file mode 100644
index 5d61b8d55..000000000
--- a/ial/api/examples/go/example.go
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-// Copyright (C) 2025 Intel Corporation
-// SPDX-License-Identifier: MIT
-//
-// Example Go program demonstrating XPUM C API usage via cgo
-
-package main
-
-/*
-#cgo pkg-config: xpum_api
-
-#include <level_zero/ze_api.h>
-#include "xpum_api.h"
-#include <stdlib.h>
-*/
-import "C"
-import (
-	"fmt"
-	"unsafe"
-)
-
-func main() {
-	fmt.Println("XPUM C API Go Example")
-	fmt.Println("======================\n")
-
-	// Initialize XPUM
-	fmt.Println("Initializing XPUM...")
-	result := C.xpumInit()
-	if result != C.XPUM_OK {
-		panic(fmt.Sprintf("Failed to initialize XPUM: %d", result))
-	}
-	defer C.xpumShutdown()
-	fmt.Println("XPUM initialized successfully\n")
-
-	// Get version info
-	fmt.Println("Getting version information...")
-	var versionCount C.int
-	result = C.xpumVersionInfo(nil, &versionCount)
-	if result == C.XPUM_OK && versionCount > 0 {
-		versions := make([]C.XpumVersionInfo, versionCount)
-		result = C.xpumVersionInfo(&versions[0], &versionCount)
-		if result == C.XPUM_OK {
-			for i := 0; i < int(versionCount); i++ {
-				versionStr := C.GoString(&versions[i].versionString[0])
-				fmt.Printf("  Version %d: %s\n", versions[i].version, versionStr)
-			}
-		}
-	}
-	fmt.Println()
-
-	// Get device list
-	fmt.Println("Enumerating devices...")
-	var deviceCount C.int
-	result = C.xpumGetDeviceList(nil, &deviceCount)
-	if result != C.XPUM_OK {
-		panic(fmt.Sprintf("Failed to get device count: %d", result))
-	}
-
-	fmt.Printf("Found %d device(s)\n\n", deviceCount)
-
-	if deviceCount > 0 {
-		devices := make([]C.XpumDeviceBasicInfo, deviceCount)
-		result = C.xpumGetDeviceList(&devices[0], &deviceCount)
-
-		if result == C.XPUM_OK {
-			for i := 0; i < int(deviceCount); i++ {
-				fmt.Printf("Device %d:\n", devices[i].deviceId)
-				fmt.Printf("  Name: %s\n", C.GoString(&devices[i].deviceName[0]))
-				fmt.Printf("  Vendor: %s\n", C.GoString(&devices[i].vendorName[0]))
-				fmt.Printf("  BDF: %s\n", C.GoString(&devices[i].pcibdfAddress[0]))
-				fmt.Printf("  UUID: %s\n", C.GoString(&devices[i].uuid[0]))
-				fmt.Println()
-
-				// Get detailed properties
-				var props C.xpum_device_properties_t
-				result = C.xpumGetDeviceProperties(devices[i].deviceId, &props)
-				if result == C.XPUM_OK {
-					fmt.Printf("  Detailed Properties (%d properties):\n", props.propertyLen)
-					for j := 0; j < int(props.propertyLen); j++ {
-						fmt.Printf("    Property %d: %s\n", props.properties[j].name,
-							C.GoString(&props.properties[j].value[0]))
-					}
-					fmt.Println()
-				}
-			}
-		}
-	}
-
-	// Test group creation
-	fmt.Println("Testing group management...")
-	groupName := C.CString("test_group")
-	defer C.free(unsafe.Pointer(groupName))
-
-	var groupID C.xpum_group_id_t
-	result = C.xpumGroupCreate(groupName, &groupID)
-	if result == C.XPUM_OK {
-		fmt.Printf("Created group 'test_group' with ID: %d\n", groupID)
-
-		// Add first device to group if available
-		if deviceCount > 0 {
-			result = C.xpumGroupAddDevice(groupID, 0)
-			if result == C.XPUM_OK {
-				fmt.Println("Added device 0 to group")
-			}
-
-			// Get group info
-			var groupInfo C.xpum_group_info_t
-			result = C.xpumGroupGetInfo(groupID, &groupInfo)
-			if result == C.XPUM_OK {
-				fmt.Println("Group info:")
-				fmt.Printf("  Name: %s\n", C.GoString(&groupInfo.groupName[0]))
-				fmt.Printf("  Device count: %d\n", groupInfo.count)
-			}
-		}
-
-		// Cleanup group
-		result = C.xpumGroupDestroy(groupID)
-		if result == C.XPUM_OK {
-			fmt.Println("Destroyed group")
-		}
-	}
-	fmt.Println()
-
-	fmt.Println("Example completed!")
-}
diff --git a/ial/api/examples/go/go.mod b/ial/api/examples/go/go.mod
deleted file mode 100644
index 5fe7e4d96..000000000
--- a/ial/api/examples/go/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module example
-
-go 1.23.5
diff --git a/ial/api/meson.build b/ial/api/meson.build
deleted file mode 100644
index 316ba4256..000000000
--- a/ial/api/meson.build
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2025-2026 Intel Corporation
-# SPDX-License-Identifier: MIT
-
-# C API examples and tests
-# Enable with: -Dbuild_examples=true
-
-if get_option('build_examples')
-  c_example = executable(
-    'xpum_c_example',
-    'examples/c/example.c',
-    include_directories: include_directories('.'),
-    dependencies: [libxpum_dep, levelzero_dep],
-    link_args : is_linux ? ['-pie'] : [],
-    install: false,
-  )
-
-  run_target('c-example',
-    command: c_example,
-  )
-
-  go_prog = find_program('go', required: false)
-  if go_prog.found()
-    go_example = custom_target(
-      'xpum_go_example',
-      output: 'xpum_go_example',
-      input: 'examples/go/example.go',
-      command: [
-        go_prog,
-        'build',
-        '-o', '@OUTPUT@',
-        '@INPUT@',
-      ],
-      env: {
-        'CGO_CFLAGS': '-I' + join_paths(meson.project_source_root(), 'ial', 'api'),
-        'CGO_LDFLAGS': '-L' + join_paths(meson.project_build_root(), 'hal', 'core') + ' -Wl,-rpath,' + join_paths(meson.project_build_root(), 'hal', 'core'),
-      },
-      depends: libxpum_shared,
-    )
-
-    run_target('go-example',
-      command: [go_example],
-    )
-  endif
-endif
diff --git a/ial/api/xpum_api.cpp b/ial/api/xpum_api.cpp
deleted file mode 100644
index a52fcd0b2..000000000
--- a/ial/api/xpum_api.cpp
+++ /dev/null
@@ -1,1725 +0,0 @@
-/*
- * Copyright (C) 2021-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-// Include Level Zero headers first (needed for type conversion functions)
-#include <ze_api.h>
-#include <zes_api.h>
-
-#include "xpum_api.h"
-#include "xpum_structs.h"
-#include "ial/cli/version.h"
-#include "hal/core/debug.h"
-#include "hal/core/device.h"
-#include "hal/core/driver.h"
-#include "hal/fwupd/fwupd.h"
-#include "hal/core/firmware.h"
-#include "oal/os.h"
-
-#include <cstdio>
-#include <cstdint>
-#include <algorithm>
-#include <cstring>
-#include <exception>
-#include <format>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <string_view>
-#include <unordered_map>
-#include <vector>
-
-// Anonymous namespace for internal implementation details
-namespace {
-
-/**************************************************************************/
-/** Internal Context Management using C++20 features
- */
-/**************************************************************************/
-
-struct APIContext
-{
-	std::unique_ptr<driver> driverInstance;
-	std::vector<devInfo> devices;
-
-	// Group management (IAL-specific, not in HAL)
-	struct GroupInfo
-	{
-		std::string name;
-		std::vector<xpum_device_id_t> devices;
-	};
-	std::unordered_map<xpum_group_id_t, GroupInfo> groups;
-	xpum_group_id_t nextGroupId{1};
-};
-
-struct APIState
-{
-	std::mutex mutex;
-	std::unique_ptr<APIContext> context;
-};
-
-/**
- * @brief Get global API state (thread-safe Meyer's singleton)
- */
-APIState &getState()
-{
-	static APIState state;
-	return state;
-}
-
-/**************************************************************************/
-/** Helper Functions
- */
-/**************************************************************************/
-
-/**
- * @brief Check if context is initialized
- */
-bool isInitialized(const APIState &state) { return state.context != nullptr; }
-
-/**
- * @brief Format UUID from Level Zero uuid struct
- */
-std::string formatUuid(const uint8_t (&id)[16])
-{
-	return std::format(
-		"{:02x}{:02x}{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}", id[0],
-		id[1], id[2], id[3], id[4], id[5], id[6], id[7], id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]);
-}
-
-/**
- * @brief Copy/format into fixed-size C string buffer (C++20)
- *
- * Overload 1: Plain string copy (no formatting)
- * Overload 2: Format with arguments using std::format
- */
-template <size_t N> void toCstr(char (&dest)[N], std::string_view src)
-{
-	const size_t len = std::min(src.size(), N - 1);
-	std::copy_n(src.data(), len, dest);
-	dest[len] = '\0';
-}
-
-// Overload for decayed pointer (e.g. function parameters), requires explicit size
-void toCstr(char *dest, size_t destSize, std::string_view src)
-{
-	const size_t len = std::min(src.size(), destSize - 1);
-	std::copy_n(src.data(), len, dest);
-	dest[len] = '\0';
-}
-
-//clang-format off
-// This got merged while failing clang-format and seems to continue to fail
-template <size_t N, typename... Args>
-	requires(sizeof...(Args) > 0)
-//clang-format on
-void toCstr(char (&dest)[N], std::format_string<Args...> fmt, Args &&...args)
-{
-	auto result = std::format_to_n(dest, N - 1, fmt, std::forward<Args>(args)...);
-	dest[result.size] = '\0';
-}
-
-/**
- * @brief Get device by ID with proper error reporting
- * @return XPUM_OK on success, XPUM_NOT_INITIALIZED or XPUM_RESULT_DEVICE_NOT_FOUND on error
- */
-xpum_result_t getDevice(const APIState &state, xpum_device_id_t deviceId, device **outDevice)
-{
-	if (!isInitialized(state)) {
-		return XPUM_NOT_INITIALIZED;
-	}
-	if (deviceId < 0 || static_cast<size_t>(deviceId) >= state.context->devices.size()) {
-		return XPUM_RESULT_DEVICE_NOT_FOUND;
-	}
-	*outDevice = state.context->devices[deviceId].dev;
-	return XPUM_OK;
-}
-
-/**
- * @brief Convert Level Zero result codes to XPUM result codes
- */
-constexpr xpum_result_t toXpumResult(ze_result_t zeResult)
-{
-	switch (zeResult) {
-	case ZE_RESULT_SUCCESS:
-		return XPUM_OK;
-	case ZE_RESULT_ERROR_UNINITIALIZED:
-		return XPUM_NOT_INITIALIZED;
-	case ZE_RESULT_ERROR_DEVICE_LOST:
-		return XPUM_RESULT_DEVICE_NOT_FOUND;
-	case ZE_RESULT_ERROR_INVALID_NULL_POINTER:
-	case ZE_RESULT_ERROR_INVALID_ARGUMENT:
-	case ZE_RESULT_ERROR_INVALID_SIZE:
-		return XPUM_GENERIC_ERROR;
-	case ZE_RESULT_ERROR_UNSUPPORTED_FEATURE:
-		return XPUM_API_UNSUPPORTED;
-	case ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY:
-	case ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY:
-		return XPUM_GENERIC_ERROR;
-	case ZE_RESULT_ERROR_NOT_AVAILABLE:
-		return XPUM_METRIC_NOT_SUPPORTED;
-	default:
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Convert XPUM standby mode to Level Zero standby mode
- */
-inline zes_standby_promo_mode_t toZesStandbyMode(xpum_standby_mode_t mode)
-{
-	switch (mode) {
-	case XPUM_STANDBY_MODE_DEFAULT:
-		return ZES_STANDBY_PROMO_MODE_DEFAULT;
-	case XPUM_STANDBY_MODE_NEVER:
-		return ZES_STANDBY_PROMO_MODE_NEVER;
-	default:
-		return ZES_STANDBY_PROMO_MODE_DEFAULT;
-	}
-}
-
-/**
- * @brief Convert Level Zero ECC state to XPUM ECC state
- */
-inline xpum_ecc_state_t toXpumEccState(zes_device_ecc_state_t state)
-{
-	switch (state) {
-	case ZES_DEVICE_ECC_STATE_UNAVAILABLE:
-		return XPUM_ECC_STATE_UNAVAILABLE;
-	case ZES_DEVICE_ECC_STATE_ENABLED:
-		return XPUM_ECC_STATE_ENABLED;
-	case ZES_DEVICE_ECC_STATE_DISABLED:
-		return XPUM_ECC_STATE_DISABLED;
-	default:
-		return XPUM_ECC_STATE_UNAVAILABLE;
-	}
-}
-
-/**
- * @brief Convert XPUM frequency domain to Level Zero frequency domain
- */
-inline zes_freq_domain_t toZesFreqDomain(xpum_freq_domain_t domain)
-{
-	switch (domain) {
-	case XPUM_FREQ_DOMAIN_GPU:
-		return ZES_FREQ_DOMAIN_GPU;
-	case XPUM_FREQ_DOMAIN_MEMORY:
-		return ZES_FREQ_DOMAIN_MEMORY;
-	default:
-		return ZES_FREQ_DOMAIN_GPU;
-	}
-}
-
-/**
- * @brief Convert Level Zero throttle reasons to XPUM throttle reasons
- */
-inline xpum_freq_throttle_reason_flags_t toXpumThrottleReasons(zes_freq_throttle_reason_flags_t reasons)
-{
-	uint32_t xpumReasons = XPUM_FREQ_THROTTLE_REASON_NONE;
-	if (reasons & ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT)
-		xpumReasons |= XPUM_FREQ_THROTTLE_REASON_THERMAL_LIMIT;
-	if (reasons & ZES_FREQ_THROTTLE_REASON_FLAG_CURRENT_LIMIT)
-		xpumReasons |= XPUM_FREQ_THROTTLE_REASON_CURRENT_LIMIT;
-#ifdef ZES_FREQ_THROTTLE_REASON_FLAG_POWER_LIMIT
-	if (reasons & ZES_FREQ_THROTTLE_REASON_FLAG_POWER_LIMIT)
-		xpumReasons |= XPUM_FREQ_THROTTLE_REASON_POWER_LIMIT;
-#endif
-#ifdef ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL_EXCURSION
-	if (reasons & ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL_EXCURSION)
-		xpumReasons |= XPUM_FREQ_THROTTLE_REASON_THERMAL_EXCURSION;
-#endif
-	if (reasons & ZES_FREQ_THROTTLE_REASON_FLAG_BURST_PWR_CAP)
-		xpumReasons |= XPUM_FREQ_THROTTLE_REASON_BURST_POWER_CAP;
-	if (reasons & ZES_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP)
-		xpumReasons |= XPUM_FREQ_THROTTLE_REASON_AVE_POWER_CAP;
-	return static_cast<xpum_freq_throttle_reason_flags_t>(xpumReasons);
-}
-
-/**
- * @brief Convert XPUM RAS error category to Level Zero RAS error category
- */
-inline zes_ras_error_cat_t toZesRasErrorCat(xpum_ras_error_cat_t category)
-{
-	switch (category) {
-	case XPUM_RAS_ERROR_CAT_RESET:
-		return ZES_RAS_ERROR_CAT_RESET;
-	case XPUM_RAS_ERROR_CAT_PROGRAMMING:
-		return ZES_RAS_ERROR_CAT_PROGRAMMING_ERRORS;
-	case XPUM_RAS_ERROR_CAT_DRIVER:
-		return ZES_RAS_ERROR_CAT_DRIVER_ERRORS;
-	case XPUM_RAS_ERROR_CAT_COMPUTE:
-		return ZES_RAS_ERROR_CAT_COMPUTE_ERRORS;
-	case XPUM_RAS_ERROR_CAT_NON_COMPUTE:
-		return ZES_RAS_ERROR_CAT_NON_COMPUTE_ERRORS;
-	case XPUM_RAS_ERROR_CAT_CACHE:
-		return ZES_RAS_ERROR_CAT_CACHE_ERRORS;
-	case XPUM_RAS_ERROR_CAT_DISPLAY:
-		return ZES_RAS_ERROR_CAT_DISPLAY_ERRORS;
-	default:
-		return ZES_RAS_ERROR_CAT_RESET;
-	}
-}
-
-/**
- * @brief Convert XPUM RAS error type to Level Zero RAS error type
- */
-inline zes_ras_error_type_t toZesRasErrorType(xpum_ras_error_type_t errorType)
-{
-	switch (errorType) {
-	case XPUM_RAS_ERROR_TYPE_CORRECTABLE:
-		return ZES_RAS_ERROR_TYPE_CORRECTABLE;
-	case XPUM_RAS_ERROR_TYPE_UNCORRECTABLE:
-		return ZES_RAS_ERROR_TYPE_UNCORRECTABLE;
-	default:
-		return ZES_RAS_ERROR_TYPE_CORRECTABLE;
-	}
-}
-
-} // anonymous namespace
-
-/**************************************************************************/
-/** C API Implementation - Basic APIs
- */
-/**************************************************************************/
-
-extern "C" {
-
-XPUM_API xpum_result_t xpumInit()
-{
-	try {
-		INFO("xpumInit called\n");
-		auto &state = getState();
-		std::scoped_lock const lock(state.mutex);
-
-		// Already initialized
-		if (isInitialized(state)) {
-			INFO("xpumInit: Already initialized\n");
-			return XPUM_OK;
-		}
-
-		// Create new context
-		state.context = std::make_unique<APIContext>();
-
-		// Initialize Level Zero driver
-		state.context->driverInstance = std::make_unique<driver>();
-		if (toXpumResult(state.context->driverInstance->init()) != XPUM_OK) {
-			ERR("xpumInit: Failed to initialize Level Zero driver\n");
-			state.context.reset();
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		// Enumerate all devices using findDevice with nullptr to get all
-		if (toXpumResult(state.context->driverInstance->findDevice(nullptr, &state.context->devices)) != XPUM_OK) {
-			ERR("xpumInit: Failed to enumerate devices\n");
-			state.context.reset();
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		INFO("xpumInit: Successfully initialized with {} devices\n", state.context->devices.size());
-		return XPUM_OK;
-
-	} catch (const std::exception &e) {
-		ERR("xpumInit: Exception: {}\n", e.what());
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumShutdown(void)
-{
-	try {
-		INFO("xpumShutdown called\n");
-		auto &state = getState();
-		std::scoped_lock const lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			INFO("xpumShutdown: Not initialized\n");
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		state.context.reset();
-		INFO("xpumShutdown: Successfully shutdown\n");
-		return XPUM_OK;
-
-	} catch (const std::exception &e) {
-		ERR("xpumShutdown: Exception: {}\n", e.what());
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumVersionInfo(XpumVersionInfo versionInfoList[], int *count)
-{
-	try {
-		if (count == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		constexpr int versionCount = 2;
-
-		if (versionInfoList == nullptr) {
-			*count = versionCount;
-			return XPUM_OK;
-		}
-
-		if (*count < versionCount) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		// XPUM IAL library version
-		versionInfoList[0].version = XPUM_VERSION;
-		toCstr(versionInfoList[0].versionString, XPUM_VERSION_STRING);
-
-		// Level Zero version
-		versionInfoList[1].version = XPUM_VERSION_LEVEL_ZERO;
-		toCstr(versionInfoList[1].versionString, "1.23.0");
-
-		*count = versionCount;
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**************************************************************************/
-/** C API Implementation - Device APIs
- */
-/**************************************************************************/
-
-XPUM_API xpum_result_t xpumGetDeviceList(XpumDeviceBasicInfo deviceList[], int *count)
-{
-	try {
-		if (count == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		const int deviceCount = static_cast<int>(state.context->devices.size());
-
-		// First call: return count
-		if (deviceList == nullptr) {
-			*count = deviceCount;
-			return XPUM_OK;
-		}
-
-		// Check buffer size
-		if (*count < deviceCount) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		// Fill device list
-		for (int i = 0; i < deviceCount; ++i) {
-			auto &devInfo = state.context->devices[i];
-			auto *dev = devInfo.dev;
-
-			deviceList[i].deviceId = i;
-			deviceList[i].type = GPU;
-			deviceList[i].functionType = XPUM_DEVICE_FUNCTION_TYPE_PHYSICAL;
-
-			// Get device properties using HAL
-			ze_device_properties_t props{};
-			props.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES;
-			if (dev->getDevProps(devInfo.deviceHdl, &props) == ZE_RESULT_SUCCESS) {
-				toCstr(deviceList[i].deviceName, props.name);
-
-				// Format UUID
-				auto uuid = formatUuid(props.uuid.id);
-				toCstr(deviceList[i].uuid, uuid);
-			}
-
-			// Get PCI BDF using HAL helper
-			auto bdfStr = dev->getBDFStr();
-			toCstr(deviceList[i].pcibdfAddress, bdfStr);
-			toCstr(deviceList[i].pciDeviceId, bdfStr);
-
-			toCstr(deviceList[i].vendorName, "Intel(R) Corporation");
-		}
-
-		*count = deviceCount;
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetDeviceProperties(xpum_device_id_t deviceId, xpum_device_properties_t *pXpumProperties)
-{
-	try {
-		if (pXpumProperties == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		// Initialize structure
-		pXpumProperties->deviceId = deviceId;
-		pXpumProperties->propertyLen = 0;
-
-		// Helper lambda to add property
-		auto addProperty = [&](xpum_device_property_name_t name, std::string_view value) {
-			if (pXpumProperties->propertyLen < XPUM_MAX_NUM_PROPERTIES) {
-				auto &prop = pXpumProperties->properties[pXpumProperties->propertyLen++];
-				prop.name = name;
-				toCstr(prop.value, value);
-			}
-		};
-
-		ze_device_handle_t zeDevice = state.context->devices[deviceId].deviceHdl;
-
-		// Get basic device properties using HAL
-		ze_device_properties_t props{};
-		props.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES;
-		if (toXpumResult(dev->getDevProps(zeDevice, &props)) == XPUM_OK) {
-			addProperty(XPUM_DEVICE_PROPERTY_DEVICE_NAME, props.name);
-			addProperty(XPUM_DEVICE_PROPERTY_VENDOR_NAME, "Intel(R) Corporation");
-
-			addProperty(XPUM_DEVICE_PROPERTY_UUID, formatUuid(props.uuid.id));
-
-			addProperty(XPUM_DEVICE_PROPERTY_PCI_DEVICE_ID, std::format("{:x}", props.deviceId));
-			addProperty(XPUM_DEVICE_PROPERTY_PCI_VENDOR_ID, std::format("{:x}", props.vendorId));
-			addProperty(XPUM_DEVICE_PROPERTY_DEVICE_STEPPING, std::format("{}", props.deviceId & 0xFF));
-			addProperty(XPUM_DEVICE_PROPERTY_NUMBER_OF_TILES, std::format("{}", props.numSlices));
-		}
-
-		// Get PCI properties using HAL helper
-		addProperty(XPUM_DEVICE_PROPERTY_PCI_BDF_ADDRESS, dev->getBDFStr());
-
-		// Get PCI details through HAL's PCI class
-		auto *pci = dev->getPCI();
-		if (pci != nullptr) {
-			zes_pci_properties_t pciProps{};
-			if (toXpumResult(pci->getProperties(state.context->devices[deviceId].zesDeviceHdl, &pciProps)) == XPUM_OK) {
-				addProperty(XPUM_DEVICE_PROPERTY_PCIE_GENERATION, std::format("{}", pciProps.maxSpeed.gen));
-				addProperty(XPUM_DEVICE_PROPERTY_PCIE_MAX_LINK_WIDTH, std::format("{}", pciProps.maxSpeed.width));
-			}
-		}
-
-		// Get memory properties using HAL
-		ze_device_memory_properties_t *memProps = nullptr;
-		uint32_t memCount = 0;
-		if (toXpumResult(dev->getMemProps(zeDevice, &memProps, &memCount)) == XPUM_OK && memCount > 0 &&
-			(memProps != nullptr)) {
-			uint64_t totalSize = 0;
-			for (uint32_t i = 0; i < memCount; ++i) {
-				totalSize += memProps[i].totalSize;
-			}
-			addProperty(XPUM_DEVICE_PROPERTY_MEMORY_PHYSICAL_SIZE_BYTE, std::format("{}", totalSize));
-
-			// Memory bus width from first memory module
-			if (memCount > 0) {
-				addProperty(XPUM_DEVICE_PROPERTY_MEMORY_BUS_WIDTH, std::format("{}", memProps[0].maxBusWidth));
-			}
-		}
-
-		// Get firmware versions using HAL
-		if (auto *firmware = dev->getFirmware()) {
-			char fwVersion[256] = {};
-			std::string const bdf = dev->getBDFStr();
-
-			// GFX firmware
-			if (toXpumResult(firmware->getFWversion(GFX, bdf.c_str(), fwVersion, sizeof(fwVersion))) == XPUM_OK) {
-				addProperty(XPUM_DEVICE_PROPERTY_GFX_FIRMWARE_VERSION, fwVersion);
-			}
-
-			// GFX Data firmware
-			if (toXpumResult(firmware->getFWversion(GFX_DATA, bdf.c_str(), fwVersion, sizeof(fwVersion))) == XPUM_OK) {
-				addProperty(XPUM_DEVICE_PROPERTY_GFX_DATA_FIRMWARE_VERSION, fwVersion);
-			}
-
-			// AMC firmware (if device has AMC)
-			if (dev->getAmcIndex() >= 0) {
-				if (toXpumResult(firmware->getFWversion(AMC, bdf.c_str(), fwVersion, sizeof(fwVersion))) == XPUM_OK) {
-					addProperty(XPUM_DEVICE_PROPERTY_AMC_FIRMWARE_VERSION, fwVersion);
-				}
-			}
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetDeviceIdByBDF(const char *bdf, xpum_device_id_t *deviceId)
-{
-	try {
-		if (bdf == nullptr || deviceId == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		// Search for matching device using HAL's BDF matching
-		for (size_t i = 0; i < state.context->devices.size(); ++i) {
-			auto *dev = state.context->devices[i].dev;
-			if ((dev != nullptr) && dev->isBDF(bdf)) {
-				*deviceId = static_cast<xpum_device_id_t>(i);
-				return XPUM_OK;
-			}
-		}
-
-		return XPUM_RESULT_DEVICE_NOT_FOUND;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetAMCFirmwareVersions(UNUSED xpum_amc_fw_version_t versionList[], int *count,
-												  UNUSED const char *username, UNUSED const char *password)
-{
-	// TODO: Implement AMC firmware version retrieval using HAL
-	if (count == nullptr) {
-		return XPUM_RESULT_INVALID_DIR;
-	}
-
-	*count = 0;
-	return XPUM_METRIC_NOT_SUPPORTED;
-}
-
-XPUM_API xpum_result_t xpumGetAMCFirmwareVersionsErrorMsg(UNUSED char *buffer, int *count)
-{
-	// TODO: Implement error message retrieval
-	if (count == nullptr) {
-		return XPUM_RESULT_INVALID_DIR;
-	}
-
-	*count = 0;
-	return XPUM_METRIC_NOT_SUPPORTED;
-}
-
-XPUM_API xpum_result_t xpumGetSerialNumberAndAmcFwVersion(xpum_device_id_t deviceId, UNUSED const char *username,
-														  UNUSED const char *password,
-														  char serialNumber[XPUM_MAX_STR_LENGTH],
-														  char amcFwVersion[XPUM_MAX_STR_LENGTH])
-{
-	try {
-		if (serialNumber == nullptr || amcFwVersion == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		// Get AMC firmware version if device has AMC
-		if (dev->getAmcIndex() >= 0) {
-			auto *firmware = dev->getFirmware();
-			if (firmware != nullptr) {
-				char fwVer[256] = {};
-				std::string const bdf = dev->getBDFStr();
-
-				if (toXpumResult(firmware->getFWversion(AMC, bdf.c_str(), fwVer, sizeof(fwVer))) == XPUM_OK) {
-					toCstr(amcFwVersion, XPUM_MAX_STR_LENGTH, fwVer);
-				} else {
-					amcFwVersion[0] = '\0';
-				}
-			} else {
-				amcFwVersion[0] = '\0';
-			}
-		} else {
-			amcFwVersion[0] = '\0';
-		}
-
-		// Serial number not available through standard Level Zero API
-		serialNumber[0] = '\0';
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**************************************************************************/
-/** C API Implementation - Device Configuration and Control APIs
- */
-/**************************************************************************/
-
-/**
- * @brief Reset a device
- */
-XPUM_API xpum_result_t xpumResetDevice(xpum_device_id_t deviceId, UNUSED bool force)
-{
-	try {
-		INFO("xpumResetDevice: deviceId={}\n", deviceId);
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			if (result == XPUM_RESULT_DEVICE_NOT_FOUND) {
-				ERR("xpumResetDevice: Invalid device ID {}\n", deviceId);
-			}
-			return result;
-		}
-
-		ze_device_handle_t zeDevice = state.context->devices[deviceId].deviceHdl;
-		xpum_result_t resetResult = toXpumResult(dev->resetDevice(zeDevice));
-		if (resetResult == XPUM_OK) {
-			INFO("xpumResetDevice: Successfully reset device {}\n", deviceId);
-		} else {
-			ERR("xpumResetDevice: Failed to reset device {}, result={}\n", deviceId, resetResult);
-		}
-		return resetResult;
-
-	} catch (UNUSED const std::exception &e) {
-		ERR("xpumResetDevice: Exception: {}\n", e.what());
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set power limit
- */
-XPUM_API xpum_result_t xpumSetPowerLimit(xpum_device_id_t deviceId, int32_t tileId, uint32_t powerLimit,
-										 UNUSED uint32_t intervalWindow)
-{
-	try {
-		INFO("xpumSetPowerLimit: deviceId={}, tileId={}, limit={}W\n", deviceId, tileId, powerLimit);
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *power = dev->getPower();
-		if (power == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		// Convert watts to milliwatts
-		uint32_t limitMw = powerLimit * 1000;
-		xpum_result_t setPowerResult = toXpumResult(power->setSustainedLimit(limitMw, tileId));
-		if (setPowerResult == XPUM_OK) {
-			INFO("xpumSetPowerLimit: Successfully set power limit\n");
-		} else {
-			ERR("xpumSetPowerLimit: Failed, result={}\n", setPowerResult);
-		}
-		return setPowerResult;
-
-	} catch (UNUSED const std::exception &e) {
-		ERR("xpumSetPowerLimit: Exception: {}\n", e.what());
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set frequency range
- */
-XPUM_API xpum_result_t xpumSetFrequencyRange(xpum_device_id_t deviceId, int32_t tileId, double minFreq, double maxFreq)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *freq = dev->getFrequency();
-		if (freq == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		if (tileId < 0) {
-			return toXpumResult(freq->setFrequencyRangeForAll(minFreq, maxFreq));
-		} else {
-			return toXpumResult(freq->setFrequencyRange(minFreq, maxFreq, tileId));
-		}
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set standby mode
- */
-XPUM_API xpum_result_t xpumSetStandby(xpum_device_id_t deviceId, xpum_standby_mode_t mode)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *standby = dev->getStandby();
-		if (standby == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(standby->setMode(toZesStandbyMode(mode)));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set scheduler mode
- */
-XPUM_API xpum_result_t xpumSetSchedulerTimeoutMode(xpum_device_id_t deviceId, uint32_t subdeviceId, uint64_t timeout)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *freq = dev->getFrequency();
-		if (freq == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(freq->setSchedulerTimeoutMode(subdeviceId, timeout));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set scheduler timeslice mode
- */
-XPUM_API xpum_result_t xpumSetSchedulerTimesliceMode(xpum_device_id_t deviceId, uint32_t subdeviceId, uint64_t interval,
-													 uint64_t yieldTimeout)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *freq = dev->getFrequency();
-		if (freq == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(freq->setSchedulerTimesliceMode(subdeviceId, interval, yieldTimeout));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set scheduler exclusive mode
- */
-XPUM_API xpum_result_t xpumSetSchedulerExclusiveMode(xpum_device_id_t deviceId, uint32_t subdeviceId)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *freq = dev->getFrequency();
-		if (freq == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(freq->setSchedulerExclusiveMode(subdeviceId));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get ECC state
- */
-XPUM_API xpum_result_t xpumGetEccState(xpum_device_id_t deviceId, bool *enabled, bool *configurable,
-									   xpum_ecc_state_t *currentState, xpum_ecc_state_t *pendingState)
-{
-	try {
-		if (enabled == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *ecc = dev->getECC();
-		if (ecc == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		zes_device_handle_t zesDevice = state.context->devices[deviceId].zesDeviceHdl;
-
-		zes_device_ecc_properties_t eccProps = {};
-		result = toXpumResult(ecc->getState(zesDevice, &eccProps));
-		if (result == XPUM_OK) {
-			*enabled = (eccProps.currentState == ZES_DEVICE_ECC_STATE_ENABLED);
-			if (configurable != nullptr) {
-				*configurable = ecc->configurable(zesDevice);
-			}
-			if (currentState != nullptr) {
-				*currentState = toXpumEccState(eccProps.currentState);
-			}
-			if (pendingState != nullptr) {
-				*pendingState = toXpumEccState(eccProps.pendingState);
-			}
-		}
-
-		return result;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Set ECC state
- */
-XPUM_API xpum_result_t xpumSetEccState(xpum_device_id_t deviceId, bool enable)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *ecc = dev->getECC();
-		if (ecc == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		zes_device_handle_t zesDevice = state.context->devices[deviceId].zesDeviceHdl;
-		return toXpumResult(ecc->setState(zesDevice, enable));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**************************************************************************/
-/** C API Implementation - Telemetry/Stats APIs
- */
-/**************************************************************************/
-
-/**
- * @brief Get current temperature readings
- */
-XPUM_API xpum_result_t xpumGetTemperature(xpum_device_id_t deviceId, double *coreTemp, double *memTemp)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *temp = dev->getTemperature();
-		if (temp == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		xpum_result_t tempResult = XPUM_OK;
-
-		if (coreTemp != nullptr) {
-			tempResult = toXpumResult(temp->getCoreTemp(coreTemp));
-			if (tempResult != XPUM_OK) {
-				return tempResult;
-			}
-		}
-
-		if (memTemp != nullptr) {
-			tempResult = toXpumResult(temp->getMemoryTemp(memTemp));
-		}
-
-		return tempResult;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get current power consumption
- */
-XPUM_API xpum_result_t xpumGetPower(xpum_device_id_t deviceId, uint64_t *power, uint64_t *timestamp)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *pwr = dev->getPower();
-		if (pwr == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(pwr->getEnergy(power, timestamp, true));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get current frequency
- */
-XPUM_API xpum_result_t xpumGetFrequency(xpum_device_id_t deviceId, double *currentFreq, xpum_freq_domain_t domain)
-{
-	try {
-		if (currentFreq == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *freq = dev->getFrequency();
-		if (freq == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(freq->getCurFreq(currentFreq, toZesFreqDomain(domain)));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get frequency throttle reasons
- */
-XPUM_API xpum_result_t xpumGetFrequencyThrottleReasons(xpum_device_id_t deviceId,
-													   xpum_freq_throttle_reason_flags_t *reasons)
-{
-	try {
-		if (reasons == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *freq = dev->getFrequency();
-		if (freq == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		zes_freq_throttle_reason_flags_t zesReasons;
-		result = toXpumResult(freq->getThrottleReason(&zesReasons));
-		if (result == XPUM_OK) {
-			*reasons = toXpumThrottleReasons(zesReasons);
-		}
-		return result;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get memory usage statistics
- */
-XPUM_API xpum_result_t xpumGetMemoryUsage(xpum_device_id_t deviceId, uint64_t *usedMemory, double *utilization)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *mem = dev->getMemory();
-		if (mem == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(mem->getMemoryUsed(usedMemory, utilization));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get memory bandwidth statistics
- */
-XPUM_API xpum_result_t xpumGetMemoryBandwidth(xpum_device_id_t deviceId, uint64_t *readBandwidth,
-											  uint64_t *writeBandwidth, uint64_t *maxBandwidth, uint64_t *timestamp)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *mem = dev->getMemory();
-		if (mem == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(mem->getMemoryRW(readBandwidth, writeBandwidth, maxBandwidth, timestamp));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**
- * @brief Get RAS error counts
- */
-XPUM_API xpum_result_t xpumGetRASErrors(xpum_device_id_t deviceId, xpum_ras_error_cat_t category,
-										xpum_ras_error_type_t errorType, uint64_t *errorCount)
-{
-	try {
-		if (errorCount == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto *ras = dev->getRAS();
-		if (ras == nullptr) {
-			return XPUM_METRIC_NOT_SUPPORTED;
-		}
-
-		return toXpumResult(ras->getErrors(toZesRasErrorCat(category), toZesRasErrorType(errorType), errorCount));
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/** C API Implementation - Group APIs
- */
-/**************************************************************************/
-
-XPUM_API xpum_result_t xpumGroupCreate(const char *groupName, xpum_group_id_t *pGroupId)
-{
-	try {
-		if (groupName == nullptr || pGroupId == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		xpum_group_id_t const newGroupId = state.context->nextGroupId++;
-		state.context->groups[newGroupId] = APIContext::GroupInfo{.name = groupName, .devices = {}};
-
-		*pGroupId = newGroupId;
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGroupDestroy(xpum_group_id_t groupId)
-{
-	try {
-		auto &state = getState();
-		std::lock_guard const lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		const auto iter = state.context->groups.find(groupId);
-		if (iter == state.context->groups.end()) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		state.context->groups.erase(iter);
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGroupAddDevice(xpum_group_id_t groupId, xpum_device_id_t deviceId)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		if (!state.context->groups.contains(groupId)) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		// Validate device exists
-		device *dev = nullptr;
-		if (getDevice(state, deviceId, &dev) != XPUM_OK) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &devices = state.context->groups[groupId].devices;
-		if (std::ranges::find(devices, deviceId) == devices.end()) {
-			devices.push_back(deviceId);
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGroupRemoveDevice(xpum_group_id_t groupId, xpum_device_id_t deviceId)
-{
-	try {
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		if (!state.context->groups.contains(groupId)) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &devices = state.context->groups[groupId].devices;
-		std::erase(devices, deviceId);
-		return XPUM_OK;
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGroupGetInfo(xpum_group_id_t groupId, xpum_group_info_t *pGroupInfo)
-{
-	try {
-		if (pGroupInfo == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		if (auto iter = state.context->groups.find(groupId); iter != state.context->groups.end()) {
-			toCstr(pGroupInfo->groupName, iter->second.name);
-			pGroupInfo->count = static_cast<int>(iter->second.devices.size());
-
-			// Copy device IDs
-			const size_t maxDevices = std::min<size_t>(iter->second.devices.size(), XPUM_MAX_NUM_DEVICES);
-			std::copy_n(iter->second.devices.begin(), maxDevices, pGroupInfo->deviceList);
-		} else {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetAllGroupIds(xpum_group_id_t groupIds[], int *count)
-{
-	try {
-		if (count == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		const int groupCount = static_cast<int>(state.context->groups.size());
-
-		if (groupIds == nullptr) {
-			*count = groupCount;
-			return XPUM_OK;
-		}
-
-		if (*count < groupCount) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		int idx = 0;
-		for (const auto &[group_id, _] : state.context->groups) {
-			groupIds[idx++] = group_id;
-		}
-
-		*count = idx;
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-/**************************************************************************/
-/** C API Implementation - Health APIs
- */
-/**************************************************************************/
-
-// Health configuration thresholds stored per device
-struct HealthConfig
-{
-	uint64_t coreThermalLimit = 105;  // Celsius
-	uint64_t memoryThermalLimit = 85; // Celsius
-	uint64_t powerLimit = 300;		  // Watts
-};
-
-// Store health configs in context
-namespace {
-std::unordered_map<xpum_device_id_t, HealthConfig> gHealthConfigs;
-std::mutex gHealthMutex;
-} // namespace
-
-XPUM_API xpum_result_t xpumSetHealthConfig(xpum_device_id_t deviceId, xpum_health_config_type_t key, void *value)
-{
-	try {
-		if (value == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex, gHealthMutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		auto &config = gHealthConfigs[deviceId];
-		auto *threshold = static_cast<uint64_t *>(value);
-
-		switch (key) {
-		case XPUM_HEALTH_CORE_THERMAL_LIMIT:
-			if (*threshold == 0 || *threshold > 200) {
-				return XPUM_RESULT_INVALID_DIR;
-			}
-			config.coreThermalLimit = *threshold;
-			break;
-
-		case XPUM_HEALTH_MEMORY_THERMAL_LIMIT:
-			if (*threshold == 0 || *threshold > 200) {
-				return XPUM_RESULT_INVALID_DIR;
-			}
-			config.memoryThermalLimit = *threshold;
-			break;
-
-		case XPUM_HEALTH_POWER_LIMIT:
-			if (*threshold == 0) {
-				return XPUM_RESULT_INVALID_DIR;
-			}
-			config.powerLimit = *threshold;
-			break;
-
-		default:
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumSetHealthConfigByGroup(xpum_group_id_t groupId, xpum_health_config_type_t key, void *value)
-{
-	try {
-		if (value == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		if (!state.context->groups.contains(groupId)) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		// Apply to all devices in group
-		for (auto deviceId : state.context->groups[groupId].devices) {
-			auto result = xpumSetHealthConfig(deviceId, key, value);
-			if (result != XPUM_OK) {
-				return result;
-			}
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetHealthConfig(xpum_device_id_t deviceId, xpum_health_config_type_t key, void *value)
-{
-	try {
-		if (value == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex, gHealthMutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		const auto &config = gHealthConfigs[deviceId];
-		auto *threshold = static_cast<uint64_t *>(value);
-
-		switch (key) {
-		case XPUM_HEALTH_CORE_THERMAL_LIMIT:
-			*threshold = config.coreThermalLimit;
-			break;
-
-		case XPUM_HEALTH_MEMORY_THERMAL_LIMIT:
-			*threshold = config.memoryThermalLimit;
-			break;
-
-		case XPUM_HEALTH_POWER_LIMIT:
-			*threshold = config.powerLimit;
-			break;
-
-		default:
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetHealthConfigByGroup(xpum_group_id_t groupId, xpum_health_config_type_t key, void *value)
-{
-	try {
-		if (value == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		if (!state.context->groups.contains(groupId)) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		// Return config from first device in group
-		if (!state.context->groups[groupId].devices.empty()) {
-			return xpumGetHealthConfig(state.context->groups[groupId].devices[0], key, value);
-		}
-
-		return XPUM_RESULT_INVALID_DIR;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetHealth(xpum_device_id_t deviceId, xpum_health_type_t type, xpum_health_data_t *data)
-{
-	try {
-		DBG("xpumGetHealth: deviceId={}, type={}\n", deviceId, type);
-		if (data == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex, gHealthMutex);
-
-		device *dev = nullptr;
-		xpum_result_t result = getDevice(state, deviceId, &dev);
-		if (result != XPUM_OK) {
-			return result;
-		}
-
-		data->description[0] = '\0';
-
-		auto &config = gHealthConfigs[deviceId];
-
-		switch (type) {
-		case XPUM_HEALTH_CORE_THERMAL: {
-			auto *temp = dev->getTemperature();
-			if (!temp)
-				return XPUM_METRIC_NOT_SUPPORTED;
-
-			double coreTemp = 0;
-			if (toXpumResult(temp->getCoreTemp(&coreTemp)) == XPUM_OK) {
-				data->throttleThreshold = config.coreThermalLimit;
-				data->shutdownThreshold = config.coreThermalLimit + 25;
-				data->status = (coreTemp >= static_cast<double>(config.coreThermalLimit)) ? XPUM_HEALTH_STATUS_CRITICAL
-																						  : XPUM_HEALTH_STATUS_OK;
-				toCstr(data->description, "{:.1f}°C", coreTemp);
-			} else {
-				toCstr(data->description, "Unable to read");
-			}
-			break;
-		}
-
-		case XPUM_HEALTH_MEMORY_THERMAL: {
-			auto *temp = dev->getTemperature();
-			if (!temp)
-				return XPUM_METRIC_NOT_SUPPORTED;
-
-			double memTemp = 0;
-			if (toXpumResult(temp->getMemoryTemp(&memTemp)) == XPUM_OK) {
-				data->throttleThreshold = config.memoryThermalLimit;
-				data->shutdownThreshold = config.memoryThermalLimit + 15;
-				data->status = (memTemp >= static_cast<double>(config.memoryThermalLimit)) ? XPUM_HEALTH_STATUS_CRITICAL
-																						   : XPUM_HEALTH_STATUS_OK;
-				toCstr(data->description, "{:.1f}°C", memTemp);
-			} else {
-				toCstr(data->description, "Unable to read");
-			}
-			break;
-		}
-
-		case XPUM_HEALTH_POWER: {
-			auto *pwr = dev->getPower();
-			if (!pwr)
-				return XPUM_METRIC_NOT_SUPPORTED;
-
-			uint64_t powerMw = 0, timestamp = 0;
-			if (toXpumResult(pwr->getEnergy(&powerMw, &timestamp, true)) == XPUM_OK) {
-				uint64_t const powerW = powerMw / 1000;
-				data->throttleThreshold = config.powerLimit;
-				data->shutdownThreshold = config.powerLimit + 50;
-
-				if (static_cast<double>(powerW) >= static_cast<double>(config.powerLimit)) {
-					data->status = XPUM_HEALTH_STATUS_CRITICAL;
-					toCstr(data->description, "Power: {}W (limit: {}W)", powerW, config.powerLimit);
-				} else if (static_cast<double>(powerW) >= static_cast<double>(config.powerLimit) * 0.8) {
-					data->status = XPUM_HEALTH_STATUS_WARNING;
-					toCstr(data->description, "Power: {}W (limit: {}W)", powerW, config.powerLimit);
-				} else {
-					data->status = XPUM_HEALTH_STATUS_OK;
-					toCstr(data->description, "Power: {}W", powerW);
-				}
-			}
-			break;
-		}
-
-		case XPUM_HEALTH_MEMORY: {
-			auto *mem = dev->getMemory();
-			if (!mem)
-				return XPUM_METRIC_NOT_SUPPORTED;
-
-			zes_mem_health_t health;
-			if (toXpumResult(mem->getMemoryHealth(&health)) == XPUM_OK) {
-				switch (health) {
-				case ZES_MEM_HEALTH_OK:
-					data->status = XPUM_HEALTH_STATUS_OK;
-					toCstr(data->description, "OK");
-					break;
-				case ZES_MEM_HEALTH_DEGRADED:
-					data->status = XPUM_HEALTH_STATUS_WARNING;
-					toCstr(data->description, "Degraded");
-					break;
-				case ZES_MEM_HEALTH_CRITICAL:
-				case ZES_MEM_HEALTH_REPLACE:
-					data->status = XPUM_HEALTH_STATUS_CRITICAL;
-					toCstr(data->description, health == ZES_MEM_HEALTH_REPLACE ? "Replace" : "Critical");
-					break;
-				default:
-					toCstr(data->description, "Unknown");
-					break;
-				}
-			}
-			break;
-		}
-
-		case XPUM_HEALTH_FREQUENCY: {
-			auto *freq = dev->getFrequency();
-			if (!freq)
-				return XPUM_METRIC_NOT_SUPPORTED;
-
-			zes_freq_throttle_reason_flags_t reasons = 0;
-			if (toXpumResult(freq->getThrottleReason(&reasons)) == XPUM_OK) {
-				if (reasons == 0) {
-					data->status = XPUM_HEALTH_STATUS_OK;
-					toCstr(data->description, "No throttling");
-				} else {
-					data->status = XPUM_HEALTH_STATUS_WARNING;
-					toCstr(data->description, "Throttled: {:#x}", static_cast<unsigned int>(reasons));
-				}
-			}
-			break;
-		}
-
-		case XPUM_HEALTH_FABRIC_PORT: {
-			auto *fabric = dev->getFabric();
-			if (!fabric)
-				return XPUM_METRIC_NOT_SUPPORTED;
-
-			// TODO: Implement fabric port health via HAL
-			data->status = XPUM_HEALTH_STATUS_OK;
-			toCstr(data->description, "OK");
-			break;
-		}
-
-		default:
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-XPUM_API xpum_result_t xpumGetHealthByGroup(xpum_group_id_t groupId, xpum_health_type_t type, xpum_health_data_t *data)
-{
-	try {
-		if (data == nullptr) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		auto &state = getState();
-		const std::scoped_lock lock(state.mutex);
-
-		if (!isInitialized(state)) {
-			return XPUM_NOT_INITIALIZED;
-		}
-
-		if (!state.context->groups.contains(groupId)) {
-			return XPUM_RESULT_INVALID_DIR;
-		}
-
-		// Return worst health status from all devices in group
-		xpum_health_status_t worstStatus = XPUM_HEALTH_STATUS_OK;
-		xpum_health_data_t worstData = {};
-
-		for (auto deviceId : state.context->groups[groupId].devices) {
-			xpum_health_data_t deviceData = {};
-			auto result = xpumGetHealth(deviceId, type, &deviceData);
-
-			if (result == XPUM_OK && deviceData.status > worstStatus) {
-				worstStatus = deviceData.status;
-				worstData = deviceData;
-			}
-		}
-
-		*data = worstData;
-		return XPUM_OK;
-
-	} catch (UNUSED const std::exception &e) {
-		return XPUM_GENERIC_ERROR;
-	}
-}
-
-} // extern "C"
\ No newline at end of file
diff --git a/ial/api/xpum_api.h b/ial/api/xpum_api.h
deleted file mode 100644
index 9ed08f812..000000000
--- a/ial/api/xpum_api.h
+++ /dev/null
@@ -1,1819 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef XPUM_api_H
-#define XPUM_api_H
-
-#if defined(__cplusplus)
-#pragma once
-#endif
-
-#include "xpum_structs.h"
-
-#ifdef _WIN32
-#ifdef LIBXPUM_EXPORTS
-#define XPUM_API __declspec(dllexport)
-#else
-#define XPUM_API __declspec(dllimport)
-#endif
-#else
-#define XPUM_API __attribute__((visibility("default")))
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/**************************************************************************/
-/** @defgroup BASIapi Basic API
- * @brief Core XPUM initialization and lifecycle management
- *
- * This group contains fundamental APIs for initializing and shutting down
- * the XPUM library, as well as querying version information.
- * @{
- */
-/**************************************************************************/
-
-/**
- * @brief Initialize the XPUM library and enumerate GPU devices
- *
- * @details This function must be called before any other XPUM API calls.
- * It initializes the Hardware Abstraction Layer (HAL), enumerates available
- * GPU devices, and prepares the library for operation.
- *
- * The function is thread-safe and idempotent. If called multiple times,
- * subsequent calls will return immediately with the same result.
- *
- * @deprecated Environment Variables (Not Supported):
- * The following environment variables were supported in legacy XPUM but are
- * @b deprecated and @b not @b supported in this C API version:
- * - @b XPUM_DISABLE_PERIODIC_METRIC_MONITOR: @deprecated No longer supported.
- *   Periodic metric collection must be managed programmatically.
- * - @b XPUM_METRICS: @deprecated No longer supported. Metric selection must
- *   be configured via API calls.
- * - @b XPUM_ENABLED_GPU_IDS: @deprecated No longer supported. All available
- *   GPUs are enumerated; filtering must be done by the application.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                Library initialized successfully
- * @retval XPUM_NOT_INITIALIZED    HAL initialization failed
- * @retval XPUM_GENERIC_ERROR  Insufficient memory
- * @retval XPUM_GENERIC_ERROR          Internal error occurred
- *
- * @note This function is thread-safe.
- * @note Supported platforms: Linux, Windows
- * @note After successful initialization, call xpumShutdown() to clean up resources.
- *
- * @see xpumShutdown()
- * @see xpumVersionInfo()
- *
- * @par Example:
- * @code{.c}
- * xpum_result_t result = xpumInit();
- * if (result != XPUM_OK) {
- *     fprintf(stderr, "Failed to initialize XPUM: 0x%x\n", result);
- *     return -1;
- * }
- * // Use XPUM APIs...
- * xpumShutdown();
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * package main
- *
- * // #cgo LDFLAGS: -lxpum_api
- * // #include <xpum_api.h>
- * import "C"
- * import "fmt"
- *
- * func main() {
- *     result := C.xpumInit()
- *     if result != C.XPUM_OK {
- *         fmt.Printf("Failed to initialize XPUM: 0x%x\n", result)
- *         return
- *     }
- *     defer C.xpumShutdown()
- *     fmt.Println("XPUM initialized successfully")
- * }
- * @endcode
- *
- * @ingroup BASIapi
- */
-XPUM_API xpum_result_t xpumInit(void);
-
-/**
- * @brief Shut down the XPUM library and release all resources
- *
- * @details This function performs a clean shutdown of the XPUM library,
- * releasing all allocated resources including device handles, group information,
- * and HAL context. After calling this function, no other XPUM API calls should
- * be made until xpumInit() is called again.
- *
- * All device handles, group IDs, and other objects obtained from XPUM APIs
- * become invalid after shutdown and must not be used.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK             Library shut down successfully
- * @retval XPUM_NOT_INITIALIZED Library was not initialized
- * @retval XPUM_GENERIC_ERROR       Internal error during shutdown
- *
- * @note This function is thread-safe.
- * @note Supported platforms: Linux, Windows
- * @note Always call this function before application exit to avoid resource leaks.
- *
- * @see xpumInit()
- *
- * @par Example:
- * @code{.c}
- * // Initialize XPUM
- * xpumInit(false);
- *
- * // Use XPUM APIs...
- *
- * // Clean shutdown
- * xpum_result_t result = xpumShutdown();
- * if (result != XPUM_OK) {
- *     fprintf(stderr, "Warning: XPUM shutdown error: 0x%x\n", result);
- * }
- * @endcode
- *
- * @ingroup BASIapi
- */
-XPUM_API xpum_result_t xpumShutdown(void);
-
-/**
- * @brief Query XPUM library and dependency version information
- *
- * @details This function retrieves version information for the XPUM library
- * and its key dependencies. Use the two-call pattern: first call with NULL
- * to get the count, then allocate memory and call again to retrieve data.
- *
- * The version information includes:
- * - XPUM library version
- * - Dependency versions
- * - Git commit hash (if available)
- *
- * @param[in,out] versionInfoList  Pointer to array of xpum_version_info structures.
- *                                  Pass NULL on first call to query count.
- *                                  On second call, must point to array of size >= *count.
- * @param[in,out] count             Pointer to version count.
- *                                  [in] When versionInfoList is not NULL, specifies array size.
- *                                  [out] Receives actual number of version entries.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Version info retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  count parameter is NULL
- * @retval XPUM_BUFFER_TOO_SMALL       Provided buffer too small (*count < required)
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @note This function can be called before xpumInit() to query library version.
- * @note Supported platforms: Linux, Windows
- *
- * @see xpum_version_info
- * @see xpum_version_t
- *
- * @par Example:
- * @code{.c}
- * // Query version count
- * int count = 0;
- * xpum_result_t result = xpumVersionInfo(NULL, &count);
- * if (result != XPUM_OK) {
- *     fprintf(stderr, "Failed to query version count\n");
- *     return -1;
- * }
- *
- * // Allocate and retrieve version info
- * xpum_version_info *versions = malloc(count * sizeof(xpum_version_info));
- * result = xpumVersionInfo(versions, &count);
- * if (result == XPUM_OK) {
- *     for (int i = 0; i < count; i++) {
- *         printf("Version type %d: %s\n",
- *                versions[i].version, versions[i].versionString);
- *     }
- * }
- * free(versions);
- * @endcode
- *
- * @ingroup BASIapi
- */
-XPUM_API xpum_result_t xpumVersionInfo(XpumVersionInfo versionInfoList[], int *count);
-
-/** @} */ // Closing for BASIapi
-
-/**************************************************************************/
-/** @defgroup DEVICE_API Device Discovery and Management
- * @brief APIs for GPU device enumeration, identification, and property queries
- *
- * This group provides functions to discover and query information about
- * GPU devices in the system, including device enumeration, property queries,
- * and device identification by PCI Bus-Device-Function (BDF) address.
- * @{
- */
-/**************************************************************************/
-
-/**
- * @brief Enumerate all GPU devices discovered by XPUM
- *
- * @details This function retrieves basic information about all GPU devices
- * available in the system. Use the two-call pattern: first call with NULL
- * to get the device count, then allocate memory and call again to retrieve data.
- *
- * The device list includes both physical GPUs and virtual functions (VFs) if
- * SR-IOV is enabled. Each device is assigned a unique device ID that remains
- * valid for the lifetime of the XPUM session.
- *
- * @param[out] deviceList  Pointer to array of xpum_device_basic_info structures.
- *                         Pass NULL on first call to query device count.
- *                         On second call, must point to array of size >= *count.
- * @param[in,out] count    Pointer to device count.
- *                         [in] When deviceList is not NULL, specifies array size.
- *                         [out] Receives actual number of devices.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Device list retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  count parameter is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized (call xpumInit first)
- * @retval XPUM_BUFFER_TOO_SMALL       Provided buffer too small (*count < required)
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- *
- * @note Device IDs are stable for the lifetime of the XPUM session
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumGetDeviceProperties()
- * @see xpumGetDeviceIdByBDF()
- * @see xpum_device_basic_info
- *
- * @par Example:
- * @code{.c}
- * // Query device count
- * int count = 0;
- * xpum_result_t result = xpumGetDeviceList(NULL, &count);
- * if (result != XPUM_OK) {
- *     fprintf(stderr, "Failed to query device count\n");
- *     return -1;
- * }
- *
- * printf("Found %d GPU device(s)\n", count);
- *
- * // Allocate and retrieve device list
- * xpum_device_basic_info *devices = malloc(count * sizeof(xpum_device_basic_info));
- * result = xpumGetDeviceList(devices, &count);
- * if (result == XPUM_OK) {
- *     for (int i = 0; i < count; i++) {
- *         printf("Device %d: %s (BDF: %s)\n",
- *                devices[i].deviceId,
- *                devices[i].deviceName,
- *                devices[i].PCIBDFAddress);
- *     }
- * }
- * free(devices);
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * // Query device count
- * var count C.int
- * result := C.xpumGetDeviceList(nil, &count)
- * if result != C.XPUM_OK {
- *     fmt.Printf("Failed to query device count: 0x%x\n", result)
- *     return
- * }
- *
- * fmt.Printf("Found %d GPU device(s)\n", count)
- *
- * // Allocate and retrieve device list
- * devices := make([]C.xpum_device_basic_info, count)
- * result = C.xpumGetDeviceList(&devices[0], &count)
- * if result == C.XPUM_OK {
- *     for i := 0; i < int(count); i++ {
- *         fmt.Printf("Device %d: %s (BDF: %s)\n",
- *                    devices[i].deviceId,
- *                    C.GoString(&devices[i].deviceName[0]),
- *                    C.GoString(&devices[i].PCIBDFAddress[0]))
- *     }
- * }
- * @endcode
- *
- * @ingroup DEVICE_API
- */
-XPUM_API xpum_result_t xpumGetDeviceList(XpumDeviceBasicInfo deviceList[], int *count);
-
-/**
- * @brief Query detailed properties of a specific GPU device
- *
- * @details This function retrieves comprehensive property information for
- * a GPU device identified by its device ID. Properties include hardware
- * specifications, firmware versions, PCI information, and device capabilities.
- *
- * The device ID must be obtained from xpumGetDeviceList() or xpumGetDeviceIdByBDF().
- *
- * @param[in] deviceId         Device identifier obtained from xpumGetDeviceList()
- * @param[out] pXpumProperties Pointer to xpum_device_properties_t structure
- *                             to receive device properties. Must not be NULL.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Properties retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  pXpumProperties is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        Device ID not found or device removed
- * @retval XPUM_GENERIC_ERROR            Internal error or HAL query failed
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be a valid device ID from xpumGetDeviceList()
- *
- * @note Supported platforms: Linux, Windows
- * @note Some properties may be empty if the device doesn't support them
- *
- * @see xpumGetDeviceList()
- * @see xpum_device_properties_t
- *
- * @par Example:
- * @code{.c}
- * xpum_device_properties_t props;
- * xpum_result_t result = xpumGetDeviceProperties(0, &props);
- * if (result == XPUM_OK) {
- *     printf("Device ID: %d has %d properties\n", props.deviceId, props.propertyLen);
- *     for (int i = 0; i < props.propertyLen; i++) {
- *         printf("  Property %d: %s\n",
- *                props.properties[i].name, props.properties[i].value);
- *     }
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * var props C.xpum_device_properties_t
- * result := C.xpumGetDeviceProperties(0, &props)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Device ID: %d has %d properties\n", props.deviceId, props.propertyLen)
- *     for i := 0; i < int(props.propertyLen); i++ {
- *         fmt.Printf("  Property %d: %s\n",
- *                    props.properties[i].name,
- *                    C.GoString(&props.properties[i].value[0]))
- *     }
- * }
- * @endcode
- *
- * @ingroup DEVICE_API
- */
-XPUM_API xpum_result_t xpumGetDeviceProperties(xpum_device_id_t deviceId, xpum_device_properties_t *pXpumProperties);
-
-/**
- * @brief Find device ID by PCI Bus-Device-Function (BDF) address
- *
- * @details This function maps a PCI BDF address string to the corresponding
- * XPUM device ID. The BDF address format is typically "DDDD:BB:DD.F" where:
- * - DDDD: Domain (segment) - 4 hex digits
- * - BB: Bus number - 2 hex digits
- * - DD: Device number - 2 hex digits
- * - F: Function number - 1 hex digit
- *
- * Common format examples: "0000:00:02.0", "0000:03:00.0"
- *
- * This is useful for mapping hardware topology information to XPUM device IDs.
- *
- * @param[in] bdf       Null-terminated PCI BDF address string. Must not be NULL.
- *                      Format: "DDDD:BB:DD.F" or "BB:DD.F"
- * @param[out] deviceId Pointer to receive the corresponding XPUM device ID.
- *                      Must not be NULL.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Device ID found successfully
- * @retval XPUM_RESULT_INVALID_DIR  bdf or deviceId is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        No device with specified BDF address
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- *
- * @note BDF address comparison is case-insensitive
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumGetDeviceList()
- * @see xpumGetDeviceProperties()
- *
- * @par Example:
- * @code{.c}
- * xpum_device_id_t device_id;
- * xpum_result_t result = xpumGetDeviceIdByBDF("0000:03:00.0", &device_id);
- * if (result == XPUM_OK) {
- *     printf("Device at BDF 0000:03:00.0 has ID: %d\n", device_id);
- *
- *     // Now can query properties
- *     xpum_device_properties_t props;
- *     xpumGetDeviceProperties(device_id, &props);
- * } else {
- *     printf("No device found at specified BDF address\n");
- * }
- * @endcode
- *
- * @ingroup DEVICE_API
- */
-XPUM_API xpum_result_t xpumGetDeviceIdByBDF(const char *bdf, xpum_device_id_t *deviceId);
-
-/**
- * @brief Query firmware versions from Advanced Management Controller (AMC)
- *
- * @details This function retrieves firmware version information from the
- * system's AMC, which manages platform-level components. Authentication
- * credentials are required to access AMC data.
- *
- * Use the two-call pattern: first call with NULL to get count, then
- * allocate memory and call again to retrieve firmware version data.
- *
- * @param[out] versionList  Pointer to array of xpum_amc_fw_version_t structures.
- *                          Pass NULL on first call to query version count.
- *                          On second call, must point to array of size >= *count.
- * @param[in,out] count     Pointer to version count.
- *                          [in] When versionList is not NULL, specifies array size.
- *                          [out] Receives actual number of firmware versions.
- * @param[in] username      AMC authentication username. Must not be NULL.
- * @param[in] password      AMC authentication password. Must not be NULL.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Firmware versions retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  count, username, or password is NULL
- * @retval XPUM_API_UNSUPPORTED  AMC not available or not implemented
- * @retval XPUM_GENERIC_ERROR   Authentication failed
- * @retval XPUM_GENERIC_ERROR            Internal error or AMC communication failed
- *
- * @note Supported platforms: Linux only
- * @note Requires AMC hardware support and proper credentials
- * @note Some systems may not have AMC capability
- *
- * @see xpumGetAMCFirmwareVersionsErrorMsg()
- * @see xpumGetSerialNumberAndAmcFwVersion()
- *
- * @par Example:
- * @code{.c}
- * int count = 0;
- * xpum_result_t result = xpumGetAMCFirmwareVersions(NULL, &count, "admin", "password");
- * if (result == XPUM_OK && count > 0) {
- *     xpum_amc_fw_version_t *versions = malloc(count * sizeof(xpum_amc_fw_version_t));
- *     result = xpumGetAMCFirmwareVersions(versions, &count, "admin", "password");
- *     // Use version data...
- *     free(versions);
- * }
- * @endcode
- *
- * @ingroup DEVICE_API
- */
-XPUM_API xpum_result_t xpumGetAMCFirmwareVersions(xpum_amc_fw_version_t versionList[], int *count, const char *username,
-												  const char *password);
-
-/**
- * @brief Retrieve error message from last AMC firmware version query
- *
- * @details When xpumGetAMCFirmwareVersions() fails, this function can be
- * called to retrieve a detailed error message explaining the failure reason.
- *
- * Use the two-call pattern to get the error message length first, then
- * allocate appropriate buffer size.
- *
- * @param[out] buffer  Pointer to character buffer to receive error message.
- *                     Pass NULL on first call to query required buffer size.
- *                     Buffer will be null-terminated.
- * @param[in,out] count  Pointer to buffer size.
- *                       [in] When buffer is not NULL, specifies buffer size in bytes.
- *                       [out] Receives required buffer size (including null terminator).
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Error message retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  count parameter is NULL
- * @retval XPUM_BUFFER_TOO_SMALL       Provided buffer too small
- * @retval XPUM_API_UNSUPPORTED  Not implemented
- * @retval XPUM_GENERIC_ERROR            No error message available
- *
- * @note Supported platforms: Linux only
- * @note Error message is only available after a failed AMC operation
- *
- * @see xpumGetAMCFirmwareVersions()
- *
- * @ingroup DEVICE_API
- */
-XPUM_API xpum_result_t xpumGetAMCFirmwareVersionsErrorMsg(char *buffer, int *count);
-
-/**
- * @brief Query device serial number and AMC firmware version
- *
- * @details This function retrieves the hardware serial number and AMC
- * firmware version for a specific GPU device. AMC authentication is
- * required to access this information.
- *
- * The serial number uniquely identifies the physical hardware. The AMC
- * firmware version indicates the management controller firmware revision.
- *
- * @param[in] deviceId      Device identifier from xpumGetDeviceList()
- * @param[in] username      AMC authentication username. Must not be NULL.
- * @param[in] password      AMC authentication password. Must not be NULL.
- * @param[out] serialNumber Buffer to receive device serial number.
- *                          Must be at least XPUM_MAX_STR_LENGTH bytes.
- *                          Will be null-terminated.
- * @param[out] amcFwVersion Buffer to receive AMC firmware version string.
- *                          Must be at least XPUM_MAX_STR_LENGTH bytes.
- *                          Will be null-terminated. May be empty if AMC
- *                          firmware version is not available.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Information retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  username, password, serialNumber, or amcFwVersion is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        Device ID not found
- * @retval XPUM_GENERIC_ERROR   Authentication failed
- * @retval XPUM_GENERIC_ERROR            Internal error or AMC communication failed
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- * @pre Output buffers must be at least XPUM_MAX_STR_LENGTH bytes
- *
- * @note Supported platforms: Linux only
- * @note AMC firmware version may be empty string if not available
- * @note Serial number should always be available from HAL
- *
- * @see xpumGetAMCFirmwareVersions()
- * @see xpumGetDeviceProperties()
- * @see XPUM_MAX_STR_LENGTH
- *
- * @par Example:
- * @code{.c}
- * char serial[XPUM_MAX_STR_LENGTH];
- * char amc_version[XPUM_MAX_STR_LENGTH];
- *
- * xpum_result_t result = xpumGetSerialNumberAndAmcFwVersion(
- *     0, "admin", "password", serial, amc_version);
- *
- * if (result == XPUM_OK) {
- *     printf("Serial Number: %s\n", serial);
- *     if (amc_version[0] != '\0') {
- *         printf("AMC Firmware: %s\n", amc_version);
- *     }
- * }
- * @endcode
- *
- * @ingroup DEVICE_API
- */
-XPUM_API xpum_result_t xpumGetSerialNumberAndAmcFwVersion(xpum_device_id_t deviceId, const char *username,
-														  const char *password, char serialNumber[XPUM_MAX_STR_LENGTH],
-														  char amcFwVersion[XPUM_MAX_STR_LENGTH]);
-
-/** @} */ // Closing for DEVICE_API
-
-/**************************************************************************/
-/** @defgroup GROUP_API Device Group Management
- * @brief APIs for organizing devices into logical groups
- *
- * Device groups allow organizing multiple GPU devices into logical collections
- * for coordinated management, monitoring, and configuration. Groups enable
- * batch operations on multiple devices and simplified topology management.
- *
- * Groups are identified by unique group IDs assigned at creation time.
- * A device can belong to multiple groups simultaneously.
- * @{
- */
-/**************************************************************************/
-
-/**
- * @brief Create a new device group
- *
- * @details This function creates a new logical group of devices with the
- * specified name. The group is initially empty; devices must be added
- * using xpumGroupAddDevice().
- *
- * Group names do not need to be unique, but using unique names is
- * recommended for clarity. Groups are identified by their group ID.
- *
- * @param[in] groupName   Null-terminated string containing the group name.
- *                        Must not be NULL. Maximum length is XPUM_MAX_STR_LENGTH-1.
- *                        The name is stored and can be retrieved via xpumGroupGetInfo().
- * @param[out] pGroupId   Pointer to receive the newly assigned group ID.
- *                        Must not be NULL. This ID is used for all subsequent
- *                        group operations.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Group created successfully
- * @retval XPUM_RESULT_INVALID_DIR  groupName or pGroupId is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR  Insufficient memory for group
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- *
- * @note Group IDs are unique and persistent for the XPUM session
- * @note Supported platforms: Linux, Windows
- * @note Groups are automatically freed when XPUM shuts down
- *
- * @see xpumGroupDestroy()
- * @see xpumGroupAddDevice()
- * @see xpumGroupGetInfo()
- *
- * @par Example:
- * @code{.c}
- * xpum_group_id_t group_id;
- * xpum_result_t result = xpumGroupCreate("compute_nodes", &group_id);
- * if (result == XPUM_OK) {
- *     printf("Created group with ID: %u\n", group_id);
- *     // Add devices to the group...
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * groupName := C.CString("ml_training_group")
- * defer C.free(unsafe.Pointer(groupName))
- *
- * var groupId C.xpum_group_id_t
- * result := C.xpumGroupCreate(groupName, &groupId)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Created group with ID: %d\n", groupId)
- *     // Add devices to the group...
- * }
- * @endcode
- *
- * @ingroup GROUP_API
- */
-XPUM_API xpum_result_t xpumGroupCreate(const char *groupName, xpum_group_id_t *pGroupId);
-
-/**
- * @brief Destroy a device group
- *
- * @details This function destroys an existing device group and releases
- * its resources. Devices that were members of the group are not affected;
- * only the group itself is destroyed.
- *
- * After destruction, the group ID becomes invalid and must not be used.
- * Any ongoing operations on the group should be completed before destruction.
- *
- * @param[in] groupId  Group identifier obtained from xpumGroupCreate()
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Group destroyed successfully
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found or invalid
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- *
- * @note Member devices are not affected by group destruction
- * @note Supported platforms: Linux, Windows
- * @note Group ID becomes invalid after successful destruction
- *
- * @see xpumGroupCreate()
- *
- * @par Example:
- * @code{.c}
- * // Create and later destroy a group
- * xpum_group_id_t group_id;
- * xpumGroupCreate("temp_group", &group_id);
- * // Use the group...
- *
- * xpum_result_t result = xpumGroupDestroy(group_id);
- * if (result == XPUM_OK) {
- *     printf("Group destroyed\n");
- *     // group_id is now invalid
- * }
- * @endcode
- *
- * @ingroup GROUP_API
- */
-XPUM_API xpum_result_t xpumGroupDestroy(xpum_group_id_t groupId);
-
-/**
- * @brief Add a device to an existing group
- *
- * @details This function adds a device to a group's membership list.
- * If the device is already a member of the group, this function succeeds
- * with no changes (idempotent operation).
- *
- * A device can be a member of multiple groups simultaneously. Group
- * operations will apply to all member devices.
- *
- * @param[in] groupId   Group identifier from xpumGroupCreate()
- * @param[in] deviceId  Device identifier from xpumGetDeviceList()
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Device added successfully (or already member)
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        Device ID not found or invalid
- * @retval XPUM_GENERIC_ERROR  Group membership list full
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note Operation is idempotent - adding an existing member succeeds
- * @note Supported platforms: Linux, Windows
- * @note Maximum devices per group: XPUM_MAX_NUM_DEVICES
- *
- * @see xpumGroupCreate()
- * @see xpumGroupRemoveDevice()
- * @see xpumGetDeviceList()
- *
- * @par Example:
- * @code{.c}
- * xpum_group_id_t group_id;
- * xpumGroupCreate("my_group", &group_id);
- *
- * // Add devices 0 and 1 to the group
- * xpum_result_t result = xpumGroupAddDevice(group_id, 0);
- * if (result == XPUM_OK) {
- *     xpumGroupAddDevice(group_id, 1);
- *     printf("Added devices to group\n");
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * import (
- *     "C"
- *     "fmt"
- *     "unsafe"
- * )
- *
- * groupName := C.CString("compute_group")
- * defer C.free(unsafe.Pointer(groupName))
- *
- * var groupId C.xpum_group_id_t
- * result := C.xpumGroupCreate(groupName, &groupId)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Created group with ID: %d\n", groupId)
- *
- *     // Add devices to group
- *     result = C.xpumGroupAddDevice(groupId, 0)
- *     if result == C.XPUM_OK {
- *         result = C.xpumGroupAddDevice(groupId, 1)
- *         fmt.Println("Added devices 0 and 1 to group")
- *     }
- *
- *     defer C.xpumGroupDestroy(groupId)
- * }
- * @endcode
- *
- * @ingroup GROUP_API
- */
-XPUM_API xpum_result_t xpumGroupAddDevice(xpum_group_id_t groupId, xpum_device_id_t deviceId);
-
-/**
- * @brief Remove a device from a group
- *
- * @details This function removes a device from a group's membership list.
- * If the device is not a member of the group, this function succeeds
- * with no changes (idempotent operation).
- *
- * The device itself is not affected; only its group membership is removed.
- *
- * @param[in] groupId   Group identifier from xpumGroupCreate()
- * @param[in] deviceId  Device identifier to remove from group
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Device removed successfully (or not a member)
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- *
- * @note Operation is idempotent - removing a non-member succeeds
- * @note Supported platforms: Linux, Windows
- * @note Device is not validated; non-existent device IDs are silently removed
- *
- * @see xpumGroupCreate()
- * @see xpumGroupAddDevice()
- *
- * @par Example:
- * @code{.c}
- * // Remove device 0 from the group
- * xpum_result_t result = xpumGroupRemoveDevice(group_id, 0);
- * if (result == XPUM_OK) {
- *     printf("Device removed from group\n");
- * }
- * @endcode
- *
- * @ingroup GROUP_API
- */
-XPUM_API xpum_result_t xpumGroupRemoveDevice(xpum_group_id_t groupId, xpum_device_id_t deviceId);
-
-/**
- * @brief Query information about a device group
- *
- * @details This function retrieves detailed information about a group,
- * including its name, member device count, and list of member device IDs.
- *
- * The device list in xpum_group_info_t is limited to XPUM_MAX_NUM_DEVICES
- * entries. If a group has more members, only the first XPUM_MAX_NUM_DEVICES
- * are returned.
- *
- * @param[in] groupId     Group identifier from xpumGroupCreate()
- * @param[out] pGroupInfo Pointer to xpum_group_info_t structure to receive
- *                        group information. Must not be NULL.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Group info retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  pGroupInfo is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- *
- * @note Device list is limited to XPUM_MAX_NUM_DEVICES entries
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumGroupCreate()
- * @see xpum_group_info_t
- * @see XPUM_MAX_NUM_DEVICES
- *
- * @par Example:
- * @code{.c}
- * xpum_group_info_t info;
- * xpum_result_t result = xpumGroupGetInfo(group_id, &info);
- * if (result == XPUM_OK) {
- *     printf("Group: %s\n", info.groupName);
- *     printf("Device count: %d\n", info.count);
- *     for (int i = 0; i < info.count; i++) {
- *         printf("  Device ID: %d\n", info.deviceList[i]);
- *     }
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * var info C.xpum_group_info_t
- * result := C.xpumGroupGetInfo(groupId, &info)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Group: %s\n", C.GoString(&info.groupName[0]))
- *     fmt.Printf("Device count: %d\n", info.count)
- *     for i := 0; i < int(info.count); i++ {
- *         fmt.Printf("  Device ID: %d\n", info.deviceList[i])
- *     }
- * }
- * @endcode
- *
- * @ingroup GROUP_API
- */
-XPUM_API xpum_result_t xpumGroupGetInfo(xpum_group_id_t groupId, xpum_group_info_t *pGroupInfo);
-
-/**
- * @brief Enumerate all device group IDs
- *
- * @details This function retrieves the IDs of all existing device groups.
- * Use the two-call pattern: first call with NULL to get the count, then
- * allocate memory and call again to retrieve the group IDs.
- *
- * Group IDs can then be used with xpumGroupGetInfo() to retrieve detailed
- * information about each group.
- *
- * @param[out] groupIds  Pointer to array to receive group IDs.
- *                       Pass NULL on first call to query group count.
- *                       On second call, must point to array of size >= *count.
- * @param[in,out] count  Pointer to group count.
- *                       [in] When groupIds is not NULL, specifies array size.
- *                       [out] Receives actual number of groups.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Group IDs retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  count is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_BUFFER_TOO_SMALL       Provided buffer too small (*count < required)
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- *
- * @note Returns 0 count if no groups exist
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumGroupCreate()
- * @see xpumGroupGetInfo()
- *
- * @par Example:
- * @code{.c}
- * // Query group count
- * int count = 0;
- * xpum_result_t result = xpumGetAllGroupIds(NULL, &count);
- * if (result == XPUM_OK && count > 0) {
- *     // Allocate and retrieve group IDs
- *     xpum_group_id_t *groups = malloc(count * sizeof(xpum_group_id_t));
- *     result = xpumGetAllGroupIds(groups, &count);
- *
- *     if (result == XPUM_OK) {
- *         for (int i = 0; i < count; i++) {
- *             xpum_group_info_t info;
- *             xpumGroupGetInfo(groups[i], &info);
- *             printf("Group %u: %s\n", groups[i], info.groupName);
- *         }
- *     }
- *     free(groups);
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * // Query group count
- * var count C.int
- * result := C.xpumGetAllGroupIds(nil, &count)
- * if result != C.XPUM_OK {
- *     fmt.Printf("Failed to get group count: 0x%x\n", result)
- *     return
- * }
- *
- * if count > 0 {
- *     // Allocate and retrieve group IDs
- *     groups := make([]C.xpum_group_id_t, count)
- *     result = C.xpumGetAllGroupIds(&groups[0], &count)
- *     if result == C.XPUM_OK {
- *         for i := 0; i < int(count); i++ {
- *             var info C.xpum_group_info_t
- *             if C.xpumGroupGetInfo(groups[i], &info) == C.XPUM_OK {
- *                 fmt.Printf("Group %d: %s\n", groups[i],
- *                            C.GoString(&info.groupName[0]))
- *             }
- *         }
- *     }
- * }
- * @endcode
- *
- * @ingroup GROUP_API
- */
-XPUM_API xpum_result_t xpumGetAllGroupIds(xpum_group_id_t groupIds[], int *count);
-
-/** @} */ // Closing for GROUP_API
-
-/**************************************************************************/
-/** @defgroup HEALTH_API Device Health Monitoring
- * @brief APIs for configuring and monitoring device health status
- *
- * Health monitoring provides automated checking of device operational status,
- * including temperature, power consumption, memory errors, and other critical
- * metrics. Configurable thresholds enable proactive alerting and intervention.
- *
- * Health checks can be performed on individual devices or entire groups,
- * enabling coordinated health management across multiple GPUs.
- *
- * @par Example (Go):
- * @code{.go}
- * import (
- *     "C"
- *     "fmt"
- *     "unsafe"
- * )
- *
- * // Set health threshold for temperature
- * deviceId := C.xpum_device_id_t(0)
- * configKey := C.XPUM_HEALTH_CONFIG_TEMP_THRESHOLD  // Example enum value
- * threshold := C.int(85)  // 85°C threshold
- *
- * result := C.xpumSetHealthConfig(deviceId, configKey, unsafe.Pointer(&threshold))
- * if result == C.XPUM_OK {
- *     fmt.Println("Health configuration set")
- * }
- *
- * // Query health status
- * var healthData C.xpum_health_data_t
- * healthType := C.XPUM_HEALTH_TYPE_TEMPERATURE
- * result = C.xpumGetHealth(deviceId, healthType, &healthData)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Health status: %d\n", healthData.status)
- * }
- *
- * // Query health for entire group
- * groupId := C.xpum_group_id_t(1)
- * result = C.xpumGetHealthByGroup(groupId, healthType, &healthData)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Group health status: %d\n", healthData.status)
- * }
- * @endcode
- *
- * @note These APIs are currently stubs and will return XPUM_API_UNSUPPORTED
- * @{
- */
-/**************************************************************************/
-
-/**
- * @brief Configure health monitoring parameters for a device
- *
- * @details This function sets health monitoring configuration parameters
- * for a specific device, such as temperature thresholds, power limits,
- * or memory error thresholds.
- *
- * Configuration changes take effect immediately and persist for the
- * lifetime of the XPUM session.
- *
- * @param[in] deviceId  Device identifier from xpumGetDeviceList()
- * @param[in] key       Health configuration parameter type to set.
- *                      Defines which health parameter is being configured.
- * @param[in] value     Pointer to configuration value. The type and size
- *                      depend on the key parameter. Must not be NULL.
- *                      Value is copied; caller retains ownership.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Configuration set successfully
- * @retval XPUM_RESULT_INVALID_DIR  value is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        Device ID not found
- * @retval XPUM_GENERIC_ERROR   Invalid key or value
- * @retval XPUM_API_UNSUPPORTED  Health monitoring not implemented
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note Currently returns XPUM_API_UNSUPPORTED (stub)
- * @note Supported platforms: Linux, Windows (when implemented)
- *
- * @see xpumGetHealthConfig()
- * @see xpumGetHealth()
- * @see xpum_health_config_type_t
- *
- * @ingroup HEALTH_API
- */
-XPUM_API xpum_result_t xpumSetHealthConfig(xpum_device_id_t deviceId, xpum_health_config_type_t key, void *value);
-
-/**
- * @brief Configure health monitoring parameters for all devices in a group
- *
- * @details This function sets health monitoring configuration parameters
- * for all devices in a group simultaneously. The same configuration is
- * applied to each member device.
- *
- * If configuration fails for any device, the operation continues for
- * remaining devices. Use xpumGetHealthConfigByGroup() to verify settings.
- *
- * @param[in] groupId  Group identifier from xpumGroupCreate()
- * @param[in] key      Health configuration parameter type to set
- * @param[in] value    Pointer to configuration value. Must not be NULL.
- *                     Value is copied; caller retains ownership.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Configuration set successfully for all devices
- * @retval XPUM_RESULT_INVALID_DIR  value is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found or invalid key
- * @retval XPUM_API_UNSUPPORTED  Health monitoring not implemented
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- *
- * @note Currently returns XPUM_API_UNSUPPORTED (stub)
- * @note Supported platforms: Linux, Windows (when implemented)
- * @note Configuration applies to all current and future group members
- *
- * @see xpumSetHealthConfig()
- * @see xpumGetHealthConfigByGroup()
- * @see xpumGroupCreate()
- *
- * @ingroup HEALTH_API
- */
-XPUM_API xpum_result_t xpumSetHealthConfigByGroup(xpum_group_id_t groupId, xpum_health_config_type_t key, void *value);
-
-/**
- * @brief Query current health monitoring configuration for a device
- *
- * @details This function retrieves the current value of a health monitoring
- * configuration parameter for a specific device.
- *
- * The caller must provide a buffer of appropriate size for the configuration
- * value type. The required size depends on the configuration key.
- *
- * @param[in] deviceId   Device identifier from xpumGetDeviceList()
- * @param[in] key        Health configuration parameter type to query
- * @param[out] value     Pointer to buffer to receive configuration value.
- *                       Must not be NULL. Buffer size must match the
- *                       expected size for the specified key.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Configuration retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  value is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        Device ID not found
- * @retval XPUM_GENERIC_ERROR   Invalid key
- * @retval XPUM_API_UNSUPPORTED  Health monitoring not implemented
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- * @pre value buffer must be properly sized for the configuration type
- *
- * @note Currently returns XPUM_API_UNSUPPORTED (stub)
- * @note Supported platforms: Linux, Windows (when implemented)
- *
- * @see xpumSetHealthConfig()
- * @see xpum_health_config_type_t
- *
- * @ingroup HEALTH_API
- */
-XPUM_API xpum_result_t xpumGetHealthConfig(xpum_device_id_t deviceId, xpum_health_config_type_t key, void *value);
-
-/**
- * @brief Query health monitoring configuration for a group
- *
- * @details This function retrieves the current value of a health monitoring
- * configuration parameter for a device group. If devices in the group have
- * different configuration values, the behavior is implementation-defined
- * (typically returns the configuration of the first device).
- *
- * @param[in] groupId  Group identifier from xpumGroupCreate()
- * @param[in] key      Health configuration parameter type to query
- * @param[out] value   Pointer to buffer to receive configuration value.
- *                     Must not be NULL. Buffer size must match the
- *                     expected size for the specified key.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Configuration retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  value is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found or invalid key
- * @retval XPUM_API_UNSUPPORTED  Health monitoring not implemented
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- * @pre value buffer must be properly sized for the configuration type
- *
- * @note Currently returns XPUM_API_UNSUPPORTED (stub)
- * @note Supported platforms: Linux, Windows (when implemented)
- * @note If group has no devices, returns error
- *
- * @see xpumSetHealthConfigByGroup()
- * @see xpumGroupCreate()
- *
- * @ingroup HEALTH_API
- */
-XPUM_API xpum_result_t xpumGetHealthConfigByGroup(xpum_group_id_t groupId, xpum_health_config_type_t key, void *value);
-
-/**
- * @brief Query current health status of a device
- *
- * @details This function performs health checks on a device and returns
- * the health status information. The type of health check (e.g., temperature,
- * power, memory errors) is specified by the type parameter.
- *
- * Health data includes status (healthy, warning, critical), current values,
- * and threshold information.
- *
- * @param[in] deviceId   Device identifier from xpumGetDeviceList()
- * @param[in] type       Type of health check to perform. Specifies which
- *                       aspect of device health to query (e.g., thermal,
- *                       power, memory).
- * @param[out] data      Pointer to xpum_health_data_t structure to receive
- *                       health status. Must not be NULL.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Health status retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  data is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_RESULT_DEVICE_NOT_FOUND        Device ID not found
- * @retval XPUM_GENERIC_ERROR   Invalid health type
- * @retval XPUM_API_UNSUPPORTED  Health monitoring not implemented
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note Currently returns XPUM_API_UNSUPPORTED (stub)
- * @note Supported platforms: Linux, Windows (when implemented)
- * @note Health checks may take some time depending on the type
- *
- * @see xpumGetHealthByGroup()
- * @see xpumSetHealthConfig()
- * @see xpum_health_type_t
- * @see xpum_health_data_t
- *
- * @ingroup HEALTH_API
- */
-XPUM_API xpum_result_t xpumGetHealth(xpum_device_id_t deviceId, xpum_health_type_t type, xpum_health_data_t *data);
-
-/**
- * @brief Query health status for all devices in a group
- *
- * @details This function performs health checks on all devices in a group
- * and aggregates the results. The overall health status reflects the worst
- * case among all member devices (e.g., if any device is critical, the
- * group status is critical).
- *
- * Individual device health information may be included in the returned
- * data structure depending on the implementation.
- *
- * @param[in] groupId  Group identifier from xpumGroupCreate()
- * @param[in] type     Type of health check to perform across all devices
- * @param[out] data    Pointer to xpum_health_data_t structure to receive
- *                     aggregated health status. Must not be NULL.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                  Health status retrieved successfully
- * @retval XPUM_RESULT_INVALID_DIR  data is NULL
- * @retval XPUM_NOT_INITIALIZED      XPUM not initialized
- * @retval XPUM_GENERIC_ERROR   Group ID not found or invalid type
- * @retval XPUM_API_UNSUPPORTED  Health monitoring not implemented
- * @retval XPUM_GENERIC_ERROR            Internal error
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre groupId must be valid from xpumGroupCreate()
- * @pre Group must contain at least one device
- *
- * @note Currently returns XPUM_API_UNSUPPORTED (stub)
- * @note Supported platforms: Linux, Windows (when implemented)
- * @note Health checks on multiple devices may take some time
- * @note Empty groups return an error
- *
- * @see xpumGetHealth()
- * @see xpumSetHealthConfigByGroup()
- * @see xpumGroupCreate()
- *
- * @ingroup HEALTH_API
- */
-XPUM_API xpum_result_t xpumGetHealthByGroup(xpum_group_id_t groupId, xpum_health_type_t type, xpum_health_data_t *data);
-
-/** @} */ // Closing for HEALTH_API
-
-/**************************************************************************/
-/** @defgroup CONFIG_API Device Configuration APIs
- * @brief APIs for configuring device settings and operational modes
- * @{
- */
-/**************************************************************************/
-
-/**
- * @brief Reset a GPU device to its initial state
- *
- * @details This function performs a hardware reset of the specified GPU device,
- * returning it to its power-on state. All active workloads on the device will
- * be terminated, and the device will be reinitialized.
- *
- * This operation is disruptive and should only be performed when necessary,
- * such as after a device hang or to recover from an error state.
- *
- * @param[in] deviceId  Device identifier from xpumGetDeviceList()
- * @param[in] force     Force reset even if device is in use (currently unused)
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Device reset successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID
- * @retval XPUM_GENERIC_ERROR           Reset operation failed or not supported
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @warning This operation terminates all workloads on the device
- * @note Device reset may take several seconds to complete
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumGetDeviceList()
- *
- * @par Example (C):
- * @code{.c}
- * xpum_device_id_t device_id = 0;
- * xpum_result_t result = xpumResetDevice(device_id, false);
- * if (result == XPUM_OK) {
- *     printf("Device %d reset successfully\n", device_id);
- * } else {
- *     fprintf(stderr, "Failed to reset device: 0x%x\n", result);
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * deviceId := C.xpum_device_id_t(0)
- * result := C.xpumResetDevice(deviceId, false)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Device %d reset successfully\n", deviceId)
- * } else {
- *     fmt.Fprintf(os.Stderr, "Failed to reset device: 0x%x\n", result)
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * let device_id: i32 = 0;
- * let result = unsafe { xpumResetDevice(device_id, false) };
- * if result == xpum_result_enum::XPUM_OK {
- *     println!("Device {} reset successfully", device_id);
- * } else {
- *     eprintln!("Failed to reset device: {:?}", result);
- * }
- * @endcode
- *
- * @ingroup CONFIG_API
- */
-XPUM_API xpum_result_t xpumResetDevice(xpum_device_id_t deviceId, bool force);
-
-/**
- * @brief Set sustained power limit for a device or tile
- *
- * @details This function configures the sustained power limit for a GPU device
- * or specific tile. The power limit controls maximum power consumption to
- * prevent thermal issues and manage power budgets.
- *
- * Multi-tile devices can have per-tile power limits configured independently,
- * or a global limit can be set for all tiles simultaneously.
- *
- * @param[in] deviceId        Device identifier from xpumGetDeviceList()
- * @param[in] tileId          Tile/subdevice ID (0, 1, ...) or -1 for all tiles
- * @param[in] powerLimit      Sustained power limit in watts
- * @param[in] intervalWindow  Interval window in milliseconds (currently unused)
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Power limit set successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID or tile ID
- * @retval XPUM_API_UNSUPPORTED         Power limit control not supported
- * @retval XPUM_GENERIC_ERROR           Operation failed
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note Power limit takes effect immediately
- * @note Supported platforms: Linux, Windows
- * @note Not all devices support per-tile power limits
- *
- * @see xpumGetDeviceProperties()
- *
- * @par Example (C):
- * @code{.c}
- * // Set 250W power limit on device 0, all tiles
- * xpum_result_t result = xpumSetPowerLimit(0, -1, 250, 0);
- * if (result == XPUM_OK) {
- *     printf("Power limit set to 250W\n");
- * }
- *
- * // Set 125W per-tile limit on a 2-tile device
- * xpumSetPowerLimit(0, 0, 125, 0);  // Tile 0
- * xpumSetPowerLimit(0, 1, 125, 0);  // Tile 1
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * // Set 300W power limit
- * deviceId := C.xpum_device_id_t(0)
- * tileId := C.int32_t(-1)  // All tiles
- * powerLimit := C.uint32_t(300)
- * result := C.xpumSetPowerLimit(deviceId, tileId, powerLimit, 0)
- * if result == C.XPUM_OK {
- *     fmt.Println("Power limit set to 300W")
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * // Set 200W power limit on all tiles
- * let result = unsafe {
- *     xpumSetPowerLimit(0, -1, 200, 0)
- * };
- * if result == xpum_result_enum::XPUM_OK {
- *     println!("Power limit set to 200W");
- * }
- * @endcode
- *
- * @ingroup CONFIG_API
- */
-XPUM_API xpum_result_t xpumSetPowerLimit(xpum_device_id_t deviceId, int32_t tileId, uint32_t powerLimit,
-										 uint32_t intervalWindow);
-
-/**
- * @brief Set GPU frequency range for a device or tile
- *
- * @details This function configures the allowable GPU frequency range. The
- * hardware will dynamically adjust frequency between min and max based on
- * workload and thermal conditions.
- *
- * Setting min == max locks the frequency to a fixed value. This can be
- * useful for benchmarking or deterministic performance scenarios.
- *
- * @param[in] deviceId    Device identifier from xpumGetDeviceList()
- * @param[in] tileId      Tile/subdevice ID (0, 1, ...) or -1 for all tiles
- * @param[in] minFreq     Minimum frequency in MHz (0 for hardware minimum)
- * @param[in] maxFreq     Maximum frequency in MHz (0 for hardware maximum)
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Frequency range set successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID or tile ID
- * @retval XPUM_API_UNSUPPORTED         Frequency control not supported
- * @retval XPUM_GENERIC_ERROR           Invalid frequency range or operation failed
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- * @pre minFreq <= maxFreq
- *
- * @note Frequency changes take effect immediately
- * @note Supported platforms: Linux, Windows
- * @note Actual frequency may be limited by power/thermal constraints
- *
- * @see xpumGetFrequency()
- *
- * @par Example (C):
- * @code{.c}
- * // Set frequency range 300-1500 MHz on all tiles
- * xpum_result_t result = xpumSetFrequencyRange(0, -1, 300.0, 1500.0);
- * if (result == XPUM_OK) {
- *     printf("Frequency range set\n");
- * }
- *
- * // Lock frequency to 1200 MHz for deterministic performance
- * xpumSetFrequencyRange(0, -1, 1200.0, 1200.0);
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * // Set frequency range 400-1400 MHz
- * result := C.xpumSetFrequencyRange(0, -1, 400.0, 1400.0)
- * if result == C.XPUM_OK {
- *     fmt.Println("Frequency range configured")
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * // Set frequency range 500-1300 MHz on tile 0
- * let result = unsafe {
- *     xpumSetFrequencyRange(0, 0, 500.0, 1300.0)
- * };
- * if result == xpum_result_enum::XPUM_OK {
- *     println!("Frequency range set for tile 0");
- * }
- * @endcode
- *
- * @ingroup CONFIG_API
- */
-XPUM_API xpum_result_t xpumSetFrequencyRange(xpum_device_id_t deviceId, int32_t tileId, double minFreq, double maxFreq);
-
-/**
- * @brief Set device standby mode
- *
- * @param[in] deviceId    Device identifier
- * @param[in] mode        Standby promotion mode
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumSetStandby(xpum_device_id_t deviceId, xpum_standby_mode_t mode);
-
-/**
- * @brief Set scheduler timeout mode
- *
- * @param[in] deviceId      Device identifier
- * @param[in] subdeviceId   Subdevice identifier
- * @param[in] timeout       Timeout value in microseconds
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumSetSchedulerTimeoutMode(xpum_device_id_t deviceId, uint32_t subdeviceId, uint64_t timeout);
-
-/**
- * @brief Set scheduler timeslice mode
- *
- * @param[in] deviceId      Device identifier
- * @param[in] subdeviceId   Subdevice identifier
- * @param[in] interval      Timeslice interval in microseconds
- * @param[in] yieldTimeout  Yield timeout in microseconds
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumSetSchedulerTimesliceMode(xpum_device_id_t deviceId, uint32_t subdeviceId, uint64_t interval,
-													 uint64_t yieldTimeout);
-
-/**
- * @brief Set scheduler exclusive mode
- *
- * @param[in] deviceId      Device identifier
- * @param[in] subdeviceId   Subdevice identifier
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumSetSchedulerExclusiveMode(xpum_device_id_t deviceId, uint32_t subdeviceId);
-
-/**
- * @brief Get ECC memory state
- *
- * @param[in]  deviceId       Device identifier
- * @param[out] enabled        ECC enabled status
- * @param[out] configurable   ECC is configurable (optional, can be NULL)
- * @param[out] currentState   Current ECC state (optional, can be NULL)
- * @param[out] pendingState   Pending ECC state (optional, can be NULL)
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumGetEccState(xpum_device_id_t deviceId, bool *enabled, bool *configurable,
-									   xpum_ecc_state_t *currentState, xpum_ecc_state_t *pendingState);
-
-/**************************************************************************/
-/** @defgroup TELEMETRY_API Telemetry and Statistics APIs
- * @brief APIs for retrieving real-time device telemetry and statistics
- * @{
- */
-/**************************************************************************/
-
-/**
- * @brief Get current device temperature readings
- *
- * @details This function retrieves current temperature measurements for GPU
- * core and memory components. Either or both output parameters can be NULL
- * if only specific temperature is needed.
- *
- * Temperature readings are instantaneous snapshots. For thermal monitoring,
- * consider using xpumGetHealth() for threshold-based alerts.
- *
- * @param[in]  deviceId   Device identifier from xpumGetDeviceList()
- * @param[out] coreTemp   Pointer to receive core temperature in Celsius.
- *                        Can be NULL if not needed.
- * @param[out] memTemp    Pointer to receive memory temperature in Celsius.
- *                        Can be NULL if not needed.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Temperature retrieved successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID
- * @retval XPUM_API_UNSUPPORTED         Temperature sensors not available
- * @retval XPUM_GENERIC_ERROR           Failed to read temperature
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note At least one output parameter must be non-NULL
- * @note Supported platforms: Linux, Windows
- * @note Some devices may not support separate memory temperature
- *
- * @see xpumGetHealth()
- *
- * @par Example (C):
- * @code{.c}
- * double core_temp = 0.0, mem_temp = 0.0;
- * xpum_result_t result = xpumGetTemperature(0, &core_temp, &mem_temp);
- * if (result == XPUM_OK) {
- *     printf("Core: %.1f°C, Memory: %.1f°C\n", core_temp, mem_temp);
- * }
- *
- * // Get only core temperature
- * xpumGetTemperature(0, &core_temp, NULL);
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * var coreTemp, memTemp C.double
- * result := C.xpumGetTemperature(0, &coreTemp, &memTemp)
- * if result == C.XPUM_OK {
- *     fmt.Printf("Core: %.1f°C, Memory: %.1f°C\n", coreTemp, memTemp)
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * let mut core_temp: f64 = 0.0;
- * let mut mem_temp: f64 = 0.0;
- * let result = unsafe {
- *     xpumGetTemperature(0, &mut core_temp, &mut mem_temp)
- * };
- * if result == xpum_result_enum::XPUM_OK {
- *     println!("Core: {:.1}°C, Memory: {:.1}°C", core_temp, mem_temp);
- * }
- * @endcode
- *
- * @ingroup TELEMETRY_API
- */
-XPUM_API xpum_result_t xpumGetTemperature(xpum_device_id_t deviceId, double *coreTemp, double *memTemp);
-
-/**
- * @brief Get current device power consumption
- *
- * @details This function retrieves the current power consumption of the device.
- * Power readings represent instantaneous power draw at the time of query.
- *
- * The optional timestamp indicates when the measurement was taken, useful
- * for correlating power data with other telemetry.
- *
- * @param[in]  deviceId    Device identifier from xpumGetDeviceList()
- * @param[out] power       Pointer to receive power consumption in milliwatts.
- *                         Must not be NULL.
- * @param[out] timestamp   Pointer to receive measurement timestamp.
- *                         Can be NULL if not needed.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Power reading retrieved successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID or power is NULL
- * @retval XPUM_API_UNSUPPORTED         Power sensors not available
- * @retval XPUM_GENERIC_ERROR           Failed to read power
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note Power values are in milliwatts (divide by 1000 for watts)
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumSetPowerLimit()
- *
- * @par Example (C):
- * @code{.c}
- * uint64_t power_mw = 0, timestamp = 0;
- * xpum_result_t result = xpumGetPower(0, &power_mw, &timestamp);
- * if (result == XPUM_OK) {
- *     double power_w = power_mw / 1000.0;
- *     printf("Power: %.2f W (timestamp: %lu)\n", power_w, timestamp);
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * var power, timestamp C.uint64_t
- * result := C.xpumGetPower(0, &power, &timestamp)
- * if result == C.XPUM_OK {
- *     powerW := float64(power) / 1000.0
- *     fmt.Printf("Power: %.2f W\n", powerW)
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * let mut power_mw: u64 = 0;
- * let mut timestamp: u64 = 0;
- * let result = unsafe {
- *     xpumGetPower(0, &mut power_mw, &mut timestamp)
- * };
- * if result == xpum_result_enum::XPUM_OK {
- *     let power_w = power_mw as f64 / 1000.0;
- *     println!("Power: {:.2} W", power_w);
- * }
- * @endcode
- *
- * @ingroup TELEMETRY_API
- */
-XPUM_API xpum_result_t xpumGetPower(xpum_device_id_t deviceId, uint64_t *power, uint64_t *timestamp);
-
-/**
- * @brief Get current operating frequency for specified domain
- *
- * @details This function retrieves the current operating frequency for a
- * specified frequency domain (GPU core, memory, etc.). The actual frequency
- * may vary dynamically based on workload, power, and thermal conditions.
- *
- * @param[in]  deviceId      Device identifier from xpumGetDeviceList()
- * @param[out] currentFreq   Pointer to receive current frequency in MHz.
- *                           Must not be NULL.
- * @param[in]  domain        Frequency domain to query (GPU, memory, etc.)
- *                           Use XPUM_FREQ_DOMAIN_GPU for GPU core frequency.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Frequency retrieved successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID or currentFreq is NULL
- * @retval XPUM_API_UNSUPPORTED         Frequency query not supported for domain
- * @retval XPUM_GENERIC_ERROR           Failed to read frequency
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note Frequency values are in MHz
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumSetFrequencyRange()
- *
- * @par Example (C):
- * @code{.c}
- * double freq_mhz = 0.0;
- * xpum_result_t result = xpumGetFrequency(0, &freq_mhz, XPUM_FREQ_DOMAIN_GPU);
- * if (result == XPUM_OK) {
- *     printf("GPU Frequency: %.0f MHz\n", freq_mhz);
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * var freq C.double
- * result := C.xpumGetFrequency(0, &freq, C.XPUM_FREQ_DOMAIN_GPU)
- * if result == C.XPUM_OK {
- *     fmt.Printf("GPU Frequency: %.0f MHz\n", freq)
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * let mut freq: f64 = 0.0;
- * let result = unsafe {
- *     xpumGetFrequency(0, &mut freq, xpum_freq_domain_t::XPUM_FREQ_DOMAIN_GPU)
- * };
- * if result == xpum_result_enum::XPUM_OK {
- *     println!("GPU Frequency: {:.0} MHz", freq);
- * }
- * @endcode
- *
- * @ingroup TELEMETRY_API
- */
-XPUM_API xpum_result_t xpumGetFrequency(xpum_device_id_t deviceId, double *currentFreq, xpum_freq_domain_t domain);
-
-/**
- * @brief Get frequency throttle reasons
- *
- * @param[in]  deviceId   Device identifier
- * @param[out] reasons    Throttle reason flags
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumGetFrequencyThrottleReasons(xpum_device_id_t deviceId,
-													   xpum_freq_throttle_reason_flags_t *reasons);
-
-/**
- * @brief Get device memory usage and utilization
- *
- * @param[in]  deviceId     Device identifier
- * @param[out] usedMemory    Pointer to receive used memory in bytes.
- *                           Can be NULL if not needed.
- * @param[out] utilization   Pointer to receive memory utilization percentage (0-100).
- *                           Can be NULL if not needed.
- *
- * @return xpum_result_t Result code:
- * @retval XPUM_OK                      Memory usage retrieved successfully
- * @retval XPUM_NOT_INITIALIZED         XPUM not initialized
- * @retval XPUM_RESULT_INVALID_DIR      Invalid device ID
- * @retval XPUM_API_UNSUPPORTED         Memory usage not available
- * @retval XPUM_GENERIC_ERROR           Failed to read memory usage
- *
- * @pre xpumInit() must be called successfully before this function
- * @pre deviceId must be valid from xpumGetDeviceList()
- *
- * @note At least one output parameter must be non-NULL
- * @note Utilization is a percentage (0.0 to 100.0)
- * @note Supported platforms: Linux, Windows
- *
- * @see xpumGetDeviceProperties()
- *
- * @par Example (C):
- * @code{.c}
- * uint64_t used_bytes = 0;
- * double utilization = 0.0;
- * xpum_result_t result = xpumGetMemoryUsage(0, &used_bytes, &utilization);
- * if (result == XPUM_OK) {
- *     double used_gb = used_bytes / (1024.0 * 1024.0 * 1024.0);
- *     printf("Memory: %.2f GB (%.1f%% utilized)\n", used_gb, utilization);
- * }
- * @endcode
- *
- * @par Example (Go):
- * @code{.go}
- * var usedBytes C.uint64_t
- * var utilization C.double
- * result := C.xpumGetMemoryUsage(0, &usedBytes, &utilization)
- * if result == C.XPUM_OK {
- *     usedGB := float64(usedBytes) / (1024.0 * 1024.0 * 1024.0)
- *     fmt.Printf("Memory: %.2f GB (%.1f%% utilized)\n", usedGB, utilization)
- * }
- * @endcode
- *
- * @par Example (Rust):
- * @code{.rs}
- * let mut used_bytes: u64 = 0;
- * let mut utilization: f64 = 0.0;
- * let result = unsafe {
- *     xpumGetMemoryUsage(0, &mut used_bytes, &mut utilization)
- * };
- * if result == xpum_result_enum::XPUM_OK {
- *     let used_gb = used_bytes as f64 / (1024.0 * 1024.0 * 1024.0);
- *     println!("Memory: {:.2} GB ({:.1}% utilized)", used_gb, utilization);
- * }
- * @endcode
- *
- * @ingroup TELEMETRY_API
- */
-XPUM_API xpum_result_t xpumGetMemoryUsage(xpum_device_id_t deviceId, uint64_t *usedMemory, double *utilization);
-
-/**
- * @brief Get memory bandwidth statistics
- *
- * @param[in]  deviceId         Device identifier
- * @param[out] readBandwidth    Read bandwidth in bytes/sec (optional, can be NULL)
- * @param[out] writeBandwidth   Write bandwidth in bytes/sec (optional, can be NULL)
- * @param[out] maxBandwidth     Maximum bandwidth in bytes/sec (optional, can be NULL)
- * @param[out] timestamp        Timestamp of measurement (optional, can be NULL)
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumGetMemoryBandwidth(xpum_device_id_t deviceId, uint64_t *readBandwidth,
-											  uint64_t *writeBandwidth, uint64_t *maxBandwidth, uint64_t *timestamp);
-
-/**
- * @brief Get RAS error counts
- *
- * @param[in]  deviceId     Device identifier
- * @param[in]  category     Error category (correctable/uncorrectable)
- * @param[in]  errorType    Specific error type
- * @param[out] errorCount   Total error count
- *
- * @return xpum_result_t
- */
-XPUM_API xpum_result_t xpumGetRASErrors(xpum_device_id_t deviceId, xpum_ras_error_cat_t category,
-										xpum_ras_error_type_t errorType, uint64_t *errorCount);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif // XPUM_api_H
diff --git a/ial/api/xpum_structs.h b/ial/api/xpum_structs.h
deleted file mode 100644
index 671ed4172..000000000
--- a/ial/api/xpum_structs.h
+++ /dev/null
@@ -1,1460 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef XPUM_STRUCTS_H
-#define XPUM_STRUCTS_H
-
-#if defined(__cplusplus)
-#pragma once
-#endif
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#define MILLIWATTS_TO_WATTS(x) (x / 1000)
-#define WATTS_TO_MILLIWATS(x) (x * 1000)
-
-/**
- * Max string length
- */
-#define XPUM_MAX_STR_LENGTH 256
-
-/**
- * Max version string length
- */
-#define XPUM_MAX_VERSION_STR_LENGTH 32
-
-/**
- * Max number of devices supported by XPUM
- */
-#define XPUM_MAX_NUM_DEVICES 32
-
-/**
- * Max limit on the number of properties of a device supported by XPUM
- */
-#define XPUM_MAX_NUM_PROPERTIES 100
-
-/**
- * Max limit on the number of groups supported by XPUM
- */
-#define XPUM_MAX_NUM_GROUPS 64
-
-/**
- * Max uuid bytes
- */
-#define XPUM_MAX_DEVICE_UUID_SIZE 32
-
-/**
- * The max number of cached metrics collecting task
- */
-#define XPUM_MAX_CACHED_METRICS_TASK_NUM 16
-
-/**
- * The device id stand for all devices
- */
-#define XPUM_DEVICE_ID_ALL_DEVICES 1024
-
-/**
- * The max number of monitored function component occupancy situation in GPU
- */
-#define XPUM_MAX_COMPONENT_OCCUPANCY_NUM 21
-
-/**
- * Device id
- */
-typedef int32_t xpum_device_id_t;
-
-/**
- * Group id
- */
-typedef uint32_t xpum_group_id_t;
-
-/**
- * Event id
- */
-typedef int32_t xpum_event_id_t;
-
-/**
- * Task id
- */
-typedef int32_t xpum_dump_task_id_t;
-
-/**
- * Tile id
- */
-typedef int32_t xpum_device_tile_id_t;
-
-/**
- * sampling interval
- */
-typedef int32_t xpum_sampling_interval_t;
-
-/**
- * API call results
- */
-typedef enum xpum_result_enum
-{
-	XPUM_OK = 0,					  ///< Ok
-	XPUM_GENERIC_ERROR = 1,			  ///< Function return with unknown errors
-	XPUM_BUFFER_TOO_SMALL = 2,		  ///< The buffer pass to function is too small
-	XPUM_RESULT_DEVICE_NOT_FOUND = 3, ///< Device not found
-	XPUM_RESULT_TILE_NOT_FOUND = 4,	  ///< Tile not found
-	XPUM_RESULT_GROUP_NOT_FOUND = 5,
-	XPUM_RESULT_POLICY_TYPE_INVALID = 6,				///< Policy type is invalid
-	XPUM_RESULT_POLICY_ACTION_TYPE_INVALID = 7,			///< Policy action type is invalid
-	XPUM_RESULT_POLICY_CONDITION_TYPE_INVALID = 8,		///< Policy condition type is invalid
-	XPUM_RESULT_POLICY_TYPE_ACTION_NOT_SUPPORT = 9,		///< Policy type and policy action not match
-	XPUM_RESULT_POLICY_TYPE_CONDITION_NOT_SUPPORT = 10, ///< Policy type and condition type not match
-	XPUM_RESULT_POLICY_INVALID_THRESHOLD = 11,			///< Policy threshold invalid
-	XPUM_RESULT_POLICY_INVALID_FREQUENCY = 12,			///< Policy frequency invalid
-	XPUM_RESULT_POLICY_NOT_EXIST = 13,					///< Policy not exist
-	XPUM_RESULT_DIAGNOSTIC_TASK_NOT_COMPLETE = 14,
-	XPUM_RESULT_DIAGNOSTIC_TASK_NOT_FOUND = 15,
-	XPUM_GROUP_DEVICE_DUPLICATED = 16,
-	XPUM_GROUP_CHANGE_NOT_ALLOWED = 17,
-	XPUM_NOT_INITIALIZED = 18,						///< XPUM is not initialized.
-	XPUM_DUMP_RAW_DATA_TASK_NOT_EXIST = 19,			///< Dump raw data task not exists
-	XPUM_DUMP_RAW_DATA_ILLEGAL_DUMP_FILE_PATH = 20, ///< Dump file path provide is illegal
-	XPUM_RESULT_UNKNOWN_AGENT_CONFIG_KEY = 21,		///< The the key for agent setting is unknown
-	XPUM_UPDATE_FIRMWARE_IMAGE_FILE_NOT_FOUND = 22,
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_AMC = 23,
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_AMC_SINGLE = 24,
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_GFX_ALL = 25, ///< Don't support updating GFX firmwares on all device
-	XPUM_UPDATE_FIRMWARE_MODEL_INCONSISTENCE = 26,
-	XPUM_UPDATE_FIRMWARE_IGSC_NOT_FOUND = 27,					   ///< "/usr/bin/igsc" not found
-	XPUM_UPDATE_FIRMWARE_TASK_RUNNING = 28,						   ///< Firmware update task is already running
-	XPUM_UPDATE_FIRMWARE_INVALID_FW_IMAGE = 29,					   ///< The image file is not a valid FW image file
-	XPUM_UPDATE_FIRMWARE_FW_IMAGE_NOT_COMPATIBLE_WITH_DEVICE = 30, ///< The image file is not compatible with device
-	XPUM_RESULT_DUMP_METRICS_TYPE_NOT_SUPPORT = 31,
-	XPUM_METRIC_NOT_SUPPORTED = 32, ///< Unsupported metric
-	XPUM_METRIC_NOT_ENABLED = 33,	///< Unenabled metric
-	XPUM_RESULT_HEALTH_INVALID_TYPE = 34,
-	XPUM_RESULT_HEALTH_INVALID_CONIG_TYPE = 35,
-	XPUM_RESULT_HEALTH_INVALID_THRESHOLD = 36,
-	XPUM_RESULT_DIAGNOSTIC_INVALID_LEVEL = 37,
-	XPUM_RESULT_DIAGNOSTIC_INVALID_TASK_TYPE = 38,
-	XPUM_RESULT_AGENT_SET_INVALID_VALUE = 39,  /// Agent set value is invalid
-	XPUM_LEVEL_ZERO_INITIALIZATION_ERROR = 40, ///< Level Zero initialization error.
-	XPUM_UNSUPPORTED_SESSIONID = 41,		   ///< Unsupported session id
-	XPUM_RESULT_MEMORY_ECC_LIB_NOT_SUPPORT = 42,
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_GFX_DATA = 43,		 ///< The device doesn't support GFX_DATA firmware update
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_PSC = 44,			 ///< The device doesn't support PSCBIN firmware update
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_PSC_IGSC = 45,		 ///< Installed igsc doesn't support PSCBIN firmware update
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_GFX_CODE_DATA = 46, ///< The device doesn't support GFX_CODE_DATA firmware update
-	XPUM_INTERVAL_INVALID = 47,
-	XPUM_RESULT_FILE_DUP = 48,
-	XPUM_RESULT_INVALID_DIR = 49,
-	XPUM_RESULT_FW_MGMT_NOT_INIT = 50, ///< The firmware management feature is not initialized
-	XPUM_VGPU_INVALID_LMEM = 51,
-	XPUM_VGPU_INVALID_NUMVFS = 52,
-	XPUM_VGPU_DIRTY_PF = 53,
-	XPUM_VGPU_VF_UNSUPPORTED_OPERATION = 54,
-	XPUM_VGPU_CREATE_VF_FAILED = 55,
-	XPUM_VGPU_REMOVE_VF_FAILED = 56,
-	XPUM_VGPU_NO_CONFIG_FILE = 57,
-	XPUM_VGPU_SYSFS_ERROR = 58,
-	XPUM_VGPU_UNSUPPORTED_DEVICE_MODEL = 59,
-	XPUM_RESULT_RESET_FAIL = 60, ///< Fail to reset device
-	XPUM_API_UNSUPPORTED = 61,
-	XPUM_PRECHECK_INVALID_SINCETIME = 62,
-	XPUM_PPR_NOT_FOUND = 63,
-	XPUM_UPDATE_FIRMWARE_GFX_DATA_IMAGE_VERSION_LOWER_OR_EQUAL_TO_DEVICE = 64,
-	XPUM_RESULT_UNSUPPORTED_DEVICE = 65,
-	XPUM_GROUP_LIMIT_REACHED = 66,
-	XPUM_INVALID_POWER_LIMIT = 67,
-	XPUM_UNSUPPORTED_FEATURE_PL_SUSTAIN = 68,
-	XPUM_UNSUPPORTED_FEATURE_PL_PEAK = 69,
-	XPUM_UNSUPPORTED_FEATURE_PL_BURST = 70,
-	XPUM_UNSUPPORTED_FEATURE_PL_UNKNOWN = 71,
-	XPUM_RESULT_PCIE_DOWNGRADE_LIB_NOT_SUPPORT = 72,
-	XPUM_UPDATE_FIRMWARE_UNSUPPORTED_OPROM_FW = 73,
-} xpum_result_t;
-
-typedef enum xpum_device_type_enum
-{
-	GPU = 0, ///< GPU
-} xpum_device_type_t;
-
-typedef enum xpum_device_function_type_enum
-{
-	XPUM_DEVICE_FUNCTION_TYPE_VIRTUAL = 0,
-	XPUM_DEVICE_FUNCTION_TYPE_PHYSICAL = 1,
-	XPUM_DEVICE_FUNCTION_TYPE_UNKNOWN = 0x7fffffff,
-} xpum_device_function_type_t;
-
-/**
- * XPUM version types
- */
-typedef enum xpum_version_enum
-{
-	XPUM_VERSION = 0,			///< XPUM version
-	XPUM_VERSION_GIT = 1,		///< The git commit hash of this build
-	XPUM_VERSION_LEVEL_ZERO = 2 ///< Underlying level-zero lib version
-} xpum_version_t;
-
-/**
- * XPUM version info
- */
-typedef struct XpumVersionInfo
-{
-	xpum_version_t version;							 ///< XPUM version types
-	char versionString[XPUM_MAX_VERSION_STR_LENGTH]; ///< Version strings
-} XpumVersionInfo;
-
-/**
- * Device basic info
- */
-typedef struct XpumDeviceBasicInfo
-{
-	xpum_device_id_t deviceId;				  ///< Device id
-	xpum_device_type_t type;				  ///< Device type
-	xpum_device_function_type_t functionType; ///< Device function type, PF or VF
-	char uuid[XPUM_MAX_STR_LENGTH];			  ///< Device uuid
-	char deviceName[XPUM_MAX_STR_LENGTH];	  ///< Device name
-	char pciDeviceId[XPUM_MAX_STR_LENGTH];	  ///< Device PCI device id
-	char pcibdfAddress[XPUM_MAX_STR_LENGTH];  ///< Device PCI bdf address
-	char vendorName[XPUM_MAX_STR_LENGTH];	  ///< Device vendor name
-	char drmDevice[XPUM_MAX_STR_LENGTH];	  ///< DRM Device
-} XpumDeviceBasicInfo;
-
-/**
- * Device property types
- */
-typedef enum xpum_device_property_name_enum
-{
-	XPUM_DEVICE_PROPERTY_DEVICE_TYPE = 0,				 ///< Device type
-	XPUM_DEVICE_PROPERTY_DEVICE_NAME = 1,				 ///< Device name
-	XPUM_DEVICE_PROPERTY_VENDOR_NAME = 2,				 ///< Vendor name
-	XPUM_DEVICE_PROPERTY_UUID = 3,						 ///< Device uuid
-	XPUM_DEVICE_PROPERTY_PCI_DEVICE_ID = 4,				 ///< The PCI device id of device
-	XPUM_DEVICE_PROPERTY_PCI_VENDOR_ID = 5,				 ///< The PCI vendor id of device
-	XPUM_DEVICE_PROPERTY_PCI_BDF_ADDRESS = 6,			 ///< The PCI bdf address of device
-	XPUM_DEVICE_PROPERTY_DRM_DEVICE = 7,				 ///< DRM Device
-	XPUM_DEVICE_PROPERTY_PCI_SLOT = 8,					 ///< PCI slot of device
-	XPUM_DEVICE_PROPERTY_PCIE_GENERATION = 9,			 ///< PCIe generation
-	XPUM_DEVICE_PROPERTY_PCIE_MAX_LINK_WIDTH = 10,		 ///< PCIe max link width
-	XPUM_DEVICE_PROPERTY_OAM_SOCKET_ID = 11,			 ///< Socket Id of OAM GPU
-	XPUM_DEVICE_PROPERTY_DEVICE_STEPPING = 12,			 ///< The stepping of device
-	XPUM_DEVICE_PROPERTY_DRIVER_VERSION = 13,			 ///< The driver version
-	XPUM_DEVICE_PROPERTY_GFX_FIRMWARE_NAME = 14,		 ///< The GFX firmware name of device
-	XPUM_DEVICE_PROPERTY_GFX_FIRMWARE_VERSION = 15,		 ///< The GFX firmware version of device
-	XPUM_DEVICE_PROPERTY_GFX_DATA_FIRMWARE_NAME = 16,	 ///< The GFX Data firmware name of device
-	XPUM_DEVICE_PROPERTY_GFX_DATA_FIRMWARE_VERSION = 17, ///< The GFX Data firmware version of device
-	XPUM_DEVICE_PROPERTY_AMC_FIRMWARE_NAME = 18,		 ///< The AMC firmware name of device
-	XPUM_DEVICE_PROPERTY_AMC_FIRMWARE_VERSION = 19,		 ///< The AMC firmware version of device
-	XPUM_DEVICE_PROPERTY_SERIAL_NUMBER = 20,			 ///< Serial number
-	XPUM_DEVICE_PROPERTY_CORE_CLOCK_RATE_MHZ = 21,		 ///< Clock rate for device core, in MHz
-	XPUM_DEVICE_PROPERTY_MEMORY_PHYSICAL_SIZE_BYTE = 22, ///< Device free memory size, in bytes
-	XPUM_DEVICE_PROPERTY_MEMORY_FREE_SIZE_BYTE = 23,	 ///< The free memory, in bytes
-	XPUM_DEVICE_PROPERTY_MAX_MEM_ALLOC_SIZE_BYTE = 24,	 ///< The total allocatable memory, in bytes
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_MEMORY_CHANNELS = 25, ///< Number of memory channels
-	XPUM_DEVICE_PROPERTY_MEMORY_BUS_WIDTH = 26,			 ///< Memory bus width
-	XPUM_DEVICE_PROPERTY_MAX_HARDWARE_CONTEXTS = 27,	 ///< Maximum number of logical hardware contexts
-	XPUM_DEVICE_PROPERTY_MAX_COMMAND_QUEUE_PRIORITY =
-		28,									   ///< Maximum priority for command queues. Higher value is higher priority
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_EUS = 29,   ///< The number of EUs
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_TILES = 30, ///< The number of tiles
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_SLICES = 31,				  ///< Maximum number of slices
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_SUB_SLICES_PER_SLICE = 32, ///< Maximum number of sub-slices per slice
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_EUS_PER_SUB_SLICE = 33,	  ///< Maximum number of EUs per sub-slice
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_THREADS_PER_EU = 34,		  ///< Maximum number of threads per EU
-	XPUM_DEVICE_PROPERTY_PHYSICAL_EU_SIMD_WIDTH = 35,		  ///< The physical EU simd width
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_MEDIA_ENGINES = 36,		  ///< The number of media engines
-	XPUM_DEVICE_PROPERTY_NUMBER_OF_MEDIA_ENH_ENGINES = 37,	  ///< The number of media enhancement engines
-	XPUM_DEVICE_PROPERTY_LINUX_KERNEL_VERSION = 38,			  ///< Linux kernel version
-	XPUM_DEVICE_PROPERTY_FABRIC_PORT_NUMBER = 39,			  ///< Number of fabric ports
-	XPUM_DEVICE_PROPERTY_FABRIC_PORT_MAX_SPEED = 40,	   ///< Maximum speed supported by the port (sum of all lanes)
-	XPUM_DEVICE_PROPERTY_FABRIC_PORT_LANES_NUMBER = 41,	   ///< The number of lanes of the port
-	XPUM_DEVICE_PROPERTY_GFX_PSCBIN_FIRMWARE_NAME = 42,	   ///< The GFX_PSCBIN firmware name of device
-	XPUM_DEVICE_PROPERTY_GFX_PSCBIN_FIRMWARE_VERSION = 43, ///< The GFX_PSCBIN firmware version of device
-	XPUM_DEVICE_PROPERTY_MEMORY_ECC_STATE = 44,			   ///< The memory ECC state of device
-	XPUM_DEVICE_PROPERTY_GFX_FIRMWARE_STATUS = 45,		   ///< The GFX firmware status
-	XPUM_DEVICE_PROPERTY_SKU_TYPE = 46,					   ///< The type of SKU
-	XPUM_DEVICE_PROPERTY_XELINK_CALIBRATION_DATE = 47,	   ///< Xe Link Calibration Date
-	XPUM_DEVICE_PROPERTY_DRIVER_PACK_VERSION = 48,		   ///< The driver package version
-	XPUM_DEVICE_PROPERTY_PCIE_MAX_BANDWIDTH = 49,		   ///< PCIe max link speed
-	XPUM_DEVICE_PROPERTY_PCIE_DOWNGRADE_STATE = 50,		   ///< The PCIe Gen4 Downgrade state of device
-	XPUM_DEVICE_PROPERTY_OPROM_CODE_FIRMWARE_NAME = 51,
-	XPUM_DEVICE_PROPERTY_OPROM_CODE_FIRMWARE_VERSION = 52,
-	XPUM_DEVICE_PROPERTY_OPROM_DATA_FIRMWARE_NAME = 53,
-	XPUM_DEVICE_PROPERTY_OPROM_DATA_FIRMWARE_VERSION = 54,
-	XPUM_DEVICE_PROPERTY_MAX
-} xpum_device_property_name_t;
-
-/**
- * @brief Struct for one device property
- */
-typedef struct xpum_device_property_t
-{
-	xpum_device_property_name_t name; ///< Device property name
-	char value[XPUM_MAX_STR_LENGTH];  ///< Device property value strings
-} xpum_device_property_t;
-
-/**
- * @brief Struct stores all properties of a device
- *
- */
-typedef struct xpum_device_properties_t
-{
-	xpum_device_id_t deviceId; ///< Device id
-	xpum_device_property_t properties[XPUM_MAX_NUM_PROPERTIES];
-	int propertyLen; ///< The property numbers stored in properties
-} xpum_device_properties_t;
-
-/**
- * @brief Struct AMC firmware version
- *
- */
-typedef struct xpum_amc_fw_version_t
-{
-	char version[XPUM_MAX_STR_LENGTH];
-} xpum_amc_fw_version_t;
-
-/**
- * @brief Struct for group info
- *
- */
-typedef struct xpum_group_info_t
-{
-	int count;										   ///< The count of devices in this group
-	char groupName[XPUM_MAX_STR_LENGTH];			   ///< The name of this group
-	xpum_device_id_t deviceList[XPUM_MAX_NUM_DEVICES]; ///< The array of device id belongs to this group
-} xpum_group_info_t;
-
-/**************************************************************************/
-/**
- * Definitions for health
- */
-/**************************************************************************/
-
-typedef enum xpum_health_config_type_enum
-{
-	XPUM_HEALTH_CORE_THERMAL_LIMIT = 0,	  ///< Threshold in celsius degree
-	XPUM_HEALTH_MEMORY_THERMAL_LIMIT = 1, ///< Threshold in celsius degree
-	XPUM_HEALTH_POWER_LIMIT = 2			  ///< Threshold in watts
-} xpum_health_config_type_t;
-
-typedef enum xpum_health_type_enum
-{
-	XPUM_HEALTH_CORE_THERMAL = 0,
-	XPUM_HEALTH_MEMORY_THERMAL = 1,
-	XPUM_HEALTH_POWER = 2,
-	XPUM_HEALTH_MEMORY = 3,
-	XPUM_HEALTH_FABRIC_PORT = 4,
-	XPUM_HEALTH_FREQUENCY = 5
-} xpum_health_type_t;
-
-typedef enum xpum_health_status_enum
-{
-	XPUM_HEALTH_STATUS_UNKNOWN = 0,
-	XPUM_HEALTH_STATUS_OK = 1,
-	XPUM_HEALTH_STATUS_WARNING = 2,
-	XPUM_HEALTH_STATUS_CRITICAL = 3,
-} xpum_health_status_t;
-
-typedef struct xpum_health_data_t
-{
-	xpum_device_id_t deviceId;			   ///< Device ID
-	xpum_health_type_t type;			   ///< Health type
-	xpum_health_status_t status;		   ///< Health status
-	char description[XPUM_MAX_STR_LENGTH]; ///< Description for health
-	uint64_t throttleThreshold;			   ///< Throttle threshold, temperature in celsius degree and power in watts
-	uint64_t shutdownThreshold;			   ///< Shutdown threshold, temperature in celsius degree and power in watts
-} xpum_health_data_t;
-
-/**************************************************************************/
-/**
- * Definitions for configuration
- */
-/**************************************************************************/
-
-typedef enum xpum_device_mode_enum
-{
-	XPUM_GPU_SCHEDULE_MODE = 0,
-	XPUM_GPU_STANDBY_MODE = 1
-} xpum_device_mode_t;
-
-typedef enum xpum_device_config_type_enum
-{
-	XPUM_DEVICE_CONFIG_DEVICE_MODE = 0,
-	XPUM_DEVICE_CONFIG_POWER_LIMIT_ENABLED = 1,
-	XPUM_DEVICE_CONFIG_POWER_LIMIT_VALUE = 2,
-	XPUM_DEVICE_CONFIG_POWER_LIMIT_AVG_WINDOW = 3,
-	XPUM_DEVICE_CONFIG_CORE_FREQ_MIN = 4,
-	XPUM_DEVICE_CONFIG_CORE_FREQ_MAX = 5,
-	XPUM_DEVICE_CONFIG_RESET = 6,
-} xpum_device_config_type_t;
-
-typedef enum xpum_diag_result_type_enum
-{
-	XPUM_DIAG_RESULT_NO_ERRORS = 0,			///< Diagnostic completed without finding errors to repair
-	XPUM_DIAG_RESULT_ABORT = 1,				///< Diagnostic had problems running tests
-	XPUM_DIAG_RESULT_FAIL_CANT_REPAIR = 2,	///< Diagnostic had problems setting up repairs
-	XPUM_DIAG_RESULT_REBOOT_FOR_REPAIR = 3, ///< Diagnostics found errors, setup for repair and reboot is required to
-											///< complete the process
-	XPUM_DIAG_RESULT_FORCE_UINT32 = 0x7fffffff
-
-} xpum_diag_result_t;
-
-/**************************************************************************/
-/**
- * Definitions for device control and telemetry
- */
-/**************************************************************************/
-
-/**
- * @brief Standby promotion modes
- */
-typedef enum xpum_standby_mode_enum
-{
-	XPUM_STANDBY_MODE_DEFAULT = 0, ///< Default mode
-	XPUM_STANDBY_MODE_NEVER = 1	   ///< Device never goes into standby
-} xpum_standby_mode_t;
-
-/**
- * @brief ECC states
- */
-typedef enum xpum_ecc_state_enum
-{
-	XPUM_ECC_STATE_UNAVAILABLE = 0, ///< ECC is not available
-	XPUM_ECC_STATE_ENABLED = 1,		///< ECC is enabled
-	XPUM_ECC_STATE_DISABLED = 2		///< ECC is disabled
-} xpum_ecc_state_t;
-
-/**
- * @brief Frequency domains
- */
-typedef enum xpum_freq_domain_enum
-{
-	XPUM_FREQ_DOMAIN_GPU = 0,	///< GPU core frequency
-	XPUM_FREQ_DOMAIN_MEMORY = 1 ///< Memory frequency
-} xpum_freq_domain_t;
-
-/**
- * @brief Frequency throttle reason flags (bitfield)
- */
-typedef enum xpum_freq_throttle_reason_enum
-{
-	XPUM_FREQ_THROTTLE_REASON_NONE = 0,
-	XPUM_FREQ_THROTTLE_REASON_THERMAL_LIMIT = (1 << 0),
-	XPUM_FREQ_THROTTLE_REASON_CURRENT_LIMIT = (1 << 1),
-	XPUM_FREQ_THROTTLE_REASON_POWER_LIMIT = (1 << 2),
-	XPUM_FREQ_THROTTLE_REASON_THERMAL_EXCURSION = (1 << 3),
-	XPUM_FREQ_THROTTLE_REASON_BURST_POWER_CAP = (1 << 4),
-	XPUM_FREQ_THROTTLE_REASON_AVE_POWER_CAP = (1 << 5)
-} xpum_freq_throttle_reason_flags_t;
-
-/**
- * @brief RAS error categories
- */
-typedef enum xpum_ras_error_cat_enum
-{
-	XPUM_RAS_ERROR_CAT_RESET = 0,		///< Errors reset after device reset
-	XPUM_RAS_ERROR_CAT_PROGRAMMING = 1, ///< Errors reset after driver reload
-	XPUM_RAS_ERROR_CAT_DRIVER = 2,		///< Errors reset after OS reboot
-	XPUM_RAS_ERROR_CAT_COMPUTE = 3,		///< Errors reset after device reset
-	XPUM_RAS_ERROR_CAT_NON_COMPUTE = 4, ///< Errors reset after device reset
-	XPUM_RAS_ERROR_CAT_CACHE = 5,		///< Errors reset after device reset
-	XPUM_RAS_ERROR_CAT_DISPLAY = 6		///< Errors reset after device reset
-} xpum_ras_error_cat_t;
-
-/**
- * @brief RAS error types
- */
-typedef enum xpum_ras_error_type_enum
-{
-	XPUM_RAS_ERROR_TYPE_CORRECTABLE = 0,  ///< Correctable errors
-	XPUM_RAS_ERROR_TYPE_UNCORRECTABLE = 1 ///< Uncorrectable errors
-} xpum_ras_error_type_t;
-
-/**************************************************************************/
-/**
- * Definitions for firmware update
- */
-/**************************************************************************/
-
-/**
- * @brief Firmware types
- *
- */
-typedef enum xpum_firmware_type_enum
-{
-	XPUM_DEVICE_FIRMWARE_GFX = 0,			///< GFX firmware
-	XPUM_DEVICE_FIRMWARE_AMC = 1,			///< AMC firmware
-	XPUM_DEVICE_FIRMWARE_GFX_DATA = 2,		///< GFX_DATA firmware
-	XPUM_DEVICE_FIRMWARE_GFX_PSCBIN = 3,	///< GFX_PSCBIN firmware
-	XPUM_DEVICE_FIRMWARE_GFX_CODE_DATA = 4, ///< GFX_CODE_DATA firmware
-	XPUM_DEVICE_FIRMWARE_FAN_TABLE = 5,		///< FAN_TABLE firmware
-	XPUM_DEVICE_FIRMWARE_VR_CONFIG = 6,		///< VR_CONFIG firmware
-	XPUM_DEVICE_FIRMWARE_OPROM_DATA = 7,
-	XPUM_DEVICE_FIRMWARE_OPROM_CODE = 8,
-} xpum_firmware_type_t;
-
-/**
- * @brief Firmware flash states
- *
- */
-typedef enum xpum_firmware_flash_result_enum
-{
-	XPUM_DEVICE_FIRMWARE_FLASH_OK = 0,			///< Firmware flash successfully
-	XPUM_DEVICE_FIRMWARE_FLASH_ERROR = 1,		///< Firmware flash in error
-	XPUM_DEVICE_FIRMWARE_FLASH_ONGOING = 2,		///< Firmware flash is on going
-	XPUM_DEVICE_FIRMWARE_FLASH_UNSUPPORTED = 3, ///< Firmware flash is unsupported
-} xpum_firmware_flash_result_t;
-
-/**
- * @brief Firmware flash job
- *
- */
-typedef struct XpumFirmwareFlashJob
-{
-	xpum_firmware_type_t type; ///< The firmware type to flash
-	const char *filePath;	   ///< The path of firmware binary file to flash
-} XpumFirmwareFlashJob;
-
-/**
- * @brief The struct stores the firmware flash states
- *
- */
-typedef struct xpum_firmware_flash_task_result_t
-{
-	xpum_device_id_t deviceId;			   ///< The id of the device to flash firmware
-	xpum_firmware_type_t type;			   ///< The firmware type to flash
-	xpum_firmware_flash_result_t result;   ///< Which state the firmware flash job is in
-	char description[XPUM_MAX_STR_LENGTH]; ///< The description of this result
-	char version[XPUM_MAX_STR_LENGTH];	   ///< Current firmware version
-	int percentage;
-} xpum_firmware_flash_task_result_t;
-
-/**************************************************************************/
-/**
- * Definitions for diagnosis
- */
-/**************************************************************************/
-
-typedef enum xpum_diag_task_type_enum
-{
-	// level 1
-	XPUM_DIAG_SOFTWARE_ENV_VARIABLES = 0,
-	XPUM_DIAG_SOFTWARE_LIBRARY = 1,
-	XPUM_DIAG_SOFTWARE_PERMISSION = 2,
-	XPUM_DIAG_SOFTWARE_EXCLUSIVE = 3,
-	XPUM_DIAG_LIGHT_COMPUTATION = 4,
-	// level 2
-	XPUM_DIAG_HARDWARE_SYSMAN = 5,
-	XPUM_DIAG_INTEGRATION_PCIE = 6,
-	XPUM_DIAG_MEDIA_CODEC = 7,
-	// level 3
-	XPUM_DIAG_PERFORMANCE_COMPUTATION = 8,
-	XPUM_DIAG_PERFORMANCE_POWER = 9,
-	XPUM_DIAG_PERFORMANCE_MEMORY_BANDWIDTH = 10,
-	XPUM_DIAG_PERFORMANCE_MEMORY_ALLOCATION = 11,
-	XPUM_DIAG_MEMORY_ERROR = 12,
-
-	// Not in level diagnostic
-	XPUM_DIAG_LIGHT_CODEC = 13,
-
-	// level 3
-	XPUM_DIAG_XE_LINK_THROUGHPUT = 14,
-
-	XPUM_DIAG_XE_LINK_ALL_TO_ALL_THROUGHPUT = 15,
-	XPUM_DIAG_TASK_TYPE_MAX
-} xpum_diag_task_type_t;
-
-typedef enum xpum_diag_task_result_enum
-{
-	XPUM_DIAG_RESULT_UNKNOWN = 0,
-	XPUM_DIAG_RESULT_PASS = 1,
-	XPUM_DIAG_RESULT_FAIL = 2
-} xpum_diag_task_result_t;
-
-typedef enum xpum_diag_level_enum
-{
-	XPUM_DIAG_LEVEL_1 = 1,
-	XPUM_DIAG_LEVEL_2 = 2,
-	XPUM_DIAG_LEVEL_3 = 3,
-	XPUM_DIAG_LEVEL_MAX
-} xpum_diag_level_t;
-
-typedef struct xpum_diag_component_info_t
-{
-	xpum_diag_task_type_t type;
-	xpum_diag_task_result_t result;
-	bool finished;
-	char message[XPUM_MAX_STR_LENGTH];
-} xpum_diag_component_info_t;
-
-typedef struct xpum_diag_task_info_t
-{
-	xpum_device_id_t deviceId;
-	xpum_diag_level_t level;
-	bool finished;
-	xpum_diag_task_result_t result;
-	xpum_diag_component_info_t componentList[XPUM_DIAG_TASK_TYPE_MAX];
-	char message[XPUM_MAX_STR_LENGTH];
-	int count;
-	uint64_t startTime;
-	uint64_t endTime;
-	xpum_diag_task_type_t targetTypes[XPUM_DIAG_TASK_TYPE_MAX];
-	int targetTypeCount;
-} xpum_diag_task_info_t;
-
-typedef enum xpum_media_format_enum
-{
-	XPUM_MEDIA_FORMAT_H265 = 0,
-	XPUM_MEDIA_FORMAT_H264 = 1,
-	XPUM_MEDIA_FORMAT_AV1 = 2
-} xpum_media_format_t;
-
-typedef enum xpum_media_resolution_enum
-{
-	XPUM_MEDIA_RESOLUTION_1080P = 0,
-	XPUM_MEDIA_RESOLUTION_4K = 1
-} xpum_media_resolution_t;
-
-typedef struct xpum_diag_media_codec_metrics_t
-{
-	xpum_device_id_t deviceId;
-	xpum_media_format_t format;
-	xpum_media_resolution_t resolution;
-	char fps[XPUM_MAX_STR_LENGTH];
-} xpum_diag_media_codec_metrics_t;
-
-typedef struct xpum_diag_xe_link_throughput_t
-{
-	xpum_device_id_t deviceId;
-	xpum_device_id_t srcDeviceId;
-	xpum_device_tile_id_t srcTileId;
-	int32_t srcPortId;
-	xpum_device_id_t dstDeviceId;
-	xpum_device_tile_id_t dstTileId;
-	int32_t dstPortId;
-	double currentSpeed; // GBPS
-	double maxSpeed;	 // GBPS
-	double threshold;	 // GBPS
-} xpum_diag_xe_link_throughput_t;
-/**************************************************************************/
-/**
- * Definitions for agent setting
- */
-/**************************************************************************/
-
-/**
- * @brief Agent setting types
- *
- */
-typedef enum xpum_agent_config_enum
-{
-	XPUM_AGENT_CONFIG_SAMPLE_INTERVAL = 0 ///< Agent sample interval, in milliseconds, options are [100, 200, 500,
-										  ///< 1000], default is 1000. Value type in xpumSetAgentConfig is int64_t
-} xpum_agent_config_t;
-
-/**************************************************************************/
-/**
- * Definitions for metrics collection
- */
-/**************************************************************************/
-
-/**
- * @brief Statistics and metrics types
- *
- */
-typedef enum xpum_stats_type_enum
-{
-	XPUM_STATS_GPU_UTILIZATION = 0,			 ///< GPU Utilization, unit %
-	XPUM_STATS_EU_ACTIVE = 1,				 ///< GPU EU Array Active, unit %
-	XPUM_STATS_EU_STALL = 2,				 ///< GPU EU Array Stall, unit %
-	XPUM_STATS_EU_IDLE = 3,					 ///< GPU EU Array Idle, unit %
-	XPUM_STATS_POWER = 4,					 ///< Power, unit W
-	XPUM_STATS_ENERGY = 5,					 ///< Energy, unit mJ
-	XPUM_STATS_GPU_FREQUENCY = 6,			 ///< Gpu Actual Frequency, unit MHz
-	XPUM_STATS_GPU_CORE_TEMPERATURE = 7,	 ///< Gpu Temeperature, unit °C
-	XPUM_STATS_MEMORY_USED = 8,				 ///< Memory Used, unit B
-	XPUM_STATS_MEMORY_UTILIZATION = 9,		 ///< Memory Utilization. Percent utilization is calculated by the equation:
-											 ///< physical size - free size / physical size. Unit %
-	XPUM_STATS_MEMORY_BANDWIDTH = 10,		 ///< Memory Bandwidth, unit %
-	XPUM_STATS_MEMORY_READ = 11,			 ///< Memory Read, unit B
-	XPUM_STATS_MEMORY_WRITE = 12,			 ///< Memory Write, unit B
-	XPUM_STATS_MEMORY_READ_THROUGHPUT = 13,	 ///< Memory read throughput, unit kB/s
-	XPUM_STATS_MEMORY_WRITE_THROUGHPUT = 14, ///< Memory write throughput, unit kB/s
-	XPUM_STATS_ENGINE_GROUP_COMPUTE_ALL_UTILIZATION = 15, ///< Engine Group Compute All Utilization, unit %
-	XPUM_STATS_ENGINE_GROUP_MEDIA_ALL_UTILIZATION = 16,	  ///< Engine Group Media All Utilization, unit %
-	XPUM_STATS_ENGINE_GROUP_COPY_ALL_UTILIZATION = 17,	  ///< Engine Group Copy All Utilization, unit %
-	XPUM_STATS_ENGINE_GROUP_RENDER_ALL_UTILIZATION = 18,  ///< Engine Group Render All Utilization, unit %
-	XPUM_STATS_ENGINE_GROUP_3D_ALL_UTILIZATION = 19,	  ///< Engine Group 3d All Utilization, unit %
-	XPUM_STATS_RAS_ERROR_CAT_RESET = 20,				  ///< Number of corresponding RAS errors
-	XPUM_STATS_RAS_ERROR_CAT_PROGRAMMING_ERRORS = 21,
-	XPUM_STATS_RAS_ERROR_CAT_DRIVER_ERRORS = 22,
-	XPUM_STATS_RAS_ERROR_CAT_CACHE_ERRORS_CORRECTABLE = 23,
-	XPUM_STATS_RAS_ERROR_CAT_CACHE_ERRORS_UNCORRECTABLE = 24,
-	XPUM_STATS_RAS_ERROR_CAT_DISPLAY_ERRORS_CORRECTABLE = 25,
-	XPUM_STATS_RAS_ERROR_CAT_DISPLAY_ERRORS_UNCORRECTABLE = 26,
-	XPUM_STATS_RAS_ERROR_CAT_NON_COMPUTE_ERRORS_CORRECTABLE = 27,
-	XPUM_STATS_RAS_ERROR_CAT_NON_COMPUTE_ERRORS_UNCORRECTABLE = 28,
-	XPUM_STATS_GPU_REQUEST_FREQUENCY = 29, ///< Gpu Request Frequency, unit MHz
-	XPUM_STATS_MEMORY_TEMPERATURE = 30,	   ///< Memory Temeperature, unit °C
-	XPUM_STATS_FREQUENCY_THROTTLE = 31,	   ///< Frequency Throttle time, unit %
-	XPUM_STATS_PCIE_READ_THROUGHPUT = 32,  ///< PCIe read throughput, unit kB/s
-	XPUM_STATS_PCIE_WRITE_THROUGHPUT = 33, ///< PCIe write throughput, unit kB/s
-	XPUM_STATS_PCIE_READ = 34,			   ///< PCIe read, unit B
-	XPUM_STATS_PCIE_WRITE = 35,			   ///< PCIe write, unit B
-	XPUM_STATS_ENGINE_UTILIZATION = 36,	   ///< Engine Utilization, unit %
-	XPUM_STATS_FABRIC_THROUGHPUT = 37,	   ///< Fabric throughput, unit kB/s
-	XPUM_STATS_FREQUENCY_THROTTLE_REASON_GPU =
-		38, ///< Frequency Throttle reason, refer to the document of zes_freq_throttle_reason_flags_t
-	XPUM_STATS_MEDIA_ENGINE_FREQUENCY = 39, ///< Media engine frequency, unit MHz
-	XPUM_STATS_MAX
-} xpum_stats_type_t;
-
-/**
- * @brief Struct to store statistics data for different metric types
- *
- */
-typedef struct xpum_device_stats_data_t
-{
-	uint64_t value;				   ///< The value of this metric type
-	uint64_t accumulated;		   ///< The accumulated value of this metric type, only valid if isCounter is true
-	uint64_t min;				   ///< The min value since last call, only valid if isCounter is false
-	uint64_t avg;				   ///< The average value since last call, only valid if isCounter is false
-	uint64_t max;				   ///< The max value since last call, only valid if isCounter is false
-	xpum_stats_type_t metricsType; ///< Metric type
-	uint32_t scale;				   ///< The magnification of the value, accumulated, min, avg, and max fields
-	bool isCounter;				   ///< If this metric is a counter
-} xpum_device_stats_data_t;
-
-/**
- * @brief Struct to store device statistics data
- *
- */
-typedef struct xpum_device_stats_t
-{
-	xpum_device_id_t deviceId; ///< Device id
-	bool isTileData;		   ///< If this statistics data is tile level
-	int32_t tileId;			   ///< The tile id, only valid if isTileData is true
-	int32_t count;			   ///< The count of data stored in dataList array
-	xpum_device_stats_data_t dataList[XPUM_STATS_MAX];
-} xpum_device_stats_t;
-
-/**
- * @brief Engine types
- *
- */
-typedef enum xpum_engine_type_enum
-{
-	XPUM_ENGINE_TYPE_COMPUTE = 0,
-	XPUM_ENGINE_TYPE_RENDER = 1,
-	XPUM_ENGINE_TYPE_DECODE = 2,
-	XPUM_ENGINE_TYPE_ENCODE = 3,
-	XPUM_ENGINE_TYPE_COPY = 4,
-	XPUM_ENGINE_TYPE_MEDIA_ENHANCEMENT = 5,
-	XPUM_ENGINE_TYPE_3D = 6,
-	XPUM_ENGINE_TYPE_UNKNOWN = 7,
-} xpum_engine_type_t;
-
-/**
- * @brief Struct to store device engine statistics data
- *
- */
-typedef struct xpum_device_engine_stats_t
-{
-	bool isTileData;		   ///< If this statistics data is tile level
-	int32_t tileId;			   ///< The tile id, only valid if isTileData is true
-	uint64_t index;			   ///< The index of the engine in the same type on the device or sub-device
-	xpum_engine_type_t type;   ///< The type of the engine
-	uint64_t value;			   ///< The value of engine utilization
-	uint64_t min;			   ///< The min value since last call
-	uint64_t avg;			   ///< The average value since last call
-	uint64_t max;			   ///< The max value since last call
-	uint32_t scale;			   ///< The magnification of the value, accumulated, min, avg, and max fields
-	xpum_device_id_t deviceId; ///< Device id
-} xpum_device_engine_stats_t;
-
-/**
- * @brief Struct to store device engine metric data
- *
- */
-typedef struct xpum_device_engine_metric_t
-{
-	bool isTileData;		 ///< If this statistics data is tile level
-	int32_t tileId;			 ///< The tile id, only valid if isTileData is true
-	uint64_t index;			 ///< The index of the engine in the same type on the device or sub-device
-	xpum_engine_type_t type; ///< The type of the engine
-	uint64_t value;			 ///< The value of engine utilization
-	uint32_t scale;			 ///< The magnification of the value field
-} xpum_device_engine_metric_t;
-
-/**
- * @brief Fabric throughput types
- *
- */
-typedef enum xpum_fabric_throughput_type_enum
-{
-	XPUM_FABRIC_THROUGHPUT_TYPE_RECEIVED = 0,
-	XPUM_FABRIC_THROUGHPUT_TYPE_TRANSMITTED = 1,
-	XPUM_FABRIC_THROUGHPUT_TYPE_RECEIVED_COUNTER = 2,
-	XPUM_FABRIC_THROUGHPUT_TYPE_TRANSMITTED_COUNTER = 3,
-	XPUM_FABRIC_THROUGHPUT_TYPE_MAX,
-} xpum_fabric_throughput_type_t;
-
-/**
- * @brief Struct to store device fabric throughput statistics data
- *
- */
-typedef struct xpum_device_fabric_throughput_stats_t
-{
-	uint32_t tileId;					///< tile id
-	uint32_t remoteDeviceId;			///< remote device id
-	uint32_t remoteDeviceTileId;		///< remote tile id
-	xpum_fabric_throughput_type_t type; ///< fabric throughput type
-	uint64_t value;						///< The value, in B/s
-	uint64_t accumulated;				///< The accumulated value for counter type
-	uint64_t min;						///< The min value since last call
-	uint64_t avg;						///< The average value since last call
-	uint64_t max;						///< The max value since last call
-	uint32_t scale;						///< The magnification of the value, accumulated, min, avg, and max fields
-	xpum_device_id_t deviceId;			///< Device id
-} xpum_device_fabric_throughput_stats_t;
-
-/**
- * @brief Struct to store device fabric throughput metric data
- *
- */
-typedef struct xpum_device_fabric_throughput_metric_t
-{
-	uint32_t tileId;					///< tile id
-	uint32_t remoteDeviceId;			///< remote device id
-	uint32_t remoteDeviceTileId;		///< remote tile id
-	xpum_fabric_throughput_type_t type; ///< fabric throughput type
-	uint64_t value;						///< The value
-	uint32_t scale;						///< The magnification of the value, accumulated, min, avg, and max fields
-} xpum_device_fabric_throughput_metric_t;
-
-/**
- * @brief Struct to store raw statistics data, not aggregated yet
- *
- */
-typedef struct xpum_metrics_raw_data_t
-{
-	xpum_device_id_t deviceId;	   ///< Device id
-	bool isTileData;			   ///< If this statistics data is tile level
-	int32_t tileId;				   ///< The tile id, only valid if isTileData is true
-	uint64_t timestamp;			   ///< The timestamp this value is telemetried
-	xpum_stats_type_t metricsType; ///< Metric type
-	uint64_t value;				   ///< The instant value of the metricsType at the timestamp
-} xpum_metrics_raw_data_t;
-
-/**
- * @brief Struct to store metric data for different metric types
- *
- */
-typedef struct xpum_device_metric_data_t
-{
-	uint64_t value;				   ///< The value of this metric type
-	uint64_t timestamp;			   ///< The timestamp of this data
-	xpum_stats_type_t metricsType; ///< Metric type
-	uint32_t scale;				   ///< The magnification of the value field
-	bool isCounter;				   ///< If this metric is a counter
-} xpum_device_metric_data_t;
-
-/**
- * @brief Struct to store device metrics data
- *
- */
-typedef struct xpum_device_metrics_t
-{
-	xpum_device_id_t deviceId; ///< Device id
-	bool isTileData;		   ///< If this statistics data is tile level
-	int32_t tileId;			   ///< The tile id, only valid if isTileData is true
-	int32_t count;			   ///< The count of data stored in dataList array
-	xpum_device_metric_data_t dataList[XPUM_STATS_MAX];
-} xpum_device_metrics_t;
-
-typedef xpum_stats_type_t xpum_realtime_metric_type_t;
-
-/**
- * @brief Struct to store realtime data for different metric types
- *
- */
-typedef struct xpum_device_realtime_metric_t
-{
-	uint64_t value;							 ///< The value of this metric type
-	xpum_realtime_metric_type_t metricsType; ///< Metric type
-	uint32_t scale;							 ///< The magnification of the value
-	bool isCounter;							 ///< If this metric is a counter
-} xpum_device_realtime_metric_t;
-
-/**
- * @brief Struct to store device realtime data
- *
- */
-typedef struct xpum_device_realtime_metrics_t
-{
-	xpum_device_id_t deviceId; ///< Device id
-	bool isTileData;		   ///< If this statistics data is tile level
-	int32_t tileId;			   ///< The tile id, only valid if isTileData is true
-	int32_t count;			   ///< The count of data stored in dataList array
-	xpum_device_realtime_metric_t dataList[XPUM_STATS_MAX];
-} xpum_device_realtime_metrics_t;
-
-/**
- * @brief Struct to store metrics of a VF(Virtual Function)
- *
- */
-typedef struct xpum_vf_metric_t
-{
-	xpum_device_id_t deviceId;			  ///< Device id
-	char bdfAddress[XPUM_MAX_STR_LENGTH]; ///< BDF address of the VF
-	uint32_t vfIndex;
-	xpum_device_realtime_metric_t metric;
-} xpum_vf_metric_t;
-
-typedef struct xpum_fabric_port_config_t
-{
-	bool onSubdevice;
-	uint32_t subdeviceId;
-	uint32_t fabricId;
-	uint32_t attachId;
-	uint8_t portNumber;
-	bool enabled;
-	bool beaconing;
-	bool settingEnabled;
-	bool settingBeaconing;
-} xpum_fabric_port_config_t;
-
-typedef enum xpum_engine_type_flags_t
-{
-	XPUM_UNDEFINED = 1 << 0,
-	XPUM_COMPUTE = 1 << 1,
-	XPUM_THREE_D = 1 << 2,
-	XPUM_MEDIA = 1 << 3,
-	XPUM_COPY = 1 << 4,
-	XPUM_RENDER = 1 << 5,
-	XPUM_TYPE_FLAGS_FORCE_UINT32 = 0x7fffffff
-} xpum_engine_type_flags_t;
-
-struct Power_limit_ext_t
-{
-	int32_t limit; // in milliwatts
-	int32_t level;
-};
-
-typedef struct xpum_power_limit_ext_t
-{
-	int32_t limit;
-	int32_t level;
-} xpum_power_limit_ext_t;
-
-#define XPUM_MAX_POWER_LIMITS 8
-
-typedef struct xpum_power_domain_ext_t
-{
-	int32_t powerDomain;
-	xpum_power_limit_ext_t plExt[XPUM_MAX_POWER_LIMITS];
-	int32_t plExtCount;
-} xpum_power_domain_ext_t;
-
-typedef struct xpum_power_sustained_limit_t
-{
-	int32_t power;
-	int32_t interval;
-	bool enabled;
-} xpum_power_sustained_limit_t;
-typedef struct xpum_power_burst_limit_t
-{
-	bool enabled;
-
-	int32_t power;
-} xpum_power_burst_limit_t;
-
-typedef struct xpum_power_peak_limit_t
-{
-	int32_t powerAc;
-
-	int32_t powerDc;
-} xpum_power_peak_limit_t;
-
-typedef struct xpum_power_limits_t
-{
-	xpum_power_sustained_limit_t sustainedLimit;
-} xpum_power_limits_t;
-
-typedef enum xpum_frequency_type_t
-{
-	XPUM_GPU_FREQUENCY = 0,
-	XPUM_MEMORY_FREQUENCY = 1,
-	XPUM_FORCE_UINT32 = 0x7fffffff
-} xpum_frequency_type_t;
-
-typedef enum xpum_scheduler_mode_t
-{
-	XPUM_TIMEOUT = 0,
-	XPUM_TIMESLICE = 1,
-	XPUM_EXCLUSIVE = 2,
-	XPUM_COMPUTE_UNIT_DEBUG = 3,
-	XPUM_MODE_FORCE_UINT32 = 0x7fffffff
-} xpum_scheduler_mode_t;
-
-typedef enum xpum_ecc_action_t
-{
-	XPUM_ECC_ACTION_NONE = 0,				///< No action.
-	XPUM_ECC_ACTION_WARM_CARD_RESET = 1,	///< Warm reset of the card.
-	XPUM_ECC_ACTION_COLD_CARD_RESET = 2,	///< Cold reset of the card.
-	XPUM_ECC_ACTION_COLD_SYSTEM_REBOOT = 3, ///< Cold reboot of the system.
-	XPUM_ECC_ACTION_FORCE_UINT32 = 0x7fffffff
-
-} xpum_ecc_action_t;
-
-typedef enum xpum_pciedown_state_t
-{
-	XPUM_PCIE_DOWNGRADE_STATE_UNAVAILABLE = 0, ///< None
-	XPUM_PCIE_DOWNGRADE_STATE_ENABLED = 1,	   ///< PCIe Downgrade enabled.
-	XPUM_PCIE_DOWNGRADE_STATE_DISABLED = 2,	   ///< PCIe Downgrade disabled.
-	XPUM_PCIE_DOWNGRADE_STATE_FORCE_UINT32 = 0x7fffffff
-
-} xpum_pciedown_state_t;
-
-typedef enum xpum_pciedown_action_t
-{
-	XPUM_PCIE_DOWNGRADE_ACTION_NONE = 0,			   ///< No action.
-	XPUM_PCIE_DOWNGRADE_ACTION_WARM_CARD_RESET = 1,	   ///< Warm reset of the card.
-	XPUM_PCIE_DOWNGRADE_ACTION_COLD_CARD_RESET = 2,	   ///< Cold reset of the card.
-	XPUM_PCIE_DOWNGRADE_ACTION_COLD_SYSTEM_REBOOT = 3, ///< Cold reboot of the system.
-	XPUM_PCIE_DOWNGRADE_ACTION_FORCE_UINT32 = 0x7fffffff
-
-} xpum_pciedown_action_t;
-
-typedef struct xpum_device_process_t
-{
-	uint32_t processId;
-	uint64_t memSize;
-	uint64_t sharedSize;
-	xpum_engine_type_flags_t engine;
-	char processName[XPUM_MAX_STR_LENGTH];
-} xpum_device_process_t;
-
-/**
- * @brief Struct to store one component occupancy
- *
- */
-typedef struct xpum_device_component_ratio_t
-{
-	char occupancyName[XPUM_MAX_STR_LENGTH]; //  Device component name
-	double value;							 //  Occupancy ratio
-} xpum_device_component_ratio_t;
-
-/**
- * @brief Struct to store all component occupancy ratio
- *
- */
-typedef struct xpum_device_components_ratio_t
-{
-	xpum_device_id_t deviceId; ///< Device id
-	xpum_device_component_ratio_t ratios[XPUM_MAX_COMPONENT_OCCUPANCY_NUM];
-	int componentNum; ///< The number of component to monitor
-} xpum_device_components_ratio_t;
-
-typedef struct
-{
-	uint32_t deviceId;
-	uint32_t processId;
-	double renderingEngineUtil;
-	double computeEngineUtil;
-	double copyEngineUtil;
-	double mediaEngineUtil;
-	double mediaEnhancementUtil;
-	uint64_t memSize;
-	uint64_t sharedMemSize;
-	char processName[XPUM_MAX_STR_LENGTH];
-} xpum_device_util_by_process_t;
-
-typedef struct xpum_device_performancefactor_t
-{
-	bool onSubdevice;
-	uint32_t subdeviceId;
-	double factor;
-	xpum_engine_type_flags_t engine;
-} xpum_device_performancefactor_t;
-
-typedef struct xpum_frequency_range_t
-{
-	xpum_frequency_type_t type;
-	uint32_t subdeviceId;
-	double min;
-	double max;
-} xpum_frequency_range_t;
-
-typedef struct xpum_scheduler_data_t
-{
-	bool onSubdevice;
-	uint32_t subdeviceId;
-	bool canControl;
-	xpum_scheduler_mode_t mode;
-	xpum_engine_type_flags_t engineTypes;
-	xpum_scheduler_mode_t supportedModes;
-	uint64_t val1;
-	uint64_t val2;
-} xpum_scheduler_data_t;
-typedef struct xpum_power_prop_data_t
-{
-	bool onSubdevice;
-	uint32_t subdeviceId;
-	bool canControl;
-	bool isEnergyThresholdSupported;
-	int32_t defaultLimit;
-	int32_t minLimit;
-	int32_t maxLimit;
-} xpum_power_prop_data_t;
-
-typedef struct xpum_scheduler_timeout_t
-{
-	uint32_t subdeviceId;
-	uint64_t watchdogTimeout;
-} xpum_scheduler_timeout_t;
-
-typedef struct xpum_scheduler_timeslice_t
-{
-	uint32_t subdeviceId;
-	uint64_t interval;
-	uint64_t yieldTimeout;
-} xpum_scheduler_timeslice_t;
-
-typedef struct xpum_scheduler_exclusive_t
-{
-	uint32_t subdeviceId;
-} xpum_scheduler_exclusive_t;
-
-typedef struct xpum_scheduler_debug_t
-{
-	uint32_t subdeviceId;
-} xpum_scheduler_debug_t;
-
-#define XPUM_MAX_CPU_LIST_LEN 512
-#define XPUM_MAX_CPU_S_LEN 128
-#define XPUM_MAX_PATH_LEN 256
-#define XPUM_MAX_XELINK_PORT 8
-
-typedef struct ParentSwitch
-{
-	char switchDevicePath[XPUM_MAX_PATH_LEN];
-} ParentSwitch;
-/**
- * @brief Struct to store topology data
- *
- */
-typedef struct xpum_topology_t
-{
-	xpum_device_id_t deviceId; ///< Device id
-	struct
-	{
-		char localCPUList[XPUM_MAX_CPU_LIST_LEN]; ///< CPU affinity, local CPU list
-		char localCPUs[XPUM_MAX_CPU_S_LEN];		  ///< CPU affinity, local CPUs
-	} cpuAffinity;
-	int switchCount; ///< the count of parent switch
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4200) // nonstandard extension used: zero-sized array in struct/union
-#endif
-	ParentSwitch switches[]; ///< device path of parent switch (C99 flexible array member)
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-} xpum_topology_t;
-
-typedef enum xpum_link_type_enum
-{
-	XPUM_LINK_UNKNOWN = 0,
-	XPUM_LINK_SELF = 1,
-	XPUM_LINK_MDF = 2,
-	XPUM_LINK_XE = 3,
-	XPUM_LINK_SYS = 4,
-	XPUM_LINK_NODE = 5,
-	XPUM_LINK_XE_TRANSMIT = 6
-} xpum_xelink_type_t;
-
-typedef struct XpumXelinkUnit
-{
-	xpum_device_id_t deviceId;
-	uint32_t subdeviceId;
-	uint32_t numaIdx;
-	bool onSubdevice;
-	char cpuAffinity[XPUM_MAX_CPU_LIST_LEN];
-} XpumXelinkUnit;
-
-typedef struct XpumXelinkTopoInfo
-{
-	XpumXelinkUnit localDevice;
-	XpumXelinkUnit remoteDevice;
-	xpum_xelink_type_t linkType;
-	uint8_t linkPorts[XPUM_MAX_XELINK_PORT];
-	int64_t maxBitRate;
-} XpumXelinkTopoInfo;
-
-typedef enum xpum_policy_type_enum
-{
-	XPUM_POLICY_TYPE_GPU_TEMPERATURE = 0,
-	XPUM_POLICY_TYPE_GPU_MEMORY_TEMPERATURE = 1,
-	XPUM_POLICY_TYPE_GPU_POWER = 2,
-	XPUM_POLICY_TYPE_RAS_ERROR_CAT_RESET = 3,
-	XPUM_POLICY_TYPE_RAS_ERROR_CAT_PROGRAMMING_ERRORS = 4,
-	XPUM_POLICY_TYPE_RAS_ERROR_CAT_DRIVER_ERRORS = 5,
-	XPUM_POLICY_TYPE_RAS_ERROR_CAT_CACHE_ERRORS_CORRECTABLE = 6,
-	XPUM_POLICY_TYPE_RAS_ERROR_CAT_CACHE_ERRORS_UNCORRECTABLE = 7,
-	XPUM_POLICY_TYPE_GPU_MISSING = 8,
-	XPUM_POLICY_TYPE_GPU_THROTTLE = 9,
-	XPUM_POLICY_TYPE_MAX
-} xpum_policy_type_t;
-
-typedef enum xpum_policy_conditon_type_enum
-{
-	XPUM_POLICY_CONDITION_TYPE_GREATER = 0,
-	XPUM_POLICY_CONDITION_TYPE_LESS = 1,
-	XPUM_POLICY_CONDITION_TYPE_WHEN_OCCUR = 2
-} xpum_policy_conditon_type_t;
-
-typedef struct xpum_policy_condition_t
-{
-	xpum_policy_conditon_type_t type;
-	uint64_t threshold;
-} xpum_policy_condition_t;
-
-typedef enum xpum_policy_action_type_enum
-{
-	XPUM_POLICY_ACTION_TYPE_NULL = 0,
-	XPUM_POLICY_ACTION_TYPE_THROTTLE_DEVICE = 1
-} xpum_policy_action_type_t;
-
-typedef struct xpum_policy_action_t
-{
-	xpum_policy_action_type_t type;
-	double throttleDeviceFrequencyMin;
-	double throttleDeviceFrequencyMax;
-} xpum_policy_action_t;
-
-typedef struct xpum_policy_notify_callback_para_t
-{
-	xpum_policy_type_t type;
-	xpum_policy_condition_t condition;
-	xpum_policy_action_t action;
-	xpum_device_id_t deviceId;
-	uint64_t timestamp;
-	uint64_t curValue;
-	bool isTileData;
-	int32_t tileId;
-	char notifyCallBackUrl[XPUM_MAX_STR_LENGTH];
-	char description[XPUM_MAX_STR_LENGTH];
-} xpum_policy_notify_callback_para_t;
-
-typedef void (*xpum_notify_callback_ptr_t)(
-	xpum_policy_notify_callback_para_t *); // return value for policy condition trigger and action
-typedef struct xpum_policy_t
-{
-	xpum_policy_type_t type;
-	xpum_policy_condition_t condition;
-	xpum_policy_action_t action;
-	xpum_notify_callback_ptr_t notifyCallBack;
-	char notifyCallBackUrl[XPUM_MAX_STR_LENGTH];
-	xpum_device_id_t deviceId; // Only for get policy api, ignored by set policy api.
-	bool isDeletePolicy; // Only for set policy api, ignored by get policy api. If true, then delete this policy in set
-						 // policy api.
-} xpum_policy_t;
-
-typedef enum xpum_dump_type_enum
-{
-	XPUM_DUMP_GPU_UTILIZATION = 0,
-	XPUM_DUMP_POWER = 1,
-	XPUM_DUMP_GPU_FREQUENCY = 2,
-	XPUM_DUMP_GPU_CORE_TEMPERATURE = 3,
-	XPUM_DUMP_MEMORY_TEMPERATURE = 4,
-	XPUM_DUMP_MEMORY_UTILIZATION = 5,
-	XPUM_DUMP_MEMORY_READ_THROUGHPUT = 6,
-	XPUM_DUMP_MEMORY_WRITE_THROUGHPUT = 7,
-	XPUM_DUMP_ENERGY = 8,
-	XPUM_DUMP_EU_ACTIVE = 9,
-	XPUM_DUMP_EU_STALL = 10,
-	XPUM_DUMP_EU_IDLE = 11,
-	XPUM_DUMP_RAS_ERROR_CAT_RESET = 12,
-	XPUM_DUMP_RAS_ERROR_CAT_PROGRAMMING_ERRORS = 13,
-	XPUM_DUMP_RAS_ERROR_CAT_DRIVER_ERRORS = 14,
-	XPUM_DUMP_RAS_ERROR_CAT_CACHE_ERRORS_CORRECTABLE = 15,
-	XPUM_DUMP_RAS_ERROR_CAT_CACHE_ERRORS_UNCORRECTABLE = 16,
-	XPUM_DUMP_MEMORY_BANDWIDTH = 17,
-	XPUM_DUMP_MEMORY_USED = 18,
-	XPUM_DUMP_PCIE_READ_THROUGHPUT = 19,
-	XPUM_DUMP_PCIE_WRITE_THROUGHPUT = 20,
-	XPUM_DUMP_COMPUTE_XE_LINK_THROUGHPUT = 21,
-	XPUM_DUMP_COMPUTE_ENGINE_UTILIZATION = 22,
-	XPUM_DUMP_RENDER_ENGINE_UTILIZATION = 23,
-	XPUM_DUMP_DECODE_ENGINE_UTILIZATION = 24,
-	XPUM_DUMP_ENCODE_ENGINE_UTILIZATION = 25,
-	XPUM_DUMP_COPY_ENGINE_UTILIZATION = 26,
-	XPUM_DUMP_MEDIA_ENHANCEMENT_ENGINE_UTILIZATION = 27,
-	XPUM_DUMP_3D_ENGINE_UTILIZATION = 28,
-	XPUM_DUMP_RAS_ERROR_CAT_NON_COMPUTE_ERRORS_CORRECTABLE = 29,
-	XPUM_DUMP_RAS_ERROR_CAT_NON_COMPUTE_ERRORS_UNCORRECTABLE = 30,
-	XPUM_DUMP_COMPUTE_ENGINE_GROUP_UTILIZATION = 31,
-	XPUM_DUMP_RENDER_ENGINE_GROUP_UTILIZATION = 32,
-	XPUM_DUMP_MEDIA_ENGINE_GROUP_UTILIZATION = 33,
-	XPUM_DUMP_COPY_ENGINE_GROUP_UTILIZATION = 34,
-	XPUM_DUMP_FREQUENCY_THROTTLE_REASON_GPU = 35,
-	XPUM_DUMP_MEDIA_ENGINE_FREQUENCY = 36,
-	XPUM_DUMP_MAX
-} xpum_dump_type_t;
-
-typedef struct xpum_dump_raw_data_option_t
-{
-	bool showDate; ///< Show date or not in the timestamp
-} xpum_dump_raw_data_option_t;
-
-/**
- * @brief dump raw data task structure
- *
- */
-typedef struct xpum_dump_raw_data_task_t
-{
-	xpum_dump_task_id_t taskId;					  ///< Task id of the task
-	xpum_device_id_t deviceId;					  ///< device id
-	xpum_device_tile_id_t tileId;				  ///< tile id, when it is -1, means dumping device level data
-	xpum_dump_type_t dumpTypeList[XPUM_DUMP_MAX]; ///< data types to dump
-	int count;									  ///< The count of entries in metricsTypeList
-	uint64_t beginTime;							  ///< The begin time of the task
-	char dumpFilePath[XPUM_MAX_STR_LENGTH];		  ///< The dump file path
-} xpum_dump_raw_data_task_t;
-
-typedef struct
-{
-	int amcIndex;						  ///< Device index
-	double value;						  ///< Sensor reading value
-	double sensorLow;					  ///< Sensor low bound
-	double sensorHigh;					  ///< Sensor high bound
-	char sensorName[XPUM_MAX_STR_LENGTH]; ///< Sensor name
-	char sensorUnit[XPUM_MAX_STR_LENGTH]; ///< Sensor reading unit
-} xpum_sensor_reading_t;
-
-typedef struct xpum_vgpu_precheck_result_t
-{
-	bool vmxFlag;							///< VMX flag
-	bool iommuStatus;						///< IOMMU status flag
-	bool sriovStatus;						///< SR-IOV status flag
-	char vmxMessage[XPUM_MAX_STR_LENGTH];	///< Message of VMX flag checking
-	char iommuMessage[XPUM_MAX_STR_LENGTH]; ///< Message of IOMMU status checking
-	char sriovMessage[XPUM_MAX_STR_LENGTH]; ///< Message of SR-IOV status checking
-} xpum_vgpu_precheck_result_t;
-
-typedef struct xpum_vgpu_config_t
-{
-	uint32_t numVfs;	///< Number of vGPU to be create
-	uint64_t lmemPerVf; ///< Local memory per vGPU (in bytes), if set to 0 then apply the configuration file to allocate
-						///< local memory for vGPUs
-} xpum_vgpu_config_t;
-
-typedef struct xpum_vgpu_function_info_t
-{
-	char bdfAddress[XPUM_MAX_STR_LENGTH];	  ///< BDF address of the function
-	xpum_device_function_type_t functionType; ///< Physical function or virtual function
-	uint64_t lmemSize;						  ///< The size of local memory of the function
-	xpum_device_id_t deviceId;				  ///< Device ID of the function
-} xpum_vgpu_function_info_t;
-
-#define XPUM_MAX_VF_NUM 128
-
-typedef struct XpumPrecheckOptions
-{
-	bool onlyGPU;		   ///< Check GPU-related error and ignore CPU error or not
-	const char *sinceTime; ///< Start time for log scanning. Only works when the logSource is JOURNALCTL. Scanning would
-						   ///< start from the latest boot if it is NULL. The generic format is "YYYY-MM-DD HH:MM:SS".
-						   ///< Alternatively the strings "yesterday", "today" are also understood. Relative times also
-						   ///< may be specified, prefixed with "-" referring to times before the current time.
-} XpumPrecheckOptions;
-
-typedef enum xpum_precheck_error_category_t
-{
-	XPUM_PRECHECK_ERROR_CATEGORY_HARDWARE = 0,
-	XPUM_PRECHECK_ERROR_CATEGORY_KMD = 1,
-	XPUM_PRECHECK_ERROR_CATEGORY_UMD = 2
-} xpum_precheck_error_category_t;
-
-typedef enum xpum_precheck_error_severity_t
-{
-	XPUM_PRECHECK_ERROR_SEVERITY_CRITICAL = 0,
-	XPUM_PRECHECK_ERROR_SEVERITY_HIGH = 1,
-	XPUM_PRECHECK_ERROR_SEVERITY_MEDIUM = 2,
-	XPUM_PRECHECK_ERROR_SEVERITY_LOW = 3
-} xpum_precheck_error_severity_t;
-
-typedef enum xpum_precheck_error_type_t
-{
-	XPUM_GUC_NOT_RUNNING = 1,
-	XPUM_GUC_ERROR = 2,
-	XPUM_GUC_INITIALIZATION_FAILED = 3,
-	XPUM_IOMMU_CATASTROPHIC_ERROR = 4,
-	XPUM_LMEM_NOT_INITIALIZED_BY_FIRMWARE = 5,
-	XPUM_PCIE_ERROR = 6,
-	XPUM_DRM_ERROR = 7,
-	XPUM_GPU_HANG = 8,
-	XPUM_I915_ERROR = 9,
-	XPUM_I915_NOT_LOADED = 10,
-	XPUM_LEVEL_ZERO_INIT_ERROR = 11,
-	XPUM_HUC_DISABLED = 12,
-	XPUM_HUC_NOT_RUNNING = 13,
-	XPUM_LEVEL_ZERO_METRICS_INIT_ERROR = 14,
-	XPUM_MEMORY_ERROR = 15,
-	XPUM_GPU_INITIALIZATION_FAILED = 16,
-	XPUM_MEI_ERROR = 17,
-	XPUM_XE_ERROR = 18,
-	XPUM_XE_NOT_LOADED = 19,
-} xpum_precheck_error_type_t;
-
-typedef struct xpum_precheck_error_t
-{
-	uint32_t errorId;
-	xpum_precheck_error_type_t errorType;
-	xpum_precheck_error_category_t errorCategory;
-	xpum_precheck_error_severity_t errorSeverity;
-} xpum_precheck_error_t;
-
-typedef enum xpum_precheck_component_type_t
-{
-	XPUM_PRECHECK_COMPONENT_TYPE_DRIVER = 0,
-	XPUM_PRECHECK_COMPONENT_TYPE_CPU = 1,
-	XPUM_PRECHECK_COMPONENT_TYPE_GPU = 2,
-} xpum_precheck_component_type_t;
-
-typedef enum xpum_precheck_component_status_t
-{
-	XPUM_PRECHECK_COMPONENT_STATUS_UNKNOWN = 0,
-	XPUM_PRECHECK_COMPONENT_STATUS_PASS = 1,
-	XPUM_PRECHECK_COMPONENT_STATUS_FAIL = 2,
-} xpum_precheck_component_status_t;
-
-typedef struct xpum_precheck_component_info_t
-{
-	xpum_precheck_component_type_t componentType;
-	char bdf[XPUM_MAX_STR_LENGTH]; // for GPU and Driver
-	int32_t cpuId;				   // only for CPU
-	xpum_precheck_component_status_t status;
-	char time[XPUM_MAX_STR_LENGTH];
-	int32_t errorId; // for GPU and Driver
-	xpum_precheck_error_category_t errorCategory;
-	xpum_precheck_error_severity_t errorSeverity;
-	char errorDetail[XPUM_MAX_STR_LENGTH];
-} xpum_precheck_component_info_t;
-
-#if defined(__cplusplus)
-} // extern "C"
-#endif
-
-#endif // XPUM_STRUCTS_H
diff --git a/ial/cli/cli.cpp b/ial/cli/cli.cpp
index f65290654..779d0b028 100644
--- a/ial/cli/cli.cpp
+++ b/ial/cli/cli.cpp
@@ -4,61 +4,33 @@
  *
  */
 
-#include "cli.h"
+#include "parser/default_parser.h"
 #include "version.h"
-#include <cmd_agentset.h>
 #include <cmd_amc.h>
-#include <cmd_listgpu.h>
+#include <cmd_listpciinfo.h>
 #include <cmd_config.h>
-#include <cmd_diag.h>
 #include <cmd_discovery.h>
 #include <cmd_dump.h>
-#include <cmd_group.h>
 #include <cmd_health.h>
 #include <cmd_log.h>
-#include <cmd_policy.h>
 #include <cmd_ps.h>
 #include <cmd_stats.h>
-#include <cmd_topdown.h>
 #include <cmd_topology.h>
 #include <cmd_updatefw.h>
 #include <cmd_vgpu.h>
-#include <cmd_smi.h>
 #include <debug.h>
-#include <functional>
 #include <iostream>
-#include <list>
 #include <memory>
 #include <os.h>
+#include <string>
+#include <vector>
+#include <format>
+#include "logger/filestream_sink.h"
+#include "logger/logger.h"
+#include <string>
 #include <vector>
 #include <format>
-#ifdef DAEMONMODE
-DAEMONCAP curDaemonMode = DAEMON;
-std::string progName = "xpumcli";
-#else
-DAEMONCAP curDaemonMode = DAEMONLESS;
 std::string progName = "xpu-smi";
-#endif
-
-/**
- * @brief Creates an instance of a command class
- * @tparam T The command class type to instantiate
- * @return A pointer to the newly created command instance
- */
-template <typename T> cmds *createInstance() { return new T(); }
-
-/**
- * @brief Deletes all elements in a list of pointers and the list itself
- * @tparam T The type of objects in the list
- * @param genericList The list of pointers to delete
- */
-template <typename T> void deleteList(std::list<T *> *genericList)
-{
-	for (auto &it : *genericList) {
-		delete it;
-	}
-	delete genericList;
-}
 
 /**
  * @brief Prints the version information for both CLI and service components
@@ -83,68 +55,36 @@ void printVersion(arg_struct *arg)
  * @brief Prints all available subcommands with short help text
  * @param cmdList List of command objects to display
  */
-void printSubCommands(std::list<cmds *> *cmdList)
+void printSubCommands(const std::vector<std::unique_ptr<cmds>> &cmdList)
 {
-	for (const auto &it : *cmdList) {
-		it->help(SHORT_HELP);
+	for (const auto &cmd : cmdList) {
+		cmd->help(SHORT_HELP);
 	}
 }
 
 /**
  * @brief Displays help information for daemon mode (xpumcli)
  */
-void helpcli()
-{
-	const std::string shortVersion = std::format("v{}.{}", MAJOR, MINOR);
-	PRINT("Intel XPU Manager Command Line Interface -- {}\n", shortVersion.c_str());
-	PRINT("Intel XPU Manager Command Line Interface provides the Intel data center GPU model and monitoring "
-		  "capabilities.\n");
-	PRINT("It can also be used to change the Intel data center GPU settings and update the firmware.\n");
-	PRINT("Intel XPU Manager is based on Intel oneAPI Level Zero. Before using Intel XPU Manager,\n");
-	PRINT("the GPU driver and Intel oneAPI Level Zero should be correctly installed.\n\n");
-}
 
-/**
- * @brief Displays help information for daemonless mode (xpu-smi)
- */
-void helpsmi()
+// ---- Shared command table -----------------------------------------------
+// Both parsers delegate here initially; each overrides commandTable() when
+// they need a different command set.
+std::vector<function_entry> defaultCommandTable()
 {
-	const std::string shortVersion = std::format("v{}.{}", MAJOR, MINOR);
-	PRINT("Intel XPU System Management Interface -- {}\n", shortVersion.c_str());
-	PRINT("Intel XPU System Management Interface provides the Intel data center GPU model."
-		  " It can also be used to update the firmware.\n");
-	PRINT("Intel XPU System Management Interface is based on Intel oneAPI Level Zero.\n");
-	PRINT("Before using Intel XPU System Management Interface, the GPU driver and Intel "
-		  "oneAPI Level Zero should be correctly installed.\n\n");
-}
-
-/**
- * @brief Displays comprehensive help information including usage, options, and subcommands
- * @param cmdList List of command objects to include in help output
- */
-void help(std::list<cmds *> *cmdList)
-{
-	if (curDaemonMode == DAEMONCAP::DAEMON) {
-		helpcli();
-	} else {
-		helpsmi();
-	}
-
-	PRINT("Supported devices:\n");
-	PRINT(" - Intel Arc B series GPU\n\n");
-
-	PRINT("Usage: {} [Options]\n", progName.c_str());
-	PRINT("  {} -v\n", progName.c_str());
-	PRINT("  {} -h\n", progName.c_str());
-	PRINT("  {} help\n", progName.c_str());
-	PRINT("  {} discovery\n\n", progName.c_str());
-
-	PRINT("Options:\n");
-	PRINT("  -h,--help                   Print this help message and exit\n");
-	PRINT("  -v,--version                Display version information and exit\n\n");
-
-	PRINT("Subcommands:\n");
-	printSubCommands(cmdList);
+	return {
+		{.createFunc = createInstance<cmdDiscovery>, .osType = OSTYPE::BOTH},
+		{.createFunc = createInstance<cmdTopology>, .osType = OSTYPE::BOTH},
+		{.createFunc = createInstance<cmdUpdateFW>, .osType = OSTYPE::BOTH},
+		{.createFunc = createInstance<cmdConfig>, .osType = OSTYPE::BOTH},
+		{.createFunc = createInstance<cmdPs>, .osType = OSTYPE::LINUX},
+		{.createFunc = createInstance<cmdVgpu>, .osType = OSTYPE::LINUX},
+		{.createFunc = createInstance<cmdStats>, .osType = OSTYPE::BOTH},
+		{.createFunc = createInstance<cmdDump>, .osType = OSTYPE::BOTH},
+		{.createFunc = createInstance<cmdLogs>, .osType = OSTYPE::LINUX},
+		{.createFunc = createInstance<cmdHealth>, .osType = OSTYPE::LINUX},
+		{.createFunc = createInstance<cmdAmc>, .osType = OSTYPE::LINUX},
+		{.createFunc = createInstance<cmdListpciinfo>, .osType = OSTYPE::LINUX},
+	};
 }
 
 /**
@@ -172,22 +112,15 @@ void setPrintLvl(arg_struct *arg, LogLevel lvl)
 int main(int argc, char *argv[])
 {
 	TRACING();
-	bool found = false;
 	arg_struct arg;
-	LogLevel dbglvl;
+	LogLevel dbglvl = getDbgLvl();
 	bool priv = PRIVILEGECHECK();
 	UNUSED_VAR(priv);
 
-	// Get current debug level
-	dbglvl = getDbgLvl();
-
-	// If we are in < debug mode, set the debug level to NO_PRINT.
-	// That's because we don't want to see all the sysman initialization messages in release mode
 	if (dbglvl < LogLevel::DBG) {
 		setPrintLvl(&arg, LogLevel::NO_PRINT);
 	}
 
-	// Create sysman driver instance
 	ze_result_t result = arg.sm.init();
 	switch (result) {
 	case ZE_RESULT_SUCCESS:
@@ -196,108 +129,26 @@ int main(int argc, char *argv[])
 	default:
 		PRINT("Sysman driver initialization failed.\n");
 		return -1;
-		break;
 	}
 
-	// Set the debug level back to the original value
 	setPrintLvl(&arg, dbglvl);
 
-	/* Create a list of commands */
-	std::list<cmds *> *cmdList = new std::list<cmds *>;
-
-	std::vector<function_entry> functionTable = {
-		{createInstance<cmdDiscovery>, DAEMONCAP::BOTH, OSTYPE::BOTH},
-		{createInstance<cmdTopology>, DAEMONCAP::BOTH, OSTYPE::BOTH},
-		{createInstance<cmdDiag>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-		{createInstance<cmdHealth>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-		{createInstance<cmdUpdateFW>, DAEMONCAP::BOTH, OSTYPE::BOTH},
-		{createInstance<cmdConfig>, DAEMONCAP::BOTH, OSTYPE::BOTH},
-		{createInstance<cmdPs>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-		{createInstance<cmdVgpu>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-		{createInstance<cmdStats>, DAEMONCAP::BOTH, OSTYPE::BOTH},
-		{createInstance<cmdDump>, DAEMONCAP::BOTH, OSTYPE::BOTH},
-		{createInstance<cmdLogs>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-		{createInstance<cmdGroup>, DAEMONCAP::DAEMON, OSTYPE::LINUX},
-		{createInstance<cmdPolicy>, DAEMONCAP::DAEMON, OSTYPE::LINUX},
-		{createInstance<cmdTopdown>, DAEMONCAP::DAEMON, OSTYPE::LINUX},
-		{createInstance<cmdAgentSet>, DAEMONCAP::DAEMON, OSTYPE::LINUX},
-		{createInstance<cmdAmc>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-		{createInstance<cmdListgpu>, DAEMONCAP::BOTH, OSTYPE::LINUX},
-	};
+	const OSTYPE currentOS = is_windows ? OSTYPE::WINDOWS : OSTYPE::LINUX;
+	/* Detect "compat" subparser prefix: xpu-smi compat <subcommand> [args...]
+	 * Shift argv left to strip "compat" so the parser sees a normal argv. */
+	if (argc >= 2 && std::string_view{argv[1]} == "compat") {
+		PRINT("compat is currently unimplemented");
+		return 1;
+	}
 
-	OSTYPE currentOS = is_windows ? OSTYPE::WINDOWS : OSTYPE::LINUX;
-	DBG("Is Daemon mode: {}\n", (curDaemonMode == DAEMONCAP::DAEMON) ? "true" : "false");
 	arg.argc = argc;
 	arg.argv = argv;
+	DefaultParser parser;
 
-	for (const auto &entry : functionTable) {
-		if ((entry.osType == OSTYPE::BOTH || entry.osType == currentOS) &&
-			(entry.daemonCap == DAEMONCAP::BOTH || entry.daemonCap == curDaemonMode)) {
-			/* Create an instance of the command and add it to the list */
-			cmds *cmd = entry.createFunc();
-			DBG("Adding {} to command list\n", cmd->getName());
-			cmdList->push_back(cmd);
-		}
-	}
-
-	/* If no command line args are provided, show GPU status in xpu-smi style,
-	 * or fall back to help text in daemon (xpumcli) mode. */
-	if (argc == 1) {
-		if (curDaemonMode == DAEMONCAP::DAEMONLESS) {
-			cmdSmi smi;
-			smi.run(&arg);
-		} else {
-			help(cmdList);
-		}
-		deleteList(cmdList);
-		return 0;
-	}
-
-	/* Print top-level help if -h, --help, or help is specified */
-	if (!STRCASECMP(argv[1], "-h") || !STRCASECMP(argv[1], "--help") || !STRCASECMP(argv[1], "help")) {
-		if (argc > 2) {
-			PRINT("The following argument was not expected: '{}'.\n", argv[2]);
-			help(cmdList);
-			deleteList(cmdList);
-			return 1;
-		}
-		help(cmdList);
-		deleteList(cmdList);
-		return 0;
-	}
-
-	/* Print out version info if -v command line arg specified */
-	if (!STRCASECMP(argv[1], "-v") || !STRCASECMP(argv[1], "--version")) {
-		printVersion(&arg);
-		deleteList(cmdList);
-		return 0;
-	}
-
-	int exitCode = 0;
-
-	/* Parse command line and run the command that the user wants */
-	for (const auto &it : *cmdList) {
-		if (!STRCASECMP(it->getName(), argv[1])) {
-			/* If the second argument is -h or --help, then just print their help */
-			if (argc > 2 && (!STRCASECMP(argv[2], "-h") || !STRCASECMP(argv[2], "--help"))) {
-				it->help(FULL_HELP);
-				deleteList(cmdList);
-				return 0;
-			}
-			/* Run the command and capture the return code */
-			exitCode = (it->run(&arg) != 0) ? 1 : 0;
-			found = true;
-			/* Exit the loop once the command is found */
-			break;
-		}
-	}
-
-	/* If we can't parse the user's command line, then print help and signal error */
-	if (!found) {
-		help(cmdList);
-		exitCode = 1;
-	}
+	// Configure file logging for DefaultParser if -f/--file option was provided
+	// Note: the logFilePath will be set during handleTopLevel() in runCli(),
+	// but we need a hook to configure the sink after parsing.
+	// For now, we'll configure it in the commands themselves if they need it.
 
-	deleteList(cmdList);
-	return exitCode;
+	return runCli(parser, &arg, currentOS);
 }
diff --git a/ial/cli/cli.h b/ial/cli/cli.h
index 3990ffc40..d72503d6f 100644
--- a/ial/cli/cli.h
+++ b/ial/cli/cli.h
@@ -8,22 +8,19 @@
 #define _CLI_H
 
 #include <cmds.h>
-#include <functional>
+#include <memory>
 
-// Enum to represent OS types
 enum class OSTYPE
 {
 	WINDOWS,
 	LINUX,
-	BOTH,
+	BOTH
 };
 
-/* Structure to hold function and OS type */
 struct function_entry
 {
-	std::function<cmds *()> createFunc;
-	DAEMONCAP daemonCap;
-	OSTYPE osType;
+	std::unique_ptr<cmds> (*createFunc)(); // factory: returns a new command instance
+	OSTYPE osType;						   // LINUX, WINDOWS, or BOTH
 };
 
 #endif
diff --git a/ial/cli/meson.build b/ial/cli/meson.build
index 69688119e..589e1cc88 100644
--- a/ial/cli/meson.build
+++ b/ial/cli/meson.build
@@ -3,8 +3,9 @@
 
 # IAL CLI build
 cli_sources = files(
-    'cli.cpp',
-    '../../hal/core/debug.cpp',
+  '../../hal/core/debug.cpp',
+  'parser/default_parser.cpp',
+  'cli.cpp',
 )
 
 cli_inc = include_directories('.')
@@ -12,11 +13,12 @@ cli_inc = include_directories('.')
 # CLI dependencies
 cli_deps = [
   libxpum_dep,
-  oal_dep, 
+  oal_dep,
   ial_cmn_dep,
   levelzero_dep,
   igsc_dep,
-  nlohmann_json_dep
+  nlohmann_json_dep,
+  cli11_dep,
 ]
 
 if is_linux
@@ -24,19 +26,19 @@ if is_linux
 endif
 
 # xpu-smi executable (SMI mode)
-xpu_smi_exe = executable('xpu-smi',
+xpu_smi_exe = executable(
+  'xpu-smi',
   cli_sources,
-  include_directories : [
+  include_directories: [
     global_inc,
     cli_inc,
     oal_inc_dirs,
     include_directories('../cmn'),
     include_directories('../../hal/core'),
-    include_directories('../../hal/fwupd')
+    include_directories('../../hal/fwupd'),
   ],
-  dependencies : cli_deps + windows_deps,
-  link_args : is_linux ? ['-pie'] : [],
-  install : true,
-  install_dir : get_option('bindir')
-)
-
+  dependencies: cli_deps + windows_deps,
+  link_args: is_linux ? ['-pie'] : [],
+  install: true,
+  install_dir: get_option('bindir'),
+)
\ No newline at end of file
diff --git a/ial/cli/parser/cli_parser.h b/ial/cli/parser/cli_parser.h
new file mode 100644
index 000000000..1a0fc40ef
--- /dev/null
+++ b/ial/cli/parser/cli_parser.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef _CLI_PARSER_H
+#define _CLI_PARSER_H
+
+#include "../cli.h"
+#include <debug.h>
+#include <algorithm>
+#include <memory>
+#include <optional>
+#include <ranges>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <vector>
+
+// Forward-declare shared utilities defined in cli.cpp.
+void printSubCommands(const std::vector<std::unique_ptr<cmds>> &cmdList);
+void printVersion(arg_struct *arg);
+std::vector<function_entry> defaultCommandTable();
+
+template <typename T> std::unique_ptr<cmds> createInstance() { return std::make_unique<T>(); }
+
+// ---- CliParser concept --------------------------------------------------
+// Defines the minimal interface each CLI parser variant must satisfy.
+// Parsers are independent types — no inheritance required.
+//
+// Prefer concepts over CRTP here: parsers are open/independent structs;
+// the interface is visible in one place; misimplementations produce clean
+// static_assert messages rather than deep template instantiation noise.
+template <typename P>
+concept CliParser = requires(P &parser, arg_struct *args, const std::vector<std::unique_ptr<cmds>> &cmdList) {
+	// Display name forwarded to the global progName (used by command help text)
+	{ parser.progName() } -> std::convertible_to<std::string_view>;
+	// Banner paragraph printed at the top of full --help output
+	{ parser.printBanner() } -> std::same_as<void>;
+	// Ordered list of commands this parser exposes (may differ per parser)
+	{ parser.commandTable() } -> std::same_as<std::vector<function_entry>>;
+	// Handle args that are not subcommand names (-h, --help, -v, "help", no-arg default).
+	// Returns exit code if the argument was consumed; std::nullopt to fall through to dispatch.
+	{ parser.handleTopLevel(args, cmdList) } -> std::same_as<std::optional<int>>;
+	// Extra option lines appended to the Options section of full help output.
+	{ parser.printExtraOptions() } -> std::same_as<void>;
+};
+
+// ---- Shared: build cmdList + dispatchMap --------------------------------
+template <CliParser P> auto buildDispatch(P &parser, OSTYPE currentOS)
+{
+	std::vector<std::unique_ptr<cmds>> cmdList;
+	std::unordered_map<std::string_view, cmds *> dispatchMap;
+	const auto table = parser.commandTable();
+	dispatchMap.reserve(table.size() * 2);
+
+	for (const auto &entry : table) {
+		if (entry.osType == OSTYPE::BOTH || entry.osType == currentOS) {
+			auto cmd = entry.createFunc();
+			dispatchMap.emplace(cmd->getName(), cmd.get());
+			cmdList.push_back(std::move(cmd));
+		}
+	}
+	return std::pair{std::move(cmdList), std::move(dispatchMap)};
+}
+
+// ---- Shared: full help output -------------------------------------------
+// Called by handleTopLevel implementations and by runCli on unknown subcommands.
+template <CliParser P> void printFullHelp(P &parser, const std::vector<std::unique_ptr<cmds>> &cmdList)
+{
+	parser.printBanner();
+	PRINT("Supported devices:\n");
+	PRINT(" - Intel Arc B series GPU\n\n");
+
+	const std::string name{parser.progName()};
+	PRINT("Usage: {} [Options]\n", name);
+	PRINT("  {} -v\n", name);
+	PRINT("  {} -h\n", name);
+	PRINT("  {} help\n", name);
+	PRINT("  {} discovery\n\n", name);
+
+	PRINT("Options:\n");
+	PRINT("  -h,--help                   Print this help message and exit\n");
+	PRINT("  -v,--version                Display version information and exit\n");
+	parser.printExtraOptions();
+	PRINT("\n");
+
+	PRINT("Subcommands:\n");
+	printSubCommands(cmdList);
+}
+
+// ---- Shared: full dispatch loop -----------------------------------------
+// All parser variants share this loop. The only runtime variation is in
+// handleTopLevel() and commandTable(), which each parser implements itself.
+template <CliParser P> int runCli(P &parser, arg_struct *args, OSTYPE currentOS)
+{
+	// Keep the global in sync so command help text uses the right name.
+	progName = std::string{parser.progName()};
+
+	auto [cmdList, dispatchMap] = buildDispatch(parser, currentOS);
+
+	// Let the parser handle flags, "help" keyword, and no-arg default.
+	if (auto rc = parser.handleTopLevel(args, cmdList); rc.has_value()) {
+		return *rc;
+	}
+
+	// Normalize to lowercase; alias keys are stored lowercase.
+	std::string subcmd{args->argv[1]};
+	std::ranges::transform(subcmd, subcmd.begin(), [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+
+	if (auto match = dispatchMap.find(subcmd); match != dispatchMap.end()) {
+		// A known subcommand ran but failed: rc 1 (runtime/command error).
+		return (match->second->run(args) != 0) ? 1 : 0;
+	}
+
+	// Unknown subcommand — emit a clear diagnostic, then show the full help so
+	// removed or mistyped subcommands fail loudly with a non-zero exit code
+	// instead of silently printing help with a success-ish exit code.
+	//
+	// This uses PRINT (stdout), not ERR (stderr), on purpose: the diagnostic is
+	// printed immediately above the full usage help, which is user-facing stdout
+	// output, so the two belong on the same stream.
+	//
+	// rc 2 (not 1) distinguishes a *usage* error — the input was never a valid
+	// command — from rc 1 above, where a valid command ran and failed. This
+	// matches the conventional shell meaning of exit code 2 (misuse / bad
+	// invocation, as used by CLI11, argparse, getopt) and lets scripts tell the
+	// two apart.
+	PRINT("'{}' is not a valid subcommand.\n\n", subcmd);
+	printFullHelp(parser, cmdList);
+	return 2;
+}
+
+#endif // _CLI_PARSER_H
diff --git a/ial/cli/parser/default_parser.cpp b/ial/cli/parser/default_parser.cpp
new file mode 100644
index 000000000..c6924f3b0
--- /dev/null
+++ b/ial/cli/parser/default_parser.cpp
@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "default_parser.h"
+#include "../version.h"
+#include "logger/logger.h"
+#include "logger/filestream_sink.h"
+#include "cli.h"
+#include "parser/cli_parser.h"
+#include "cmds.h"
+#include "os.h"
+#include <CLI/App.hpp>
+#include <CLI/Error.hpp>
+#include <algorithm>
+#include <cmd_smi.h>
+#include <cmd_dump.h>
+#include <array>
+#include <charconv>
+#include <exception>
+#include <format>
+#include <ios>
+#include <optional>
+#include <memory>
+#include <ranges>
+#include <string>
+#include <string_view>
+#include <system_error>
+#include <vector>
+
+// ---- Implementation helpers -----------------------------------------------
+
+namespace {
+
+// Pre-extracted top-level arguments (stripped before CLI11 parsing).
+struct PreArgs
+{
+	bool queryGpuFlag = false;
+	std::string queryGpu;
+	std::string deviceSpec;
+	std::string displayType;
+	std::string loopStr;
+	std::string countStr;
+	std::string logFilePath;
+	bool loopInMs = false;
+};
+
+// Declarative flag specification for pre-extraction.
+struct FlagSpec
+{
+	std::string_view longName;	// "--flag"; equals form ("--flag=value") is derived at match time
+	std::string_view shortFlag; // "-f" short alias, or empty to disable
+	std::string *value;			// receives the extracted value (always non-null)
+	std::optional<std::reference_wrapper<bool>> matchedFlag; // set to true when matched; nullopt = unused
+	std::string_view defaultIfBare; // stored when flag has no trailing argument; empty = disallow bare
+};
+
+// Try to extract one flag from argv[i], advancing i if the value is space-separated.
+bool tryExtractFlag(const FlagSpec &spec, std::string_view a, int &i, int argc, char **argv)
+{
+	// --flag=value inline form (equals sign immediately after the flag name)
+	if (a.size() > spec.longName.size() && a.starts_with(spec.longName) && a[spec.longName.size()] == '=') {
+		*spec.value = a.substr(spec.longName.size() + 1);
+		if (spec.matchedFlag) {
+			spec.matchedFlag->get() = true;
+		}
+		return true;
+	}
+	// -fVALUE or -f=VALUE short-flag inline form
+	if (!spec.shortFlag.empty() && a.starts_with(spec.shortFlag) && a.size() > spec.shortFlag.size()) {
+		auto val = a.substr(spec.shortFlag.size());
+		if (val.starts_with('=')) {
+			val.remove_prefix(1);
+		}
+		*spec.value = std::string{val};
+		if (spec.matchedFlag) {
+			spec.matchedFlag->get() = true;
+		}
+		return true;
+	}
+	// --flag value or -f value (space-separated next token), or bare --flag
+	if (a == spec.longName || (!spec.shortFlag.empty() && a == spec.shortFlag)) {
+		if (i + 1 < argc) {
+			*spec.value = argv[++i];
+		} else if (!spec.defaultIfBare.empty()) {
+			*spec.value = std::string{spec.defaultIfBare};
+		} else {
+			return false;
+		}
+		if (spec.matchedFlag) {
+			spec.matchedFlag->get() = true;
+		}
+		return true;
+	}
+	return false;
+}
+
+// Scan argv and extract flags that CLI11 can't handle cleanly, returning the
+// remaining arguments for CLI11 to parse.
+//
+// Pre-extraction is needed for:
+//   - --loop-ms: multi-char short flag that CLI11 rejects
+//   - --query-gpu: optional-value flag (bare --query-gpu + -d POWER is valid)
+//   - top-level flags that share names with subcommand flags (--id, --display, etc.)
+//
+// Only long-form options are supported in v2.0 (short aliases removed except -f).
+std::pair<PreArgs, std::vector<std::string>> extractPreArgs(arg_struct *args)
+{
+	PreArgs pre;
+	const auto flagSpecs = std::to_array<FlagSpec>({
+		{.longName = "--id",
+		 .shortFlag = "",
+		 .value = &pre.deviceSpec,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = ""},
+		{.longName = "--device",
+		 .shortFlag = "",
+		 .value = &pre.deviceSpec,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = ""},
+		{.longName = "--display",
+		 .shortFlag = "",
+		 .value = &pre.displayType,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = ""},
+		{.longName = "--metrics",
+		 .shortFlag = "",
+		 .value = &pre.displayType,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = ""},
+		{.longName = "--loop-ms",
+		 .shortFlag = "",
+		 .value = &pre.loopStr,
+		 .matchedFlag = std::ref(pre.loopInMs),
+		 .defaultIfBare = ""},
+		{.longName = "--loop",
+		 .shortFlag = "",
+		 .value = &pre.loopStr,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = "1"},
+		{.longName = "--count",
+		 .shortFlag = "",
+		 .value = &pre.countStr,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = ""},
+		{.longName = "--file",
+		 .shortFlag = "-f",
+		 .value = &pre.logFilePath,
+		 .matchedFlag = std::nullopt,
+		 .defaultIfBare = ""},
+	});
+
+	std::vector<std::string> argvVec;
+	constexpr std::string_view queryGpuEqPrefix = "--query-gpu=";
+	for (int i = 1; i < args->argc; ++i) {
+		const std::string_view a{args->argv[i]};
+		if (a.starts_with(queryGpuEqPrefix)) {
+			pre.queryGpuFlag = true;
+			pre.queryGpu = std::string{a.substr(queryGpuEqPrefix.size())};
+			continue;
+		}
+		if (a == "--query-gpu") {
+			pre.queryGpuFlag = true;
+			if (i + 1 < args->argc && args->argv[i + 1][0] != '-') {
+				pre.queryGpu = args->argv[++i];
+			}
+			continue;
+		}
+		if (std::ranges::any_of(
+				flagSpecs, [&](const FlagSpec &spec) { return tryExtractFlag(spec, a, i, args->argc, args->argv); })) {
+			continue;
+		}
+		argvVec.emplace_back(a);
+	}
+	return {pre, argvVec};
+}
+
+// Configure file logging from the given path. Noop if path is empty.
+void configureFileLogging(const std::string &logFilePath)
+{
+	if (logFilePath.empty()) {
+		return;
+	}
+	try {
+		auto fileSink =
+			std::make_shared<FileStreamSink>(logFilePath, FileStreamSinkConfig{.openMode = std::ios::trunc});
+		Logger::instance().setSink(fileSink);
+	} catch (const std::exception &) {
+		PRINT("Warning: Failed to open log file '{}'", logFilePath);
+	}
+}
+
+// Build a QueryFormat from pre-extracted arguments and the --format string.
+QueryFormat buildQueryFormat(const PreArgs &pre, const std::string &formatStr)
+{
+	QueryFormat fmt{};
+	for (const auto word : std::string_view{formatStr} | std::views::split(',')) {
+		const std::string_view tok{word.begin(), word.end()};
+		if (tok == "noheader") {
+			fmt.noheader = true;
+		}
+		if (tok == "nounits" || tok == "nounit") {
+			fmt.nounits = true;
+		}
+	}
+	constexpr int msPerSecond = 1000;
+	if (!pre.loopStr.empty()) {
+		int intervalSec = 1;
+		if (std::from_chars(pre.loopStr.data(), pre.loopStr.data() + pre.loopStr.size(), intervalSec).ec !=
+				std::errc{} ||
+			intervalSec <= 0) {
+			intervalSec = 1;
+		}
+		fmt.loopMs = pre.loopInMs ? intervalSec : intervalSec * msPerSecond;
+	}
+	if (!pre.countStr.empty()) {
+		int iterations = 0;
+		if (std::from_chars(pre.countStr.data(), pre.countStr.data() + pre.countStr.size(), iterations).ec ==
+			std::errc{}) {
+			fmt.count = iterations;
+		}
+	}
+	return fmt;
+}
+
+} // namespace
+
+// ---- DefaultParser ----------------------------------------------------------
+
+std::string_view DefaultParser::progName() { return "xpu-smi"; }
+
+void DefaultParser::printBanner()
+{
+	const std::string shortVersion = std::format("v{}.{}", MAJOR, MINOR);
+	PRINT("Intel XPU System Management Interface -- {}\n", shortVersion.c_str());
+	PRINT("Intel XPU System Management Interface provides the Intel data center GPU model."
+		  " It can also be used to update the firmware.\n");
+	PRINT("Intel XPU System Management Interface is based on Intel oneAPI Level Zero.\n");
+	PRINT("Before using Intel XPU System Management Interface, the GPU driver and Intel "
+		  "oneAPI Level Zero should be correctly installed.\n\n");
+}
+
+std::vector<function_entry> DefaultParser::commandTable() { return defaultCommandTable(); }
+
+void DefaultParser::printExtraOptions()
+{
+	PRINT("  --list-gpus                 Print a list of GPUs and exit\n");
+	PRINT("  --query-gpu=<fields>        Single-shot query of per-GPU metrics (comma-separated field names)\n");
+	PRINT("                              Example: --query-gpu=temperature.gpu,power.draw --id=0\n");
+	PRINT("  --id=<n>                    Select GPU by index or PCI BDF\n");
+	PRINT("  --display=TYPE[,TYPE]       Show only selected sections (MEMORY,UTILIZATION,ECC,\n");
+	PRINT("                              TEMPERATURE,POWER,CLOCK,COMPUTE,PIDS,...)\n");
+	PRINT("  --loop[=<sec>]              Repeat query every <sec> seconds (default: 1)\n");
+	PRINT("  --loop-ms=<ms>              Repeat query every <ms> milliseconds\n");
+	PRINT("  --count=<n>                 Number of loop iterations (default: infinite)\n");
+	PRINT("  --format=csv[,noheader][,nounits]  Output format for --query-gpu\n");
+	PRINT("  -f,--file=<path>            Log output to file instead of stdout\n");
+}
+
+std::optional<int> DefaultParser::handleTopLevel(arg_struct *args, const std::vector<std::unique_ptr<cmds>> &cmdList)
+{
+	if (args->argc == 1) {
+		cmdSmi smi;
+		smi.run(args);
+		return 0;
+	}
+
+	if (!STRCASECMP(args->argv[1], "help")) {
+		if (args->argc > 2) {
+			PRINT("The following argument was not expected: '{}'.\n", args->argv[2]);
+			printFullHelp(*this, cmdList);
+			return 1;
+		}
+		printFullHelp(*this, cmdList);
+		return 0;
+	}
+
+	if (args->argv[1][0] != '-') {
+		return std::nullopt; // subcommand name — fall through to dispatch
+	}
+
+	/* Top-level flags (-h/--help, -v/--version, -q/--query/--query-gpu).
+	 *
+	 * Note: -q/--query is handled before CLI11 to avoid CLI11 prefix-matching
+	 * '--query' against '--query-gpu' (since '--query' is a prefix of '--query-gpu'). */
+	const std::string_view flag{args->argv[1]};
+	if (flag == "-q" || flag == "--query") {
+		PRINT("query: not yet implemented.\n");
+		return 0;
+	}
+
+	CLI::App topApp{"", std::string{DefaultParser::progName()}};
+	topApp.set_help_flag("-h,--help", "Print this help message and exit");
+
+	bool versionFlag = false;
+	bool listGpusFlag = false;
+	std::string formatStr;
+	topApp.add_flag("-v,--version", versionFlag, "Display version information and exit");
+	topApp.add_flag("--list-gpus", listGpusFlag, "Print a list of GPUs and exit");
+	topApp.add_option("--format", formatStr, "Output format: csv[,noheader][,nounits]");
+
+	auto [pre, argvVec] = extractPreArgs(args);
+	configureFileLogging(pre.logFilePath);
+
+	try {
+		topApp.parse(argvVec);
+	} catch (const CLI::CallForHelp &) {
+		if (pre.queryGpuFlag) {
+			cmdDump::printQueryHelp();
+		} else {
+			printFullHelp(*this, cmdList);
+		}
+		return 0;
+	} catch (const CLI::ParseError &) {
+		// If argvVec is not empty, it contains unparsed tokens for a subcommand.
+		if (!argvVec.empty()) {
+			// Rebuild args->argv/argc so subcommand dispatch sees the stripped tokens.
+			// Storage is kept alive in ownedArgv_ (a member of DefaultParser) which
+			// outlives the entire runCli() call, so args->argv remains valid until
+			// the subcommand's run() returns.
+			ownedArgv_.args.clear();
+			ownedArgv_.argv.clear();
+			ownedArgv_.args.emplace_back(args->argv[0]);
+			for (const auto &s : argvVec) {
+				ownedArgv_.args.emplace_back(s);
+			}
+			for (auto &s : ownedArgv_.args) {
+				ownedArgv_.argv.push_back(s.data());
+			}
+			args->argv = ownedArgv_.argv.data();
+			args->argc = static_cast<int>(ownedArgv_.argv.size());
+			return std::nullopt;
+		}
+		PRINT("The following argument was not expected: '{}'.\n", args->argv[1]);
+		printFullHelp(*this, cmdList);
+		return 1;
+	}
+
+	if (versionFlag) {
+		printVersion(args);
+		return 0;
+	}
+	if (listGpusFlag) {
+		return cmdDump::listGpus(args);
+	}
+	if (pre.queryGpuFlag || !pre.displayType.empty()) {
+		// Bare --query-gpu with no fields: show available fields
+		if (pre.queryGpuFlag && pre.queryGpu.empty() && pre.displayType.empty()) {
+			cmdDump::printQueryHelp();
+			return 0;
+		}
+		// If only --display was given (no --query-gpu), treat the display type as the
+		// metric group selector — equivalent to --query-gpu=<displayType>.
+		const std::string &effectiveQuery = pre.queryGpu.empty() ? pre.displayType : pre.queryGpu;
+		return cmdDump::runQuery(effectiveQuery, pre.deviceSpec, args, buildQueryFormat(pre, formatStr));
+	}
+
+	// No query/version/list-gpus flags, but options like -f may have been extracted —
+	// fall through to subcommand dispatch (e.g., xpu-smi -f file.txt dump help).
+	return std::nullopt;
+}
diff --git a/ial/cli/parser/default_parser.h b/ial/cli/parser/default_parser.h
new file mode 100644
index 000000000..bfdd6c2f7
--- /dev/null
+++ b/ial/cli/parser/default_parser.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef DEFAULT_PARSER_H
+#define DEFAULT_PARSER_H
+
+#include "cli.h"
+#include "cli_parser.h"
+#include <string_view>
+#include <vector>
+#include <optional>
+#include "cmds.h"
+#include <memory>
+
+// Default CLI parser — matches the existing xpu-smi / xpumcli behaviour.
+// When no "compat" prefix is present this parser is selected.
+class DefaultParser
+{
+	// Owns the rebuilt argv storage when subcommand dispatch requires flag stripping.
+	// Must outlive any call to handleTopLevel so that args->argv remains valid until
+	// the subcommand's run() returns in runCli().
+	struct OwnedArgv
+	{
+		std::vector<std::string> args;
+		std::vector<char *> argv;
+	};
+	OwnedArgv ownedArgv_;
+
+public:
+	// Display name used in usage lines and forwarded to the progName global.
+	static std::string_view progName();
+
+	// Banner printed at the top of --help output.
+	static void printBanner();
+
+	// Commands available through this parser. Diverges from CompatParser
+	// once the two CLIs need different command sets or flags.
+	static std::vector<function_entry> commandTable();
+
+	// Handle top-level args that are not subcommand names.
+	// Returns exit code if consumed; std::nullopt to fall through to dispatch.
+	std::optional<int> handleTopLevel(arg_struct *args, const std::vector<std::unique_ptr<cmds>> &cmdList);
+
+	// Extra option lines appended to the Options section of full help output.
+	static void printExtraOptions();
+};
+
+static_assert(CliParser<DefaultParser>, "DefaultParser must satisfy the CliParser concept");
+
+#endif // DEFAULT_PARSER_H
diff --git a/ial/cmn/cmd_agentset.cpp b/ial/cmn/cmd_agentset.cpp
deleted file mode 100644
index c03f434ff..000000000
--- a/ial/cmn/cmd_agentset.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "cmd_agentset.h"
-#include "debug.h"
-
-/**
- * @brief Displays help information for the agentset command
- *
- * This function prints usage information, command line options, and examples
- * for the agentset command which manages XPU Manager daemon settings.
- *
- * @param helpType The type of help to display (FULL_HELP or SHORT_HELP)
- */
-void cmdAgentSet::help(HELP helpType)
-{
-	TRACING();
-	std::vector<helpCmd> helpList;
-	helpList.push_back(helpCmd(TITLE, "Get or change some XPU Manager settings."));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s agentset [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s agentset -l", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s agentset -l -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s agentset -t 200", progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-l, --list                  Display all agent settings"));
-	helpList.push_back(helpCmd(HEADING, "-t, --time                  Set the time interval(in milliseconds) by which"
-										" XPU Manager daemon should retrieve raw gpu statistics."
-										" Valid values are 100, 200, 500, 1000."));
-
-	printHelp(helpList, helpType);
-	helpList.clear();
-}
-
-/**
- * @brief Executes the agentset command with parsed command line arguments
- *
- * This function processes command line arguments for the agentset command,
- * handling options for listing current settings, setting time intervals,
- * and managing JSON output format. It validates input parameters and
- * applies the requested configuration changes.
- *
- * @param args Pointer to argument structure containing argc, argv, and system manager
- * @return int ZE_RESULT_SUCCESS on success, error code on failure
- */
-int cmdAgentSet::run(arg_struct *args)
-{
-	TRACING();
-	static struct option longOptions[] = {
-		{"help", no_argument, 0, 'h'},
-		{"json", no_argument, 0, 'j'},
-		{"list", no_argument, 0, 'l'},
-		{"time", required_argument, 0, 't'},
-		{0, 0, 0, 0},
-	};
-
-	int opt;
-	int optionIndex = 0;
-	bool showJson = false;
-	bool showList = false;
-	int timeInterval = -1;
-
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, "hjlt:", longOptions, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			showJson = true;
-			break;
-		case 'l':
-			showList = true;
-			break;
-		case 't':
-			if (optarg) {
-				timeInterval = atoi(optarg);
-			}
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (showJson) {
-		// handle json output logic
-	}
-
-	if (showList) {
-		// handle list logic
-	} else if (timeInterval != 100 && timeInterval != 200 && timeInterval != 500 && timeInterval != 1000) {
-		ERR("Invalid time interval. Valid values include 100, 200, 500, 1000.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	// handle time interval logic
-
-	return ZE_RESULT_SUCCESS;
-}
diff --git a/ial/cmn/cmd_agentset.h b/ial/cmn/cmd_agentset.h
deleted file mode 100644
index 26fe4a42a..000000000
--- a/ial/cmn/cmd_agentset.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _CMD_AGENTSET_H
-#define _CMD_AGENTSET_H
-
-#include "cmds.h"
-#include <os.h>
-
-class cmdAgentSet : public cmds
-{
-public:
-	cmdAgentSet() { STRCPY_S(name, MAX_PATH, "agentset"); };
-	~cmdAgentSet(){};
-	void help(HELP helpType = FULL_HELP);
-	int run(arg_struct *args);
-};
-
-#endif
\ No newline at end of file
diff --git a/ial/cmn/cmd_amc.cpp b/ial/cmn/cmd_amc.cpp
index c193ff548..2b4559eba 100644
--- a/ial/cmn/cmd_amc.cpp
+++ b/ial/cmn/cmd_amc.cpp
@@ -6,6 +6,7 @@
 
 #include "cmd_amc.h"
 #include "debug.h"
+#include <CLI/CLI.hpp>
 #include "table_builder.h"
 #include "amclib.h"
 #include "printer.h"
@@ -17,18 +18,20 @@
 #include <unordered_map>
 #include <algorithm>
 #include <nlohmann/json.hpp>
+#include <ctime>
+#include <array>
 
 static std::unordered_map<amcSubCmdType, amcSubCmdStruct> amcCmds = {
-	{AMC_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{AMC_GPURESET, {{"gpureset", no_argument, 0, 0}, &cmdAmc::gpuReset, false, ""}},
-	{AMC_SENSOR, {{"sensor", no_argument, 0, 0}, &cmdAmc::readSensor, false, ""}},
-	{AMC_SENSORID, {{"sensorid", required_argument, 0, 's'}, nullptr, false, ""}},
-	{AMC_FILE, {{"file", no_argument, 0, 0}, &cmdAmc::readFile, false, ""}},
-	{AMC_FILE_TYPE, {{"filetype", required_argument, 0, 0}, nullptr, false, ""}},
-	{AMC_OP_FILENAME, {{"filename", required_argument, 0, 0}, nullptr, false, ""}},
-	{AMC_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{AMC_YES, {{"yes", no_argument, 0, 'y'}, nullptr, false, ""}},
-	{AMC_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
+	{AMC_HELP, {}},
+	{AMC_GPURESET, {.func = &cmdAmc::gpuReset}},
+	{AMC_SENSOR, {.func = &cmdAmc::readSensor}},
+	{AMC_SENSORID, {}},
+	{AMC_FILE, {.func = &cmdAmc::readFile}},
+	{AMC_FILE_TYPE, {}},
+	{AMC_OP_FILENAME, {}},
+	{AMC_DEVICE, {}},
+	{AMC_YES, {}},
+	{AMC_JSON, {}},
 };
 
 AmcTextPrinter::AmcTextPrinter() : TextPrinter() {}
@@ -59,6 +62,8 @@ void AmcTextPrinter::printDeviceInfo(nlohmann::ordered_json *jsonObj)
 		std::string value;
 		if (item.value().is_string()) {
 			value = item.value().get<std::string>();
+		} else if (item.value().is_number_integer() && item.value().get<int64_t>() == -1) {
+			value = "N/A";
 		} else {
 			value = item.value().dump();
 		}
@@ -93,32 +98,32 @@ void cmdAmc::help(HELP helpType)
 	helpList.push_back(helpCmd(TITLE, "AMC Operations"));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(TITLE, "Usage: %s amc [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s amc --gpureset", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s amc --gpureset -y", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s amc --gpureset -d [deviceId]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s amc --gpureset -d [deviceId] -y", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s amc --gpuReset", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s amc --gpuReset -y", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s amc --gpuReset -d [deviceId]", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s amc --gpuReset -d [deviceId] -y", progName.c_str()));
 	helpList.push_back(helpCmd(HEADING, "%s amc --sensor -d [deviceId] -s [sensorId]", progName.c_str()));
 	helpList.push_back(helpCmd(HEADING, "%s amc --sensor -d [deviceId] -s [sensorId] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s amc --file -d [deviceId] --filetype [fileType] --filename [outputFile]",
+	helpList.push_back(helpCmd(HEADING, "%s amc --file -d [deviceId] --fileType [fileType] --fileName [outputFile]",
 							   progName.c_str()));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(TITLE, "Options:"));
 	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 Specify the device ID or PCI BDF address"));
-	helpList.push_back(helpCmd(HEADING, "--gpureset                  Reset GPU(s) via AMC"));
+	helpList.push_back(helpCmd(HEADING, "--device,--id               Specify the device ID or PCI BDF address"));
+	helpList.push_back(helpCmd(HEADING, "--gpuReset                  Reset GPU(s) via AMC"));
 	helpList.push_back(helpCmd(HEADING, "--sensor                    Read AMC real-time sensor readings"));
 	helpList.push_back(
-		helpCmd(HEADING, "-s,--sensorid               Specify the sensor ID (Sensor IDs are listed below)"));
+		helpCmd(HEADING, "-s,--sensorId               Specify the sensor ID (Sensor IDs are listed below)"));
 	helpList.push_back(helpCmd(HEADING, "--file                      Read a file from GPU via AMC"));
 	helpList.push_back(helpCmd(
-		HEADING, "--filetype                  Specify the type of file to read (Filetype ids are listed below)"));
+		HEADING, "--fileType                  Specify the type of file to read (Filetype ids are listed below)"));
 	helpList.push_back(helpCmd(
 		HEADING,
-		"--filename                  Specify the output file name. Default is amc_file_<YrMthDt_HrMinSec>.txt"));
+		"--fileName                  Specify the output file name. Default is <filepdrname_YrMthDt_HrMinSec>.bin"));
 	helpList.push_back(helpCmd(HEADING, "-y,--yes                    Skip confirmation prompt"));
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Sensor IDs (used with -s/--sensorid):"));
+	helpList.push_back(helpCmd(TITLE, "Sensor IDs (used with -s/--sensorId):"));
 	helpList.push_back(helpCmd(SUB_HEADING, "1. Temperature Sensor 0 from Add-In-Card"));
 	helpList.push_back(helpCmd(SUB_HEADING, "2. Temperature Sensor 1 from Add-In-Card"));
 	helpList.push_back(helpCmd(SUB_HEADING, "3. VR Voltage from Add-In-Card"));
@@ -127,9 +132,11 @@ void cmdAmc::help(HELP helpType)
 	helpList.push_back(helpCmd(SUB_HEADING, "6. VR Temperature Sensor"));
 	helpList.push_back(helpCmd(SUB_HEADING, "7. Total Board Power"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "File Types (used with --filetype):"));
-	// Note: The actual file type IDs and descriptions should be updated based on the implementation
-	helpList.push_back(helpCmd(SUB_HEADING, "0. GPU logs"));
+	helpList.push_back(helpCmd(TITLE, "File Types (used with --fileType):"));
+	helpList.push_back(helpCmd(SUB_HEADING, "1. AMC crash logs"));
+	helpList.push_back(helpCmd(SUB_HEADING, "2. System trace logs"));
+	helpList.push_back(helpCmd(SUB_HEADING, "3. GPU crash logs"));
+	helpList.push_back(helpCmd(SUB_HEADING, "4. GPU bulk telemetry logs"));
 	helpList.push_back(helpCmd(TITLE, "WARNING:"));
 	helpList.push_back(helpCmd(HEADING, "  - The operation may require root/administrator privileges"));
 
@@ -151,71 +158,44 @@ void cmdAmc::help(HELP helpType)
 int cmdAmc::run(arg_struct *args)
 {
 	TRACING();
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
 
-	processOptions(amcCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-
-	int opt;
-	int optionIndex = 0;
-
-	int startind = 2;
-	optind = 2;
+	// Reset state
+	for (auto &[k, v] : amcCmds) {
+		v.enabled = false;
+		v.val.clear();
+	}
 
 	if (args->argc == 2) {
 		help();
 		return ZE_RESULT_SUCCESS;
 	}
 
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return 0;
-		case 'd':
-			amcCmds[AMC_DEVICE].enabled = true;
-			amcCmds[AMC_DEVICE].val = optarg;
-			break;
-		case 'y':
-			amcCmds[AMC_YES].enabled = true;
-			break;
-		case 'j':
-			amcCmds[AMC_JSON].enabled = true;
-			break;
-		case 's':
-			amcCmds[AMC_SENSORID].enabled = true;
-			amcCmds[AMC_SENSORID].val = optarg;
-			break;
-		case 0: {
-			bool found = false;
-			for (auto &cmd : amcCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			break;
-		}
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
+	CLI::App sub{"AMC firmware and sensor operations", "amc"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", amcCmds[AMC_JSON].enabled, "Print result in JSON format");
+	sub.add_flag("--gpureset", amcCmds[AMC_GPURESET].enabled, "Reset a GPU");
+	sub.add_flag("--sensor", amcCmds[AMC_SENSOR].enabled, "Read AMC sensor data");
+	sub.add_option("-s,--sensorid", amcCmds[AMC_SENSORID].val, "Sensor ID")->each([&](const std::string &) {
+		amcCmds[AMC_SENSORID].enabled = true;
+	});
+	sub.add_flag("--file", amcCmds[AMC_FILE].enabled, "Read a file from AMC");
+	sub.add_option("--filetype", amcCmds[AMC_FILE_TYPE].val, "File type ID")->each([&](const std::string &) {
+		amcCmds[AMC_FILE_TYPE].enabled = true;
+	});
+	sub.add_option("--filename", amcCmds[AMC_OP_FILENAME].val, "Output filename")->each([&](const std::string &) {
+		amcCmds[AMC_OP_FILENAME].enabled = true;
+	});
+	sub.add_option("-d,--device,--id", amcCmds[AMC_DEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { amcCmds[AMC_DEVICE].enabled = true; });
+	sub.add_flag("-y,--yes", amcCmds[AMC_YES].enabled, "Assume yes to all questions");
 
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
@@ -236,7 +216,7 @@ int cmdAmc::run(arg_struct *args)
 
 	if (operationCount == 0) {
 		help(SHORT_HELP);
-		return 0;
+		return ZE_RESULT_SUCCESS;
 	}
 
 	amclib amc;
@@ -512,6 +492,10 @@ ze_result_t cmdAmc::readFile(amclib *amc, int numCards)
 {
 	TRACING();
 
+	constexpr std::array<const char *, 5> filePdrNames = {
+		"Unknown", "amc_crash_dump", "syst_log", "gpu_crash_log", "gpu_bulk_telemetry",
+	};
+
 	if (!amcCmds[AMC_DEVICE].enabled || amcCmds[AMC_DEVICE].val.empty()) {
 		ERR("Device ID must be specified with --device option.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
@@ -522,14 +506,30 @@ ze_result_t cmdAmc::readFile(amclib *amc, int numCards)
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
+	uint16_t filePdrId = 0;
+	try {
+		unsigned long parsed = std::stoul(amcCmds[AMC_FILE_TYPE].val);
+		if (parsed > UINT16_MAX) {
+			throw std::out_of_range("File type ID exceeds 16-bit limit");
+		}
+		filePdrId = static_cast<uint16_t>(parsed);
+		if (filePdrId == 0 || filePdrId >= filePdrNames.size()) {
+			ERR("Invalid file type ID: {}. Valid range is 1 to {}.\n", filePdrId, filePdrNames.size() - 1);
+			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+		}
+	} catch (const std::exception &) {
+		ERR("Invalid file type: {}. File type must be a numeric value.\n", amcCmds[AMC_FILE_TYPE].val.c_str());
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	}
+
 	std::string opFilename{};
 	if (amcCmds[AMC_OP_FILENAME].enabled && !amcCmds[AMC_OP_FILENAME].val.empty()) {
 		opFilename = amcCmds[AMC_OP_FILENAME].val;
 	} else {
 		std::time_t now = std::time(nullptr);
 		char timeStr[20];
-		std::strftime(timeStr, sizeof(timeStr), "%Y%m%d_%H%M%S", std::localtime(&now));
-		opFilename = "amc_file_" + std::string(timeStr) + ".txt";
+		std::strftime(timeStr, sizeof(timeStr), "_%Y%m%d_%H%M%S", std::localtime(&now));
+		opFilename = filePdrNames[filePdrId] + std::string(timeStr) + ".bin";
 	}
 
 	int deviceIndex = -1;
@@ -537,13 +537,6 @@ ze_result_t cmdAmc::readFile(amclib *amc, int numCards)
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
-	uint32_t filePdrId = 0;
-	try {
-		filePdrId = static_cast<uint32_t>(std::stoul(amcCmds[AMC_FILE_TYPE].val));
-	} catch (const std::exception &) {
-		ERR("Invalid file type: {}. File type must be a numeric value.\n", amcCmds[AMC_FILE_TYPE].val.c_str());
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
 	std::vector<uint8_t> fileData;
 	int ret = amc->amcReadFile(deviceIndex, filePdrId, fileData);
 	if (ret != AMC_SUCCESS) {
diff --git a/ial/cmn/cmd_amc.h b/ial/cmn/cmd_amc.h
index 7531bcde2..6a9a0aa96 100644
--- a/ial/cmn/cmd_amc.h
+++ b/ial/cmn/cmd_amc.h
@@ -25,7 +25,7 @@ class AmcTextPrinter : public TextPrinter
 class cmdAmc : public cmds
 {
 public:
-	cmdAmc() { STRCPY_S(name, MAX_PATH, "amc"); }
+	cmdAmc() { name = "amc"; }
 	~cmdAmc() {}
 
 	void help(HELP helpType = FULL_HELP) override;
@@ -57,10 +57,9 @@ using amcSubCmdFunc = ze_result_t (cmdAmc::*)(amclib *, int);
 
 struct amcSubCmdStruct
 {
-	option opt;
-	amcSubCmdFunc func;
-	bool enabled;
-	std::string val;
+	amcSubCmdFunc func{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
 #endif
diff --git a/ial/cmn/cmd_config.cpp b/ial/cmn/cmd_config.cpp
index a0ac0e3be..b49170329 100644
--- a/ial/cmn/cmd_config.cpp
+++ b/ial/cmn/cmd_config.cpp
@@ -6,6 +6,7 @@
 
 #include "cmd_config.h"
 #include "debug.h"
+#include <CLI/CLI.hpp>
 #include "table_builder.h"
 #include "bdf.h"
 #include <assert.h>
@@ -18,8 +19,8 @@
 #include <frequency.h>
 #include <nlohmann/json.hpp>
 #include <power.h>
+#include <powerexp.h>
 #include <scheduler.h>
-#include <performance.h>
 #include <standby.h>
 #include <stdexcept>
 #include <sstream>
@@ -30,8 +31,9 @@
 #include <cstdlib>
 #include <limits>
 
-// Conversion factors
-constexpr uint64_t W_TO_MW = 1000;
+// Conversion helpers between watts and milliwatts
+constexpr inline int mwToW(int32_t mw) { return static_cast<int>(mw / 1000); }
+constexpr inline uint32_t wToMw(double w) { return static_cast<uint32_t>(w * 1000.0); }
 
 // Fan curve input limits
 constexpr uint32_t FAN_CURVE_TEMP_MIN_C = 0;
@@ -44,30 +46,26 @@ constexpr uint64_t SCHEDULER_TIME_MIN = 5000;
 constexpr uint64_t SCHEDULER_TIME_MAX = 100000000;
 
 static std::unordered_map<configCmdType, configCmdStruct> configCmds = {
-	{configCmdType::CONFIGHELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{configCmdType::CONFIGJSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{configCmdType::CONFIGDEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{configCmdType::TILE, {{"tile", required_argument, 0, 't'}, nullptr, false, ""}},
-	{configCmdType::FREQUENCYRANGE,
-	 {{"frequencyrange", required_argument, 0, 0}, &cmdConfig::setFrequencyRange, false, ""}},
-	{configCmdType::POWERLIMIT, {{"powerlimit", required_argument, 0, 0}, &cmdConfig::setPowerLimit, false, ""}},
-	{configCmdType::STANDBYMODE, {{"standby", required_argument, 0, 0}, &cmdConfig::setStandby, false, ""}},
-	{configCmdType::SCHEDULERMODE, {{"scheduler", required_argument, 0, 0}, &cmdConfig::setScheduler, false, ""}},
-	{configCmdType::PERFORMANCEFACTOR,
-	 {{"performancefactor", required_argument, 0, 0}, &cmdConfig::setPerformanceFactor, false, ""}},
-	{configCmdType::MEMORYECC, {{"memoryecc", required_argument, 0, 0}, &cmdConfig::setMemoryEcc, false, ""}},
-	{configCmdType::PCIEDOWNGRADE,
-	 {{"pciedowngrade", required_argument, 0, 0}, &cmdConfig::setPCIeGenUpdate, false, ""}},
-	{configCmdType::RESET, {{"reset", no_argument, 0, 0}, &cmdConfig::resetDevice, false, ""}},
-	{configCmdType::CLEARRAS, {{"clear-ras-errors", no_argument, 0, 0}, &cmdConfig::clearRasErrors, false, ""}},
-	{configCmdType::FANSPEED, {{"fanspeed", required_argument, 0, 0}, &cmdConfig::setFanSpeed, false, ""}},
-	{configCmdType::FANCURVE, {{"fancurve", required_argument, 0, 0}, &cmdConfig::setFanCurve, false, ""}},
-	{configCmdType::FANCURVERPM, {{"fancurve-rpm", required_argument, 0, 0}, &cmdConfig::setFanCurveRpm, false, ""}},
-	{configCmdType::FANID, {{"fanid", required_argument, 0, 0}, nullptr, false, ""}},
-	{configCmdType::COLDRESET, {{"coldreset", no_argument, 0, 0}, &cmdConfig::coldResetDevice, false, ""}},
-	{configCmdType::IGNORE_GPU_USER_PROCESSES, {{"ignore-gpu-user-processes", no_argument, 0, 0}, nullptr, false, ""}},
-	{configCmdType::FORCE_RESET_GPUS, {{"force-reset-gpus", no_argument, 0, 0}, nullptr, false, ""}},
-	{configCmdType::POWERTYPE, {{"powertype", required_argument, 0, 0}, nullptr, false, ""}},
+	{configCmdType::CONFIGHELP, {}},
+	{configCmdType::CONFIGJSON, {}},
+	{configCmdType::CONFIGDEVICE, {}},
+	{configCmdType::TILE, {}},
+	{configCmdType::FREQUENCYRANGE, {.func = &cmdConfig::setFrequencyRange}},
+	{configCmdType::POWERLIMIT, {.func = &cmdConfig::setPowerLimit}},
+	{configCmdType::STANDBYMODE, {.func = &cmdConfig::setStandby}},
+	{configCmdType::SCHEDULERMODE, {.func = &cmdConfig::setScheduler}},
+	{configCmdType::MEMORYECC, {.func = &cmdConfig::setMemoryEcc}},
+	{configCmdType::PCIEDOWNGRADE, {.func = &cmdConfig::setPCIeGenUpdate}},
+	{configCmdType::RESET, {.func = &cmdConfig::resetDevice}},
+	{configCmdType::CLEARRAS, {.func = &cmdConfig::clearRasErrors}},
+	{configCmdType::FANSPEED, {.func = &cmdConfig::setFanSpeed}},
+	{configCmdType::FANCURVE, {.func = &cmdConfig::setFanCurve}},
+	{configCmdType::FANCURVERPM, {.func = &cmdConfig::setFanCurveRpm}},
+	{configCmdType::FANID, {}},
+	{configCmdType::COLDRESET, {.func = &cmdConfig::coldResetDevice}},
+	{configCmdType::IGNORE_GPU_USER_PROCESSES, {}},
+	{configCmdType::FORCE_RESET_GPUS, {}},
+	{configCmdType::POWERTYPE, {}},
 };
 
 /**
@@ -392,8 +390,9 @@ static std::string buildDeviceConfigJson(devInfo *d, size_t indent)
 	int plCardPeak = 0;
 	std::string powerValidRange;
 	power *pwr = d->dev->getPower();
-	if (pwr != nullptr) {
-		std::map<zes_power_domain_t, std::map<zes_power_level_t, uint32_t>> domainLimits;
+	powerExp *pwrExp = d->dev->getPowerExp();
+	if (!pwrExp->isPowerExpEnabled() && pwr != nullptr) {
+		std::map<zes_power_domain_t, std::map<zes_power_level_t, int32_t>> domainLimits;
 		pwr->getDomainLimits(domainLimits);
 
 		auto getLimitW = [&](zes_power_domain_t domain, zes_power_level_t level) -> int {
@@ -405,7 +404,7 @@ static std::string buildDeviceConfigJson(devInfo *d, size_t indent)
 			if (levelIt == domainIt->second.end()) {
 				return 0;
 			}
-			return static_cast<int>(levelIt->second / 1000);
+			return mwToW(levelIt->second);
 		};
 
 		plCardSustain = getLimitW(ZES_POWER_DOMAIN_CARD, ZES_POWER_LEVEL_SUSTAINED);
@@ -416,6 +415,17 @@ static std::string buildDeviceConfigJson(devInfo *d, size_t indent)
 		plPackagePeak = getLimitW(ZES_POWER_DOMAIN_PACKAGE, ZES_POWER_LEVEL_PEAK);
 
 		pwr->getMaxPowerLimit(powerValidRange);
+	} else if (pwrExp->isPowerExpEnabled()) {
+		std::vector<power_limits_exp_t> powerLimits;
+		if (pwrExp->getPowerLimits(powerLimits) == ZE_RESULT_SUCCESS) {
+			for (const auto &limits : powerLimits) {
+				if (limits.domain == ZES_POWER_DOMAIN_CARD) {
+					plCardSustain = mwToW(limits.limit);
+				} else if (limits.domain == ZES_POWER_DOMAIN_PACKAGE) {
+					plPackageSustain = mwToW(limits.limit);
+				}
+			}
+		}
 	}
 
 	uint32_t tileCount = 0;
@@ -614,50 +624,50 @@ void cmdConfig::help(HELP helpType)
 	helpList.push_back(helpCmd(TITLE, "Get and change the GPU settings"));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(TITLE, "Usage: %s config [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s config -d [deviceId]", progName.c_str()));
-	helpList.push_back(helpCmd(
-		HEADING, "%s config -d [deviceId] -t [tileId] --frequencyrange [minFrequency,maxFrequency]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s config -d [deviceId] --powerlimit [powerValue]", progName.c_str()));
-	helpList.push_back(
-		helpCmd(HEADING, "%s config -d [deviceId] -t [tileId] --standby [standbyMode]", progName.c_str()));
-	helpList.push_back(
-		helpCmd(HEADING, "%s config -d [deviceId] -t [tileId] --scheduler [schedulerMode]", progName.c_str()));
-	helpList.push_back(helpCmd(
-		HEADING, "%s config -d [deviceId] -t [tileId] --performancefactor [engineType,factorValue]", progName.c_str()));
-	helpList.push_back(
-		helpCmd(HEADING, "%s config -d [deviceId] --memoryecc [0|1] 0:disable; 1:enable", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [deviceId]", progName.c_str()));
 	helpList.push_back(
-		helpCmd(HEADING, "%s config -d [deviceId] --pciedowngrade [0|1] 0:disable; 1:enable", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING,
-							   "%s config -d [deviceId] [--fanid <id|-1>] --fanspeed [value] 0-100(percent);default",
+		helpCmd(HEADING, "%s config --device [deviceId] [--tile tileId] --frequencyrange [minFrequency,maxFrequency]",
+				progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [deviceId] --powerlimit [powerValue]", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [deviceId] --standby [standbyMode]", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [deviceId] [--tile tileId] --scheduler [schedulerMode]",
 							   progName.c_str()));
 	helpList.push_back(
-		helpCmd(HEADING,
-				"%s config -d [deviceId] [--fanid <id|-1>] --fancurve [curve] temp:speed pairs, e.g. 40:25,60:50,80:90",
-				progName.c_str()));
+		helpCmd(HEADING, "%s config --device [deviceId] --memoryecc [0|1] 0:disable; 1:enable", progName.c_str()));
+	helpList.push_back(
+		helpCmd(HEADING, "%s config --device [deviceId] --pciedowngrade [0|1] 0:disable; 1:enable", progName.c_str()));
 	helpList.push_back(
-		helpCmd(HEADING,
-				"%s config -d [deviceId] [--fanid <id|-1>] --fancurve-rpm [curve] temp:rpm pairs, e.g. 40:1200,70:2800",
+		helpCmd(HEADING, "%s config --device [deviceId] [--fanid <id|-1>] --fanspeed [value] 0-100(percent);default",
 				progName.c_str()));
+	helpList.push_back(helpCmd(
+		HEADING,
+		"%s config --device [deviceId] [--fanid <id|-1>] --fancurve [curve] temp:speed pairs, e.g. 40:25,60:50,80:90",
+		progName.c_str()));
+	helpList.push_back(helpCmd(
+		HEADING,
+		"%s config --device [deviceId] [--fanid <id|-1>] --fancurve-rpm [curve] temp:rpm pairs, e.g. 40:1200,70:2800",
+		progName.c_str()));
 	helpList.push_back(helpCmd(HEADING, "--fanid                     Fan target: -1 (all fans, default) or 0..N-1"));
 
-	helpList.push_back(helpCmd(HEADING, "%s config -d [deviceId] --reset", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s config -d [pciBdfAddress] --coldreset", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s config -d [deviceId] --clear-ras-errors", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [deviceId] --reset", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [pciBdfAddress] --coldreset", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s config --device [deviceId] --clear-ras-errors", progName.c_str()));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(TITLE, "Options:"));
 	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address to query"));
+	helpList.push_back(helpCmd(HEADING, "--device,--id               The device ID or PCI BDF address to query"));
 	helpList.push_back(helpCmd(HEADING, "-t,--tile                   The tile ID"));
-	helpList.push_back(helpCmd(HEADING, "--frequencyrange            GPU tile-level core frequency range"));
+	helpList.push_back(helpCmd(
+		HEADING, "--frequencyrange            Core frequency range (MHz). Applies to all tiles when -t is omitted"));
 	helpList.push_back(helpCmd(HEADING, "--powerlimit                Device-level power limit"));
-	helpList.push_back(
-		helpCmd(HEADING, "--standby                   Tile-level standby mode. Valid options: \"default\"; \"never\""));
-	helpList.push_back(
-		helpCmd(HEADING, "--scheduler                 Tile-level scheduler mode. Value options: "
-						 "\"timeout\",timeoutValue (us); \"timeslice\",interval (us),yieldtimeout (us);\"exclusive\""));
+	helpList.push_back(helpCmd(
+		HEADING, "--standby                   Standby mode (device-level). Valid options: \"default\"; \"never\""));
+	helpList.push_back(helpCmd(
+		HEADING,
+		"--scheduler                 Scheduler mode. Applies to all tiles when -t is omitted. "
+		"Value options: \"timeout\",timeoutValue (us); \"timeslice\",interval (us),yieldtimeout (us);\"exclusive\""));
 	helpList.push_back(helpCmd(SUB_HEADING, "The valid range of all time values (us) is from 5000 to 100,000,000."));
 	helpList.push_back(helpCmd(HEADING, "--reset                     Reset device by SBR (Secondary Bus Reset)"));
 	helpList.push_back(helpCmd(SUB_HEADING, "For Intel(R) Max Series GPU, when SR-IOV is enabled, please add "
@@ -676,12 +686,6 @@ void cmdConfig::help(HELP helpType)
 		helpCmd(HEADING, "--force-reset-gpus          Proceed with --coldreset even if other PCI devices share"));
 	helpList.push_back(helpCmd(SUB_HEADING, "the PCIe slot. All devices on the slot will be reset together."));
 	helpList.push_back(helpCmd(HEADING, "--clear-ras-errors          Clear all RAS error counters for the device"));
-	helpList.push_back(helpCmd(HEADING, "--performancefactor         Set the tile-level performance factor. Valid "
-										"options: \"compute/media\",factorValue. The factor value should be"));
-	helpList.push_back(helpCmd(SUB_HEADING, "between 0 to 100. 100 means that the workload is completely compute "
-											"bounded and requires very little support from the memory support"));
-	helpList.push_back(helpCmd(SUB_HEADING, "0 means that the workload is completely memory bounded and the "
-											"performance of the memory controller needs to be increased"));
 	helpList.push_back(
 		helpCmd(HEADING, "--memoryecc                 Enable/disable memory ECC setting. 0:disable; 1:enable"));
 	helpList.push_back(helpCmd(HEADING, "--powerlimit                Device-level power limit"));
@@ -725,7 +729,7 @@ void cmdConfig::displayDeviceConfig(devInfo *d)
 	table.addColumn("Configuration", 62);
 
 	// Power configuration - using getDomainLimits() via HAL
-	std::map<zes_power_domain_t, std::map<zes_power_level_t, uint32_t>> domainLimits;
+	std::map<zes_power_domain_t, std::map<zes_power_level_t, int32_t>> domainLimits;
 	power *pwr = d->dev->getPower();
 	if (pwr != nullptr) {
 		pwr->getDomainLimits(domainLimits);
@@ -733,7 +737,7 @@ void cmdConfig::displayDeviceConfig(devInfo *d)
 
 	// Display power limits by domain (fixed order: card, package)
 	auto addPowerDomain = [&](bool showDeviceId, const char *domainStr,
-							  const std::map<zes_power_level_t, uint32_t> *limits) {
+							  const std::map<zes_power_level_t, int32_t> *limits) {
 		std::string domainLabel = " Power domain " + std::string(domainStr) + ":";
 		if (showDeviceId) {
 			table.addRow("GPU", std::to_string(d->index), domainLabel);
@@ -745,7 +749,7 @@ void cmdConfig::displayDeviceConfig(devInfo *d)
 			if (limits != nullptr) {
 				auto it = limits->find(level);
 				if (it != limits->end()) {
-					return std::to_string(it->second / 1000);
+					return std::to_string(mwToW(it->second));
 				}
 			}
 			return "N/A";
@@ -756,8 +760,8 @@ void cmdConfig::displayDeviceConfig(devInfo *d)
 		table.addRow("", "", "  peak(w): " + getLimitStr(ZES_POWER_LEVEL_PEAK));
 	};
 
-	const std::map<zes_power_level_t, uint32_t> *cardLimits = nullptr;
-	const std::map<zes_power_level_t, uint32_t> *packageLimits = nullptr;
+	const std::map<zes_power_level_t, int32_t> *cardLimits = nullptr;
+	const std::map<zes_power_level_t, int32_t> *packageLimits = nullptr;
 	auto cardIt = domainLimits.find(ZES_POWER_DOMAIN_CARD);
 	if (cardIt != domainLimits.end()) {
 		cardLimits = &cardIt->second;
@@ -1010,18 +1014,15 @@ ze_result_t cmdConfig::setFrequencyRange(devInfo *d)
 {
 	TRACING();
 
-	if (!configCmds[configCmdType::TILE].enabled) {
-		ERR("Error: Tile ID is required for frequency configuration. Use -t <tileId>.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	// Validate tile ID is numeric
-	const std::string &tileIdStr = configCmds[configCmdType::TILE].val;
-	if (tileIdStr.empty() || !std::all_of(tileIdStr.begin(), tileIdStr.end(), ::isdigit)) {
-		ERR("Error: Invalid tile ID.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	int32_t tileId = -1;
+	if (configCmds[configCmdType::TILE].enabled) {
+		uint32_t parsedTileId = 0;
+		if (!parseUint32NoThrow(configCmds[configCmdType::TILE].val, parsedTileId)) {
+			ERR("Error: Invalid tile ID.\n");
+			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+		}
+		tileId = static_cast<int32_t>(parsedTileId);
 	}
-	uint32_t tileId = std::stoi(tileIdStr);
 
 	std::string rangeStr = configCmds[configCmdType::FREQUENCYRANGE].val;
 	size_t commaPos = rangeStr.find(',');
@@ -1064,8 +1065,13 @@ ze_result_t cmdConfig::setFrequencyRange(devInfo *d)
 	ze_result_t result = fq->setFrequencyRange(minFreq, maxFreq, tileId);
 
 	if (result == ZE_RESULT_SUCCESS) {
-		PRINT("Succeeded in changing the core frequency range on GPU {} tile {} to {:.0f}-{:.0f} MHz.\n", d->index,
-			  tileId, minFreq, maxFreq);
+		if (tileId < 0) {
+			PRINT("Succeeded in changing the core frequency range on GPU {} (all tiles) to {:.0f}-{:.0f} MHz.\n",
+				  d->index, minFreq, maxFreq);
+		} else {
+			PRINT("Succeeded in changing the core frequency range on GPU {} tile {} to {:.0f}-{:.0f} MHz.\n", d->index,
+				  tileId, minFreq, maxFreq);
+		}
 	}
 
 	return result;
@@ -1084,7 +1090,15 @@ ze_result_t cmdConfig::setPowerLimit(devInfo *d)
 
 	// Parse the power limit from the option string - may include type
 	std::string powerLimitStr = configCmds[configCmdType::POWERLIMIT].val;
-	double powerLimit = std::stod(powerLimitStr);
+	double powerLimit = 0.0;
+	try {
+		powerLimit = std::stod(powerLimitStr);
+	} catch (const std::exception &) {
+		// std::stod throws on non-numeric / empty input; reject it cleanly
+		// instead of letting the exception abort the process.
+		ERR("Invalid power limit value. Power limit must be a non-negative number.\n");
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	}
 
 	if (powerLimit < 0) {
 		ERR("Invalid power limit value. Power limit must be non-negative.\n");
@@ -1097,9 +1111,18 @@ ze_result_t cmdConfig::setPowerLimit(devInfo *d)
 		return ZE_RESULT_ERROR_UNKNOWN;
 	}
 
-	uint32_t limitMw = static_cast<uint32_t>(powerLimit * W_TO_MW);
+	uint32_t limitMw = wToMw(powerLimit);
 	ze_result_t result = ZE_RESULT_ERROR_UNKNOWN;
 
+	powerExp *pwrExp = d->dev->getPowerExp();
+	if (pwrExp != nullptr && pwrExp->isPowerExpEnabled()) {
+		result = pwrExp->setPowerLimit(limitMw);
+		if (result == ZE_RESULT_SUCCESS) {
+			PRINT("Succeeded in setting the power limit to {:.1f} W on GPU {}\n", powerLimit, d->index);
+		}
+		return result;
+	}
+
 	// Determine power type if specified
 	std::string powerType = configCmds[configCmdType::POWERTYPE].val;
 	if (powerType.empty() || powerType == "sustain") {
@@ -1173,18 +1196,15 @@ ze_result_t cmdConfig::setScheduler(devInfo *d)
 {
 	TRACING();
 
-	if (!configCmds[configCmdType::TILE].enabled) {
-		ERR("Error: Tile ID is required for scheduler configuration. Use -t <tileId>.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	// Validate tile ID is numeric
-	const std::string &tileIdStr = configCmds[configCmdType::TILE].val;
-	if (tileIdStr.empty() || !std::all_of(tileIdStr.begin(), tileIdStr.end(), ::isdigit)) {
-		ERR("Error: Invalid tile ID.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	// Determine target tile(s): specific tile if -t given, all tiles otherwise
+	bool singleTile = configCmds[configCmdType::TILE].enabled;
+	uint32_t specificTileId = 0;
+	if (singleTile) {
+		if (!parseUint32NoThrow(configCmds[configCmdType::TILE].val, specificTileId)) {
+			ERR("Error: Invalid tile ID.\n");
+			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+		}
 	}
-	uint32_t tileId = static_cast<uint32_t>(std::stoul(tileIdStr));
 
 	std::string schedulerMode = configCmds[configCmdType::SCHEDULERMODE].val;
 	std::vector<std::string> parts = split(schedulerMode, ',');
@@ -1194,139 +1214,98 @@ ze_result_t cmdConfig::setScheduler(devInfo *d)
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
-	frequency *fq = d->dev->getFrequency();
-	if (fq == nullptr) {
-		ERR("Error: Frequency pointer not found.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
 	std::string mode = parts[0];
 	std::transform(mode.begin(), mode.end(), mode.begin(),
 				   [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
 
-	ze_result_t result = ZE_RESULT_ERROR_UNKNOWN;
+	// Validate mode and parameters before applying
+	uint64_t timeoutValue = 0;
+	uint64_t interval = 0;
+	uint64_t yieldTimeout = 0;
 
 	if (mode == "timeout") {
 		if (parts.size() != 2) {
 			ERR("Invalid timeout format. Expected: timeout,value\n");
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-
-		// Validate numeric value
 		const std::string &timeoutStr = parts[1];
 		if (timeoutStr.empty() || !std::all_of(timeoutStr.begin(), timeoutStr.end(), ::isdigit)) {
 			ERR("Error parsing timeout value: invalid numeric format\n");
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-
-		uint64_t timeoutValue = std::stoull(timeoutStr);
+		timeoutValue = std::stoull(timeoutStr);
 		if (timeoutValue < SCHEDULER_TIME_MIN || timeoutValue > SCHEDULER_TIME_MAX) {
 			ERR("Timeout value must be between {} and {} us\n", SCHEDULER_TIME_MIN, SCHEDULER_TIME_MAX);
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-		result = fq->setSchedulerTimeoutMode(tileId, timeoutValue);
 	} else if (mode == "timeslice") {
 		if (parts.size() != 3) {
 			ERR("Invalid timeslice format. Expected: timeslice,interval,yieldTimeout\n");
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-
-		// Validate both numeric values
 		const std::string &intervalStr = parts[1];
 		const std::string &yieldStr = parts[2];
-
 		if (intervalStr.empty() || !std::all_of(intervalStr.begin(), intervalStr.end(), ::isdigit)) {
 			ERR("Error parsing timeslice values: invalid interval format\n");
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-
 		if (yieldStr.empty() || !std::all_of(yieldStr.begin(), yieldStr.end(), ::isdigit)) {
 			ERR("Error parsing timeslice values: invalid yield timeout format\n");
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-
-		uint64_t interval = std::stoull(intervalStr);
-		uint64_t yieldTimeout = std::stoull(yieldStr);
-
+		interval = std::stoull(intervalStr);
+		yieldTimeout = std::stoull(yieldStr);
 		if (interval < SCHEDULER_TIME_MIN || interval > SCHEDULER_TIME_MAX || yieldTimeout < SCHEDULER_TIME_MIN ||
 			yieldTimeout > SCHEDULER_TIME_MAX) {
 			ERR("Time values must be between {} and {} us\n", SCHEDULER_TIME_MIN, SCHEDULER_TIME_MAX);
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
-		result = fq->setSchedulerTimesliceMode(tileId, interval, yieldTimeout);
 	} else if (mode == "exclusive") {
-		result = fq->setSchedulerExclusiveMode(tileId);
+		if (parts.size() != 1) {
+			ERR("Invalid exclusive format. Expected: exclusive\n");
+			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+		}
 	} else {
 		ERR("Invalid scheduler mode. Valid options: timeout, timeslice, exclusive\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (result == ZE_RESULT_SUCCESS) {
-		PRINT("Succeeded in changing the scheduler mode on GPU {} tile {} to {}\n", d->index, tileId, mode.c_str());
-	}
-
-	return result;
-}
-
-/**
- * @brief Sets the performance factor for the device.
- *
- * @param d Device information structure.
- *
- * @return ze_result_t Result of the operation.
- */
-ze_result_t cmdConfig::setPerformanceFactor(devInfo *d)
-{
-	TRACING();
-
-	std::string performanceFactor = configCmds[configCmdType::PERFORMANCEFACTOR].val;
-	std::vector<std::string> parts = split(performanceFactor, ',');
-
-	if (parts.size() != 2) {
-		ERR("Invalid performance factor format. Expected: engineType,factorValue\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	std::string engineType = parts[0];
-	std::transform(engineType.begin(), engineType.end(), engineType.begin(),
-				   [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
-
-	if (engineType != "compute" && engineType != "media") {
-		ERR("Invalid engine type. Valid options: compute, media\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	// Validate factor value is numeric (can be decimal)
-	char *endPtr = nullptr;
-	double factorValue = std::strtod(parts[1].c_str(), &endPtr);
-	if (endPtr == parts[1].c_str() || *endPtr != '\0') {
-		ERR("Error parsing factor value: invalid numeric format\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (factorValue < 0 || factorValue > 100) {
-		ERR("Factor value must be between 0 and 100\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	performance *perf = d->dev->getPerformance();
-	if (perf == nullptr) {
-		ERR("Error: Performance pointer not found.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	zes_engine_type_flag_t engineTypeFlag =
-		(engineType == "compute") ? ZES_ENGINE_TYPE_FLAG_COMPUTE : ZES_ENGINE_TYPE_FLAG_MEDIA;
-
-	ze_result_t result = perf->setConfig(engineTypeFlag, factorValue);
+	ze_result_t result = ZE_RESULT_ERROR_UNKNOWN;
 
-	if (result == ZE_RESULT_SUCCESS) {
-		if (configCmds[configCmdType::TILE].enabled) {
-			PRINT("Succeeded in changing the {} performance factor to {:.1f} on GPU {} tile {}\n", engineType.c_str(),
-				  factorValue, d->index, configCmds[configCmdType::TILE].val.c_str());
+	if (!singleTile) {
+		// All tiles: use scheduler HAL which iterates all scheduler controllers in one pass
+		scheduler *sched = d->dev->getScheduler();
+		if (sched == nullptr) {
+			ERR("Error: Scheduler pointer not found.\n");
+			return ZE_RESULT_ERROR_UNKNOWN;
+		}
+		if (mode == "timeout") {
+			result = sched->setTimeoutMode(timeoutValue);
+		} else if (mode == "timeslice") {
+			result = sched->setTimesliceMode(interval, yieldTimeout);
+		} else {
+			result = sched->setExclusiveMode();
+		}
+		if (result == ZE_RESULT_SUCCESS) {
+			PRINT("Succeeded in changing the scheduler mode on GPU {} (all tiles) to {}\n", d->index, mode.c_str());
+		}
+	} else {
+		// Single tile: use frequency HAL which targets a specific subdevice's scheduler
+		frequency *fq = d->dev->getFrequency();
+		if (fq == nullptr) {
+			ERR("Error: Frequency pointer not found.\n");
+			return ZE_RESULT_ERROR_UNKNOWN;
+		}
+		if (mode == "timeout") {
+			result = fq->setSchedulerTimeoutMode(specificTileId, timeoutValue);
+		} else if (mode == "timeslice") {
+			result = fq->setSchedulerTimesliceMode(specificTileId, interval, yieldTimeout);
 		} else {
-			PRINT("Succeeded in changing the {} performance factor to {:.1f} on GPU {}\n", engineType.c_str(),
-				  factorValue, d->index);
+			result = fq->setSchedulerExclusiveMode(specificTileId);
+		}
+		if (result == ZE_RESULT_SUCCESS) {
+			PRINT("Succeeded in changing the scheduler mode on GPU {} tile {} to {}\n", d->index, specificTileId,
+				  mode.c_str());
 		}
 	}
 
@@ -1344,7 +1323,18 @@ ze_result_t cmdConfig::setMemoryEcc(devInfo *d)
 {
 	TRACING();
 	// Set memory ECC. Valid options are 0:disable; 1:enable
-	int memoryEcc = stoi(configCmds[configCmdType::MEMORYECC].val);
+	int memoryEcc = 0;
+	try {
+		size_t pos = 0;
+		memoryEcc = stoi(configCmds[configCmdType::MEMORYECC].val, &pos);
+		// Reject trailing garbage (e.g. "0,1") that stoi would otherwise ignore.
+		if (pos != configCmds[configCmdType::MEMORYECC].val.size()) {
+			throw std::invalid_argument("trailing characters");
+		}
+	} catch (const std::exception &) {
+		ERR("Invalid memory ECC value. Valid options are 0:disable; 1:enable\n");
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	}
 	if (memoryEcc != 0 && memoryEcc != 1) {
 		ERR("Invalid memory ECC value. Valid options are 0:disable; 1:enable\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
@@ -1358,6 +1348,20 @@ ze_result_t cmdConfig::setMemoryEcc(devInfo *d)
 
 	ecc_state_t state = {};
 	ze_result_t result = e->setState(d->zesDeviceHdl, memoryEcc, &state);
+	if (result == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+		// ECC is not supported/configurable on this device.
+		if (memoryEcc == 0) {
+			// Disabling ECC on hardware without ECC support is effectively a
+			// no-op: the requested state (disabled) already holds, so report
+			// success instead of surfacing a confusing Level Zero error.
+			PRINT("Memory ECC is already disabled on GPU {} (ECC not supported).\n", d->index);
+			return ZE_RESULT_SUCCESS;
+		}
+		// Enabling ECC on hardware that does not support it cannot succeed;
+		// fail gracefully with a clear message and a non-zero exit code.
+		ERR("Memory ECC configuration is not supported on GPU {}.\n", d->index);
+		return result;
+	}
 	if (result != ZE_RESULT_SUCCESS) {
 		ERR("Failed to set memory ECC state: 0x{:X} ({})\n", result, l0_error_to_string(result));
 		return result;
@@ -1428,7 +1432,15 @@ ze_result_t cmdConfig::setPCIeGenUpdate(devInfo *d)
 {
 	TRACING();
 	// Set PCIe downgrade. Valid options are 0:disable; 1:enable
-	int pcieDowngrade = stoi(configCmds[configCmdType::PCIEDOWNGRADE].val);
+	int pcieDowngrade = 0;
+	try {
+		pcieDowngrade = stoi(configCmds[configCmdType::PCIEDOWNGRADE].val);
+	} catch (const std::exception &) {
+		// stoi throws on non-numeric / empty input; reject it cleanly instead
+		// of letting the exception abort the process.
+		ERR("Invalid PCIe downgrade value. Valid options are 0:disable; 1:enable\n");
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	}
 	if (pcieDowngrade != 0 && pcieDowngrade != 1) {
 		ERR("Invalid PCIe downgrade value. Valid options are 0:disable; 1:enable\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
@@ -1902,74 +1914,102 @@ int cmdConfig::run(arg_struct *args)
 	TRACING();
 	std::vector<devInfo> deviceList;
 	ze_result_t result;
-	int opt;
-	int optionIndex = 0;
-	bool found = false;
-	bool isQueryMode = true; // Track if this is a query or set operation
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(configCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	// Parse command line arguments
-	while ((opt = GETOPT_LONG(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return 0;
-		case 'j':
-			configCmds[configCmdType::CONFIGJSON].enabled = true;
-			break;
-		case 'd':
-			configCmds[configCmdType::CONFIGDEVICE].enabled = true;
-			configCmds[configCmdType::CONFIGDEVICE].val = optarg;
-			break;
-		case 't':
-			configCmds[configCmdType::TILE].enabled = true;
-			configCmds[configCmdType::TILE].val = optarg;
-			break;
-		case 0:
-			for (auto &cmd : configCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					// Any command with a function means this is a set operation
-					if (cmd.second.func != nullptr || cmd.first == configCmdType::RESET) {
-						isQueryMode = false;
-					}
-					found = true;
-					break;
-				}
-			}
-
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
+	bool isQueryMode = true;
+
+	// Reset state
+	for (auto &[k, v] : configCmds) {
+		v.enabled = false;
+		v.val.clear();
+	}
+
+	CLI::App sub{"Configure GPU settings", "config"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", configCmds[configCmdType::CONFIGJSON].enabled, "Print result in JSON format");
+	sub.add_option("-d,--device,--id", configCmds[configCmdType::CONFIGDEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { configCmds[configCmdType::CONFIGDEVICE].enabled = true; });
+	sub.add_option("-t,--tile", configCmds[configCmdType::TILE].val, "Tile ID")->each([&](const std::string &) {
+		configCmds[configCmdType::TILE].enabled = true;
+	});
+	sub.add_option("--frequencyrange", configCmds[configCmdType::FREQUENCYRANGE].val,
+				   "Set frequency range (MHz), e.g. minFreq:maxFreq")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::FREQUENCYRANGE].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--powerlimit", configCmds[configCmdType::POWERLIMIT].val, "Set power limit (W)")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::POWERLIMIT].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--standby", configCmds[configCmdType::STANDBYMODE].val, "Set standby mode")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::STANDBYMODE].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--scheduler", configCmds[configCmdType::SCHEDULERMODE].val, "Set scheduler mode")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::SCHEDULERMODE].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--memoryecc", configCmds[configCmdType::MEMORYECC].val, "Enable (1) or disable (0) ECC")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::MEMORYECC].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--pciedowngrade", configCmds[configCmdType::PCIEDOWNGRADE].val, "Set PCIe generation downgrade")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::PCIEDOWNGRADE].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_flag("--reset", configCmds[configCmdType::RESET].enabled, "Reset the GPU");
+	sub.add_option("--powertype", configCmds[configCmdType::POWERTYPE].val, "Power type")
+		->each([&](const std::string &) { configCmds[configCmdType::POWERTYPE].enabled = true; });
+	sub.add_flag("--clear-ras-errors", configCmds[configCmdType::CLEARRAS].enabled, "Clear RAS error counters");
+	sub.add_option("--fanspeed", configCmds[configCmdType::FANSPEED].val,
+				   "Set fan speed (%). Use --fanid to target a specific fan; omit for all fans")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::FANSPEED].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--fancurve", configCmds[configCmdType::FANCURVE].val,
+				   "Set fan curve as temp:speed pairs, e.g. 50:20,80:60,100:100")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::FANCURVE].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--fancurve-rpm", configCmds[configCmdType::FANCURVERPM].val,
+				   "Set fan curve in RPM as temp:rpm pairs, e.g. 50:800,80:1200")
+		->each([&](const std::string &) {
+			configCmds[configCmdType::FANCURVERPM].enabled = true;
+			isQueryMode = false;
+		});
+	sub.add_option("--fanid", configCmds[configCmdType::FANID].val,
+				   "Target fan ID (-1 = all fans, 0..N-1 = specific fan)")
+		->each([&](const std::string &) { configCmds[configCmdType::FANID].enabled = true; });
+	sub.add_flag("--coldreset", configCmds[configCmdType::COLDRESET].enabled,
+				 "Cold-reset the device (requires PCI BDF address for --device, not a device index)");
+	sub.add_flag("--ignore-gpu-user-processes", configCmds[configCmdType::IGNORE_GPU_USER_PROCESSES].enabled,
+				 "Skip check for running GPU user processes before reset");
+	sub.add_flag("--force-reset-gpus", configCmds[configCmdType::FORCE_RESET_GPUS].enabled,
+				 "Force GPU reset even if user processes are present");
 
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// Check for extra arguments
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
+	// Flags that constitute a write (non-query) operation
+	if (configCmds[configCmdType::RESET].enabled || configCmds[configCmdType::CLEARRAS].enabled ||
+		configCmds[configCmdType::COLDRESET].enabled) {
+		isQueryMode = false;
+	}
+
 	// Check if the device ID is provided
 	if (configCmds[configCmdType::CONFIGDEVICE].val.empty()) {
 		ERR("Device ID is required.\n");
diff --git a/ial/cmn/cmd_config.h b/ial/cmn/cmd_config.h
index 1d6e856e9..02a50a8f4 100644
--- a/ial/cmn/cmd_config.h
+++ b/ial/cmn/cmd_config.h
@@ -22,7 +22,6 @@ enum configCmdType
 	POWERTYPE,
 	STANDBYMODE,
 	SCHEDULERMODE,
-	PERFORMANCEFACTOR,
 	MEMORYECC,
 	RESET,
 	COLDRESET,
@@ -43,7 +42,7 @@ class cmdConfig : public cmds
 {
 
 public:
-	cmdConfig() { STRCPY_S(name, MAX_PATH, "config"); }
+	cmdConfig() { name = "config"; }
 	~cmdConfig() {}
 	void help(HELP helpType = FULL_HELP);
 	void displayDeviceConfig(devInfo *d);
@@ -51,7 +50,6 @@ class cmdConfig : public cmds
 	ze_result_t setPowerLimit(devInfo *d);
 	ze_result_t setStandby(devInfo *d);
 	ze_result_t setScheduler(devInfo *d);
-	ze_result_t setPerformanceFactor(devInfo *d);
 	ze_result_t setMemoryEcc(devInfo *d);
 	ze_result_t setPCIeGenUpdate(devInfo *d);
 	ze_result_t resetDevice(devInfo *d);
@@ -68,10 +66,9 @@ using configSubCmdFunc = ze_result_t (cmdConfig::*)(devInfo *d);
 
 struct configCmdStruct
 {
-	option opt;
-	configSubCmdFunc func;
-	bool enabled;
-	std::string val;
+	configSubCmdFunc func{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
 #endif
diff --git a/ial/cmn/cmd_diag.cpp b/ial/cmn/cmd_diag.cpp
deleted file mode 100644
index 06b4ab549..000000000
--- a/ial/cmn/cmd_diag.cpp
+++ /dev/null
@@ -1,1583 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "cmd_diag.h"
-#include "debug.h"
-#include "table_builder.h"
-#include <format>
-#include <pci.h>
-#include <power.h>
-#include <chrono>
-#include <thread>
-#include <cmath>
-#include <fstream>
-#include <sys/stat.h>
-#include <assert.h>
-#include <ecc.h>
-#include <fabric.h>
-#include <frequency.h>
-#include <scheduler.h>
-#include <performance.h>
-#include <standby.h>
-#include <stdexcept>
-#include <inttypes.h>
-#include <ranges>
-#include <charconv>
-/*
- * @brief Command structure for diagnostic commands.
- * The way that this structure is defined allows for easy addition of new commands
- * by simply adding a new entry to the diagCmds map.
- * The command type is defined in the diagCmdType enum. It allows for easy
- * identification of the command type when requiring a specific command.
- * Next comes the option structure, which defines the command line options for the command.
- * The option structure is defined in the getopt.h header file. It allows for easy parsing
- * of command line options.
- * The next field is a pointer to the function that will be called when the command is executed.
- * This function is defined in the cmd_diag class. It doesn't have to be defined if a particular
- * command doesn't require a function to be called.
- * The next field is a boolean that indicates whether the command line option has been specified
- * by the user.
- * The last field is the value of the command line option (if any). This is simply stored as a
- * string. It is required to convert it to the appropriate type when the command is executed.
- */
-
-static std::unordered_map<diagCmdType, diagCmdStruct> diagCmds = {
-	{diagCmdType::DIAGHELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{diagCmdType::DIAGJSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{diagCmdType::DIAGDEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{diagCmdType::LEVEL, {{"level", required_argument, 0, 'l'}, &cmdDiag::level, false, ""}},
-	{diagCmdType::PRECHECK, {{"precheck", no_argument, 0, 0}, nullptr, false, ""}},
-	{diagCmdType::STRESS, {{"stress", no_argument, 0, 's'}, &cmdDiag::stress, false, ""}},
-	{diagCmdType::SINGLETEST, {{"singletest", required_argument, 0, 0}, &cmdDiag::runSingleTest, false, ""}},
-	{diagCmdType::LISTTYPES, {{"listtypes", no_argument, 0, 0}, nullptr, false, ""}},
-	{diagCmdType::GPU, {{"gpu", no_argument, 0, 0}, nullptr, false, ""}},
-	{diagCmdType::SINCE, {{"since", required_argument, 0, 0}, &cmdDiag::runSince, false, ""}},
-	{diagCmdType::STRESSTIME, {{"stresstime", required_argument, 0, 0}, nullptr, false, ""}},
-};
-
-std::unordered_map<diagLevel, std::vector<std::pair<diagSubCmdType, diagSubLevelCmdStruct>>> cmdDiag::levelToDiagTests =
-	{
-		{diagLevel::LEVEL_1,
-		 {
-			 {
-				 DIAG_LEVEL_SW_LIBRARY,
-				 {&cmdDiag::checkLibrary, "XPUM_DIAG_SOFTWARE_LIBRARY", true},
-			 },
-			 {
-				 DIAG_LEVEL_SW_PERMISSION,
-				 {&cmdDiag::checkAccessPermission, "XPUM_DIAG_SOFTWARE_PERMISSION", true},
-			 },
-			 {
-				 DIAG_LEVEL_SW_EXCLUSIVE,
-				 {&cmdDiag::checkExclusive, "XPUM_DIAG_SOFTWARE_EXCLUSIVE", true},
-			 },
-			 {
-				 DIAG_LEVEL_COMPUTATIONFUNCTEST,
-				 {&cmdDiag::computationFuncTest, "XPUM_DIAG_LIGHT_COMPUTATION", true},
-			 },
-		 }},
-		{diagLevel::LEVEL_2,
-		 {
-			 {
-				 DIAG_LEVEL_PCIEBANDWIDTH,
-				 {&cmdDiag::pcieBandwidth, "XPUM_DIAG_INTEGRATION_PCIE", true},
-			 },
-			 {
-				 DIAG_LEVEL_MEDIA,
-				 {&cmdDiag::mediaFuncTest, "XPUM_DIAG_MEDIA_CODEC", true},
-			 },
-		 }},
-		{diagLevel::LEVEL_3,
-		 {
-			 {
-				 DIAG_LEVEL_COMPUTATION,
-				 {&cmdDiag::computation, "XPUM_DIAG_PERFORMANCE_COMPUTATION", true},
-			 },
-			 {
-				 DIAG_LEVEL_POWER,
-				 {&cmdDiag::powerTest, "XPUM_DIAG_PERFORMANCE_POWER", true},
-			 },
-			 {
-				 DIAG_LEVEL_MEMORYBANDWIDTH,
-				 {&cmdDiag::memoryBandwidth, "XPUM_DIAG_PERFORMANCE_MEMORY_BANDWIDTH", true},
-			 },
-			 {
-				 DIAG_LEVEL_MEMORYALLOCATION,
-				 {&cmdDiag::memoryAllocation, "XPUM_DIAG_PERFORMANCE_MEMORY_ALLOCATION", true},
-			 },
-			 {
-				 DIAG_LEVEL_MEMORYERROR,
-				 {&cmdDiag::memoryError, "XPUM_DIAG_MEMORY_ERROR", true},
-			 },
-		 }},
-};
-
-/**
- * @brief Wraps text to fit within specified width, returning lines.
- *
- * Splits text at word boundaries to fit within maxWidth. Continuation
- * lines are indented by 2 spaces.
- *
- * @param[in] text Text to wrap.
- * @param[in] maxWidth Maximum width per line.
- * @return Vector of wrapped lines.
- */
-static std::vector<std::string> wrapText(std::string_view text, size_t maxWidth)
-{
-	constexpr size_t indentSize = 2;
-	constexpr size_t minWidth = indentSize + 1;
-	std::vector<std::string> lines;
-
-	if (maxWidth < minWidth) {
-		maxWidth = minWidth;
-	}
-
-	if (text.length() <= maxWidth) {
-		lines.emplace_back(text);
-		return lines;
-	}
-
-	std::string_view remaining = text;
-	bool firstLine = true;
-
-	while (!remaining.empty()) {
-		const size_t lineWidth = firstLine ? maxWidth : (maxWidth - indentSize);
-
-		if (remaining.length() <= lineWidth) {
-			lines.push_back(std::format("{}{}", firstLine ? "" : "  ", remaining));
-			break;
-		}
-
-		size_t breakPos = remaining.rfind(' ', lineWidth);
-		if (breakPos == std::string_view::npos || breakPos == 0) {
-			breakPos = lineWidth;
-		}
-
-		auto line = remaining.substr(0, breakPos);
-		if (auto lastNonSpace = line.find_last_not_of(' '); lastNonSpace != std::string_view::npos) {
-			line = line.substr(0, lastNonSpace + 1);
-		}
-		lines.push_back(std::format("{}{}", firstLine ? "" : "  ", line));
-
-		remaining = remaining.substr(breakPos);
-		if (auto firstNonSpace = remaining.find_first_not_of(' '); firstNonSpace != std::string_view::npos) {
-			remaining = remaining.substr(firstNonSpace);
-		} else {
-			remaining = {};
-		}
-
-		firstLine = false;
-	}
-
-	return lines;
-}
-
-/**
- * @brief Adds help commands to the provided help list.
- *
- * @param helpList A pointer to a list of help commands.
- */
-void cmdDiag::help(HELP helpType)
-{
-	TRACING();
-	std::vector<helpCmd> helpList;
-
-	helpList.push_back(helpCmd(TITLE, "Run some test suites to diagnose GPU"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s diag [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [deviceId] -l [level]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [pciBdfAddress] -l [level]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [deviceId] -l [level] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [pciBdfAddress] -l [level] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [deviceId] --singletest [testIds]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [pciBdfAddress] --singletest [testIds]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [deviceId] --singletest [testIds] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [pciBdfAddress] --singletest [testIds] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [deviceIds] --stress", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag -d [deviceIds] --stress --stresstime [time]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --listtypes", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --listtypes -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --gpu", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --gpu -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --since [startTime]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --since [startTime] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --gpu --since [startTime]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --precheck --gpu --since [startTime] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --stress", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s diag --stress --stresstime [time]", progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address"));
-	helpList.push_back(
-		helpCmd(HEADING, "-l,--level                  The diagnostic levels to run. The valid options include"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "1. quick test"));
-	helpList.push_back(helpCmd(
-		SUB_HEADING2,
-		"2. medium test - this diagnostic level will have the significant performance impact on the specified GPUs"));
-	helpList.push_back(helpCmd(
-		SUB_HEADING2,
-		"3. long test - this diagnostic level will have the significant performance impact on the specified GPUs"));
-	helpList.push_back(helpCmd(HEADING, "-s,--stress                 Stress the GPU(s) for the specified time"));
-	helpList.push_back(helpCmd(HEADING, "--stresstime                Stress time (in minutes)"));
-	helpList.push_back(helpCmd(HEADING, "--precheck                  Do the precheck on the GPU and GPU driver. By "
-										"default, precheck scans kernel messages by journalctl"));
-	helpList.push_back(helpCmd(SUB_HEADING, "It could be configured to scan dmesg or log file through xpum.conf"));
-	helpList.push_back(helpCmd(HEADING, "--listtypes                 List all supported GPU error types"));
-	helpList.push_back(helpCmd(HEADING, "--gpu                       Show the GPU status only"));
-	helpList.push_back(helpCmd(HEADING, "--since                     Start time for log scanning. It only works with "
-										"the journalctl option. The generic format is \"YYYY-MM-DD HH:MM:SS\""));
-	helpList.push_back(helpCmd(SUB_HEADING, "Alternatively the strings \"yesterday\", \"today\" are also understood"));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"Relative times also may be specified, prefixed with \"-\" referring to times before the current time"));
-	helpList.push_back(helpCmd(SUB_HEADING, "Scanning would start from the latest boot if it is not specified"));
-	helpList.push_back(
-		helpCmd(HEADING, "--singletest                Selectively run some particular tests. Separated by the comma"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "1. Computation"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "2. Memory Error"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "3. Memory Bandwidth"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "4. Media Codec"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "5. PCIe Bandwidth"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "6. Power"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "7. Computation functional test"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "8. Media Codec functional test"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "9. Memory Allocation"));
-	helpList.push_back(helpCmd(SUB_HEADING, "Note that in a multi NUMA node server, it may need to use numactl to "
-											"specify which node the PCIe bandwidth test runs on"));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"Usage: numactl [ --membind nodes ] [ --cpunodebind nodes ] xpu-smi diag -d [deviceId] --singletest 5"));
-	helpList.push_back(helpCmd(SUB_HEADING, "It also applies to diag level tests"));
-
-	printHelp(helpList, helpType);
-	helpList.clear();
-}
-
-/**
- * @brief Prints Precheck information.
- *
- * @param[in] deviceList A list of device information structures.
- * @param[in] gpuOnly A flag of GPU display.
- * @return ze_result_t Returns ZE_RESULT_SUCCESS on success.
- */
-ze_result_t cmdDiag::printPrecheckInfo(std::vector<devInfo> deviceList, std::unique_ptr<Printer> &printer, bool gpuOnly)
-{
-	TRACING();
-	std::string outputLine;
-	std::string resultLine;
-	std::string fwStatus;
-
-	if (gpuOnly && !diagCmds[diagCmdType::PRECHECK].enabled) {
-		ERR("--gpu requires --precheck.\n");
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto componentListJson = std::make_unique<nlohmann::ordered_json>();
-	outputLine = (driverLoaded) ? std::string("Pass") : std::string("Fail");
-	auto componentJson = printPreCheckDetail(std::string(), std::string(), outputLine, std::string("Driver"));
-	componentListJson->push_back(*componentJson);
-
-	if (!gpuOnly) {
-		auto componentCPUJson =
-			printPreCheckDetail(std::string("0"), std::string(), CHECKCPUSTATUS(), std::string("CPU"));
-		componentListJson->push_back(*componentCPUJson);
-	}
-
-	for (auto &device : deviceList) {
-		pci *p = device.dev->getPCI();
-		if (p == nullptr) {
-			ERR("Failed to get PCI device properties.\n");
-			return ZE_RESULT_ERROR_UNKNOWN;
-		}
-		outputLine = p->getBDFStr();
-		fwStatus = p->getFWStatus();
-		resultLine = ((fwStatus == std::string("normal")) && CHECKPCIELINKSTATUS(outputLine)) ? std::string("Pass")
-																							  : std::string("Unknown");
-		auto componentGPUJson = printPreCheckDetail(std::string(), outputLine, resultLine, std::string("GPU"));
-		componentListJson->push_back(*componentGPUJson);
-	}
-
-	auto devicesJson = std::make_unique<nlohmann::ordered_json>();
-	(*devicesJson)["component_list"] = *componentListJson;
-
-	printer->print(devicesJson.get());
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes stress testing diagnostics on the device
- *
- * This function runs intensive stress tests designed to validate device
- * stability and performance under heavy computational loads. It helps
- * identify potential hardware issues and thermal limitations.
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS if stress tests pass, error code otherwise
- */
-ze_result_t cmdDiag::stress(devInfo *d, UNUSED nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-	ze_result_t res;
-	const std::string filename = "ze_int_compute.spv";
-	const std::string moduleName = "compute_int_v1";
-	int inputValue = 4;
-	long double current;
-	uint64_t round = 0;
-	bool featureOnly;
-	std::string outputLine;
-
-	if (diagCmds[diagCmdType::STRESSTIME].enabled) {
-		if (stoi(diagCmds[diagCmdType::STRESSTIME].val) < 0) {
-			ERR("Stress time should be greater than or equal to 0.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-	}
-
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	PRINT("Started to stress GPU and would update the status in every minute \n");
-	featureOnly = false;
-	outputLine = std::to_string(d->index);
-	while (true) {
-		std::this_thread::sleep_for(std::chrono::seconds(60));
-		round++;
-		res = diag->computationTest(d, 2048, &inputValue, sizeof(int), filename, moduleName, current, featureOnly);
-		if (res != ZE_RESULT_SUCCESS) {
-			ERR("Failed to run stress: {}\n", l0_error_to_string(res));
-			return res;
-		} else {
-			PRINT("Stress on GPU: {}; Round {}; Integer compute: {:f} GIOPS.\n", outputLine.c_str(), round, current);
-			if (diagCmds[diagCmdType::STRESSTIME].enabled) {
-				if ((stoi(diagCmds[diagCmdType::STRESSTIME].val) != 0) &&
-					(round >= static_cast<uint64_t>(stoi(diagCmds[diagCmdType::STRESSTIME].val)))) {
-					PRINT("Finish stressing.\n");
-					return ZE_RESULT_SUCCESS;
-				}
-			}
-		}
-	}
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief check Library.
- *
- * This function check Library on a device to ensure the system in the healthy states.
- * It loads the device related info and performs the tests:
- * 1. Retrieves the device's PCI properties
- * 2. Make sure firmware get loaded and work in normal state.
- * 3. Make sure all the driver & related library get loaded properly.
- *
- * @param[in] d Pointer to device information structure
- * @return ze_result_t ZE_RESULT_SUCCESS on success, or an error code on failure
- */
-ze_result_t cmdDiag::checkLibrary(devInfo *d, UNUSED nlohmann::ordered_json *jsonObj)
-{
-	std::string fwStatus;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	fwStatus = p->getFWStatus();
-	if ((fwStatus != "normal") || !(driverLoaded)) {
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief check access permission.
- *
- * This function check permission on a device to ensure having necessary access permission.
- * It performs the tests:
- * 1. check if there is a /dev/dri folder and can accessed or not
- * 2. check if there is any entry name under the /dev/dri, which has the prefix with "renderD"
- *    and after are all digits and can be accessed or not
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on success, or an error code on failure
- */
-ze_result_t cmdDiag::checkAccessPermission(UNUSED devInfo *d, UNUSED nlohmann::ordered_json *jsonObj)
-{
-	if (!CHECKPERMISSION()) {
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief check exclusive.
- *
- * This function check if the host processes can simultaneously & exclusively run on the specified device.
- * It performs the tests:
- * 1. loads the number of processes connected to the device and run them dynamically,
- * 2. check if the processes currently attached to the device can run successfully.
- * 3. check if all these process related stream files, which have names with "/proc/" + std::to_string(processId)
- *    + "/cmdline" have healthy states and ready for i/o operations.
- *
- * @param[in] d Pointer to device information structure
- * @return ze_result_t ZE_RESULT_SUCCESS on success, or an error code on failure
- */
-ze_result_t cmdDiag::checkExclusive(devInfo *d, UNUSED nlohmann::ordered_json *jsonObj)
-{
-	ze_result_t ret;
-	std::vector<zes_process_state_t> processList;
-
-	process *ps = (process *)d->dev->getProcess();
-	if (ps == nullptr) {
-		ERR("Error: Process pointer not found.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	ret = ps->getState(d->zesDeviceHdl, &processList);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get process states\n");
-		return ret;
-	}
-
-	for (const auto &proc : processList) {
-		if (!CHECKPROCESSEXCLUSIVE(proc.processId)) {
-			return ZE_RESULT_ERROR_UNKNOWN;
-		}
-	}
-
-	return ZE_RESULT_SUCCESS;
-}
-
-std::unique_ptr<nlohmann::ordered_json> cmdDiag::printDiagDetail(std::string componentType, std::string componentMsg,
-																 std::string componentResult, bool finished)
-{
-	auto jsonObj = std::make_unique<nlohmann::ordered_json>();
-
-	// Get string values first, then assign to JSON
-	(*jsonObj)["component_type"] = componentType;
-	(*jsonObj)["finished"] = finished;
-	(*jsonObj)["message"] = componentMsg;
-	(*jsonObj)["result"] = componentResult;
-
-	return jsonObj;
-}
-
-/**
- * @brief Prints detailed precheck component information in JSON format
- *
- * @param[in] preId string for the CPU id info
- * @param[in] preBdf string for the GPU BDF info
- * @param[in] preStatus string for the component status info
- * @param[in] preType string for the component type info
- * @return std::unique_ptr<nlohmann::ordered_json> JSON object containing device details
- */
-std::unique_ptr<nlohmann::ordered_json> cmdDiag::printPreCheckDetail(std::string preId, std::string preBdf,
-																	 std::string preStatus, std::string preType)
-{
-	auto jsonObj = std::make_unique<nlohmann::ordered_json>();
-
-	// Get string values first, then assign to JSON
-	if (preId != "") {
-		(*jsonObj)["id"] = preId;
-	}
-	if (preBdf != "") {
-		(*jsonObj)["bdf"] = preBdf;
-	}
-	if (preStatus != "") {
-		(*jsonObj)["status"] = preStatus;
-	}
-	if (preType != "") {
-		(*jsonObj)["type"] = preType;
-	}
-	return jsonObj;
-}
-
-/**
- * @brief prints detailed precheck error component information in JSON format
- *
- * @param[in] errCategory string for the error Category info
- * @param[in] errID string for the error id info
- * @param[in] errSeverity string for the error Severity info
- * @param[in] errType string for the error type info
- * @return std::unique_ptr<nlohmann::ordered_json> JSON object containing error component details
- */
-std::unique_ptr<nlohmann::ordered_json> cmdDiag::printErrorDetail(std::string errCategory, std::string errID,
-																  std::string errSeverity, std::string errType)
-{
-	auto jsonObj = std::make_unique<nlohmann::ordered_json>();
-
-	// Get string values first, then assign to JSON
-	(*jsonObj)["error_category"] = errCategory;
-	(*jsonObj)["error_id"] = errID;
-	(*jsonObj)["error_severity"] = errSeverity;
-	(*jsonObj)["error_type"] = errType;
-
-	return jsonObj;
-}
-
-/**
- * @brief prints precheck error information in JSON format
- *
- * @param[in][out] errListJson nlohmann::ordered_json for the error info
- * @param[in] errCategory string for the error Category info
- * @param[in] errID string for the error id info
- * @param[in] errSeverity string for the error Severity info
- * @param[in] preType string for the error type info
- */
-void cmdDiag::printErrorInfo(nlohmann::ordered_json *errListJson, std::string errCategory, std::string errID,
-							 std::string errSeverity, std::string errType)
-{
-	auto errJson = printErrorDetail(errCategory, errID, errSeverity, errType);
-	errListJson->push_back(*errJson);
-}
-
-/**
- * @brief prints single diagnostic test information in JSON format
- * @param[in] d pointer to device information structure
- * @param[in] jsonObj nlohmann::ordered_json pointer
- * @param[in] type string for the test type info
- * @param[in] msg string for the test message info
- * @param[in] result string for the test result info
- */
-void cmdDiag::printSingleDiagInfo(devInfo *d, nlohmann::ordered_json *jsonObj, std::string type, std::string msg,
-								  std::string result)
-{
-	// Set device_id if not already set
-	if (!jsonObj->contains("device_id")) {
-		(*jsonObj)["device_id"] = d->index;
-	}
-
-	// Initialize component_list if not already present
-	if (!jsonObj->contains("component_list")) {
-		(*jsonObj)["component_list"] = nlohmann::ordered_json::array();
-	}
-
-	// Append new component
-	bool finished = (result == "Pass" || result == "Fail");
-	auto componentJson = printDiagDetail(type, msg, result, finished);
-	(*jsonObj)["component_list"].push_back(*componentJson);
-}
-
-/**
- * @brief Validates and processes diagnostic level parameter
- *
- * This function validates the diagnostic level parameter provided by the user,
- * ensuring it falls within the valid range (1-3). Each level represents different
- * test intensity: 1 for quick tests, 2 for medium tests, 3 for comprehensive tests.
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS if level is valid, error code otherwise
- */
-ze_result_t cmdDiag::level(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-	ze_result_t result = ZE_RESULT_SUCCESS;
-	bool finalResult = true;
-	int totalCount = 0;
-	std::string msgLine, resultLine;
-	// Check if the level is valid
-	if (diagCmds[diagCmdType::LEVEL].val.empty()) {
-		ERR("Level is required.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	// Convert the level string to an integer
-	int level = stoi(diagCmds[diagCmdType::LEVEL].val);
-	if (level < 1 || level > 3) {
-		ERR("Invalid level. Valid options are 1, 2, or 3.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto startTime = std::chrono::system_clock::now();
-	auto startTimeS = std::chrono::floor<std::chrono::seconds>(startTime);
-	auto startTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(startTime - startTimeS);
-	std::string startTimeStr = std::format("{:%Y-%m-%dT%H:%M:%S}.{:03d}", startTimeS, startTimeMs.count());
-
-	for (int le = 1; le <= level; le++) {
-		for (auto &test : levelToDiagTests.at(static_cast<diagLevel>(le))) {
-
-			DBG("Preparing to run test for level {}\n", le);
-			result = (this->*test.second.func)(d, jsonObj);
-			if (result != ZE_RESULT_SUCCESS) {
-				finalResult = false;
-				test.second.result = false;
-			}
-			totalCount++;
-		}
-	}
-
-	auto endTime = std::chrono::system_clock::now();
-	auto endTimeS = std::chrono::floor<std::chrono::seconds>(endTime);
-	auto endTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(endTime - endTimeS);
-	std::string endTimeStr = std::format("{:%Y-%m-%dT%H:%M:%S}.{:03d}", endTimeS, endTimeMs.count());
-
-	auto componentListJson = std::make_unique<nlohmann::ordered_json>();
-	for (int le = 1; le <= level; le++) {
-		for (const auto &test : levelToDiagTests.at(static_cast<diagLevel>(le))) {
-			DBG("Preparing to run test for level {}\n", le);
-			bool testFinished = test.second.result;
-			resultLine = testFinished ? "Pass" : "Fail";
-
-			// Create user-friendly messages based on test type
-			const auto userFriendlyName = test.second.showString;
-			if (userFriendlyName == "XPUM_DIAG_SOFTWARE_LIBRARY") {
-				msgLine = testFinished ? "Pass to check libraries." : "Fail to check libraries.";
-			} else if (userFriendlyName == "XPUM_DIAG_SOFTWARE_PERMISSION") {
-				msgLine = testFinished ? "Pass to check permission." : "Fail to check permission.";
-			} else if (userFriendlyName == "XPUM_DIAG_SOFTWARE_EXCLUSIVE") {
-				msgLine =
-					testFinished ? "Pass to check the software exclusive." : "Fail to check the software exclusive.";
-			} else if (userFriendlyName == "XPUM_DIAG_LIGHT_COMPUTATION") {
-				msgLine = testFinished ? "Pass to check computation functionality."
-									   : "Fail to check computation functionality.";
-			} else {
-				msgLine = std::format("{} to check {}.", testFinished ? "Pass" : "Fail", userFriendlyName);
-			}
-
-			auto componentJson = printDiagDetail(userFriendlyName, msgLine, resultLine, testFinished);
-			componentListJson->push_back(*componentJson);
-		}
-	}
-
-	(*jsonObj)["component_count"] = totalCount;
-	(*jsonObj)["component_list"] = *componentListJson;
-	(*jsonObj)["device_id"] = d->index;
-	(*jsonObj)["end_time"] = endTimeStr;
-	(*jsonObj)["finished"] = finalResult;
-	(*jsonObj)["level"] = level;
-	(*jsonObj)["message"] = finalResult ? "All diagnostics done" : "Some diagnostics failed";
-	(*jsonObj)["result"] = (finalResult) ? "Pass" : "Fail";
-	(*jsonObj)["start_time"] = startTimeStr;
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes a specific diagnostic test based on user selection
- *
- * This function runs individual diagnostic tests selected by the user through
- * the --singletest parameter. It maps test IDs to corresponding test functions
- * and executes the requested diagnostic test on the specified device.
- *
- * @param[in] d Pointer to device information structure containing device context
- * @return ze_result_t ZE_RESULT_SUCCESS if test completes successfully, error code otherwise
- */
-ze_result_t cmdDiag::runSingleTest(devInfo *d, nlohmann::ordered_json *jsonObj)
-
-{
-	TRACING();
-	ze_result_t result = ZE_RESULT_SUCCESS;
-
-	// Map user-facing test numbers to enum values (matching help text order)
-	static std::unordered_map<int, diagSubSingleCmdType> testIdMap = {
-		{1, DIAG_SINGLE_COMPUTATION},		  {2, DIAG_SINGLE_MEMORYERROR},
-		{3, DIAG_SINGLE_MEMORYBANDWIDTH},	  {4, DIAG_SINGLE_MEDIA},
-		{5, DIAG_SINGLE_PCIEBANDWIDTH},		  {6, DIAG_SINGLE_POWER},
-		{7, DIAG_SINGLE_COMPUTATIONFUNCTEST}, {8, DIAG_SINGLE_MEDIAFUNCTEST},
-		{9, DIAG_SINGLE_MEMORYALLOCATION},
-	};
-
-	static std::unordered_map<diagSubSingleCmdType, diagSubSingleCmdStruct> diagSingleTests = {
-		{DIAG_SINGLE_COMPUTATION, {&cmdDiag::computation}},
-		{DIAG_SINGLE_MEMORYERROR, {&cmdDiag::memoryError}},
-		{DIAG_SINGLE_MEMORYBANDWIDTH, {&cmdDiag::memoryBandwidth}},
-		{DIAG_SINGLE_MEDIA, {&cmdDiag::mediaCodec}},
-		{DIAG_SINGLE_PCIEBANDWIDTH, {&cmdDiag::pcieBandwidth}},
-		{DIAG_SINGLE_POWER, {&cmdDiag::powerTest}},
-		{DIAG_SINGLE_COMPUTATIONFUNCTEST, {&cmdDiag::computationFuncTest}},
-		{DIAG_SINGLE_MEDIAFUNCTEST, {&cmdDiag::mediaFuncTest}},
-		{DIAG_SINGLE_MEMORYALLOCATION, {&cmdDiag::memoryAllocation}},
-	};
-
-	// Parse comma-separated test IDs
-	const std::string_view testIds = diagCmds[diagCmdType::SINGLETEST].val;
-	std::vector<int> testList;
-
-	for (const auto token : testIds | std::views::split(',')) {
-		const std::string_view tokenView(token.begin(), token.end());
-		int testId = 0;
-		const auto [ptr, ec] = std::from_chars(tokenView.data(), tokenView.data() + tokenView.size(), testId);
-		if (ec != std::errc{}) {
-			ERR("Invalid test ID: '{}'\n", tokenView);
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		testList.push_back(testId);
-	}
-
-	auto startTime = std::chrono::system_clock::now();
-	auto startTimeS = std::chrono::floor<std::chrono::seconds>(startTime);
-	auto startTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(startTime - startTimeS);
-	std::string startTimeStr = std::format("{:%Y-%m-%dT%H:%M:%S}.{:03d}", startTimeS, startTimeMs.count());
-
-	// Set up device_id once if not already set
-	if (!jsonObj->contains("device_id")) {
-		(*jsonObj)["device_id"] = d->index;
-		(*jsonObj)["component_list"] = nlohmann::ordered_json::array();
-	}
-
-	// Run each test and track if any fail
-	bool anyFailed = false;
-	for (const int testId : testList) {
-		if (const auto testTypeIt = testIdMap.find(testId); testTypeIt != testIdMap.end()) {
-			if (const auto testIt = diagSingleTests.find(testTypeIt->second); testIt != diagSingleTests.end()) {
-				INFO("Running test: {}\n", testId);
-				const ze_result_t testResult = (this->*testIt->second.func)(d, jsonObj);
-				if (testResult != ZE_RESULT_SUCCESS) {
-					anyFailed = true;
-				}
-			}
-		} else {
-			ERR("Invalid test ID: {}. Valid test IDs are 1-9.\n", testId);
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-	}
-
-	// Return generic error if any test failed; specific errors are in JSON
-	if (anyFailed) {
-		result = ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	const auto endTime = std::chrono::system_clock::now();
-	const auto endTimeS = std::chrono::floor<std::chrono::seconds>(endTime);
-	const auto endTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(endTime - endTimeS);
-	const std::string endTimeStr = std::format("{:%Y-%m-%dT%H:%M:%S}.{:03d}", endTimeS, endTimeMs.count());
-
-	// Add summary fields to match expected format
-	const bool allPassed = (result == ZE_RESULT_SUCCESS);
-	(*jsonObj)["component_count"] = static_cast<int>(testList.size());
-	(*jsonObj)["device_id"] = d->index;
-	(*jsonObj)["end_time"] = endTimeStr;
-	(*jsonObj)["errno"] = static_cast<int>(result);
-	(*jsonObj)["finished"] = true;
-	(*jsonObj)["message"] = allPassed ? "All diagnostics done" : "Some diagnostics failed";
-	(*jsonObj)["result"] = allPassed ? "Pass" : "Fail";
-	(*jsonObj)["start_time"] = startTimeStr;
-
-	return result;
-}
-
-/**
- * @brief Runs the computation diagnostic test on the specified device when user runs diag --singletest 1
- *
- * This function performs a floating-point computation test on the GPU device to measure its performance
- * in terms of GFLOPS. It loads a SPIR-V kernel, allocates necessary device memory, sets up and launches
- * the kernel, and reports the measured performance.
- *
- * @param[in] d Pointer to the device information structure.
- * @return ze_result_t Returns ZE_RESULT_SUCCESS on success, or an appropriate error code on failure.
- */
-ze_result_t cmdDiag::computation(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	const std::string fileName = "ze_sp_compute.spv";
-	const std::string moduleName = "compute_sp_v1";
-	float inputValue = 1.3f;
-	bool featureOnly;
-	long double current;
-	std::string msg;
-
-	// Call into HAL to perform computation test
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	featureOnly = false;
-	ze_result_t res =
-		diag->computationTest(d, 4096, &inputValue, sizeof(float), fileName, moduleName, current, featureOnly);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (res != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to check computation. Test failed:{}", l0_error_to_string(res));
-			printSingleDiagInfo(d, jsonObj, "Computation", msg, "Fail");
-		} else {
-			msg = "Pass to check computation.";
-			if (!featureOnly) {
-				msg = msg + std::format(" Computation test completed with {:.3Lf} GFLOPS. ", current);
-			}
-			printSingleDiagInfo(d, jsonObj, "Computation", msg, "Pass");
-		}
-	}
-	return res;
-}
-
-/**
- * @brief Executes memory error diagnostic test
- *
- * This function performs memory error detection tests on the GPU device,
- * checking for memory corruption, ECC errors, and memory integrity issues.
- * It validates GPU memory subsystem reliability and health.
- *
- * @param[in] d Pointer to device information structure
- * @return ze_result_t ZE_RESULT_SUCCESS if memory tests pass, error code otherwise
- */
-ze_result_t cmdDiag::memoryError(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	int errorCount;
-	std::string msg;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	if (p->getFuncType() == devFuncType::DEVICE_FUNCTION_TYPE_VIRTUAL) {
-		ERR("Device does not support this diagnostic feature.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t res = diag->memoryErrorTest(d, errorCount);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (res != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to test memory error.Test failed:{}", l0_error_to_string(res));
-			if (errorCount > 0)
-				msg = msg + std::format("Error count: {}.", errorCount);
-			printSingleDiagInfo(d, jsonObj, "Memory error", msg, "Fail");
-
-		} else {
-			msg = "Pass to test memory error.";
-			printSingleDiagInfo(d, jsonObj, "Memory error", msg, "Pass");
-		}
-	}
-	return res;
-}
-
-/**
- * @brief Executes memory allocation diagnostic test
- *
- * This function measures GPU memory allocation performance by running
- * memory-intensive kernels and calculating throughput metrics. It validates
- * memory subsystem performance and identifies potential bandwidth limitations.
- *
- * @param[in] d Pointer to device information structure
- * @return ze_result_t ZE_RESULT_SUCCESS if allocation tests complete, error code otherwise
- */
-ze_result_t cmdDiag::memoryAllocation(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-	std::string msg;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	if (p->getFuncType() == devFuncType::DEVICE_FUNCTION_TYPE_VIRTUAL) {
-		ERR("Device does not support this diagnostic feature.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t res = diag->peformanceMemoryAllocation(d);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (res != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to check memory allocation. Test failed:{}", l0_error_to_string(res));
-			printSingleDiagInfo(d, jsonObj, "Memory allocation", msg, "Fail");
-		} else {
-			msg = "Pass to check memory allocation.";
-			printSingleDiagInfo(d, jsonObj, "Memory allocation", msg, "Pass");
-		}
-	}
-	return res;
-}
-
-/**
- * @brief Executes memory bandwidth diagnostic test
- *
- * This function measures GPU memory bandwidth performance by running
- * memory-intensive kernels and calculating throughput metrics. It validates
- * memory subsystem performance and identifies potential bandwidth limitations.
- *
- * @param[in] d Pointer to device information structure
- * @return ze_result_t ZE_RESULT_SUCCESS if bandwidth tests complete, error code otherwise
- */
-ze_result_t cmdDiag::memoryBandwidth(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	std::vector<long double> totalGbps;
-	std::string msg;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	if (p->getFuncType() == devFuncType::DEVICE_FUNCTION_TYPE_VIRTUAL) {
-		ERR("Device does not support this diagnostic feature.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t res = diag->memoryBandwidthTest(d, totalGbps);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (res != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to check memory bandwidth. Test failed:{}", l0_error_to_string(res));
-			printSingleDiagInfo(d, jsonObj, "Memory bandwidth", msg, "Fail");
-		} else {
-			msg = "Pass to test memory bandwidth.";
-			for (std::size_t i = 0; i < totalGbps.size(); i++) {
-				msg = msg + std::format(" Memory bandwidth on copy engine group {} is {:.3Lf} GBPS.", i, totalGbps[i]);
-			}
-			printSingleDiagInfo(d, jsonObj, "Memory bandwidth", msg, "Pass");
-		}
-	}
-	return res;
-}
-
-/**
- * @brief Executes media codec diagnostic test
- *
- * This function tests GPU media encoding and decoding capabilities,
- * validating media engine functionality and performance. It checks
- * video codec acceleration and media processing capabilities.
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS if media tests pass, error code otherwise
- */
-ze_result_t cmdDiag::mediaCodec(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	std::string bdfStr;
-	std::string outputLine;
-	std::string msg;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	bdfStr = p->getBDFStr();
-	if (!CHECKMEDIACODEC(bdfStr, true, outputLine)) {
-		if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-			msg = std::format("Fail to check media transcode. Test failed:{}", outputLine);
-			printSingleDiagInfo(d, jsonObj, "Media transcode", msg, "Fail");
-		}
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		msg = std::format("Pass to check media transcode.{}", outputLine);
-		printSingleDiagInfo(d, jsonObj, "Media transcode", msg, "Pass");
-	}
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes PCIe bandwidth diagnostic test
- *
- * This function measures PCIe interface bandwidth between CPU and GPU,
- * testing data transfer rates and identifying potential PCIe bottlenecks.
- * It validates system interconnect performance and PCIe link integrity.
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS if PCIe tests complete, error code otherwise
- */
-ze_result_t cmdDiag::pcieBandwidth(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	std::string bdfStr;
-	std::string outputLine;
-	long double totalBandwidth;
-	long double totalLatency;
-	std::string msg;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	bdfStr = p->getBDFStr();
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t res = diag->pcieBandwidthTest(d, totalBandwidth, totalLatency);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (res != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to check PCIe bandwidth. Test failed:{}", l0_error_to_string(res));
-			printSingleDiagInfo(d, jsonObj, "PCIe bandwidth", msg, "Fail");
-		} else {
-			msg = "Pass to check PCIe bandwidth. ";
-			msg = msg + std::format("Total pcie bandwidth is: {} GB/s. Total pcie latency is: {} us.", totalBandwidth,
-									totalLatency);
-			if (p->getFuncType() != devFuncType::DEVICE_FUNCTION_TYPE_VIRTUAL) {
-				outputLine = GETDOWNGRADEDPCIEINFO(bdfStr);
-				if (outputLine.size() != 0) {
-					msg = msg + outputLine;
-				}
-			}
-			printSingleDiagInfo(d, jsonObj, "PCIe bandwidth", msg, "Pass");
-		}
-	}
-	return res;
-}
-
-/**
- * @brief Executes power management diagnostic test
- *
- * This function tests GPU power management capabilities on the specified device
- * It performs intensive computation calculations, then measures the power.
- *
- * The test:
- * 1. Set up the intensive computation
- * 2. perform this intensive computation
- * 3. Measure and calculate the power
- *
- * @param[in] d Pointer to the device information structure containing the device handle and context
- * @return ze_result_t ZE_RESULT_SUCCESS on successful test completion, or an error code on failure
- */
-ze_result_t cmdDiag::powerTest(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	ze_result_t ret;
-	const std::string filename = "ze_int_compute.spv";
-	const std::string moduleName = "compute_int_v1";
-	int inputValue = 4;
-	bool featureOnly;
-	long double current;
-	int totalPowerValue;
-	std::string msg;
-
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	featureOnly = false;
-	ret = diag->computationTest(d, 2048, &inputValue, sizeof(int), filename, moduleName, current, featureOnly);
-	if (ret != ZE_RESULT_SUCCESS) {
-		ERR("Computation test failed: {}\n", l0_error_to_string(ret));
-		return ret;
-	}
-
-	ret = diag->calculatePowerConsumption(d, totalPowerValue);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (ret != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to check power test. Test failed:{}", l0_error_to_string(ret));
-			printSingleDiagInfo(d, jsonObj, "Power test", msg, "Fail");
-		} else {
-			msg = "Pass to check power test.";
-			if (!featureOnly) {
-				msg = msg + std::format("Computation test completed with {} GFLOPS. ", current);
-			}
-			msg = msg + std::format(" Update peak power value: {} w.", totalPowerValue);
-			printSingleDiagInfo(d, jsonObj, "Power test", msg, "Pass");
-		}
-	}
-	return ret;
-}
-
-/**
- * @brief Executes computation functional diagnostic test
- *
- * This function performs functional validation of GPU compute capabilities,
- * running basic compute operations to verify correct GPU functionality
- * without performance measurement emphasis.
- *
- * @param[in] d Pointer to device information structure
- * @return ze_result_t ZE_RESULT_SUCCESS if functional tests pass, error code otherwise
- */
-ze_result_t cmdDiag::computationFuncTest(devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	const std::string fileName = "ze_sp_compute.spv";
-	const std::string moduleName = "compute_sp_v1";
-	float inputValue = 1.3f;
-	bool featureOnly;
-	long double current;
-	std::string msg;
-
-	diagnostic *diag = d->dev->getDiagnostic();
-	if (diag == nullptr) {
-		ERR("Device does not support diagnostics.\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	featureOnly = true;
-	ze_result_t res =
-		diag->computationTest(d, 4096, &inputValue, sizeof(float), fileName, moduleName, current, featureOnly);
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		if (res != ZE_RESULT_SUCCESS) {
-			msg = std::format("Fail to check computation. Test failed:{}", l0_error_to_string(res));
-			printSingleDiagInfo(d, jsonObj, "Computation feature", msg, "Fail");
-
-		} else {
-			msg = "Pass to check computation feature.";
-			if (!featureOnly) {
-				msg = msg + std::format(" Computation test completed with {} GFLOPS. ", current);
-			}
-			printSingleDiagInfo(d, jsonObj, "Computation feature", msg, "Pass");
-		}
-	}
-	return res;
-}
-
-/**
- * @brief Executes media functional diagnostic test
- *
- * This function performs functional validation of GPU media engines,
- * testing basic media processing capabilities to verify correct media
- * subsystem operation without performance measurement emphasis.
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS if media functional tests pass, error code otherwise
- */
-ze_result_t cmdDiag::mediaFuncTest(UNUSED devInfo *d, nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	std::string pdfStr;
-	std::string outputLine;
-	std::string msg;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI device properties.\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	pdfStr = p->getBDFStr();
-	if (!CHECKMEDIACODEC(pdfStr, true, outputLine)) {
-		if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-			msg = std::format("Fail to check media transcode. Test failed:{}", outputLine);
-			printSingleDiagInfo(d, jsonObj, "Media transcode feature", msg, "Fail");
-		}
-		return ZE_RESULT_ERROR_UNKNOWN;
-	}
-
-	if (diagCmds[diagCmdType::SINGLETEST].enabled) {
-		msg = std::format("Pass to check media transcode.{}", outputLine);
-		printSingleDiagInfo(d, jsonObj, "Media transcode feature", msg, "Pass");
-	}
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Prints formatted table borders for diagnostic output
- *
- * This utility function prints formatted table borders used in diagnostic
- * output displays, providing consistent visual formatting for tabular
- * diagnostic results and error type listings.
- */
-ze_result_t cmdDiag::printListTypes(std::unique_ptr<Printer> &printer)
-{
-	TRACING();
-
-	if (!diagCmds[diagCmdType::PRECHECK].enabled) {
-		ERR("--listtypes requires --precheck.\n");
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto errListJson = std::make_unique<nlohmann::ordered_json>();
-	printErrorInfo(errListJson.get(), "Hardware", "1", "Critical", "GuC Not Running");
-	printErrorInfo(errListJson.get(), "Hardware", "2", "Critical", "GuC Error");
-	printErrorInfo(errListJson.get(), "Hardware", "3", "Critical", "GuC Initialization Failed");
-	printErrorInfo(errListJson.get(), "Hardware", "4", "Critical", "IOMMU Catastrophic Error");
-	printErrorInfo(errListJson.get(), "Hardware", "5", "Critical", "LMEM Not Initialized By Firmware");
-	printErrorInfo(errListJson.get(), "Hardware", "6", "Critical", "PCIe Error");
-	printErrorInfo(errListJson.get(), "Kernel Mode Driver", "7", "Critical", "DRM Error");
-	printErrorInfo(errListJson.get(), "Kernel Mode Driver", "8", "Critical", "GPU Hang");
-	printErrorInfo(errListJson.get(), "Kernel Mode Driver", "9", "Critical", "Xe Error");
-	printErrorInfo(errListJson.get(), "Kernel Mode Driver", "10", "Critical", "Xe Not Loaded");
-	printErrorInfo(errListJson.get(), "Kernel Mode Driver", "11", "Critical", "Level Zero Init Error");
-	printErrorInfo(errListJson.get(), "Hardware", "12", "High", "HuC Disabled");
-	printErrorInfo(errListJson.get(), "Hardware", "13", "High", "HuC Not Running");
-	printErrorInfo(errListJson.get(), "User Mode Driver", "14", "High", "Level Zero Metrics Init Error");
-	printErrorInfo(errListJson.get(), "Hardware", "15", "Critical", "Memory Error");
-	printErrorInfo(errListJson.get(), "Hardware", "16", "Critical", "GPU Initialization Failed");
-	printErrorInfo(errListJson.get(), "Kernel Mode Driver", "17", "High", "MEI Error");
-
-	auto errsJson = std::make_unique<nlohmann::ordered_json>();
-	(*errsJson)["error_type_list"] = *errListJson;
-	printer->print(errsJson.get());
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief get key display name for an input key
- *
- * This utility function provides key display name for an input key used in diagnostic
- * output displays
- * @param[in] key reference to std::string &key
- */
-std::string getKeyDisplayName(const std::string &key)
-{
-	static const std::unordered_map<std::string, std::string> keyDisplayMap = {
-		{"device_id", "Device ID"},
-		{"level", "Level"},
-		{"result", "Result"},
-		{"component_count", "Items"},
-		{"XPUM_DIAG_SOFTWARE_LIBRARY", "Software Library"},
-		{"XPUM_DIAG_SOFTWARE_PERMISSION", "Software Permission"},
-		{"XPUM_DIAG_SOFTWARE_EXCLUSIVE", "Software Exclusive"},
-		{"XPUM_DIAG_LIGHT_COMPUTATION", "Computation Check"},
-		{"XPUM_DIAG_INTEGRATION_PCIE", "PCIe Bandwidth"},
-		{"XPUM_DIAG_MEDIA_CODEC", "Media Codec"},
-		{"XPUM_DIAG_PERFORMANCE_COMPUTATION", "Computation"},
-		{"XPUM_DIAG_PERFORMANCE_POWER", "Power"},
-		{"XPUM_DIAG_PERFORMANCE_MEMORY_BANDWIDTH", "Memory Bandwidth"},
-		{"XPUM_DIAG_PERFORMANCE_MEMORY_ALLOCATION", "Memory Allocation"},
-		{"XPUM_DIAG_MEMORY_ERROR", "Memory Error"},
-	};
-
-	const auto it = keyDisplayMap.find(key);
-	if (it != keyDisplayMap.end()) {
-		return it->second;
-	}
-	return key;
-}
-
-/**
- * @brief Prints test format for diagnostic output
- *
- * This utility function prints formatted text info used in diagnostic
- * output displays
- * @param[in] jsonObj Pointer to nlohmann::ordered_json object structure
- */
-void DiagTextPrinter::print(nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-
-	auto valueToString = [](const nlohmann::ordered_json &val) -> std::string {
-		if (val.is_string()) {
-			return val.get<std::string>();
-		}
-		return val.dump();
-	};
-
-	// Calculate required column widths based on content
-	constexpr int totalWidth = 100;	  // Total table width
-	constexpr int borderOverhead = 5; // Borders and padding (| + space on each side + |)
-	constexpr int minCol2Width = 20;  // Minimum second column width
-	int maxCol1Width = 15;			  // Minimum first column width
-
-	if (jsonObj->contains("level")) {
-		static const std::vector<std::string> headerFields = {"device_id", "level", "result", "component_count"};
-		for (const auto &field : headerFields) {
-			if (jsonObj->contains(field)) {
-				maxCol1Width = std::max(maxCol1Width, static_cast<int>(getKeyDisplayName(field).length()));
-			}
-		}
-		for (const auto &component : (*jsonObj)["component_list"]) {
-			const std::string componentType = valueToString(component["component_type"]);
-			maxCol1Width = std::max(maxCol1Width, static_cast<int>(getKeyDisplayName(componentType).length()));
-		}
-
-		const int col1 = maxCol1Width;
-		const int col2 = std::max(minCol2Width, totalWidth - maxCol1Width - borderOverhead);
-
-		TableBuilder table;
-		table.addColumn(getKeyDisplayName("device_id"), col1);
-		table.addColumn(jsonObj->contains("device_id") ? valueToString((*jsonObj)["device_id"]) : "", col2);
-
-		// Print remaining header fields (device_id is already the column header)
-		for (const auto &field : headerFields) {
-			if (field != "device_id" && jsonObj->contains(field)) {
-				table.addRow(getKeyDisplayName(field), valueToString((*jsonObj)[field]));
-			}
-		}
-
-		table.addSeparator(BorderStyle::Normal);
-
-		// Print components with word-wrapped messages
-		const auto &componentList = (*jsonObj)["component_list"];
-		for (size_t i = 0; i < componentList.size(); ++i) {
-			const auto &component = componentList[i];
-			const std::string componentType = valueToString(component["component_type"]);
-			const std::string friendlyName = getKeyDisplayName(componentType);
-			table.addRow(friendlyName, std::format("Result: {}", valueToString(component["result"])));
-			const std::string messageInfo = std::format("Message: {}", valueToString(component["message"]));
-			const auto wrappedLines = wrapText(messageInfo, static_cast<size_t>(col2));
-			for (const auto &line : wrappedLines) {
-				table.addRow("", line);
-			}
-			if (i + 1 < componentList.size()) {
-				table.addSeparator(BorderStyle::Normal);
-			}
-		}
-
-		PRINT("{}", table.toString().c_str());
-	} else if (jsonObj->contains("device_id")) {
-		maxCol1Width = std::max(maxCol1Width, static_cast<int>(getKeyDisplayName("device_id").length()));
-		for (const auto &component : (*jsonObj)["component_list"]) {
-			const std::string componentType = valueToString(component["component_type"]);
-			maxCol1Width = std::max(maxCol1Width, static_cast<int>(getKeyDisplayName(componentType).length()));
-		}
-
-		const int col1 = maxCol1Width;
-		const int col2 = std::max(minCol2Width, totalWidth - maxCol1Width - borderOverhead);
-
-		TableBuilder table;
-		table.addColumn(getKeyDisplayName("device_id"), col1);
-		table.addColumn(valueToString((*jsonObj)["device_id"]), col2);
-
-		const auto &componentList = (*jsonObj)["component_list"];
-		for (size_t i = 0; i < componentList.size(); ++i) {
-			const auto &component = componentList[i];
-			const std::string componentType = valueToString(component["component_type"]);
-			const std::string friendlyName = getKeyDisplayName(componentType);
-			table.addRow(friendlyName, std::format("Result: {}", valueToString(component["result"])));
-			const std::string messageInfo = std::format("Message: {}", valueToString(component["message"]));
-			const auto wrappedLines = wrapText(messageInfo, static_cast<size_t>(col2));
-			for (const auto &line : wrappedLines) {
-				table.addRow("", line);
-			}
-			if (i + 1 < componentList.size()) {
-				table.addSeparator(BorderStyle::Normal);
-			}
-		}
-
-		PRINT("{}", table.toString().c_str());
-	} else if (jsonObj->contains("error_type_list")) {
-		TableBuilder table;
-		table.addColumn("Error ID", 10);
-		table.addColumn("Error Type", 35);
-		table.addColumn("Error Category", 25);
-		table.addColumn("Error Severity", 21);
-
-		for (const auto &component : (*jsonObj)["error_type_list"]) {
-			table.addRow(valueToString(component["error_id"]), valueToString(component["error_type"]),
-						 valueToString(component["error_category"]), valueToString(component["error_severity"]));
-		}
-
-		PRINT("{}", table.toString().c_str());
-	} else if (jsonObj->contains("component_list")) {
-		const int col2 = std::max(minCol2Width, totalWidth - maxCol1Width - 25);
-
-		TableBuilder table;
-		table.addColumn("Component", maxCol1Width);
-		table.addColumn("Details", col2);
-
-		const auto &componentList = (*jsonObj)["component_list"];
-		for (size_t i = 0; i < componentList.size(); ++i) {
-			const auto &component = componentList[i];
-			if (component["type"].get<std::string>() == "Driver") {
-				table.addRow(component["type"].get<std::string>(),
-							 std::format("Status: {}", component["status"].get<std::string>()));
-			} else if (component["type"].get<std::string>() == "CPU") {
-				table.addRow(component["type"].get<std::string>(),
-							 std::format("CPU ID: {}", component["id"].get<std::string>()));
-				table.addRow("", std::format("Status: {}", component["status"].get<std::string>()));
-			} else if (component["type"].get<std::string>() == "GPU") {
-				table.addRow(component["type"].get<std::string>(),
-							 std::format("BDF: {}", component["bdf"].get<std::string>()));
-				table.addRow("", std::format("Status: {}", component["status"].get<std::string>()));
-			}
-			if (i + 1 < componentList.size()) {
-				table.addSeparator(BorderStyle::Normal);
-			}
-		}
-
-		PRINT("{}", table.toString().c_str());
-	}
-}
-
-/**
- * @brief Executes time-based log scanning for diagnostic precheck
- *
- * This function scans system logs starting from a specified time point
- * to identify GPU-related errors and issues. It provides historical
- * system analysis for diagnostic precheck operations.
- *
- * @param[in] d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS if log scanning completes, error code otherwise
- */
-ze_result_t cmdDiag::runSince(UNUSED devInfo *d, UNUSED nlohmann::ordered_json *jsonObj)
-{
-	TRACING();
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the diag run.
- *
- * @return int Returns 0 on success.
- */
-int cmdDiag::run(arg_struct *args)
-{
-	TRACING();
-	std::vector<devInfo> deviceList;
-	ze_result_t result;
-	bool found = false;
-	int opt;
-	int optionIndex = 0;
-	std::unique_ptr<Printer> printer;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(diagCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return 0;
-		case 'j':
-			diagCmds[diagCmdType::DIAGJSON].enabled = true;
-			break;
-		case 'd':
-			diagCmds[diagCmdType::DIAGDEVICE].enabled = true;
-			diagCmds[diagCmdType::DIAGDEVICE].val = optarg;
-			break;
-		case 'l':
-			diagCmds[diagCmdType::LEVEL].enabled = true;
-			diagCmds[diagCmdType::LEVEL].val = optarg;
-			break;
-		case 's':
-			diagCmds[diagCmdType::STRESS].enabled = true;
-			break;
-		case 0:
-			for (auto &cmd : diagCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
-
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// Check if any actual diagnostic command was specified
-	bool hasCommand = false;
-	for (const auto &cmd : diagCmds) {
-		// Skip help and json flags - they're modifiers, not commands
-		if (cmd.first != diagCmdType::DIAGHELP && cmd.first != diagCmdType::DIAGJSON) {
-			if (cmd.second.enabled) {
-				hasCommand = true;
-				break;
-			}
-		}
-	}
-
-	// If no command was specified, show help
-	if (!hasCommand) {
-		help();
-		return 0;
-	}
-
-	if (diagCmds[diagCmdType::DIAGJSON].enabled == true) {
-		printer = std::make_unique<JsonPrinter>();
-	} else {
-		printer = std::make_unique<DiagTextPrinter>();
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	result = args->sm.findDevice(diagCmds[diagCmdType::DIAGDEVICE].val.c_str(), &deviceList);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Error: Device handle not found for device ID '{}'.\n", diagCmds[diagCmdType::DIAGDEVICE].val.c_str());
-		return result;
-	}
-
-	driverLoaded = args->sm.isDriverLoaded();
-	if (diagCmds[diagCmdType::LISTTYPES].enabled) {
-		printListTypes(printer);
-	} else if (diagCmds[diagCmdType::GPU].enabled) {
-		printPrecheckInfo(deviceList, printer, true);
-	} else if (diagCmds[diagCmdType::PRECHECK].enabled && !diagCmds[diagCmdType::GPU].enabled &&
-			   !diagCmds[diagCmdType::LISTTYPES].enabled) {
-		printPrecheckInfo(deviceList, printer, false);
-	} else {
-		INFO("Running diagnostics can take several minutes to complete.\n");
-		// Iterate through the device list and execute the command
-		auto jsonObj = std::make_unique<nlohmann::ordered_json>();
-		// JSON object to collect diagnostic results for all devices and commands
-		for (auto &device : deviceList) {
-			if (device.dev->isIGPU()) {
-				DBG("Diagnostics are only supported on discrete GPUs so skipping device {}.\n", device.index);
-				continue;
-			}
-
-			// Call the appropriate command function based on the command type
-			for (const auto &cmd : diagCmds) {
-				if (cmd.second.enabled && cmd.second.func != nullptr) {
-					DBG("Running command: {}\n", cmd.second.opt.name);
-					result = (this->*cmd.second.func)(&device, jsonObj.get());
-					if (diagCmds[diagCmdType::DIAGDEVICE].enabled) {
-						DBG("Exiting command: {}\n", cmd.second.opt.name);
-						break;
-					}
-				}
-			}
-		}
-
-		printer->print(jsonObj.get());
-	}
-	return result;
-}
diff --git a/ial/cmn/cmd_diag.h b/ial/cmn/cmd_diag.h
deleted file mode 100644
index bfaae89cc..000000000
--- a/ial/cmn/cmd_diag.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _CMD_DIAG_H
-#define _CMD_DIAG_H
-
-#include "cmds.h"
-#include "printer.h"
-#include <os.h>
-#include <string>
-
-enum diagCmdType
-{
-	DIAGHELP,
-	DIAGJSON,
-	DIAGDEVICE,
-	LEVEL,
-	PRECHECK,
-	STRESS,
-	SINGLETEST,
-	LISTTYPES,
-	GPU,
-	SINCE,
-	STRESSTIME,
-	TOTAL_DIAG,
-};
-
-enum diagSubCmdType
-{
-	DIAG_LEVEL_SW_LIBRARY = 0,
-	DIAG_LEVEL_SW_PERMISSION,
-	DIAG_LEVEL_SW_EXCLUSIVE,
-	DIAG_LEVEL_COMPUTATIONFUNCTEST,
-	DIAG_LEVEL_PCIEBANDWIDTH,
-	DIAG_LEVEL_MEDIA,
-	DIAG_LEVEL_COMPUTATION,
-	DIAG_LEVEL_POWER,
-	DIAG_LEVEL_MEMORYBANDWIDTH,
-	DIAG_LEVEL_MEMORYALLOCATION,
-	DIAG_LEVEL_MEMORYERROR,
-	TOTAL_DIAG_SUB_LEVEL_CMD,
-};
-
-enum diagSubSingleCmdType
-{
-	DIAG_SINGLE_COMPUTATION = 1,
-	DIAG_SINGLE_MEMORYERROR,
-	DIAG_SINGLE_MEMORYBANDWIDTH,
-	DIAG_SINGLE_MEDIA,
-	DIAG_SINGLE_PCIEBANDWIDTH,
-	DIAG_SINGLE_POWER,
-	DIAG_SINGLE_COMPUTATIONFUNCTEST,
-	DIAG_SINGLE_MEDIAFUNCTEST,
-	DIAG_SINGLE_MEMORYALLOCATION,
-	TOTAL_DIAG_SUB_SINGLE_CMD,
-};
-
-enum diagLevel
-{
-	LEVEL_1 = 1,
-	LEVEL_2,
-	LEVEL_3,
-};
-
-class cmdDiag;
-
-using diagSubCmdFunc = ze_result_t (cmdDiag::*)(devInfo *d, nlohmann::ordered_json *cmdJson);
-struct diagCmdStruct
-{
-	option opt;
-	diagSubCmdFunc func;
-	bool enabled;
-	std::string val;
-};
-
-struct diagSubLevelCmdStruct
-{
-	diagSubCmdFunc func;
-	std::string showString;
-	bool result;
-};
-
-struct diagSubSingleCmdStruct
-{
-	diagSubCmdFunc func;
-};
-
-/**
- * @brief Discovery-specific text printer that formats discovery output as human-readable text
- */
-class DiagTextPrinter : public Printer
-{
-public:
-	DiagTextPrinter() : Printer() {}
-	void print(nlohmann::ordered_json *jsonObj) override;
-};
-
-class cmdDiag : public cmds
-{
-private:
-	bool driverLoaded;
-
-	static std::unordered_map<diagLevel, std::vector<std::pair<diagSubCmdType, diagSubLevelCmdStruct>>>
-		levelToDiagTests;
-
-public:
-	cmdDiag() : driverLoaded(false) { STRCPY_S(name, MAX_PATH, "diag"); };
-	~cmdDiag(){};
-	void help(HELP helpType = FULL_HELP);
-	ze_result_t precheck(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t stress(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t level(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t runSingleTest(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t printListTypes(std::unique_ptr<Printer> &printer);
-	ze_result_t printPrecheckInfo(std::vector<devInfo> deviceList, std::unique_ptr<Printer> &printer, bool gpuOnly);
-	ze_result_t runSince(devInfo *d, nlohmann::ordered_json *jsonObj);
-	std::unique_ptr<nlohmann::ordered_json> printDiagDetail(std::string componentType, std::string componentMsg,
-															std::string componentResult, bool finished);
-	void printSingleDiagInfo(devInfo *d, nlohmann::ordered_json *jsonObj, std::string type, std::string msg,
-							 std::string result);
-	std::unique_ptr<nlohmann::ordered_json> printErrorDetail(std::string errCategory, std::string errID,
-															 std::string errSeverity, std::string errType);
-	void printErrorInfo(nlohmann::ordered_json *errListJson, std::string errCategory, std::string errID,
-						std::string errSeverity, std::string errType);
-	std::unique_ptr<nlohmann::ordered_json> printPreCheckDetail(std::string preId, std::string preBdf,
-																std::string preStatus, std::string preType);
-	ze_result_t checkLibrary(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t checkExclusive(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t checkAccessPermission(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t computation(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t memoryError(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t memoryAllocation(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t memoryBandwidth(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t mediaCodec(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t pcieBandwidth(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t powerTest(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t computationFuncTest(devInfo *d, nlohmann::ordered_json *jsonObj);
-	ze_result_t mediaFuncTest(devInfo *d, nlohmann::ordered_json *jsonObj);
-
-	int run(arg_struct *args);
-};
-
-#endif
diff --git a/ial/cmn/cmd_discovery.cpp b/ial/cmn/cmd_discovery.cpp
index 6699f2be0..811bf31cc 100644
--- a/ial/cmn/cmd_discovery.cpp
+++ b/ial/cmn/cmd_discovery.cpp
@@ -6,6 +6,7 @@
 
 #include "cmd_discovery.h"
 #include "debug.h"
+#include <CLI/CLI.hpp>
 #include "printer.h"
 #include "table_builder.h"
 #include "amclib.h"
@@ -32,70 +33,70 @@
  * discoveryCmdStruct with a pointer to the function that will be called when the command is executed
  */
 static std::unordered_map<discCmdType, discoveryCmdStruct> discCmds = {
-	{discCmdType::DISC_HELP, {{"help", no_argument, 0, 'h'}, nullptr, nullptr, false, ""}},
-	{discCmdType::DISC_JSON, {{"json", no_argument, 0, 'j'}, nullptr, nullptr, false, ""}},
-	{discCmdType::DISC_DEVICE, {{"device", required_argument, 0, 'd'}, &cmdDiscovery::dumpAll, nullptr, false, ""}},
-	{discCmdType::DISC_PF, {{"pf", no_argument, 0, 0}, nullptr, nullptr, false, ""}},
-	{discCmdType::DISC_PHYSICALFUNCTION, {{"physicalFunction", no_argument, 0, 0}, nullptr, nullptr, false, ""}},
-	{discCmdType::DISC_VF, {{"vf", no_argument, 0, 0}, nullptr, nullptr, false, ""}},
-	{discCmdType::DISC_VIRTUALFUNCTION, {{"virtualFunction", no_argument, 0, 0}, nullptr, nullptr, false, ""}},
-	{discCmdType::DISC_DUMP,
-	 {{"dump", required_argument, 0, 0}, &cmdDiscovery::dump, &cmdDiscovery::dumpHeading, false, ""}},
-	{discCmdType::DISC_LISTAMCVERSIONS,
-	 {{"listamcversions", no_argument, 0, 0}, &cmdDiscovery::listamcversions, nullptr, false, ""}},
-};
-
-static std::unordered_map<int, discoveryDumpStruct> discDumpCmds = {
-	{DUMP_DEVICEID, {&cmdDiscovery::deviceID, "Device ID"}},
-	{DUMP_DEVICENAME, {&cmdDiscovery::deviceName, "Device Name"}},
-	{DUMP_VENDORNAME, {&cmdDiscovery::vendorName, "Vendor Name"}},
-	{DUMP_SOCUUID, {&cmdDiscovery::socUuid, "SOC UUID"}},
-	{DUMP_SERIALNUMBER, {&cmdDiscovery::serialNumber, "Serial Number"}},
-	{DUMP_CORECLOCKRATE, {&cmdDiscovery::coreClockRate, "Core Clock Rate"}},
-	{DUMP_STEPPING, {&cmdDiscovery::stepping, "Stepping"}},
-	{DUMP_DRIVERVERSION, {&cmdDiscovery::driverVersion, "Driver Version"}},
-	{DUMP_GFXFIRMWAREVERSION, {&cmdDiscovery::gfxFirmwareVersion, "GFX Firmware Version"}},
-	{DUMP_GFXDATAFIRMWAREVERSION, {&cmdDiscovery::gfxDataFirmwareVersion, "GFX Data Firmware Version"}},
-	{DUMP_PCIBDFADDRESS, {&cmdDiscovery::pciBDFAddress, "PCI BDF Address"}},
-	{DUMP_PCISLOT, {&cmdDiscovery::pciSlot, "PCI Slot"}},
-	{DUMP_PCIEGENERATION, {&cmdDiscovery::pcieGeneration, "PCIe Generation"}},
-	{DUMP_PCIEMAXLINKWIDTH, {&cmdDiscovery::pcieMaxLinkWidth, "PCIe Max Link Width"}},
-	{DUMP_OAMSOCID, {&cmdDiscovery::oamSocketID, "OAM Socket ID"}},
-	{DUMP_MEMORYPHYSICALSIZE, {&cmdDiscovery::memoryPhysicalSize, "Memory Physical Size"}},
-	{DUMP_MEMORYCHANNELS, {&cmdDiscovery::memoryChannels, "Number of Memory Channels"}},
-	{DUMP_MEMORYBUSWIDTH, {&cmdDiscovery::memoryBusWidth, "Memory Bus Width"}},
-	{DUMP_EUS, {&cmdDiscovery::eus, "Number of EUs"}},
-	{DUMP_MEDIAENGINES, {&cmdDiscovery::mediaEngines, "Number of Media Engines"}},
-	{DUMP_MEDIAENHANCEMENTENGINES, {&cmdDiscovery::mediaEnhancementEngines, "Number of Media Enhancement Engines"}},
-	{DUMP_GFXFIRMWARESTATUS, {&cmdDiscovery::gfxFirmwareStatus, "GFX Firmware Status"}},
-	{DUMP_PCIVENDORID, {&cmdDiscovery::pciVendorID, "PCI Vendor ID"}},
-	{DUMP_PCIDEVICEID, {&cmdDiscovery::pciDeviceID, "PCI Device ID"}},
-	{DUMP_NUMBEROFTILES, {&cmdDiscovery::numberOfTiles, "Number of Tiles"}},
-	{DUMP_NUMBEROFSLICES, {&cmdDiscovery::numberOfSlices, "Number of Slices"}},
-	{DUMP_NUMBEROFSUBSLICESPERSLICE, {&cmdDiscovery::numberOfSubslicesPerSlice, "Number of Sub-slices per Slice"}},
-	{DUMP_NUMBEROFEUS_PERSUBSLICE, {&cmdDiscovery::numberOfEUsPerSubslice, "Number of EUs per Sub-slice"}},
-	{DUMP_NUMBEROFTHREADSPEREU, {&cmdDiscovery::numberOfThreadsPerEU, "Number of Threads per EU"}},
-	{DUMP_PHYSICALEUSIMDWIDTH, {&cmdDiscovery::physicalEUSimdWidth, "Physical EU SIMD Width"}},
-	{DUMP_MAXCOMMANDQUEUEPRIORITY, {&cmdDiscovery::maxCommandQueuePriority, "Max Command Queue Priority"}},
-	{DUMP_MAXHARDWARECONTEXTS, {&cmdDiscovery::maxHardwareContexts, "Max Hardware Contexts"}},
-	{DUMP_MAXMEMALLOCSIZE, {&cmdDiscovery::maxMemAllocSize, "Max Memory Alloc Size"}},
-	{DUMP_MEMORYFREESIZE, {&cmdDiscovery::memoryFreeSize, "Memory Free Size"}},
-	{DUMP_MEMORYECCSTATE, {&cmdDiscovery::memoryEccState, "Memory ECC State"}},
-	{DUMP_KERNELVERSION, {&cmdDiscovery::kernelVersion, "Kernel Version"}},
-	{DUMP_DRMDEVICE, {&cmdDiscovery::drmDevice, "DRM Device"}},
-	{DUMP_DEVICETYPE, {&cmdDiscovery::deviceType, "Device Type"}},
-	{DUMP_SKUTYPE, {&cmdDiscovery::skuType, "SKU Type"}},
-	{DUMP_PCIEMAXBANDWIDTH, {&cmdDiscovery::pcieMaxBandwidth, "PCIe Max Bandwidth"}},
-	{DUMP_AMCFIRMWARENAME, {&cmdDiscovery::amcFirmwareName, "AMC Firmware Name"}},
-	{DUMP_AMCFIRMWAREVERSION, {&cmdDiscovery::amcFirmwareVersion, "AMC Firmware Version"}},
-	{DUMP_GFXPSCBINFIRMWARENAME, {&cmdDiscovery::gfxPscBinFirmwareName, "GFX PSCBIN Firmware Name"}},
-	{DUMP_GFXPSCBINFIRMWAREVERSION, {&cmdDiscovery::gfxPscBinFirmwareVersion, "GFX PSCBIN Firmware Version"}},
-	{DUMP_OPROMCODEFIRMWARENAME, {&cmdDiscovery::opromCodeFirmwareName, "OPROM CODE Firmware Name"}},
-	{DUMP_OPROMCODEFIRMWAREVERSION, {&cmdDiscovery::opromCodeFirmwareVersion, "OPROM CODE Firmware Version"}},
-	{DUMP_OPROMDATAFIRMWARENAME, {&cmdDiscovery::opromDataFirmwareName, "OPROM DATA Firmware Name"}},
-	{DUMP_OPROMDATAFIRMWAREVERSION, {&cmdDiscovery::opromDataFirmwareVersion, "OPROM DATA Firmware Version"}},
+	{discCmdType::DISC_HELP, {}},
+	{discCmdType::DISC_JSON, {}},
+	{discCmdType::DISC_DEVICE, {.func = &cmdDiscovery::dumpAll}},
+	{discCmdType::DISC_PF, {}},
+	{discCmdType::DISC_PHYSICALFUNCTION, {}},
+	{discCmdType::DISC_VF, {}},
+	{discCmdType::DISC_VIRTUALFUNCTION, {}},
+	{discCmdType::DISC_DUMP, {.func = &cmdDiscovery::dump, .headingFunc = &cmdDiscovery::dumpHeading}},
+	{discCmdType::DISC_LISTAMCVERSIONS, {.func = &cmdDiscovery::listamcversions}},
 };
 
+// Array indexed by discDumpType enum value (1-based; slot 0 unused).
+// Direct O(1) lookup by property ID replaces the former unordered_map linear scan.
+static const std::array<discoveryDumpStruct, TOTAL_DISC_DUMPS> DISC_DUMP_CMDS{{
+	{nullptr, ""},																	 // 0 – unused
+	{&cmdDiscovery::deviceID, "Device ID"},											 // 1
+	{&cmdDiscovery::deviceName, "Device Name"},										 // 2
+	{&cmdDiscovery::vendorName, "Vendor Name"},										 // 3
+	{&cmdDiscovery::socUuid, "SOC UUID"},											 // 4
+	{&cmdDiscovery::serialNumber, "Serial Number"},									 // 5
+	{&cmdDiscovery::coreClockRate, "Core Clock Rate"},								 // 6
+	{&cmdDiscovery::stepping, "Stepping"},											 // 7
+	{&cmdDiscovery::driverVersion, "Driver Version"},								 // 8
+	{&cmdDiscovery::gfxFirmwareVersion, "GFX Firmware Version"},					 // 9
+	{&cmdDiscovery::gfxDataFirmwareVersion, "GFX Data Firmware Version"},			 // 10
+	{&cmdDiscovery::pciBDFAddress, "PCI BDF Address"},								 // 11
+	{&cmdDiscovery::pciSlot, "PCI Slot"},											 // 12
+	{&cmdDiscovery::pcieGeneration, "PCIe Generation"},								 // 13
+	{&cmdDiscovery::pcieMaxLinkWidth, "PCIe Max Link Width"},						 // 14
+	{&cmdDiscovery::oamSocketID, "OAM Socket ID"},									 // 15
+	{&cmdDiscovery::memoryPhysicalSize, "Memory Physical Size"},					 // 16
+	{&cmdDiscovery::memoryChannels, "Number of Memory Channels"},					 // 17
+	{&cmdDiscovery::memoryBusWidth, "Memory Bus Width"},							 // 18
+	{&cmdDiscovery::eus, "Number of EUs"},											 // 19
+	{&cmdDiscovery::mediaEngines, "Number of Media Engines"},						 // 20
+	{&cmdDiscovery::mediaEnhancementEngines, "Number of Media Enhancement Engines"}, // 21
+	{&cmdDiscovery::gfxFirmwareStatus, "GFX Firmware Status"},						 // 22
+	{&cmdDiscovery::pciVendorID, "PCI Vendor ID"},									 // 23
+	{&cmdDiscovery::pciDeviceID, "PCI Device ID"},									 // 24
+	{&cmdDiscovery::numberOfTiles, "Number of Tiles"},								 // 25
+	{&cmdDiscovery::numberOfSlices, "Number of Slices"},							 // 26
+	{&cmdDiscovery::numberOfSubslicesPerSlice, "Number of Sub-slices per Slice"},	 // 27
+	{&cmdDiscovery::numberOfEUsPerSubslice, "Number of EUs per Sub-slice"},			 // 28
+	{&cmdDiscovery::numberOfThreadsPerEU, "Number of Threads per EU"},				 // 29
+	{&cmdDiscovery::physicalEUSimdWidth, "Physical EU SIMD Width"},					 // 30
+	{&cmdDiscovery::maxCommandQueuePriority, "Max Command Queue Priority"},			 // 31
+	{&cmdDiscovery::maxHardwareContexts, "Max Hardware Contexts"},					 // 32
+	{&cmdDiscovery::maxMemAllocSize, "Max Memory Alloc Size"},						 // 33
+	{&cmdDiscovery::memoryFreeSize, "Memory Free Size"},							 // 34
+	{&cmdDiscovery::memoryEccState, "Memory ECC State"},							 // 35
+	{&cmdDiscovery::kernelVersion, "Kernel Version"},								 // 36
+	{&cmdDiscovery::drmDevice, "DRM Device"},										 // 37
+	{&cmdDiscovery::deviceType, "Device Type"},										 // 38
+	{&cmdDiscovery::skuType, "SKU Type"},											 // 39
+	{&cmdDiscovery::pcieMaxBandwidth, "PCIe Max Bandwidth"},						 // 40
+	{&cmdDiscovery::amcFirmwareName, "AMC Firmware Name"},							 // 41
+	{&cmdDiscovery::amcFirmwareVersion, "AMC Firmware Version"},					 // 42
+	{&cmdDiscovery::gfxPscBinFirmwareName, "GFX PSCBIN Firmware Name"},				 // 43
+	{&cmdDiscovery::gfxPscBinFirmwareVersion, "GFX PSCBIN Firmware Version"},		 // 44
+	{&cmdDiscovery::opromCodeFirmwareName, "OPROM Code Firmware Name"},				 // 45
+	{&cmdDiscovery::opromCodeFirmwareVersion, "OPROM Code Firmware Version"},		 // 46
+	{&cmdDiscovery::opromDataFirmwareName, "OPROM Data Firmware Name"},				 // 47
+	{&cmdDiscovery::opromDataFirmwareVersion, "OPROM Data Firmware Version"},		 // 48
+}};
 /**
  * @brief Helper function to convert internal JSON keys to user-friendly display names
  *
@@ -114,7 +115,7 @@ std::string getDisplayName(const std::string &key)
 		{"pci_bdf_address", "PCI BDF Address"},
 		{"drm_device_path", "DRM Device"},
 		{"device_function_type", "Function Type"},
-		{"survivability_mode", "Survivability mode"},
+		{"survivability_mode", "Survivability Mode"},
 		{"serial_number", "Serial Number"},
 		{"core_clock_rate", "Core Clock Rate"},
 		{"device_stepping", "Stepping"},
@@ -143,7 +144,7 @@ std::string getDisplayName(const std::string &key)
 		{"physical_eu_simd_width", "Physical EU SIMD Width"},
 		{"max_command_queue_priority", "Max Command Queue Priority"},
 		{"max_hardware_contexts", "Max Hardware Contexts"},
-		{"max_mem_alloc_size_byte", "Max Memory Alloc Size"},
+		{"max_mem_alloc_size_byte", "Max Memory Alloc Size (In Bytes)"},
 		{"memory_free_size_byte", "Memory Free Size"},
 		{"memory_ecc_state", "Memory ECC State"},
 		{"kernel_version", "Kernel Version"},
@@ -188,6 +189,9 @@ void DiscoveryTextPrinter::print(nlohmann::ordered_json *jsonObj)
 		if (val.is_string()) {
 			return val.get<std::string>();
 		}
+		if (val.is_number_integer() && val.get<int64_t>() == -1) {
+			return "N/A";
+		}
 		return val.dump();
 	};
 
@@ -398,35 +402,15 @@ void cmdDiscovery::help(HELP helpType)
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(
-		HEADING, "-d,--device                 Device ID or PCI BDF address to query. It will show more detailed info"));
+		HEADING, "--device,--id               Device ID or PCI BDF address to query. It will show more detailed info"));
 	helpList.push_back(helpCmd(HEADING, "--pf,--physicalFunction     Display the physical functions only"));
 	helpList.push_back(helpCmd(HEADING, "--vf,--virtualFunction      Display the virtual functions only"));
 	helpList.push_back(helpCmd(HEADING, "--dump                      Property ID to dump device properties in CSV "
 										"format. Separated by the comma. \"-1\" means all properties"));
-	helpList.push_back(helpCmd(SUB_HEADING, "1. Device ID"));
-	helpList.push_back(helpCmd(SUB_HEADING, "2. Device Name"));
-	helpList.push_back(helpCmd(SUB_HEADING, "3. Vendor Name"));
-	helpList.push_back(helpCmd(SUB_HEADING, "4. SOC UUID"));
-	helpList.push_back(helpCmd(SUB_HEADING, "5. Serial Number"));
-	helpList.push_back(helpCmd(SUB_HEADING, "6. Core Clock Rate"));
-	helpList.push_back(helpCmd(SUB_HEADING, "7. Stepping"));
-	helpList.push_back(helpCmd(SUB_HEADING, "8. Driver Version"));
-	helpList.push_back(helpCmd(SUB_HEADING, "9. GFX Firmware Version"));
-	helpList.push_back(helpCmd(SUB_HEADING, "10. GFX Data Firmware Version"));
-	helpList.push_back(helpCmd(SUB_HEADING, "11. PCI BDF Address"));
-	helpList.push_back(helpCmd(SUB_HEADING, "12. PCI Slot"));
-	helpList.push_back(helpCmd(SUB_HEADING, "13. PCIe Generation"));
-	helpList.push_back(helpCmd(SUB_HEADING, "14. PCIe Max Link Width"));
-	helpList.push_back(helpCmd(SUB_HEADING, "15. OAM Socket ID"));
-	helpList.push_back(helpCmd(SUB_HEADING, "16. Memory Physical Size"));
-	helpList.push_back(helpCmd(SUB_HEADING, "17. Number of Memory Channels"));
-	helpList.push_back(helpCmd(SUB_HEADING, "18. Memory Bus Width"));
-	helpList.push_back(helpCmd(SUB_HEADING, "19. Number of EUs"));
-	helpList.push_back(helpCmd(SUB_HEADING, "20. Number of Media Engines"));
-	helpList.push_back(helpCmd(SUB_HEADING, "21. Number of Media Enhancement Engines"));
-	helpList.push_back(helpCmd(SUB_HEADING, "22. GFX Firmware Status"));
-	helpList.push_back(helpCmd(SUB_HEADING, "23. PCI Vendor ID"));
-	helpList.push_back(helpCmd(SUB_HEADING, "24. PCI Device ID"));
+
+	for (int propId = 1; propId < TOTAL_DISC_DUMPS; propId++) {
+		helpList.push_back(helpCmd(SUB_HEADING, std::format("{}. {}", propId, DISC_DUMP_CMDS[propId].heading).c_str()));
+	}
 	helpList.push_back(helpCmd(HEADING, "--listamcversions           Show all AMC firmware versions"));
 
 	printHelp(helpList, helpType);
@@ -472,10 +456,10 @@ ze_result_t cmdDiscovery::preCheck(std::vector<int> *dumpArgs)
 		}
 	}
 
-	// Check if each dump command argument is a number between 1 and TOTAL_DISC_DUMPS
+	// Valid IDs are 1..(TOTAL_DISC_DUMPS-1); TOTAL_DISC_DUMPS itself is the sentinel, not a valid property.
 	for (const auto arg : *dumpArgs) {
-		if (arg < DUMP_DEVICEID || arg > TOTAL_DISC_DUMPS) {
-			ERR("Invalid dump command argument '{}'. It must be between 1 and {}\n", arg, TOTAL_DISC_DUMPS);
+		if (arg < DUMP_DEVICEID || arg >= TOTAL_DISC_DUMPS) {
+			ERR("Invalid dump command argument '{}'. It must be between 1 and {}\n", arg, TOTAL_DISC_DUMPS - 1);
 			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 		}
 	}
@@ -505,12 +489,8 @@ ze_result_t cmdDiscovery::dumpHeading(nlohmann::ordered_json *jsonObj)
 	}
 
 	for (const auto arg : dumpArgs) {
-		for (const auto &cmd : discDumpCmds) {
-			if (cmd.first == arg) {
-				found = true;
-				headingJson->push_back(cmd.second.heading);
-			}
-		}
+		found = true;
+		headingJson->push_back(DISC_DUMP_CMDS[arg].heading);
 	}
 
 	if (!found) {
@@ -548,19 +528,14 @@ ze_result_t cmdDiscovery::dump(devInfo *d, nlohmann::ordered_json *jsonObj)
 
 	std::string outputLine;
 	for (const auto arg : dumpArgs) {
-		for (const auto &cmd : discDumpCmds) {
-			if (cmd.first == arg) {
-				DBG("Running command: {}\n", cmd.first);
-				result = (this->*cmd.second.func)(d, &outputLine);
-				if (result != ZE_RESULT_SUCCESS) {
-					return result;
-				}
-				valuesJson->push_back(outputLine);
-				// Set found to true to indicate that we have printed at least one command
-				found = true;
-				break;
-			}
+		const auto &cmd = DISC_DUMP_CMDS[arg];
+		DBG("Running command: {}\n", arg);
+		result = (this->*cmd.func)(d, &outputLine);
+		if (result != ZE_RESULT_SUCCESS) {
+			return result;
 		}
+		valuesJson->push_back(outputLine);
+		found = true;
 	}
 
 	if (!found) {
@@ -602,6 +577,27 @@ ze_result_t cmdDiscovery::dumpAll(devInfo *d, nlohmann::ordered_json *jsonObj)
 
 	*jsonObj = props;
 
+	// The property map stores every value as text, but several documented
+	// fields are JSON numbers in the schema. Promote the known-numeric keys
+	// from their string form to integers so the emitted JSON matches the
+	// documented shape (and ordered_json keeps their original position).
+	(*jsonObj)["device_id"] = d->index;
+	auto promoteToInteger = [&](const char *key) {
+		auto it = props.find(key);
+		if (it == props.end()) {
+			return;
+		}
+		const std::string &s = it->second;
+		long long value = 0;
+		const auto [ptr, ec] = std::from_chars(s.data(), s.data() + s.size(), value);
+		if (ec == std::errc{} && ptr == s.data() + s.size()) {
+			(*jsonObj)[key] = value;
+		}
+	};
+	promoteToInteger("number_of_tiles");
+	promoteToInteger("number_of_eus");
+	promoteToInteger("memory_physical_size_byte");
+
 	return result;
 }
 
@@ -1126,7 +1122,7 @@ ze_result_t cmdDiscovery::pcieGeneration(devInfo *d, std::string *outputLine)
 		return result;
 	}
 
-	*outputLine = std::to_string(pciProps.maxSpeed.gen);
+	*outputLine = (pciProps.maxSpeed.gen == -1) ? "N/A" : std::to_string(pciProps.maxSpeed.gen);
 	return ZE_RESULT_SUCCESS;
 }
 
@@ -1151,7 +1147,7 @@ ze_result_t cmdDiscovery::pcieMaxLinkWidth(devInfo *d, std::string *outputLine)
 		ERR("Failed to get PCI properties: 0x{:X} ({})\n", result, l0_error_to_string(result));
 		return result;
 	}
-	*outputLine = std::to_string(pciProps.maxSpeed.width);
+	*outputLine = (pciProps.maxSpeed.width == -1) ? "N/A" : std::to_string(pciProps.maxSpeed.width);
 
 	return ZE_RESULT_SUCCESS;
 }
@@ -1827,9 +1823,10 @@ ze_result_t cmdDiscovery::pcieMaxBandwidth(devInfo *d, std::string *outputLine)
 		ERR("Failed to get PCI properties: 0x{:X} ({})\n", result, l0_error_to_string(result));
 		return result;
 	}
-	// If the PCI information is unavailable display -1
+	// If the PCI information is unavailable display N/A
 	if (pciProps.maxSpeed.width == -1) {
-		*outputLine = "-1";
+		*outputLine = "N/A";
+		return ZE_RESULT_SUCCESS;
 	}
 	// Calculate bandwidth based on PCIe generation and width
 	// Formula: (width * gen_rate) where gen_rate depends on PCIe generation
@@ -2041,7 +2038,9 @@ ze_result_t cmdDiscovery::listamcversions(devInfo *d, nlohmann::ordered_json *js
 	auto *const fw = d->dev->getFirmware();
 
 	fw->getFWversion(fwType::AMC, p->getBDFStr().c_str(), version.data(), static_cast<uint32_t>(version.size()));
-	jsonObj->push_back(version.data());
+	// Wrap the versions in the documented object shape
+	// ({"amc_fw_version": [...]}) instead of emitting a bare JSON array.
+	(*jsonObj)["amc_fw_version"].push_back(version.data());
 
 	return ZE_RESULT_SUCCESS;
 }
@@ -2150,69 +2149,46 @@ int cmdDiscovery::run(arg_struct *args)
 {
 	TRACING();
 	std::vector<devInfo> deviceList;
-	bool found = false, headingFirst = true;
-	int opt;
-	int optionIndex = 0;
+	bool headingFirst = true;
 	std::unique_ptr<Printer> printer;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(discCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return 0;
-		case 'j':
-			discCmds[discCmdType::DISC_JSON].enabled = true;
-			break;
-		case 'd':
-			discCmds[discCmdType::DISC_DEVICE].enabled = true;
-			discCmds[discCmdType::DISC_DEVICE].val = optarg;
-			break;
-		case 0:
-			for (auto &cmd : discCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
 
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
+	// Reset state
+	for (auto &[k, v] : discCmds) {
+		v.enabled = false;
+		v.val.clear();
+	}
+
+	CLI::App sub{"Discover Intel GPU devices", "discovery"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", discCmds[discCmdType::DISC_JSON].enabled, "Print result in JSON format");
+	sub.add_option("-d,--device,--id", discCmds[discCmdType::DISC_DEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { discCmds[discCmdType::DISC_DEVICE].enabled = true; });
+	sub.add_flag("--pf", discCmds[discCmdType::DISC_PF].enabled, "List physical function devices");
+	sub.add_flag("--physicalFunction", discCmds[discCmdType::DISC_PHYSICALFUNCTION].enabled,
+				 "List physical function devices (alias for --pf)");
+	sub.add_flag("--vf", discCmds[discCmdType::DISC_VF].enabled, "List virtual function devices");
+	sub.add_flag("--virtualFunction", discCmds[discCmdType::DISC_VIRTUALFUNCTION].enabled,
+				 "List virtual function devices (alias for --vf)");
+	sub.add_option("--dump", discCmds[discCmdType::DISC_DUMP].val, "Dump specific property IDs (comma-separated)")
+		->each([&](const std::string &) { discCmds[discCmdType::DISC_DUMP].enabled = true; });
+	sub.add_flag("--listamcversions", discCmds[discCmdType::DISC_LISTAMCVERSIONS].enabled,
+				 "List AMC firmware versions");
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
+		ERR("Run with --help for more information.\n");
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 	if (discCmds[discCmdType::DISC_JSON].enabled == true) {
 		printer = std::make_unique<JsonPrinter>();
 	} else {
 		printer = std::make_unique<DiscoveryTextPrinter>();
 	}
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
 
 	auto result = args->sm.findDevice(discCmds[discCmdType::DISC_DEVICE].val.c_str(), &deviceList);
 	if (result != ZE_RESULT_SUCCESS) {
@@ -2252,7 +2228,7 @@ int cmdDiscovery::run(arg_struct *args)
 						}
 					}
 
-					DBG("Running command: {}\n", cmd.second.opt.name);
+					DBG("Running command: {}\n", discCmdName(cmd.first));
 					result = (this->*cmd.second.func)(&device, jsonObj.get());
 					if (result != ZE_RESULT_SUCCESS) {
 						return result;
diff --git a/ial/cmn/cmd_discovery.h b/ial/cmn/cmd_discovery.h
index 16c42244a..a0f7e8889 100644
--- a/ial/cmn/cmd_discovery.h
+++ b/ial/cmn/cmd_discovery.h
@@ -11,6 +11,7 @@
 #include "printer.h"
 #include <os.h>
 #include <map>
+#include <string_view>
 
 inline constexpr char DEVICE_STATE_SURV_MODE[] =
 	"survivability mode (firmware update and cold reset are recommended for device recovery)";
@@ -102,7 +103,7 @@ class cmdDiscovery : public cmds
 {
 
 public:
-	cmdDiscovery() { STRCPY_S(name, MAX_PATH, "discovery"); };
+	cmdDiscovery() { name = "discovery"; };
 	~cmdDiscovery(){};
 	void help(HELP helpType = FULL_HELP);
 	ze_result_t preCheck(std::vector<int> *dumpArgs);
@@ -179,13 +180,26 @@ using discoveryFunc = ze_result_t (cmdDiscovery::*)(devInfo *d, nlohmann::ordere
 
 struct discoveryCmdStruct
 {
-	option opt;
-	discoveryFunc func;
-	discoveryHeadingFunc headingFunc;
-	bool enabled;
-	std::string val;
+	discoveryFunc func{nullptr};
+	discoveryHeadingFunc headingFunc{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
+constexpr std::string_view discCmdName(discCmdType t) noexcept
+{
+	switch (t) {
+	case discCmdType::DISC_DEVICE:
+		return "device";
+	case discCmdType::DISC_DUMP:
+		return "dump";
+	case discCmdType::DISC_LISTAMCVERSIONS:
+		return "listamcversions";
+	default:
+		return "";
+	}
+}
+
 struct discoveryDumpStruct
 {
 	discoverySubCmdFunc func;
diff --git a/ial/cmn/cmd_dump.cpp b/ial/cmn/cmd_dump.cpp
index 925837c94..22cab8e5b 100644
--- a/ial/cmn/cmd_dump.cpp
+++ b/ial/cmn/cmd_dump.cpp
@@ -5,1976 +5,1117 @@
  */
 
 #include "cmd_dump.h"
-#include "debug.h"
-#include <array>
-#include <assert.h>
-#include <temperature.h>
-#include <frequency.h>
-#include <memory.h>
-#include <power.h>
-#include <enginegroup.h>
-#include <ras.h>
-#include <pci.h>
-#include <format>
-#include <iostream>
+#include "cmds.h"
+#include "logger/logger.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "table_builder.h"
+#include "ze_api.h"
+#include <CLI/CLI.hpp>
+#include <nlohmann/json.hpp>
+#include <algorithm>
+#include <cctype>
+#include <charconv>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
-#include <iomanip>
+#include <format>
+#include <functional>
+#include <ios>
+#include <optional>
+#include <ranges>
+#include <span>
+#include <string>
+#include <string_view>
+#include <system_error>
 #include <thread>
-#include <atomic>
-#include <chrono>
-#include <unordered_set>
-#include <memory>
-
-static std::unordered_map<dumpCmdType, dumpCmdStruct> dumpCmds = {
-	{dumpCmdType::DUMP_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_TILE, {{"tile", required_argument, 0, 't'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_METRICS, {{"metrics", required_argument, 0, 'm'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_FILE, {{"file", required_argument, 0, 'f'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_IMS, {{"ims", required_argument, 0, 0}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_TIME, {{"time", required_argument, 0, 0}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_DATE, {{"date", no_argument, 0, 0}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_INTERVAL, {{"interval", required_argument, 0, 'i'}, nullptr, false, ""}},
-	{dumpCmdType::DUMP_NUMBER, {{"number", required_argument, 0, 'n'}, nullptr, false, ""}},
-};
+#include <unordered_map>
+#include <variant>
+#include <utility>
+#include <vector>
 
-static std::unordered_map<int, dumpCmdSubStruct> dumpMetrics = {
-	{dumpCmdSubType::DUMP_GPU_UTILIZATION, {&cmdDump::gpuUtilization, "GPU Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_POWER, {&cmdDump::gpuPower, "GPU Power (W)", false}},
-	{dumpCmdSubType::DUMP_GPU_FREQUENCY, {&cmdDump::gpuFrequency, "GPU Frequency (MHz)", true}},
-	{dumpCmdSubType::DUMP_GPU_CORE_TEMPERATURE, {&cmdDump::gpuCoreTemperature, "GPU Core Temperature (C)", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_TEMPERATURE,
-	 {&cmdDump::gpuMemoryTemperature, "GPU Memory Temperature (C)", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_UTILIZATION,
-	 {&cmdDump::gpuMemoryUtilization, "GPU Memory Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_READ, {&cmdDump::gpuMemoryRead, "GPU Memory Read (kB/s)", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_WRITE, {&cmdDump::gpuMemoryWrite, "GPU Memory Write (kB/s)", false}},
-	{dumpCmdSubType::DUMP_GPU_ENERGY_CONSUMED, {&cmdDump::gpuEnergyConsumed, "GPU Energy Consumed (J)", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_ACTIVE, {&cmdDump::gpuEuArrayActive, "GPU EU Array Active (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_STALL, {&cmdDump::gpuEuArrayStall, "GPU EU Array Stall (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_IDLE, {&cmdDump::gpuEuArrayIdle, "GPU EU Array Idle (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_RESET_COUNTER,
-	 {&cmdDump::gpuEuArrayResetCounter, "GPU EU Array Reset Counter", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_PROGRAMMING_ERRORS,
-	 {&cmdDump::gpuEuArrayProgrammingErrors, "GPU EU Array Programming Errors", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_DRIVER_ERRORS,
-	 {&cmdDump::gpuEuArrayDriverErrors, "GPU EU Array Driver Errors", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_CACHE_ERRORS_CORRECTABLE,
-	 {&cmdDump::gpuEuArrayCacheErrorsCorrectable, "GPU EU Array Cache Errors Correctable", false}},
-	{dumpCmdSubType::DUMP_GPU_EU_ARRAY_CACHE_ERRORS_UNCORRECTABLE,
-	 {&cmdDump::gpuEuArrayCacheErrorsUncorrectable, "GPU EU Array Cache Errors Uncorrectable", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_BANDWIDTH_UTILIZATION,
-	 {&cmdDump::gpuMemoryBandwidthUtilization, "GPU Memory Bandwidth Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_USED, {&cmdDump::gpuMemoryUsed, "GPU Memory Used (MB)", false}},
-	{dumpCmdSubType::DUMP_PCIE_READ, {&cmdDump::pcieRead, "PCIe Read (kB/s)", false}},
-	{dumpCmdSubType::DUMP_PCIE_WRITE, {&cmdDump::pcieWrite, "PCIe Write (kB/s)", false}},
-	{dumpCmdSubType::DUMP_COMPUTE_ENGINE_UTILIZATION,
-	 {&cmdDump::computeEngineUtilization, "Compute Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_RENDER_ENGINE_UTILIZATION,
-	 {&cmdDump::renderEngineUtilization, "Render Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_MEDIA_DECODER_ENGINE_UTILIZATION,
-	 {&cmdDump::mediaDecoderEngineUtilization, "Media Decoder Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_MEDIA_ENCODER_ENGINE_UTILIZATION,
-	 {&cmdDump::mediaEncoderEngineUtilization, "Media Encoder Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_COPY_ENGINE_UTILIZATION,
-	 {&cmdDump::copyEngineUtilization, "Copy Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_MEDIA_ENHANCEMENT_ENGINE_UTILIZATION,
-	 {&cmdDump::mediaEnhancementEngineUtilization, "Media Enhancement Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_3D_ENGINE_UTILIZATION, {&cmdDump::engineUtilization, "3D Engine Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_ERRORS_CORRECTABLE,
-	 {&cmdDump::gpuMemoryErrorsCorrectable, "GPU Memory Errors Correctable", false}},
-	{dumpCmdSubType::DUMP_GPU_MEMORY_ERRORS_UNCORRECTABLE,
-	 {&cmdDump::gpuMemoryErrorsUncorrectable, "GPU Memory Errors Uncorrectable", false}},
-	{dumpCmdSubType::DUMP_COMPUTE_ENGINE_GROUP_UTILIZATION,
-	 {&cmdDump::computeEngineGroupUtilization, "Compute Engine Group Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_RENDER_ENGINE_GROUP_UTILIZATION,
-	 {&cmdDump::renderEngineGroupUtilization, "Render Engine Group Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_MEDIA_ENGINE_GROUP_UTILIZATION,
-	 {&cmdDump::mediaEngineGroupUtilization, "Media Engine Group Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_COPY_ENGINE_GROUP_UTILIZATION,
-	 {&cmdDump::copyEngineGroupUtilization, "Copy Engine Group Utilization (%)", false}},
-	{dumpCmdSubType::DUMP_THROTTLE_REASON, {&cmdDump::throttleReason, "Throttle Reason", false}},
-	{dumpCmdSubType::DUMP_MEDIA_ENGINE_FREQUENCY,
-	 {&cmdDump::mediaEngineFrequency, "Media Engine Frequency (MHz)", false}},
-};
+namespace {
+
+// Parsing utilities
 
 /**
- * @brief Adds help commands to the provided help list.
- *
- * @param helpType A enum to specify the type of help message to print.
+ * @brief Parse an integer from a string_view using std::from_chars.
+ *
+ * @tparam T      Integral type to parse into.
+ * @param[in] str Input string; must consist solely of the integer representation
+ *                with no leading or trailing whitespace.
+ * @retval std::optional<T>  The parsed value on success.
+ * @retval std::nullopt      When the string is not a valid integer or contains
+ *         unconsumed trailing characters after the number.
  */
-void cmdDump::help(HELP helpType)
+template <typename T> [[nodiscard]] std::optional<T> parseInteger(std::string_view str) noexcept
 {
-	TRACING();
-	std::vector<helpCmd> helpList;
-	int32_t i = 0;
-
-	helpList.push_back(helpCmd(TITLE, "Dump device statistics data"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s dump [Options]", progName.c_str()));
-	helpList.push_back(
-		helpCmd(HEADING, "%s dump -d [deviceIds] -t [deviceTileIds] -m [metricsIds] -i [timeInterval] -n [dumpTimes]",
-				progName.c_str()));
-	helpList.push_back(helpCmd(
-		HEADING, "%s dump -d [pciBdfAddress] -t [deviceTileIds] -m [metricsIds] -i [timeInterval] -n [dumpTimes]",
-		progName.c_str()));
-	helpList.push_back(helpCmd(
-		HEADING, "%s dump -d [deviceIds] -m [metricsIds] --file [filename] --ims [milliseconds] --time [seconds]",
-		progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device IDs or PCI BDF addresses to query. The "
-										"value of \"-1\" means all devices"));
-	helpList.push_back(helpCmd(HEADING, "-t,--tile                   The device tile IDs to query. If the device has "
-										"only one tile, this parameter should not be specified"));
-	helpList.push_back(helpCmd(
-		HEADING, "-m,--metrics                Metrics type to collect raw data, options. Separated by a comma"));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU Utilization (%), GPU active time of the elapsed time, per tile or "
-							   "device.",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING2, "Device-level is the average value of tiles for multi-tiles"));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. GPU Power (W), per tile or device", i++));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"%d. GPU Frequency (MHz), per tile or device. Device-level is the average value of tiles for multi-tiles",
-		i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU Core Temperature (Celsius Degree), per tile or device. "
-							   "Device-level is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU Memory Temperature (Celsius Degree), per tile or device. "
-							   "Device-level is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU Memory Utilization (%), per tile or device. Device-level is the "
-							   "average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"%d. GPU Memory Read (kB/s), per tile or device. Device-level is the sum value of tiles for multi-tiles", i++));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"%d. GPU Memory Write (kB/s), per tile or device. Device-level is the sum value of tiles for multi-tiles",
-		i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. GPU Energy Consumed (J), per tile or device", i++));
-	helpList.push_back(
-		helpCmd(SUB_HEADING,
-				"%d. GPU EU Array Active (%), the normalized sum of all cycles on all EUs that were spent actively "
-				"executing instructions.",
-				i++));
-	helpList.push_back(
-		helpCmd(SUB_HEADING2, "Per tile or device. Device-level is the average value of tiles for multi-tiles"));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU EU Array Stall (%), the normalized sum of all cycles on all EUs during "
-							   "which the EUs were stalled",
-							   i++));
-	helpList.push_back(
-		helpCmd(SUB_HEADING2, "At least one thread is loaded, but the EU is stalled. Per tile or device."));
-	helpList.push_back(helpCmd(SUB_HEADING2, "Device-level is the average value of tiles for multi-tiles"));
-	helpList.push_back(
-		helpCmd(SUB_HEADING,
-				"%d. GPU EU Array Idle (%), the normalized sum of all cycles on all cores when no threads were "
-				"scheduled on a core.",
-				i++));
-	helpList.push_back(
-		helpCmd(SUB_HEADING2, "Per tile or device. Device-level is the average value of tiles for multi-tiles"));
-	helpList.push_back(
-		helpCmd(SUB_HEADING,
-				"%d. Reset Counter, per tile or device. Device-level is the sum value of tiles for multi-tiles", i++));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"%d. Programming Errors, per tile or device. Device-level is the sum value of tiles for multi-tiles", i++));
-	helpList.push_back(
-		helpCmd(SUB_HEADING,
-				"%d. Driver Errors, per tile or device. Device-level is the sum value of tiles for multi-tiles", i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Cache Errors Correctable, per tile or device. Device-level is the sum "
-							   "value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Cache Errors Uncorrectable, per tile or device. Device-level is the sum "
-							   "value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU Memory Bandwidth Utilization (%), per tile or device. "
-							   "Device-level is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(
-		SUB_HEADING,
-		"%d. GPU Memory Used (MiB), per tile or device. Device-level is the sum value of tiles for multi-tiles", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. PCIe Read (kB/s), per device", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. PCIe Write (kB/s), per device", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Compute engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Render engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Media decoder engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Media encoder engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Copy engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Media enhancement engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. 3D engine utilizations (%), per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. GPU Memory Errors Correctable, per tile or device. Other non-compute correctable "
-							   "errors are also included.",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING2, "Device-level is the sum value of tiles for multi-tiles"));
-	helpList.push_back(
-		helpCmd(SUB_HEADING,
-				"%d. GPU Memory Errors Uncorrectable, per tile or device. Other non-compute uncorrectable "
-				"errors are also included.",
-				i++));
-	helpList.push_back(helpCmd(SUB_HEADING2, "Device-level is the sum value of tiles for multi-tiles"));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Compute engine group utilization (%), per tile or device. "
-							   "Device-level is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Render engine group utilization (%), per tile or device. Device-level "
-							   "is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Media engine group utilization (%), per tile or device. Device-level "
-							   "is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Copy engine group utilization (%), per tile or device. Device-level "
-							   "is the average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(SUB_HEADING, "%d. Throttle reason, per tile", i++));
-	helpList.push_back(helpCmd(SUB_HEADING,
-							   "%d. Media Engine Frequency (MHz), per tile or device. Device-level is the "
-							   "average value of tiles for multi-tiles",
-							   i++));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-i                          The interval (in seconds) to dump the device "
-										"statistics to screen. Default value: 1 second"));
-	helpList.push_back(helpCmd(HEADING, "-n                          Number of the device statistics dump to screen. "
-										"The dump will never be ended if this parameter is not specified"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "--file                      Dump the raw statistics to the file"));
-	helpList.push_back(helpCmd(HEADING,
-							   "--ims                       The interval (in milliseconds) to dump the device "
-							   "statistics to file for high-frequency monitoring. Its value should be 10 to 1000"));
-	helpList.push_back(helpCmd(SUB_HEADING, "The recommended metrics types for high-frequency sampling: GPU "
-											"power, GPU frequency, GPU utilization"));
-	helpList.push_back(helpCmd(SUB_HEADING, "GPU temperature, GPU memory read/write/bandwidth, GPU PCIe read/write, "
-											"GPU engine utilizations"));
-	helpList.push_back(helpCmd(HEADING, "--time                      Dump total time in seconds"));
-	helpList.push_back(helpCmd(HEADING, "--date                      Show date in timestamp"));
-	helpList.push_back(helpCmd(BLANK));
-
-	printHelp(helpList, helpType);
-	helpList.clear();
+	T value{};
+	const auto result = std::from_chars(str.data(), str.data() + str.size(), value);
+	if (result.ec == std::errc{} && result.ptr == str.data() + str.size()) {
+		return value;
+	}
+	return std::nullopt;
 }
 
 /**
- * @brief Executes the metrics command based on the provided arguments.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @brief Extract a named flag and its value from an argv span in a single pass.
+ *
+ * Supports two syntactic forms:
+ *  - @c "--flag=value" / @c "-flag=value"  (equals-delimited)
+ *  - @c "--flag value" / @c "-flag value"  (space-separated)
+ *
+ * @param[in] argv       Span of raw argv pointers (not including @c argv[0]).
+ * @param[in] flagShort  Short form of the flag (e.g. @c "-lms"); pass an empty
+ *                       string_view to ignore the short form.
+ * @param[in] flagLong   Long form of the flag (e.g. @c "--loop-ms"); pass an empty
+ *                       string_view to ignore the long form.
+ * @return A pair where:
+ *   - @c first:  The remaining argument strings with the matched flag and its value removed.
+ *   - @c second: The flag's value if found; std::nullopt otherwise.
  */
-THREAD_RET cmdDump::metrics(void *args)
+[[nodiscard]] std::pair<std::vector<std::string>, std::optional<std::string>>
+filterArgvAndExtract(std::span<char *const> argv, std::string_view flagShort, std::string_view flagLong)
 {
-	TRACING();
-	threadArgs *metricArgs = (threadArgs *)args;
-	cmdDump *cmdDumpInstance = metricArgs->cmdDumpInstance;
-	devInfo *d = metricArgs->d;
-	ze_result_t result = ZE_RESULT_SUCCESS;
-	UNUSED_VAR(result);
-	bool found = false;
-
-	// Iterate through the dump commands and execute the metrics function for each
-	for (const auto &cmd : dumpMetrics) {
-		if (cmd.first == stoi(metricArgs->cmdName) && cmd.second.func != nullptr) {
-			found = true;
-			/* Run the command only if this is not an iGPU or this command is available for iGPUs */
-			if (!d->dev->isIGPU() || cmd.second.availableForIGPU) {
-				result = (cmdDumpInstance->*cmd.second.func)(d, &metricArgs->outputLine, &metricArgs->td);
-			} else {
-				// If the command is not available for iGPUs, set outputLine to N/A
-				metricArgs->outputLine = "N/A";
+	std::vector<std::string> result;
+	std::optional<std::string> extracted;
+
+	for (std::size_t i = 0; i < argv.size(); ++i) {
+		const std::string_view arg{argv[i]};
+		bool skip = false;
+
+		// Check --flag=value or -flag=value
+		for (const auto flag : {flagLong, flagShort}) {
+			if (!flag.empty() && arg.starts_with(flag) && arg.size() > flag.size() && arg[flag.size()] == '=') {
+				extracted = std::string{arg.substr(flag.size() + 1)};
+				skip = true;
+				break;
 			}
-			break;
 		}
-	}
+		if (skip) {
+			continue;
+		}
 
-	if (!found) {
-		ERR("The following metric ID was not expected: '{}'.\n", metricArgs->cmdName.c_str());
-		ERR("Run with --help for more information.\n");
-		// Error already reported
-		metricArgs->outputLine = "N/A";
+		// Check --flag value or -flag value (space-separated)
+		if (arg == flagLong || arg == flagShort) {
+			if (i + 1 < argv.size()) {
+				extracted = std::string{argv[++i]};
+			}
+			continue;
+		}
+
+		result.emplace_back(arg);
 	}
-	return 0;
+
+	return {result, extracted};
 }
 
 /**
- * @brief Converts GPU frequency throttle reason flags to human-readable string
+ * @brief Map from legacy numeric metric ID to canonical registry field name.
  *
- * This function analyzes the frequency throttle reason flags from the Level Zero
- * Sysman API and returns a descriptive string explaining why the GPU frequency
- * is being throttled. It checks various throttle reasons including power limits,
- * thermal limits, current limits, and software/hardware constraints.
- *
- * @param flags Frequency throttle reason flags from zes_freq_throttle_reason_flags_t
- * @return std::string Human-readable description of the throttle reason
+ * Preserved for backward compatibility so that @c "dump -m 0,1,2" continues to work.
+ * Unsupported legacy IDs (21, 27, 28) are absent from the map and produce an error log
+ * entry in translateMetricQuery().
  */
-std::string cmdDump::getFreqThrottleString(zes_freq_throttle_reason_flags_t flags)
-{
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP) == ZES_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP)
-		return "frequency throttled due to average power excursion.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_BURST_PWR_CAP) == ZES_FREQ_THROTTLE_REASON_FLAG_BURST_PWR_CAP)
-		return "frequency throttled due to burst power excursion.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_CURRENT_LIMIT) == ZES_FREQ_THROTTLE_REASON_FLAG_CURRENT_LIMIT)
-		return "frequency throttled due to current excursion.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT) == ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT)
-		return "frequency throttled due to thermal excursion.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_PSU_ALERT) == ZES_FREQ_THROTTLE_REASON_FLAG_PSU_ALERT)
-		return "frequency throttled due to power supply assertion.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_SW_RANGE) == ZES_FREQ_THROTTLE_REASON_FLAG_SW_RANGE)
-		return "frequency throttled due to software supplied frequency range.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_HW_RANGE) == ZES_FREQ_THROTTLE_REASON_FLAG_HW_RANGE)
-		return "frequency throttled due to a sub block that has a lower frequency.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL) == ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL)
-		return "frequency throttled due to thermal conditions.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_POWER) == ZES_FREQ_THROTTLE_REASON_FLAG_POWER)
-		return "frequency throttled due to power constraints.";
-	if ((flags & ZES_FREQ_THROTTLE_REASON_FLAG_VOLTAGE) == ZES_FREQ_THROTTLE_REASON_FLAG_VOLTAGE)
-		return "frequency throttled due to voltage excursion.";
-	return "Not Throttled";
-}
+const std::unordered_map<int, std::string_view> LEGACY_METRIC_NAMES = {
+	{0, "utilization.gpu"},					// GPU Utilization (%)
+	{1, "power.draw"},						// GPU Power (W)
+	{2, "clocks.current.graphics"},			// GPU Frequency (MHz)
+	{3, "temperature.gpu"},					// GPU Core Temperature (C)
+	{4, "temperature.memory"},				// GPU Memory Temperature (C)
+	{5, "utilization.memory"},				// GPU Memory Utilization (%)
+	{6, "memory.read.bandwidth"},			// GPU Memory Read (kB/s)
+	{7, "memory.write.bandwidth"},			// GPU Memory Write (kB/s)
+	{8, "energy.consumed"},					// GPU Energy Consumed (J)
+	{9, "eu.active"},						// EU Array Active (%)
+	{10, "eu.stall"},						// EU Array Stall (%)
+	{11, "eu.idle"},						// EU Array Idle (%)
+	{12, "ras.reset"},						// Reset Counter
+	{13, "ras.programming.errors"},			// Programming Errors
+	{14, "ras.driver.errors"},				// Driver Errors
+	{15, "ras.cache.errors.correctable"},	// Cache Errors Correctable
+	{16, "ras.cache.errors.uncorrectable"}, // Cache Errors Uncorrectable
+	{17, "memory.bandwidth.utilization"},	// Memory Bandwidth Utilization (%)
+	{18, "memory.used"},					// Memory Used (MiB)
+	{19, "pcie.rx.throughput.kbs"},			// PCIe Read (kB/s)
+	{20, "pcie.tx.throughput.kbs"},			// PCIe Write (kB/s)
+	// 21: Xe Link Throughput -- not supported
+	{22, "utilization.compute"}, // Compute Engine Utilization (%)
+	{23, "utilization.render"},	 // Render Engine Utilization (%)
+	{24, "utilization.media"},	 // Media Decoder Engine Utilization (%)
+	{25, "utilization.media"},	 // Media Encoder Engine Utilization (%)
+	{26, "utilization.copy"},	 // Copy Engine Utilization (%)
+	// 27: Media Enhancement Engine -- not supported
+	// 28: 3D Engine Utilization -- not supported
+	{29, "ras.non_compute.errors.correctable"},	  // Memory Errors Correctable
+	{30, "ras.non_compute.errors.uncorrectable"}, // Memory Errors Uncorrectable
+	{31, "utilization.compute"},				  // Compute Engine Group Utilization (%)
+	{32, "utilization.render"},					  // Render Engine Group Utilization (%)
+	{33, "utilization.media"},					  // Media Engine Group Utilization (%)
+	{34, "utilization.copy"},					  // Copy Engine Group Utilization (%)
+	{35, "clocks.throttle.reason"},				  // Throttle Reason
+	{36, "clocks.current.media"},				  // Media Engine Frequency (MHz)
+};
 
 /**
- * @brief Helper function to get the GPU power.
+ * @brief Translate a user-supplied metric query string into canonical registry field names.
  *
- * @param d A pointer to the device information structure.
- * @param gpuPower A pointer to store the GPU power value.
- * @param timeStamp A pointer to store the timestamp of the power reading.
- * @param forGPU A boolean value to indicate if the power reading is for the GPU or the entire card.
+ * The input is a comma-separated list of tokens, each of which may be:
+ *  - A legacy numeric ID (0–36): mapped via LEGACY_METRIC_NAMES.
+ *  - Any other token: passed through unchanged for metrics::resolveQuery() to handle
+ *    (group names, single- and multi-character shortcuts via parseGroupMask).
  *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * Single/multi-character shortcuts follow the registry's GROUP_TABLE:
+ *  @c p = POWER+TEMPERATURE, @c u = UTILIZATION, @c t = PCI, etc.
+ *
+ * Unsupported legacy IDs produce an error log entry and are silently dropped.
+ *
+ * @param[in] query  Comma-separated metric query string supplied by the user.
+ * @return           Translated comma-separated query string suitable for metrics::resolveQuery().
+ *                   Returns an empty string if all tokens were invalid or the input was empty.
  */
-ze_result_t cmdDump::gpuPowerIter(devInfo *d, uint64_t *gpuPower, uint64_t *timeStamp, bool forGPU)
+std::string translateMetricQuery(const std::string &query)
 {
-	TRACING();
-	power *p = d->dev->getPower();
-	if (p == nullptr) {
-		ERR("Failed to get power handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
+	std::string result;
+	for (auto &&rng : std::string_view{query} | std::views::split(',')) {
+		std::string_view sv{rng.begin(), rng.end()};
+		const auto b = sv.find_first_not_of(" \t");
+		if (b == std::string_view::npos) {
+			continue;
+		}
+		sv = sv.substr(b, sv.find_last_not_of(" \t") - b + 1);
 
-	ze_result_t result = p->getEnergy(gpuPower, timeStamp, forGPU);
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("Failed to get GPU power: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
+		std::string token;
+		if (const auto n = parseInteger<int>(sv); n.has_value()) {
+			const auto it = LEGACY_METRIC_NAMES.find(*n);
+			if (it == LEGACY_METRIC_NAMES.end()) {
+				ERR("Legacy metric {} is not supported; skipping.\n", *n);
+				continue;
+			}
+			token = it->second;
+		} else {
+			token = std::string{sv}; // group names, shortcuts, and multi-char combos handled by resolveQuery
+		}
 
-	return ZE_RESULT_SUCCESS;
+		if (!result.empty()) {
+			result += ',';
+		}
+		result += token;
+	}
+	return result;
 }
 
 /**
- * @brief Helper function to get utilization on an engine type
+ * @brief Build aligned "Group:" / "Alias:" display lines for the dump help text.
  *
- * @param d A pointer to the device information structure.
- * @param typeTable Span of engine group types to search for utilization.
- * @param outputLine A pointer to store the formatted utilization percentage string.
- * @param td A pointer to thread-specific data holding utilization samples.
+ * Derived from metrics::detail::GROUP_TABLE (excludes IDENTITY). Shortcuts match
+ * nvidia-smi dmon conventions: @c p = POWER+TEMPERATURE, @c t = PCI, etc.
  *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @return  Vector of non-blank strings, typically two elements (Group row then Alias row).
  */
-ze_result_t cmdDump::utilization(devInfo *d, std::span<const zes_engine_group_t> typeTable, std::string *outputLine,
-								 threadData *td)
+std::vector<std::string> buildGroupAliasLines()
 {
-	TRACING();
-	double utilizationDiff = 0.0;
-
-	enginegroup *eg = d->dev->getEngineGroup();
-	if (eg == nullptr) {
-		ERR("Failed to get engine group\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	const auto [result, activeTime, timestamp] = eg->getUtilization(typeTable);
-	if (result != ZE_RESULT_SUCCESS) {
-		return result;
+	// Derived from metrics::detail::GROUP_TABLE; IDENTITY excluded (not a dump metric group).
+	using Entry = std::pair<std::string_view, std::string_view>;
+	std::vector<Entry> groups;
+	for (const auto &e : metrics::detail::GROUP_TABLE) {
+		if (e.group != metrics::MetricGroup::IDENTITY) {
+			groups.emplace_back(e.name, e.shortcut);
+		}
 	}
 
-	td->u[0].utilization = activeTime;
-	td->u[0].timeStamp = timestamp;
+	TableBuilder tb;
+	tb.configure(TableBuilder::TableConfig{.borderChar = ' ', .cornerChar = ' ', .verticalChar = ' '})
+		.suppressHeaderSeparator()
+		.suppressHeaderColumnSeparators()
+		.suppressDataColumnSeparators()
+		.enableAutoSizing();
 
-	if (td->u[1].timeStamp) {
-		utilizationDiff = ((td->u[0].timeStamp - td->u[1].timeStamp) == 0)
-							  ? 0
-							  : (double)((double)td->u[0].utilization - (double)td->u[1].utilization) * 100 /
-									(double)(td->u[0].timeStamp - td->u[1].timeStamp);
-		*outputLine = std::format("{:.2f}", utilizationDiff);
+	// One label column + one column per group (all with empty headers).
+	tb.addColumn("", Align::Left);
+	for (std::size_t i = 0; i < std::size(groups); ++i) {
+		tb.addColumn("", Align::Left);
 	}
 
-	memcpy(&td->u[1], &td->u[0], sizeof(utilData));
+	{
+		std::vector<std::string> row{"Group:"};
+		for (const auto &[g, a] : groups) {
+			row.emplace_back(g);
+		}
+		tb.addRowFromContainer(row);
+	}
+	{
+		std::vector<std::string> row{"Alias:"};
+		for (const auto &[g, a] : groups) {
+			row.emplace_back(a);
+		}
+		tb.addRowFromContainer(row);
+	}
 
-	return ZE_RESULT_SUCCESS;
+	std::vector<std::string> lines;
+	for (const auto &rng : tb.toString() | std::views::split('\n')) {
+		const std::string_view line{rng.begin(), rng.end()};
+		if (line.find_first_not_of(' ') != std::string_view::npos) {
+			lines.emplace_back(line);
+		}
+	}
+	return lines;
 }
 
-ze_result_t cmdDump::utilization(devInfo *d, zes_engine_group_t type, std::string *outputLine, threadData *td)
+/**
+ * @brief Parsed command-line options for the @c dump / @c dmon command.
+ *
+ * All @c std::optional fields are absent (@c std::nullopt) when the corresponding
+ * flag was not supplied on the command line.
+ */
+struct DumpOpts
 {
-	return utilization(d, std::span<const zes_engine_group_t>(&type, 1), outputLine, td);
-}
+	bool json = false;
+	bool date = false;
+	bool csvFormat = false; /**< --format=csv: force CSV output even on a TTY */
+	bool noheader = false;	/**< --format=...,noheader: suppress the header row */
+	bool nounits = false;	/**< --format=...,nounits: strip unit suffixes from column headers */
+	std::string device;
+	std::optional<std::string> metrics;
+	std::optional<std::string> file;
+	std::optional<std::string> time;
+	std::optional<std::string> interval;
+	std::optional<std::string> number;
+};
 
 /**
- * @brief Executes the GPU utilization command when user requests dump -m 0
+ * @brief Resolved sampling-timing parameters produced by parseSamplingTiming().
  *
- * GPU Utilization (%), GPU active time of the elapsed time, per tile or device. Device-level is the average value of
- * tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * Fields with a sentinel value of @c -1 indicate "unlimited / not specified".
  */
-ze_result_t cmdDump::gpuUtilization(devInfo *d, std::string *outputLine, threadData *td)
+struct SamplingTiming
 {
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_ALL, outputLine, td);
-}
+	std::chrono::milliseconds interval{DEFAULT_INTERVAL};
+	int64_t totalTimeSeconds = -1; // -1 = unlimited
+	int iterations = -1;		   // -1 = unlimited
+};
 
 /**
- * @brief Executes the GPU power command when user requests dump -m 1.
- *
- * GPU Power (W), per tile or device.
+ * @brief Validate, translate, and resolve a --metrics argument.
  *
- * @param d A pointer to the device information structure.
+ * Rejects dot-notation field names that belong to @c --query-gpu, then delegates to
+ * translateMetricQuery() followed by metrics::resolveQuery().
  *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @pre   @p metricsArg must not be empty.
+ * @param[in] metricsArg  Raw value of the --metrics option.
+ * @return  Non-owning pointers to the resolved QueryMetric descriptors, in query order.
+ *          Returns an empty vector on any validation or resolution failure (error already logged).
  */
-ze_result_t cmdDump::gpuPower(devInfo *d, std::string *outputLine, threadData *td)
+std::vector<const metrics::QueryMetric *> resolveMetricsArg(const std::string &metricsArg)
 {
-	TRACING();
-
-	// Call gpuPowerIter to get the first power reading. The last parameter is false to indicate it's not for GPU,
-	// instead it is for the entire card
-	ze_result_t result = gpuPowerIter(d, &td->p[0].power, &td->p[0].timeStamp, false);
-	if (result != ZE_RESULT_SUCCESS) {
-		return result;
+	for (auto &&rng : std::string_view{metricsArg} | std::views::split(',')) {
+		std::string_view sv{rng.begin(), rng.end()};
+		const auto b = sv.find_first_not_of(" \t");
+		if (b == std::string_view::npos) {
+			continue;
+		}
+		sv = sv.substr(b, sv.find_last_not_of(" \t") - b + 1);
+		if (!parseInteger<int>(sv).has_value() && sv.find('.') != std::string_view::npos) {
+			ERR("'{}' looks like a field name. Use '--query-gpu={}' for field-name queries.\n", sv, metricsArg.c_str());
+			ERR("Use group names with --metrics (e.g. '--metrics POWER' or '--metrics pu').\n");
+			return {};
+		}
 	}
-
-	if (td->p[1].timeStamp) {
-		// Calculate the power difference. First check if the time difference is zero to avoid division by zero
-		// Next, calculate the power difference by checking the current power (in gpuPower[0]) against
-		// the last power (in gpuPower[1]) and the time difference (in timeStamp[0] - timeStamp[1])
-		double gpuPowerDiff =
-			(td->p[0].timeStamp - td->p[1].timeStamp) == 0
-				? 0
-				: (double)(td->p[0].power - td->p[1].power) / (double)(td->p[0].timeStamp - td->p[1].timeStamp);
-
-		*outputLine = std::format("{:.2f}", gpuPowerDiff);
+	const std::string translated = translateMetricQuery(metricsArg);
+	if (translated.empty()) {
+		return {};
 	}
-
-	// Update the last power and timestamp values for the next iteration
-	memcpy(&td->p[1], &td->p[0], sizeof(powerData));
-
-	return result;
+	auto fields = metrics::resolveQuery(translated);
+	if (fields.empty()) {
+		ERR("No valid metrics matched: '{}'", metricsArg.c_str());
+		ERR("Use group names like 'POWER' or 'pu'. Run with --help for details.\n");
+	}
+	return fields;
 }
 
 /**
- * @brief Executes the GPU frequency command when user requests dump -m 2.
- *
- * GPU Frequency (MHz), per tile or device. Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @brief Parse and validate the sampling-timing options from DumpOpts.
+ *
+ * Validation rules applied in order:
+ *  - @c --number: positive integer.
+ *  - @c --interval: positive integer, at most MAX_INTERVAL seconds.
+ *  - @c --loop-ms (@p loopMs): positive integer in ms; overrides @c --interval when present.
+ *  - @c --time: total wall-clock duration in seconds; may not be combined with @c --number.
+ *
+ * @param[in] opts    Fully-parsed DumpOpts from parseDumpCLI().
+ * @param[in] loopMs  Optional value of the @c --loop-ms flag, pre-extracted
+ *                    by filterArgvAndExtract() before CLI11 parsing.
+ * @retval std::optional<SamplingTiming>  Populated timing struct on success.
+ * @retval std::nullopt  If any validation error is detected (error already logged).
  */
-ze_result_t cmdDump::gpuFrequency(devInfo *d, std::string *outputLine, UNUSED threadData *td)
+std::optional<SamplingTiming> parseSamplingTiming(const DumpOpts &opts, const std::optional<std::string> &loopMs)
 {
-	TRACING();
-	double curFreq = 0.0;
+	SamplingTiming t;
+	if (opts.number.has_value()) {
+		if (const auto n = parseInteger<int>(*opts.number); n && *n > 0) {
+			t.iterations = *n;
+		} else {
+			ERR("Invalid value for --number: '{}'", opts.number->c_str());
+			return std::nullopt;
+		}
+	}
 
-	frequency *fq = d->dev->getFrequency();
-	if (fq == nullptr) {
-		ERR("Failed to get frequency handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	if (opts.interval.has_value()) {
+		if (const auto sec = parseInteger<int>(*opts.interval);
+			sec && *sec > 0 && std::chrono::seconds{*sec} <= MAX_INTERVAL) {
+			t.interval = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::seconds{*sec});
+		} else {
+			ERR("Invalid value for --interval: '{}'", opts.interval->c_str());
+			return std::nullopt;
+		}
 	}
 
-	ze_result_t result = fq->getCurFreq(&curFreq, ZES_FREQ_DOMAIN_GPU);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get GPU frequency: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	if (loopMs.has_value()) {
+		if (const auto ms = parseInteger<int>(*loopMs); ms && *ms > 0) {
+			t.interval = std::chrono::milliseconds{*ms};
+		} else {
+			ERR("Invalid value for --loop-ms: '{}'", *loopMs);
+			return std::nullopt;
+		}
 	}
 
-	*outputLine = std::format("{:.2f}", curFreq);
+	if (opts.time.has_value()) {
+		if (opts.number.has_value()) {
+			ERR("--time and --number cannot be used together.\n");
+			return std::nullopt;
+		}
+		if (const auto parsed = parseInteger<int64_t>(*opts.time);
+			parsed && *parsed >= 1 && *parsed <= MAX_DUMP_TIME_SECONDS) {
+			t.totalTimeSeconds = *parsed;
+		} else {
+			ERR("Invalid value for --time: '{}'", opts.time->c_str());
+			return std::nullopt;
+		}
+	}
 
-	return ZE_RESULT_SUCCESS;
+	return t;
 }
 
 /**
- * @brief Executes the GPU core temperature command when user requests dump -m 3.
- *
- * GPU Core Temperature (C), per tile or device. Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @brief Aggregate return type for parseDumpCLI() on a successful parse.
  */
-ze_result_t cmdDump::gpuCoreTemperature(devInfo *d, std::string *outputLine, UNUSED threadData *td)
+struct ParsedArgs
 {
-	TRACING();
-	double coreTemp = 0.0;
+	DumpOpts opts;
+	std::optional<std::string> loopMs;
+};
 
-	temperature *t = d->dev->getTemperature();
-	if (t == nullptr) {
-		ERR("Failed to get temperature handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+/**
+ * @brief Parse the @c dump / @c dmon command-line arguments using CLI11.
+ *
+ * Handles special cases before handing off to CLI11:
+ *  - Bare @c "help" keyword (e.g. @c "xpu-smi dump help"): calls @p showHelp and returns 0.
+ *  - @c --loop-ms (multi-character flag pre-extracted before CLI11 parsing): stored in
+ *    ParsedArgs::loopMs.
+ *
+ * @param[in] cmdName   The canonical command name (@c "dump" or @c "dmon"), used as the
+ *                      CLI11 app name for error messages.
+ * @param[in] showHelp  Callable invoked to display help text on @c -h / @c --help or the
+ *                      bare @c "help" keyword.
+ * @param[in] args      Raw argument vector from the command dispatcher.
+ * @retval std::variant<ParsedArgs, int>
+ *         - ParsedArgs                           on a successful parse.
+ *         - int (ZE_RESULT_SUCCESS)              when help was displayed.
+ *         - int (ZE_RESULT_ERROR_INVALID_ARGUMENT) on a CLI11 parse error.
+ */
+std::variant<ParsedArgs, int> parseDumpCLI(std::string_view cmdName, const std::function<void()> &showHelp,
+										   arg_struct *args)
+{
+	ParsedArgs parsed;
+
+	CLI::App sub{std::string{cmdName}};
+	sub.set_help_flag("-h,--help", "Display help");
+	sub.add_flag("-j,--json", parsed.opts.json, "Output in JSON format");
+	sub.add_option("-d,--device,--id", parsed.opts.device, "Device index or PCI BDF address (-1 = all)")
+		->each([&](const std::string &val) {
+			if (const auto n = parseInteger<int>(val); n && *n == -1) {
+				parsed.opts.device.clear();
+			}
+		});
+	sub.add_option("--metrics,--select", parsed.opts.metrics, "Metric query");
+	sub.add_option("-f,--file,--filename", parsed.opts.file, "Output file path");
+	sub.add_option("--time", parsed.opts.time, "Total dump duration in seconds");
+	sub.add_flag("--date", parsed.opts.date, "Include date in timestamp");
+	sub.add_option("--interval,--delay,--loop", parsed.opts.interval, "Sampling interval in seconds (default: 1)");
+	sub.add_option("--number,--count", parsed.opts.number, "Number of samples");
+	std::string formatStr;
+	sub.add_option("--format", formatStr, "Output format: [csv][,noheader][,nounits]");
+
+	// Skip command name (argv[1]) if it matches "dump" or "dmon" (our primary or alias name)
+	int argStart = 1;
+	if (args->argc > 1) {
+		std::string_view const cmd{args->argv[1]};
+		if (cmd == "dump" || cmd == "dmon") {
+			argStart = 2;
+		}
 	}
 
-	ze_result_t result = t->getCoreTemp(&coreTemp);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get core temperature: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	// Handle bare "help" keyword (e.g., "xpu-smi dump help" or "xpu-smi dmon help")
+	if (args->argc == argStart + 1) {
+		std::string_view const lastArg{args->argv[argStart]};
+		if (lastArg == "help") {
+			showHelp();
+			return static_cast<int>(ZE_RESULT_SUCCESS);
+		}
 	}
 
-	*outputLine = std::format("{:.2f}", coreTemp);
-
-	return ZE_RESULT_SUCCESS;
-}
+	// Pre-extract and filter --loop-ms before CLI11 to avoid ambiguity with --loop
+	auto [filteredArgs, loopMsValue] =
+		filterArgvAndExtract(std::span{args->argv + 1, static_cast<std::size_t>(args->argc - 1)}, "", "--loop-ms");
+	parsed.loopMs = loopMsValue;
 
-/**
- * @brief Executes the GPU memory temperature command when user requests dump -m 4.
- *
- * GPU Memory Temperature (C), per tile or device. Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
- */
-ze_result_t cmdDump::gpuMemoryTemperature(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	double memoryTemp = 0.0;
+	// Build argv pointers for CLI11 parsing (must use stable storage)
+	std::vector<char *> filteredArgv;
+	for (auto &arg : filteredArgs) {
+		filteredArgv.push_back(arg.data());
+	}
 
-	temperature *t = d->dev->getTemperature();
-	if (t == nullptr) {
-		ERR("Failed to get temperature handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	try {
+		sub.parse(static_cast<int>(filteredArgv.size()), filteredArgv.data());
+	} catch (const CLI::CallForHelp &) {
+		showHelp();
+		return static_cast<int>(ZE_RESULT_SUCCESS);
+	} catch (const CLI::ParseError &e) {
+		ERR("{}\n", e.what());
+		return static_cast<int>(ZE_RESULT_ERROR_INVALID_ARGUMENT);
 	}
 
-	ze_result_t result = t->getMemoryTemp(&memoryTemp);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get memory temperature: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	for (const auto tok : std::string_view{formatStr} | std::views::split(',')) {
+		const std::string_view t{tok.begin(), tok.end()};
+		if (t == "csv") {
+			parsed.opts.csvFormat = true;
+		} else if (t == "noheader") {
+			parsed.opts.noheader = true;
+		} else if (t == "nounits" || t == "nounit") {
+			parsed.opts.nounits = true;
+		}
 	}
 
-	*outputLine = std::format("{:.2f}", memoryTemp);
-	return ZE_RESULT_SUCCESS;
+	return parsed;
 }
 
 /**
- * @brief Executes the GPU memory utilization command when user requests dump -m 5.
- *
- * GPU Memory Utilization (%), per tile or device. Device-level is the average value of tiles for multi-tiles.
+ * @brief Format the current wall-clock time as a CSV-ready timestamp string.
  *
- * @param d A pointer to the device information structure.
+ * The time point is floored to millisecond precision before formatting.
  *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @param[in] showDate  When @c true, prefix the time component with @c "YYYY/MM/DD ".
+ * @return  Formatted string: @c "HH:MM:SS.mmm" or @c "YYYY/MM/DD HH:MM:SS.mmm".
  */
-ze_result_t cmdDump::gpuMemoryUtilization(devInfo *d, std::string *outputLine, UNUSED threadData *td)
+std::string getTimestamp(bool showDate)
 {
-	TRACING();
-	double memoryUtilization = 0;
-
-	memory *mem = d->dev->getMemory();
-	if (mem == nullptr) {
-		ERR("Failed to get memory handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = mem->getMemoryUsed(nullptr, &memoryUtilization);
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("Failed to get GPU memory used: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::format("{:.2f}", memoryUtilization);
-	return ZE_RESULT_SUCCESS;
+	auto now = std::chrono::system_clock::now();
+	auto nowMs = std::chrono::floor<std::chrono::milliseconds>(now);
+	return showDate ? std::format("{:%Y/%m/%d %H:%M:%S}", nowMs) : std::format("{:%H:%M:%S}", nowMs);
 }
 
 /**
- * @brief Executes the GPU memory read command when user requests dump -m 6.
+ * @brief MetricOutput sink that formats and writes one CSV line per device per sample.
  *
- * GPU Memory Read (kB/s), per tile or device. Device-level is the average value of tiles for multi-tiles.
+ * Implements the MetricOutput concept expected by metrics::runMetricsWithCaches():
+ * @c onBegin, @c onBeginDevice, @c onMetric, @c onEndDevice, @c onEnd.
  *
- * @param d A pointer to the device information structure.
+ * Each row is flushed to disk immediately after @c onEndDevice() to support live file
+ * tailing. When @c useFile is @c false, output is sent to stdout via @c PRINT.
  *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @note  Set @c prependTimestamp = @c false and @c prependDeviceId = @c false when
+ *        those columns are provided as explicit metric fields (e.g. @c --query-gpu).
  */
-ze_result_t cmdDump::gpuMemoryRead(devInfo *d, std::string *outputLine, threadData *td)
+struct DumpOutput
 {
-	TRACING();
+	bool showDate;
+	bool useFile;
+	std::ofstream *dumpFile;
+	bool json{false};			 // emit JSON Lines instead of CSV
+	bool prependTimestamp{true}; // false for --query-gpu (timestamp is an explicit field)
+	bool prependDeviceId{true};	 // false for --query-gpu (index is an explicit field)
+	bool aligned{false};		 // true when stdout is a TTY: use space-padded columns instead of CSV
+	bool noheader{false};		 // suppress header row entirely
+	bool nounits{false};		 // strip unit suffixes from column headers
+
+	DumpOutput(bool date, bool toFile, std::ofstream *file) : showDate{date}, useFile{toFile}, dumpFile{file} {}
+
+	void onBegin(std::span<const metrics::QueryMetric *> fields)
+	{
+		fieldDefs.assign(fields.begin(), fields.end());
+
+		// Build the column formatter for use in onEndDevice() regardless of header suppression.
+		if (!json) {
+			alignedFormatter.emplace();
+			if (prependTimestamp) {
+				alignedFormatter->addColumn("Timestamp", showDate ? 23 : 12, Align::Left);
+			}
+			if (prependDeviceId) {
+				alignedFormatter->addColumn("DeviceId", 8, Align::Right);
+			}
+			for (const auto *f : fieldDefs) {
+				const std::string label =
+					(!nounits && !f->unit.empty()) ? std::format("{} ({})", f->name, f->unit) : std::string{f->name};
+				alignedFormatter->addColumn(label, std::max(static_cast<int>(label.size()), 6), Align::Right);
+			}
+			alignedFormatter->lockWidths();
+		}
 
-	memory *mem = d->dev->getMemory();
-	if (mem == nullptr) {
-		ERR("Failed to get memory handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+		// Emit header unless suppressed (file headers written by run(); JSON has none).
+		if (json || noheader || headerEmitted || useFile) {
+			headerEmitted = true;
+			return;
+		}
+		headerEmitted = true;
+		emit(aligned ? alignedFormatter->headerLine() : alignedFormatter->headerLine(TableBuilder::LineStyle::Csv));
 	}
 
-	ze_result_t result = mem->getMemoryRW(&td->m[0].read, nullptr, nullptr, &td->m[0].timeStamp);
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("Failed to get GPU memory read: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	void onBeginDevice(devInfo &dev)
+	{
+		currentDev = &dev;
+		row.clear();
 	}
 
-	if (td->m[1].timeStamp) {
-		double memoryReadDiff = (td->m[0].timeStamp - td->m[1].timeStamp) == 0
-									? 0
-									: (double)(1000000 * (td->m[0].read - td->m[1].read)) /
-										  (double)(td->m[0].timeStamp - td->m[1].timeStamp) / 1024;
+	void onMetric([[maybe_unused]] const metrics::QueryMetric &f, const std::string &val) { row.push_back(val); }
+
+	void onEndDevice([[maybe_unused]] devInfo & /*unused*/)
+	{
+		if (json) {
+			nlohmann::ordered_json obj;
+			if (prependTimestamp) {
+				obj["timestamp"] = getTimestamp(showDate);
+			}
+			if (prependDeviceId) {
+				obj["device"] = currentDev->index;
+			}
+
+			const bool hasEnvelope = prependTimestamp || prependDeviceId;
+			nlohmann::ordered_json metricsHolder;
+			nlohmann::ordered_json &metricsTarget = hasEnvelope ? metricsHolder : obj;
+
+			for (auto i : std::views::iota(std::size_t{0}, std::min(row.size(), fieldDefs.size()))) {
+				metricsTarget[std::string{fieldDefs[i]->name}] = row[i];
+			}
+			if (hasEnvelope) {
+				obj["metrics"] = std::move(metricsHolder);
+			}
+			emit(obj.dump());
+			return;
+		}
 
-		*outputLine = std::format("{:d}", (int)memoryReadDiff);
+		std::vector<std::string> rowValues;
+		if (prependTimestamp) {
+			rowValues.push_back(getTimestamp(showDate));
+		}
+		if (prependDeviceId) {
+			rowValues.push_back(std::to_string(currentDev->index));
+		}
+		for (const auto &v : row) {
+			rowValues.push_back(v);
+		}
+		emit(aligned ? alignedFormatter->rowLine(rowValues)
+					 : alignedFormatter->rowLine(rowValues, TableBuilder::LineStyle::Csv));
 	}
 
-	// Update the last memory read and timestamp values for the next iteration
-	td->m[1] = td->m[0];
+	void onEnd() {}
 
-	return ZE_RESULT_SUCCESS;
-}
+private:
+	void emit(const std::string &line) const
+	{
+		if (useFile && (dumpFile != nullptr)) {
+			*dumpFile << line << "\n";
+			dumpFile->flush();
+		} else {
+			PRINT("{}", line);
+		}
+	}
+
+	std::vector<std::string> row;
+	std::vector<const metrics::QueryMetric *> fieldDefs;
+	std::optional<TableBuilder> alignedFormatter;
+	bool headerEmitted{false};
+	devInfo *currentDev{nullptr};
+};
 
 /**
- * @brief Executes the GPU memory write command when user requests dump -m 7.
- *
- * GPU Memory Write (kB/s), per tile or device. Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @brief Continuously re-sample metrics in loop mode for @c --query-gpu.
+ *
+ * The first sample has already been emitted by cmdDump::runQuery() before this function
+ * is called.  This function emits the second and subsequent samples at @p loopInterval
+ * intervals until @p count samples have been emitted in total, or the user presses
+ * @c q / @c Q / ESC / Ctrl-C.
+ *
+ * @pre   @p fields must be non-empty.
+ * @pre   @p deviceList and @p caches must have equal size and be pre-populated by the caller.
+ * @pre   @p count must be 0 (infinite) or a positive integer.
+ *
+ * @param[in]     out           Metric output sink (taken by value; owned by this function).
+ * @param[in]     fields        Span of resolved QueryMetric descriptors to sample.
+ * @param[in,out] deviceList    Device handles; mutated by populateMetricCacheContinuous().
+ * @param[in]     caches        Initial metric caches from the first sample (moved in).
+ * @param[in]     loopInterval  Delay between consecutive sample collections.
+ * @param[in]     count         Total number of samples to emit (0 = unlimited).
+ * @retval ZE_RESULT_SUCCESS  Always; per-metric errors are logged by the metric layer.
+ *
+ * @note  The keyboard-input thread uses the @c std::jthread stop token for cooperative
+ *        cancellation; the thread exits after the next key press once a stop is requested.
  */
-ze_result_t cmdDump::gpuMemoryWrite(devInfo *d, std::string *outputLine, threadData *td)
+ze_result_t runQueryLoopMode(DumpOutput out, std::span<const metrics::QueryMetric *> fields,
+							 std::vector<devInfo> &deviceList, std::vector<metrics::MetricCache> caches,
+							 std::chrono::milliseconds loopInterval, int count)
 {
-	TRACING();
-
-	memory *mem = d->dev->getMemory();
-	if (mem == nullptr) {
-		ERR("Failed to get memory handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	int remaining = count; // 0 = infinite
+	if (remaining == 1) {
+		return ZE_RESULT_SUCCESS; // already emitted the only sample
 	}
-
-	ze_result_t result = mem->getMemoryRW(nullptr, &td->m[0].write, nullptr, &td->m[0].timeStamp);
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("Failed to get GPU memory write: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	if (remaining > 1) {
+		--remaining; // first sample was already emitted
 	}
 
-	if (td->m[1].timeStamp) {
-		double memoryWriteDiff = (td->m[0].timeStamp - td->m[1].timeStamp) == 0
-									 ? 0
-									 : (double)(1000000 * (td->m[0].write - td->m[1].write)) /
-										   (double)(td->m[0].timeStamp - td->m[1].timeStamp) / 1024;
+	std::jthread inputThread([&](const std::stop_token &stoken) {
+		char ch = 0;
+		while (!stoken.stop_requested()) {
+			ch = GETCH();
+			if (ch == 'q' || ch == 'Q' || ch == 27 || ch == 3) {
+				return;
+			}
+		}
+	});
 
-		*outputLine = std::format("{:d}", (int)memoryWriteDiff);
-	}
+	const std::size_t numDevices = deviceList.size();
+	auto stoken = inputThread.get_stop_token();
 
-	// Update the last memory write and timestamp values for the next iteration
-	td->m[1] = td->m[0];
+	while (!stoken.stop_requested()) {
+		std::this_thread::sleep_for(loopInterval);
 
-	return ZE_RESULT_SUCCESS;
-}
+		for (std::size_t i = 0; i < numDevices; ++i) {
+			caches[i] = metrics::populateMetricCacheContinuous(deviceList[i], caches[i]);
+		}
 
-/**
- * @brief Executes the GPU energy consumed command when user requests dump -m 8.
- *
- * GPU Energy Consumed (J), per tile or device.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
- */
-ze_result_t cmdDump::gpuEnergyConsumed(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t gpuPower1 = 0;
-	uint64_t timeStamp1 = 0;
+		metrics::runMetricsWithCaches(out, fields, std::span<devInfo>(deviceList),
+									  std::span<const metrics::MetricCache>(caches));
 
-	// Call gpuPowerIter to get the energy consumed by the GPU. The last parameter is true to indicate it's for GPU
-	ze_result_t result = gpuPowerIter(d, &gpuPower1, &timeStamp1, true);
-	if (result != ZE_RESULT_SUCCESS) {
-		return result;
+		if (remaining > 0 && --remaining == 0) {
+			inputThread.request_stop();
+			break;
+		}
 	}
 
-	double energyConsumed = (double)(gpuPower1) / 1000000;
-
-	*outputLine = std::format("{:.2f}", energyConsumed);
+	// std::jthread automatically joins on destruction - no need to manually join/detach
+	RESTORE_TERMINAL();
 	return ZE_RESULT_SUCCESS;
 }
 
 /**
- * @brief Executes the GPU EU array active command when user requests dump -m 9.
- *
- * GPU EU Array Active (%), the normalized sum of all cycles on all EUs that were spent actively executing instructions.
- * Per tile or device. Device-level is the average value of tiles for multi-tiles.
- *
- * @param[in] d A pointer to the device information structure.
- * @param[out] outputLine A pointer to store the formatted output string.
- * @param[in,out] td A pointer to the thread data structure for maintaining state across iterations.
-
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
+ * @brief Main continuous-sampling loop for the @c dump command.
+ *
+ * Initialises metric caches, emits the first sample after one @p timing.interval window,
+ * then loops until a stop condition is met:
+ *  - @p timing.iterations samples have been emitted, or
+ *  - @p timing.totalTimeSeconds wall-clock seconds have elapsed, or
+ *  - The user presses @c q / @c Q / ESC / Ctrl-C (interactive TTY only).
+ *
+ * A keyboard-input thread is spawned only when appropriate: stdin is a TTY, no fixed
+ * sample count was requested, and no fixed total duration was set.
+ *
+ * @pre   @p fields must be non-empty.
+ * @pre   If @p useFile is @c true, @p dumpFile must already be open for writing.
+ *
+ * @param[in]     out        Metric output sink (taken by value; owned by this function).
+ * @param[in]     fields     Span of resolved QueryMetric descriptors to sample.
+ * @param[in,out] deviceList Device handles; mutated each iteration by the metric layer.
+ * @param[in]     timing     Resolved sampling-timing parameters (interval, count, duration).
+ * @param[in]     useFile    @c true when output is directed to @p dumpFile instead of stdout.
+ * @param[in,out] dumpFile   Output file stream; closed on function exit when @p useFile is @c true.
+ * @retval ZE_RESULT_SUCCESS  Always; per-metric errors are logged by the metric layer.
+ *
+ * @note  A keyboard-input thread is spawned only for interactive TTY sessions without a
+ *        fixed sample count or duration. The thread is detached rather than joined because
+ *        GETCH() blocks indefinitely; cooperative cancellation uses @c std::stop_source /
+ *        @c std::stop_token so the main loop and input thread share a single quit signal.
  */
-ze_result_t cmdDump::gpuEuArrayActive(devInfo *d, std::string *outputLine, threadData *td)
+ze_result_t runOutputLoop(DumpOutput out, std::span<const metrics::QueryMetric *> fields,
+						  std::vector<devInfo> &deviceList, const SamplingTiming &timing, bool useFile,
+						  std::ofstream &dumpFile)
 {
-	TRACING();
-	UNUSED_VAR(td);
+	// Shared quit signal: either the user presses q/ESC/Ctrl-C or the main loop
+	// exhausts its iteration/time budget. Both sides write to the same stop_source.
+	std::stop_source quitSource;
+	auto quitToken = quitSource.get_token();
 
-	// Initialize output to N/A in case of early return
-	*outputLine = "N/A";
+	int iter = timing.iterations;
+	const bool shouldStartInputThread =
+		STDIN_ISATTY() && ((iter < 0 && !useFile) || (useFile && timing.totalTimeSeconds < 0));
 
-	metric *m = d->dev->getMetric();
-	if (m == nullptr) {
-		ERR("Failed to get metric handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	std::jthread inputThread;
+	if (shouldStartInputThread) {
+		inputThread = std::jthread([quitSource, quitToken](const std::stop_token &ownStop) mutable {
+			char ch = 0;
+			while (!ownStop.stop_requested() && !quitToken.stop_requested()) {
+				ch = GETCH();
+				if (ch == 'q' || ch == 'Q' || ch == 27 || ch == 3) {
+					quitSource.request_stop();
+					return;
+				}
+			}
+		});
 	}
 
-	// Get EU metrics from the metric class
-	std::vector<EuMetricsData> metricsData;
-	ze_result_t result = m->getEuActiveStallIdle(d->deviceHdl, d->dev->getDriverHandle(), metricsData);
+	const auto startTime = std::chrono::steady_clock::now();
+	const std::size_t numDevices = deviceList.size();
+	std::vector<metrics::MetricCache> caches(numDevices);
 
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("getEuActiveStallIdle failed: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	const auto firstSampleDeadline = startTime + timing.interval;
+	for (std::size_t i = 0; i < numDevices; ++i) {
+		caches[i] = metrics::populateMetricCacheBegin(deviceList[i]);
+	}
+	std::this_thread::sleep_until(firstSampleDeadline);
+	for (std::size_t i = 0; i < numDevices; ++i) {
+		metrics::populateMetricCacheEnd(deviceList[i], caches[i]);
 	}
 
-	if (metricsData.empty()) {
-		ERR("getEuActiveStallIdle returned no data\n");
-		return ZE_RESULT_ERROR_UNKNOWN;
+	metrics::runMetricsWithCaches(out, std::span<const metrics::QueryMetric *>{fields}, std::span<devInfo>(deviceList),
+								  std::span<const metrics::MetricCache>{caches});
+	if (iter > 0 && --iter == 0) {
+		quitSource.request_stop();
 	}
 
-	// For single device or when requesting device-level data, return the first entry
-	// For multi-tile, the calling code should handle tile iteration
-	double euActivePercent = static_cast<double>(metricsData[0].euActive) / metricsData[0].scaleFactor;
-	*outputLine = std::format("{:.2f}", euActivePercent);
+	if (!quitToken.stop_requested() && iter != 0) {
+		std::this_thread::sleep_for(timing.interval);
+	}
 
-	return ZE_RESULT_SUCCESS;
-}
+	while (!quitToken.stop_requested()) {
+		const auto cycleStartTime = std::chrono::steady_clock::now();
 
-/**
- * @brief Executes the GPU EU array stall command when user requests dump -m 10.
- *
- * GPU EU Array Stall (%), the normalized sum of all cycles on all EUs during which the EUs were stalled. At least one
- * thread is loaded, but the EU is stalled. Per tile or device. Device-level is the average value of tiles for
- * multi-tiles.
- *
- * @param[in] d A pointer to the device information structure.
- * @param[out] outputLine A pointer to store the formatted output string
- * @param[in,out] td A pointer to the thread data structure for maintaining state across iterations
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
- */
-ze_result_t cmdDump::gpuEuArrayStall(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	UNUSED_VAR(td);
+		for (std::size_t i = 0; i < numDevices; ++i) {
+			caches[i] = metrics::populateMetricCacheContinuous(deviceList[i], caches[i]);
+		}
+		metrics::runMetricsWithCaches(out, std::span<const metrics::QueryMetric *>{fields},
+									  std::span<devInfo>(deviceList), std::span<const metrics::MetricCache>{caches});
+
+		const auto collectionTimeMs =
+			std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - cycleStartTime);
+		const auto remainingSleep = timing.interval - collectionTimeMs;
+		if (remainingSleep.count() > 0) {
+			std::this_thread::sleep_for(remainingSleep);
+		}
 
-	// Initialize output to N/A in case of early return
-	*outputLine = "N/A";
+		if (iter > 0 && --iter == 0) {
+			quitSource.request_stop();
+			break;
+		}
 
-	metric *m = d->dev->getMetric();
-	if (m == nullptr) {
-		ERR("Failed to get metric handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+		if (timing.totalTimeSeconds > 0) {
+			const auto elapsedMs =
+				std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - startTime)
+					.count();
+			if (elapsedMs >= timing.totalTimeSeconds * 1000LL) {
+				quitSource.request_stop();
+				break;
+			}
+		}
 	}
 
-	std::vector<EuMetricsData> metricsData;
-	ze_result_t result = m->getEuActiveStallIdle(d->deviceHdl, d->dev->getDriverHandle(), metricsData);
-
-	if (result != ZE_RESULT_SUCCESS || metricsData.empty()) {
-		*outputLine = "N/A";
-		return result;
+	if (useFile) {
+		dumpFile.close();
+		PRINT("\nDumping is stopped.\n");
 	}
 
-	double euStallPercent = static_cast<double>(metricsData[0].euStall) / metricsData[0].scaleFactor;
-	*outputLine = std::format("{:.2f}", euStallPercent);
-
+	if (inputThread.joinable()) {
+		inputThread.detach();
+	}
+	RESTORE_TERMINAL();
 	return ZE_RESULT_SUCCESS;
 }
 
-/**
- * @brief Executes the GPU EU array idle command when user requests dump -m 11.
- *
- * GPU EU Array Idle (%), the normalized sum of all cycles on all EUs during which the EUs were idle. Per tile or
- * device.
- *
- * @param[in] d A pointer to the device information structure.
- * @param[out] outputLine A pointer to store the formatted output string
- * @param[in,out] td A pointer to the thread data structure for maintaining state across iterations
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
- */
-ze_result_t cmdDump::gpuEuArrayIdle(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	UNUSED_VAR(td);
+} // namespace
 
-	// Initialize output to N/A in case of early return
-	*outputLine = "N/A";
+// -- runQuery ---------------------------------------------------------
 
-	metric *m = d->dev->getMetric();
-	if (m == nullptr) {
-		ERR("Failed to get metric handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+int cmdDump::runQuery(const std::string &metrics, const std::string &deviceSpec, arg_struct *args, QueryFormat fmt)
+{
+	// --query-gpu accepts dot-notation field names and group aliases, not legacy numeric IDs.
+	for (auto &&rng : std::string_view{metrics} | std::views::split(',')) {
+		std::string_view sv{rng.begin(), rng.end()};
+		const auto b = sv.find_first_not_of(" \t");
+		if (b == std::string_view::npos) {
+			continue;
+		}
+		if (parseInteger<int>(sv.substr(b, sv.find_last_not_of(" \t") - b + 1)).has_value()) {
+			ERR("Numeric metric IDs are not supported by --query-gpu.\n");
+			ERR("Use field names like 'temperature.gpu,power.draw' or group aliases like 'pu'.\n");
+			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+		}
 	}
 
-	std::vector<EuMetricsData> metricsData;
-	ze_result_t result = m->getEuActiveStallIdle(d->deviceHdl, d->dev->getDriverHandle(), metricsData);
+	auto fields = metrics::resolveQuery(metrics);
+	if (fields.empty()) {
+		ERR("No valid metrics matched: '{}'", metrics.c_str());
+		ERR("Use field names like 'temperature.gpu,power.draw' or aliases like 'pu' (POWER+UTILIZATION).\n");
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	}
 
-	if (result != ZE_RESULT_SUCCESS || metricsData.empty()) {
-		*outputLine = "N/A";
+	std::vector<devInfo> deviceList;
+	ze_result_t const result = args->sm.findDevice(deviceSpec.c_str(), &deviceList);
+	if (result != ZE_RESULT_SUCCESS) {
+		ERR("Error: Device handle not found for device ID '{}'\n", deviceSpec.c_str());
 		return result;
 	}
 
-	double euIdlePercent = static_cast<double>(metricsData[0].euIdle) / metricsData[0].scaleFactor;
-	*outputLine = std::format("{:.2f}", euIdlePercent);
+	DumpOutput out{false, false, nullptr};
+	out.json = fmt.json;
+	out.noheader = fmt.noheader;
+	out.nounits = fmt.nounits;
+	out.prependTimestamp = false;
+	out.prependDeviceId = false;
+
+	const std::size_t numDevices = deviceList.size();
+	std::vector<metrics::MetricCache> caches(numDevices);
+	const auto sampleDeadline = std::chrono::steady_clock::now() + metrics::detail::SAMPLE_WINDOW;
+	for (std::size_t i = 0; i < numDevices; ++i) {
+		caches[i] = metrics::populateMetricCacheBegin(deviceList[i]);
+	}
+	std::this_thread::sleep_until(sampleDeadline);
+	for (std::size_t i = 0; i < numDevices; ++i) {
+		metrics::populateMetricCacheEnd(deviceList[i], caches[i]);
+	}
+	metrics::runMetricsWithCaches(out, std::span<const metrics::QueryMetric *>(fields), std::span<devInfo>(deviceList),
+								  std::span<const metrics::MetricCache>(caches));
+
+	if (fmt.loopMs > 0) {
+		return runQueryLoopMode(std::move(out), fields, deviceList, std::move(caches),
+								std::chrono::milliseconds{fmt.loopMs}, fmt.count);
+	}
 
 	return ZE_RESULT_SUCCESS;
 }
 
-/**
- * @brief Executes the GPU EU array reset counter command when user requests dump -m 12.
- *
- * GPU EU Array Reset Counter, resets the EU array counters.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error code.
- */
-ze_result_t cmdDump::gpuEuArrayResetCounter(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = r->getErrors(ZES_RAS_ERROR_CAT_RESET, ZES_RAS_ERROR_TYPE_FORCE_UINT32, &rasCounter);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS reset counter: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::to_string(rasCounter);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU EU array programming errors command when user requests dump -m 13.
- *
- * GPU EU Array Programming Errors, per tile or device. Device-level is the sum value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuEuArrayProgrammingErrors(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result =
-		r->getErrors(ZES_RAS_ERROR_CAT_PROGRAMMING_ERRORS, ZES_RAS_ERROR_TYPE_FORCE_UINT32, &rasCounter);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS programming counter: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::to_string(rasCounter);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU EU array driver errors command when user requests dump -m 14.
- *
- * GPU EU Array Driver Errors, per tile or device. Device-level is the sum value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuEuArrayDriverErrors(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = r->getErrors(ZES_RAS_ERROR_CAT_DRIVER_ERRORS, ZES_RAS_ERROR_TYPE_FORCE_UINT32, &rasCounter);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS driver counter: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::to_string(rasCounter);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU EU array cache errors correctable command when user requests dump -m 15.
- *
- * GPU EU Array Cache Errors Correctable, per tile or device. Device-level is the sum value of tiles for
- * multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuEuArrayCacheErrorsCorrectable(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = r->getErrors(ZES_RAS_ERROR_CAT_CACHE_ERRORS, ZES_RAS_ERROR_TYPE_CORRECTABLE, &rasCounter);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS cache correctable counter: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::to_string(rasCounter);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU EU array cache errors uncorrectable command when user requests dump -m 16.
- *
- * GPU EU Array Cache Errors Uncorrectable, per tile or device. Device-level is the sum value of tiles for
- * multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuEuArrayCacheErrorsUncorrectable(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = r->getErrors(ZES_RAS_ERROR_CAT_CACHE_ERRORS, ZES_RAS_ERROR_TYPE_UNCORRECTABLE, &rasCounter);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS cache uncorrectable counter: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::to_string(rasCounter);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU memory bandwidth utilization command when user requests dump -m 17.
- *
- * GPU Memory Bandwidth Utilization (%), per tile or device. Device-level is the average value of tiles for
- * multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuMemoryBandwidthUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	uint64_t maxBandwidth = 0;
-	double memoryBW[2] = {0}, memoryBWDiff = 0;
-
-	memory *mem = d->dev->getMemory();
-	if (mem == nullptr) {
-		ERR("Failed to get memory handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = mem->getMemoryRW(&td->m[0].read, &td->m[0].write, &maxBandwidth, &td->m[0].timeStamp);
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("Failed to get GPU memory read: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	if (td->m[1].timeStamp) {
-		// Calculate bandwidth utilization as a percentage of the maximum bandwidth
-		memoryBW[0] = (double)(100 * (td->m[0].read / 1000 + td->m[0].write / 1000) / (maxBandwidth / 1000) * 1000);
-		memoryBW[1] = (double)(100 * (td->m[1].read / 1000 + td->m[1].write / 1000) / (maxBandwidth / 1000) * 1000);
-
-		// Calculate the memory bandwidth difference
-		memoryBWDiff = (td->m[0].timeStamp - td->m[1].timeStamp) == 0
-						   ? 0
-						   : (memoryBW[0] - memoryBW[1]) / ((double)(td->m[0].timeStamp - td->m[1].timeStamp) / 1000.0);
-
-		*outputLine = std::format("{:d}", (uint32_t)memoryBWDiff);
-	}
-
-	// Update the last memory read, write, and timestamp values for the next iteration
-	memcpy(&td->m[1], &td->m[0], sizeof(memData));
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU memory used command when user requests dump -m 18.
- *
- * GPU Memory Used (MiB), per tile or device. Device-level is the sum value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuMemoryUsed(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t memoryUsed = 0;
-
-	memory *mem = d->dev->getMemory();
-	if (mem == nullptr) {
-		ERR("Failed to get memory handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = mem->getMemoryUsed(&memoryUsed, nullptr);
-	if (result != ZE_RESULT_SUCCESS) {
-		DBG("Failed to get GPU memory used: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = std::format("{:.2f}", (double)memoryUsed / (1024 * 1024));
-	return ZE_RESULT_SUCCESS;
-}
+// -- printQueryHelp -----------------------------------------------------------
 
-/**
- * @brief Executes the PCIe read command when user requests dump -m 19.
- *
- * PCIe Read (kB/s), per device.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::pcieRead(devInfo *d, std::string *outputLine, threadData *td)
+void cmdDump::printQueryHelp()
 {
-	TRACING();
-	uint64_t pciDiff = 0;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = p->getStats(d->zesDeviceHdl, &td->pci[0].pciStats);
-	if (result != ZE_RESULT_SUCCESS) {
-		return result;
-	}
-
-	if (td->pci[1].pciStats.timestamp) {
-
-		pciDiff = (td->pci[0].pciStats.timestamp - td->pci[1].pciStats.timestamp == 0)
-					  ? 0
-					  : 1000000 * (td->pci[0].pciStats.rxCounter - td->pci[1].pciStats.rxCounter) /
-							(td->pci[0].pciStats.timestamp - td->pci[1].pciStats.timestamp) / 1024;
-
-		*outputLine = std::to_string(pciDiff);
-	}
-
-	// Update the last pciStats for the next iteration
-	memcpy(&td->pci[1], &td->pci[0], sizeof(pciData));
-
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the PCIe write command when user requests dump -m 20.
- *
- * PCIe Write (kB/s), per device.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::pcieWrite(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	uint64_t pciDiff = 0;
-
-	pci *p = d->dev->getPCI();
-	if (p == nullptr) {
-		ERR("Failed to get PCI handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
+	std::vector<helpCmd> helpList;
 
-	ze_result_t result = p->getStats(d->zesDeviceHdl, &td->pci[0].pciStats);
-	if (result != ZE_RESULT_SUCCESS) {
-		return result;
+	helpList.emplace_back(TITLE, "Query individual per-GPU metric fields");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Usage: %s --query-gpu=<fields> [Options]", progName.c_str());
+	helpList.emplace_back(HEADING, "%s --query-gpu=temperature.gpu,power.draw --id=0 --loop=5", progName.c_str());
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Options:");
+	helpList.emplace_back(HEADING, "--id=<n>                    Device index or PCI BDF (default: all)");
+	helpList.emplace_back(HEADING, "--loop[=<sec>]              Repeat every N seconds (default: 1)");
+	helpList.emplace_back(HEADING, "--loop-ms=<ms>              Repeat every N milliseconds");
+	helpList.emplace_back(HEADING, "--count=<n>                 Number of iterations (default: infinite)");
+	helpList.emplace_back(HEADING, "--format=csv[,noheader][,nounits]  Output format");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Available fields: (legacy ID in brackets)");
+	for (const metrics::QueryMetric &f : metrics::getQueryMetrics()) {
+		std::optional<int> legacyId;
+		for (const auto &[id, metricName] : LEGACY_METRIC_NAMES) {
+			if (metricName == f.name && (!legacyId.has_value() || id < *legacyId)) {
+				legacyId = id;
+			}
+		}
+		std::string fieldName = std::string(f.name);
+		if (legacyId.has_value()) {
+			fieldName += std::format(" [{}]", *legacyId);
+		}
+		if (f.unit.empty()) {
+			helpList.emplace_back(SUB_HEADING, "%-40s %s", fieldName.c_str(), f.description.data());
+		} else {
+			helpList.emplace_back(SUB_HEADING, "%-40s %s (%s)", fieldName.c_str(), f.description.data(), f.unit.data());
+		}
 	}
+	helpList.emplace_back(BLANK);
 
-	if (td->pci[1].pciStats.timestamp) {
-
-		pciDiff = (td->pci[0].pciStats.timestamp - td->pci[1].pciStats.timestamp == 0)
-					  ? 0
-					  : 1000000 * (td->pci[0].pciStats.txCounter - td->pci[1].pciStats.txCounter) /
-							(td->pci[0].pciStats.timestamp - td->pci[1].pciStats.timestamp) / 1024;
-
-		*outputLine = std::to_string(pciDiff);
+	for (const auto &entry : helpList) {
+		PRINT("{0:<{1}}{2}\n", "", entry.char_gap, entry.line);
 	}
-
-	// Update the last pciStats for the next iteration
-	memcpy(&td->pci[1], &td->pci[0], sizeof(pciData));
-
-	return ZE_RESULT_SUCCESS;
 }
 
-/**
- * @brief Executes the compute engine utilization command when user requests dump -m 22.
- *
- * Compute engine utilization (%), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::computeEngineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_COMPUTE_SINGLE, outputLine, td);
-}
+// -- listGpus ─────────────────────────────────────────────────────────────────
 
-/**
- * @brief Executes the render engine utilization command when user requests dump -m 23.
- *
- * Render engine utilization (%), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::renderEngineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_RENDER_SINGLE, outputLine, td);
-}
-
-/**
- * @brief Executes the media decoder engine utilization command when user requests dump -m 24.
- *
- * Media decoder engine utilizations (%), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::mediaDecoderEngineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE, outputLine, td);
-}
-
-/**
- * @brief Executes the media encoder engine utilization command when user requests dump -m 25.
- *
- * Media encoder engine utilizations (%), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::mediaEncoderEngineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE, outputLine, td);
-}
-
-/**
- * @brief Executes the copy engine utilization command when user requests dump -m 26.
- *
- * Copy engine utilization (%), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::copyEngineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_COPY_SINGLE, outputLine, td);
-}
-
-/**
- * @brief Executes the media enhancement engine utilization command when user requests dump -m 27.
- *
- * Media enhancement engine utilization (%), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::mediaEnhancementEngineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	return utilization(d, ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE, outputLine, td);
-}
-
-/**
- * @brief Executes the 3D engine utilization command when user requests dump -m 28.
- *
- * 3D engine utilization (%), per tile.
- * Note: This metric may not be available on all platforms. If unsupported, "N/A" will be displayed.
- *
- * @param[in] d A pointer to the device information structure.
- * @param[out] outputLine A pointer to the string that will contain the output.
- * @param[in,out] td A pointer to the thread data structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-
-ze_result_t cmdDump::engineUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	ze_result_t result = utilization(d, ZES_ENGINE_GROUP_3D_ALL, outputLine, td);
-
-	// If 3D engine is not supported on this platform, return N/A
-	if (result == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
-		*outputLine = "N/A";
-		return ZE_RESULT_SUCCESS;
-	}
-
-	if (result == ZE_RESULT_SUCCESS && outputLine && outputLine->empty()) {
-		*outputLine = "N/A";
-	}
-
-	return result;
-}
-
-/**
- * @brief Executes the GPU memory errors correctable command when user requests dump -m 29.
- *
- * GPU Memory Errors Correctable, per tile or device. Other non-compute correctable errors are also included.
- * Device-level is the sum value of tiles for multi-tiles.
- *
- * @param[in] d A pointer to the device information structure.
- * @param[out] outputLine A pointer to the string that will contain the output.
- * @param[in] td A pointer to the thread data structure (unused).
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuMemoryErrorsCorrectable(devInfo *d, std::string *outputLine, UNUSED threadData *td)
+int cmdDump::listGpus(arg_struct *args)
 {
 	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result =
-		r->getErrors(ZES_RAS_ERROR_CAT_NON_COMPUTE_ERRORS, ZES_RAS_ERROR_TYPE_CORRECTABLE, &rasCounter);
+	std::vector<devInfo> deviceList;
+	const ze_result_t result = args->sm.findDevice("", &deviceList);
 	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS non-compute correctable errors: 0x{:X} ({})\n", result, l0_error_to_string(result));
+		ERR("Failed to enumerate GPU devices\n");
 		return result;
 	}
-
-	*outputLine = std::to_string(rasCounter);
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Executes the GPU memory errors uncorrectable command when user requests dump -m 30.
- *
- * GPU Memory Errors Uncorrectable, per tile or device. Other non-compute uncorrectable errors are also included.
- * Device-level is the sum value of tiles for multi-tiles.
- *
- * @param[in] d A pointer to the device information structure.
- * @param[out] outputLine A pointer to the string that will contain the output.
- * @param[in] td A pointer to the thread data structure (unused).
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::gpuMemoryErrorsUncorrectable(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	uint64_t rasCounter;
-	ras *r = (ras *)d->dev->getRAS();
-	if (r == nullptr) {
-		ERR("Failed to get RAS handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result =
-		r->getErrors(ZES_RAS_ERROR_CAT_NON_COMPUTE_ERRORS, ZES_RAS_ERROR_TYPE_UNCORRECTABLE, &rasCounter);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get RAS non-compute uncorrectable errors: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+	metrics::MetricCache const dummy{};
+	const auto nameMetric = metrics::findMetric("name");
+	const auto uuidMetric = metrics::findMetric("uuid");
+	const auto indexMetric = metrics::findMetric("index");
+	for (auto &dev : deviceList) {
+		std::string gpuName = "N/A";
+		std::string gpuUuid = "N/A";
+		std::string gpuIdx = "N/A";
+		if (nameMetric) {
+			nameMetric->getter(dev, gpuName, dummy);
+		}
+		if (uuidMetric) {
+			uuidMetric->getter(dev, gpuUuid, dummy);
+		}
+		if (indexMetric) {
+			indexMetric->getter(dev, gpuIdx, dummy);
+		}
+		PRINT("GPU {}: {} (UUID: GPU-{})\n", gpuIdx.c_str(), gpuName.c_str(), gpuUuid.c_str());
 	}
-
-	*outputLine = std::to_string(rasCounter);
 	return ZE_RESULT_SUCCESS;
 }
 
-/**
- * @brief Executes the compute engine group utilization command when user requests dump -m 31.
- *
- * Compute engine group utilization (%), per tile.
- * Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::computeEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	constexpr auto engineTable = std::array{ZES_ENGINE_GROUP_COMPUTE_SINGLE, ZES_ENGINE_GROUP_COMPUTE_ALL};
-	return utilization(d, std::span(engineTable), outputLine, td);
-}
-
-/**
- * @brief Executes the render engine group utilization command when user requests dump -m 32.
- *
- * Render engine group utilization (%), per tile.
- * Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::renderEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	constexpr auto engineTable = std::array{ZES_ENGINE_GROUP_RENDER_SINGLE, ZES_ENGINE_GROUP_RENDER_ALL};
-	return utilization(d, std::span(engineTable), outputLine, td);
-}
+// -- help
+// ---------------------------------------------------------
 
-/**
- * @brief Executes the media engine group utilization command when user requests dump -m 33.
- *
- * Media engine group utilization (%), per tile.
- * Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::mediaEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	constexpr auto engineTable = std::array{ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE, ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE,
-											ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE, ZES_ENGINE_GROUP_MEDIA_ALL};
-	return utilization(d, std::span(engineTable), outputLine, td);
-}
-
-/**
- * @brief Executes the copy engine group utilization command when user requests dump -m 34.
- *
- * Copy engine group utilization (%), per tile.
- * Device-level is the average value of tiles for multi-tiles.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::copyEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td)
-{
-	TRACING();
-	constexpr auto engineTable = std::array{ZES_ENGINE_GROUP_COPY_SINGLE, ZES_ENGINE_GROUP_COPY_ALL};
-	return utilization(d, std::span(engineTable), outputLine, td);
-}
-
-/**
- * @brief Executes the throttle reason command when user requests dump -m 35.
- *
- * Throttle reason, per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::throttleReason(devInfo *d, std::string *outputLine, UNUSED threadData *td)
+void cmdDump::help(HELP helpType)
 {
 	TRACING();
-	zes_freq_throttle_reason_flags_t throttleReasons;
-
-	frequency *fq = d->dev->getFrequency();
-	if (fq == nullptr) {
-		ERR("Failed to get frequency handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
-
-	ze_result_t result = fq->getThrottleReason(&throttleReasons);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get GPU frequency: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
-	}
-
-	*outputLine = getFreqThrottleString(throttleReasons);
-
-	return ZE_RESULT_SUCCESS;
-}
+	std::vector<helpCmd> helpList;
 
-/**
- * @brief Executes the media engine frequency command when user requests dump -m 36.
- *
- * Media engine frequency (MHz), per tile.
- *
- * @param d A pointer to the device information structure.
- *
- * @return ze_result_t Returns ZE_RESULT_SUCCESS if the command executes successfully, otherwise returns an error
- * code.
- */
-ze_result_t cmdDump::mediaEngineFrequency(devInfo *d, std::string *outputLine, UNUSED threadData *td)
-{
-	TRACING();
-	double curFreq = 0.0;
+	helpList.emplace_back(TITLE, "Dump device statistics data");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Usage: %s dump [Options]", progName.c_str());
+	helpList.emplace_back(HEADING, "%s dump --device [id] --metrics [metrics] --interval [secs] --number [count]",
+						  progName.c_str());
+	helpList.emplace_back(HEADING,
+						  "%s dump --device [id] --metrics [metrics] -f [filename] --loop-ms [ms] --time [secs]",
+						  progName.c_str());
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Options:");
+	helpList.emplace_back(HEADING, "-h,--help                   Print this help message and exit");
+	helpList.emplace_back(HEADING, "-j,--json                   Print result in JSON format");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(HEADING, "--device,--id               Device index or PCI BDF address (-1 = all)");
+	helpList.emplace_back(HEADING, "--metrics,--select          Comma-separated group names or aliases:");
+	for (const auto &line : buildGroupAliasLines()) {
+		helpList.emplace_back(SUB_HEADING, "%s", line.c_str());
+	}
+	helpList.emplace_back(SUB_HEADING, "Multi-char aliases: e.g. \"pu\" = POWER+TEMPERATURE+UTILIZATION");
+	helpList.emplace_back(SUB_HEADING, "For individual field names use --query-gpu instead.");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Available fields: (legacy ID in brackets)");
+	for (const metrics::QueryMetric &f : metrics::getQueryMetrics()) {
+		// Find the lowest legacy numeric ID for this field, if any
+		std::optional<int> legacyId;
+		for (const auto &[id, metricName] : LEGACY_METRIC_NAMES) {
+			if (metricName == f.name && (!legacyId.has_value() || id < *legacyId)) {
+				legacyId = id;
+			}
+		}
 
-	frequency *fq = d->dev->getFrequency();
-	if (fq == nullptr) {
-		ERR("Failed to get frequency handle\n");
-		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
-	}
+		std::string fieldName = std::string(f.name);
+		if (legacyId.has_value()) {
+			fieldName += std::format(" [{}]", *legacyId);
+		}
 
-	ze_result_t result = fq->getCurFreq(&curFreq, ZES_FREQ_DOMAIN_MEDIA);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Failed to get Media frequency: 0x{:X} ({})\n", result, l0_error_to_string(result));
-		return result;
+		if (f.unit.empty()) {
+			helpList.emplace_back(SUB_HEADING, "%-40s %s", fieldName.c_str(), f.description.data());
+		} else {
+			helpList.emplace_back(SUB_HEADING, "%-40s %s (%s)", fieldName.c_str(), f.description.data(), f.unit.data());
+		}
 	}
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(HEADING, "--interval,--delay          Sampling interval in seconds (default: 1)");
+	helpList.emplace_back(HEADING, "--number,--count            Number of samples (default: unlimited)");
+	helpList.emplace_back(HEADING,
+						  "--loop-ms                   Sampling interval in milliseconds (overrides --interval)");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(HEADING, "-f,--file,--filename        Write output to a file instead of stdout");
+	helpList.emplace_back(HEADING, "--time                      Total dump duration in seconds");
+	helpList.emplace_back(HEADING, "--date                      Prefix timestamps with date");
+	helpList.emplace_back(HEADING, "--format=csv[,noheader][,nounits]  Force CSV output; suppress header or units");
+	helpList.emplace_back(BLANK);
 
-	*outputLine = std::format("{:.2f}", curFreq);
-	return ZE_RESULT_SUCCESS;
+	printHelp(helpList, helpType);
 }
 
-/**
- * @brief Generates a timestamp string with optional date prefix
- *
- * @param showDate If true, includes date in YYYY-MM-DD format before time
- * @return std::string Formatted timestamp in ISO 8601 format with milliseconds
- */
-static std::string getTimestamp(bool showDate)
-{
-	auto now = std::chrono::system_clock::now();
-	auto nowMs = std::chrono::floor<std::chrono::milliseconds>(now);
-
-	if (showDate) {
-		// Format: YYYY-MM-DDTHH:MM:%S (with milliseconds)
-		return std::format("{:%Y-%m-%dT%H:%M:%S}", nowMs);
-	} else {
-		// Format: HH:MM:%S (with milliseconds)
-		return std::format("{:%H:%M:%S}", nowMs);
-	}
-}
+// -- run
+// -----------------------------------------------------------
 
-/**
- * @brief Executes the dump run. It processes command-line arguments, finds devices, and runs the specified dump
- * commands.
- *
- * @param args A pointer to the argument structure.
- *
- * @return int Returns 0 on success.
- */
 int cmdDump::run(arg_struct *args)
 {
 	TRACING();
-	std::vector<devInfo> deviceList;
-	ze_result_t result;
-	bool found = false;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-	std::string header;
-	bool first = true;
-	auto running = std::make_shared<std::atomic<bool>>(true);
-	int total = 0, iter = -1;
-	std::chrono::milliseconds interval = DEFAULT_INTERVAL;
-	std::thread inputThread;
-	auto inputThreadExited = std::make_shared<std::atomic<bool>>(false);
-	bool showDate = false;
-
-	// If the user didn't provide any arguments, show help
+
 	if (args->argc == 2) {
 		help();
 		return ZE_RESULT_SUCCESS;
 	}
 
-	processOptions(dumpCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		found = false;
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			dumpCmds[dumpCmdType::DUMP_JSON].enabled = true;
-			break;
-		case 'd':
-			dumpCmds[dumpCmdType::DUMP_DEVICE].enabled = true;
-			dumpCmds[dumpCmdType::DUMP_DEVICE].val = optarg;
-			if (stoi(dumpCmds[dumpCmdType::DUMP_DEVICE].val) == -1) {
-				dumpCmds[dumpCmdType::DUMP_DEVICE].val = "";
-			}
-			break;
-		case 't':
-			dumpCmds[dumpCmdType::DUMP_TILE].enabled = true;
-			dumpCmds[dumpCmdType::DUMP_TILE].val = optarg;
-			break;
-		case 'm':
-			dumpCmds[dumpCmdType::DUMP_METRICS].enabled = true;
-			dumpCmds[dumpCmdType::DUMP_METRICS].val = optarg;
-			break;
-		case 'i':
-			dumpCmds[dumpCmdType::DUMP_INTERVAL].enabled = true;
-			dumpCmds[dumpCmdType::DUMP_INTERVAL].val = optarg;
-			break;
-		case 'n':
-			dumpCmds[dumpCmdType::DUMP_NUMBER].enabled = true;
-			dumpCmds[dumpCmdType::DUMP_NUMBER].val = optarg;
-			break;
-		case 'f':
-			dumpCmds[dumpCmdType::DUMP_FILE].enabled = true;
-			dumpCmds[dumpCmdType::DUMP_FILE].val = optarg;
-			break;
-		case 0:
-			for (auto &cmd : dumpCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
-
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	auto parseResult = parseDumpCLI(name, [this] { help(); }, args);
+	if (const int *code = std::get_if<int>(&parseResult)) {
+		return *code;
 	}
+	auto &[opts, loopMs] = std::get<ParsedArgs>(parseResult);
 
-	// --file requires --metrics
-	if (dumpCmds[dumpCmdType::DUMP_FILE].enabled && !dumpCmds[dumpCmdType::DUMP_METRICS].enabled) {
+	if (opts.file.has_value() && !opts.metrics.has_value()) {
 		ERR("--file requires --metrics\n");
-		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
-	// Parse and validate metric IDs once, while preserving user-specified order.
-	std::vector<int> metricIds;
-	std::vector<std::string> dumpArgs;
-	if (dumpCmds[dumpCmdType::DUMP_METRICS].enabled) {
-		std::stringstream ss(dumpCmds[dumpCmdType::DUMP_METRICS].val.c_str());
-		std::string token;
-		std::unordered_set<int> seenMetricIds;
-		std::vector<int> duplicatedMetricIds;
-		std::unordered_set<int> reportedDuplicatedMetricIds;
-		std::vector<std::string> invalidMetricIds;
-
-		while (getline(ss, token, ',')) {
-			// Trim whitespaces around metric id token
-			auto begin = token.find_first_not_of(" \t\r\n");
-			auto end = token.find_last_not_of(" \t\r\n");
-			std::string trimmed = (begin == std::string::npos) ? "" : token.substr(begin, end - begin + 1);
-
-			int metricId;
-			try {
-				size_t pos = 0;
-				metricId = stoi(trimmed, &pos);
-				if (pos != trimmed.size()) {
-					throw std::invalid_argument("trailing characters");
-				}
-			} catch (const std::exception &) {
-				invalidMetricIds.push_back(trimmed);
-				continue;
-			}
-			// Check if metricId exists in dumpMetrics
-			if (dumpMetrics.find(metricId) == dumpMetrics.end()) {
-				invalidMetricIds.push_back(trimmed);
-				continue;
-			}
-
-			if (seenMetricIds.count(metricId)) {
-				if (reportedDuplicatedMetricIds.insert(metricId).second) {
-					duplicatedMetricIds.push_back(metricId);
-				}
-				continue;
-			}
-
-			seenMetricIds.insert(metricId);
-			dumpArgs.push_back(trimmed);
-			metricIds.push_back(metricId);
-		}
-
-		// Report all invalid metric IDs
-		if (!invalidMetricIds.empty()) {
-			for (const auto &invalidId : invalidMetricIds) {
-				ERR("The following metric ID was not expected: '{}'.\n", invalidId.c_str());
-			}
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-
-		if (!duplicatedMetricIds.empty()) {
-			for (const auto duplicateMetricId : duplicatedMetricIds) {
-				ERR("Duplicate metric ID: {}.\n", duplicateMetricId);
-			}
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
+	if (!opts.metrics.has_value()) {
+		help();
+		return ZE_RESULT_SUCCESS;
 	}
 
-	// If the user specified the -n /--number option, we need to check if it is a valid positive integer.
-	if (dumpCmds[dumpCmdType::DUMP_NUMBER].enabled) {
-		try {
-			size_t pos = 0;
-			iter = stoi(dumpCmds[dumpCmdType::DUMP_NUMBER].val, &pos);
-			if (pos != dumpCmds[dumpCmdType::DUMP_NUMBER].val.size() || iter <= 0) {
-				ERR("Invalid value for -n/--number: '{}'. Must be a positive integer.\n",
-					dumpCmds[dumpCmdType::DUMP_NUMBER].val.c_str());
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-		} catch (const std::exception &) {
-			ERR("Invalid value for -n/--number: '{}'. Must be a positive integer.\n",
-				dumpCmds[dumpCmdType::DUMP_NUMBER].val.c_str());
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
+	// dump -m accepts group names, aliases, and legacy numeric IDs only.
+	// Dot-notation field names (e.g. "temperature.gpu") belong to --query-gpu.
+	auto fields = resolveMetricsArg(*opts.metrics);
+	if (fields.empty()) {
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
-	// If the user specified an interval with -i / --interval, we need to check if it is a valid positive integer.
-	if (dumpCmds[dumpCmdType::DUMP_INTERVAL].enabled) {
-		try {
-			size_t pos = 0;
-			int intervalSecValue = stoi(dumpCmds[dumpCmdType::DUMP_INTERVAL].val, &pos);
-			if (pos != dumpCmds[dumpCmdType::DUMP_INTERVAL].val.size()) {
-				throw std::invalid_argument("trailing characters");
-			}
-			std::chrono::seconds intervalSec{intervalSecValue};
+	const bool hasPowerMetrics = std::ranges::any_of(
+		fields, [](const metrics::QueryMetric *f) { return f->name == "power.draw" || f->name == "power.draw.gpu"; });
 
-			// intervalSec.count() now contains the parsed integer. Check for valid range
-			if (intervalSec.count() <= 0 || intervalSec > MAX_INTERVAL) {
-				ERR("Invalid value for -i/--interval: '{}'. Must be a positive integer and less than {}.\n",
-					dumpCmds[dumpCmdType::DUMP_INTERVAL].val.c_str(), static_cast<long long>(MAX_INTERVAL.count()));
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			interval = std::chrono::duration_cast<std::chrono::milliseconds>(intervalSec);
-		} catch (const std::exception &) {
-			ERR("Invalid value for -i/--interval: '{}'. Must be a positive integer.\n",
-				dumpCmds[dumpCmdType::DUMP_INTERVAL].val.c_str());
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
+	const auto timing = parseSamplingTiming(opts, loopMs);
+	if (!timing) {
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
-	// If the user specified --ims option, we need to check if it is a valid integer between 10 and 1000
-	if (dumpCmds[dumpCmdType::DUMP_IMS].enabled) {
-		try {
-			size_t pos = 0;
-			int msIntervalValue = stoi(dumpCmds[dumpCmdType::DUMP_IMS].val, &pos);
-			if (pos != dumpCmds[dumpCmdType::DUMP_IMS].val.size()) {
-				throw std::invalid_argument("trailing characters");
-			}
-
-			if (msIntervalValue < 10 || msIntervalValue > 1000) {
-				ERR("Invalid value for --ims: '{}'. Must be an integer between 10 and 1000.\n",
-					dumpCmds[dumpCmdType::DUMP_IMS].val.c_str());
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			interval = std::chrono::milliseconds{msIntervalValue};
-
-			// --ims requires --file option
-			if (!dumpCmds[dumpCmdType::DUMP_FILE].enabled) {
-				ERR("Error: --ims option requires --file option to be specified.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-		} catch (const std::exception &) {
-			ERR("Invalid value for --ims: '{}'. Must be an integer between 10 and 1000.\n",
-				dumpCmds[dumpCmdType::DUMP_IMS].val.c_str());
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
+	if (hasPowerMetrics && timing->interval.count() < 50) {
+		PRINT("Warning: Power metrics are unreliable with sample windows < 50ms.\n");
+		PRINT("Recommend using at least 50ms (--loop-ms=50) for stable power.draw readings.\n");
 	}
 
-	// If the user specified --time option, we need to check if it is a valid positive integer
-	int64_t dumpTotalTime = -1;
-	if (dumpCmds[dumpCmdType::DUMP_TIME].enabled) {
-		try {
-			size_t pos = 0;
-			dumpTotalTime = stoll(dumpCmds[dumpCmdType::DUMP_TIME].val, &pos);
-			if (pos != dumpCmds[dumpCmdType::DUMP_TIME].val.size()) {
-				throw std::invalid_argument("trailing characters");
-			}
-
-			if (dumpTotalTime < 1 || dumpTotalTime > MAX_DUMP_TIME_SECONDS) {
-				ERR("Invalid value for --time: '{}'. Must be an integer between 1 and {}.\n",
-					dumpCmds[dumpCmdType::DUMP_TIME].val.c_str(), (long long)MAX_DUMP_TIME_SECONDS);
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-
-			// --time requires --ims option
-			if (!dumpCmds[dumpCmdType::DUMP_IMS].enabled) {
-				ERR("Error: --time option requires --ims option to be specified.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-
-			// --time and -n/--number cannot be used together
-			if (dumpCmds[dumpCmdType::DUMP_NUMBER].enabled) {
-				ERR("Error: --time and -n/--number options cannot be used together.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-		} catch (const std::exception &) {
-			ERR("Invalid value for --time: '{}'. Must be an integer between 1 and {}.\n",
-				dumpCmds[dumpCmdType::DUMP_TIME].val.c_str(), (long long)MAX_DUMP_TIME_SECONDS);
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-	}
-
-	showDate = dumpCmds[dumpCmdType::DUMP_DATE].enabled;
-
-	result = args->sm.findDevice(dumpCmds[dumpCmdType::DUMP_DEVICE].val.c_str(), &deviceList);
+	std::vector<devInfo> deviceList;
+	ze_result_t const result = args->sm.findDevice(opts.device.c_str(), &deviceList);
 	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Error: Device handle not found for device ID '{}'.\n", dumpCmds[dumpCmdType::DUMP_DEVICE].val.c_str());
+		ERR("Error: Device handle not found for device ID '{}'", opts.device.c_str());
 		return result;
 	}
 
-	header = "Timestamp, DeviceId, ";
-	// First print the header which looks like this Timestamp, DeviceId, <heading>
-	for (const auto metricId : metricIds) {
-		auto it = dumpMetrics.find(metricId);
-		if (it != dumpMetrics.end() && it->second.func != nullptr) {
-			if (!first) {
-				header += ", ";
-			}
-			header += it->second.heading;
-			first = false;
-		}
-	}
-
-	// Open file for writing if --file option is specified
 	std::ofstream dumpFile;
-	bool useFile = dumpCmds[dumpCmdType::DUMP_FILE].enabled;
+	const bool useFile = opts.file.has_value();
 	if (useFile) {
-		dumpFile.open(dumpCmds[dumpCmdType::DUMP_FILE].val, std::ios::out | std::ios::trunc);
+		dumpFile.open(*opts.file, std::ios::out | std::ios::trunc);
 		if (!dumpFile.is_open()) {
-			ERR("Failed to open file '{}' for writing.\n", dumpCmds[dumpCmdType::DUMP_FILE].val.c_str());
+			ERR("Failed to open file '{}'", opts.file->c_str());
 			return ZE_RESULT_ERROR_UNKNOWN;
 		}
-		// Write header to file
-		dumpFile << header << std::endl;
-		if (!dumpCmds[dumpCmdType::DUMP_TIME].enabled && STDIN_ISATTY()) {
-			PRINT("Dump data to file {}. Press 'q' or ESC to stop dumping. On some systems, Ctrl+C may terminate the "
-				  "program immediately.\n",
-				  dumpCmds[dumpCmdType::DUMP_FILE].val.c_str());
-		} else {
-			PRINT("Dump data to file {}.\n", dumpCmds[dumpCmdType::DUMP_FILE].val.c_str());
-		}
-	} else {
-		// Print header to screen
-		PRINT("{}\n", header.c_str());
-	}
-
-	threadArgs **argsList = new threadArgs *[deviceList.size() * dumpArgs.size()] {};
-	thread_id **tidList = new thread_id *[deviceList.size() * dumpArgs.size()] {};
-	if (tidList == nullptr) {
-		ERR("Failed to allocate memory for thread ID list.\n");
-		return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-	}
-
-	// Start a thread to check for key presses to stop dumping
-	// Only start if: 1) no iteration count specified, 2) stdin is a terminal, and
-	// 3) not using --time option (which auto-terminates)
-	bool shouldStartInputThread =
-		STDIN_ISATTY() && ((iter < 0 && !useFile) || (useFile && !dumpCmds[dumpCmdType::DUMP_TIME].enabled));
-
-	if (shouldStartInputThread) {
-		inputThread = std::thread([running, inputThreadExited]() {
-			char ch;
-			while (running->load()) {
-				ch = GETCH();
-				// Accept 'q', 'Q', ESC, or Ctrl+C key to stop dumping
-				if (ch == 'q' || ch == 'Q' || ch == 27 || ch == 3) {
-					running->store(false);
-					break;
-				}
-			}
-			inputThreadExited->store(true);
-		});
-	}
-
-	// Track start time for --time option
-	auto startTime = std::chrono::steady_clock::now();
-
-	// Perform an initial "warm-up" iteration to initialize baseline data for metrics that need two samples
-	// This prevents empty values in the first real iteration
-	// Always do warm-up iteration for all cases including -n 1
-	bool skipOutput = true;
-
-	while (running->load()) {
-		total = 0;
-
-		// Iterate through the device list and create a thread called metrics for each device
-		for (auto &device : deviceList) {
-			for (const auto &arg : dumpArgs) {
-				threadData prevThreadData = {};
-				if (argsList[total] != nullptr) {
-					// Copy any previous thread data before we delete the old argsList entry
-					prevThreadData = argsList[total]->td;
-					delete argsList[total]; // Clean up any previously allocated memory
-				}
-				argsList[total] = new threadArgs{this, &device, arg, "", {}};
-				// Copy any previous thread data into the new argsList entry just in case the underlying functions
-				// need to access it to do comparison between old and new values
-				argsList[total]->td = prevThreadData;
-				tidList[total] = create_thread(metrics, argsList[total]);
-				total++;
-			}
-		}
-
-		// Wait for all threads to complete
-		for (int i = 0; i < total; i++) {
-			if (tidList[i] != nullptr) {
-				wait_for_thread(tidList[i]);
+		if (!opts.json && !opts.noheader) {
+			std::string header = "Timestamp, DeviceId";
+			for (const metrics::QueryMetric *const f : fields) {
+				header += (!opts.nounits && !f->unit.empty()) ? std::format(", {} ({})", f->name, f->unit)
+															  : std::format(", {}", f->name);
 			}
+			dumpFile << header << "\n";
 		}
-
-		// Skip printing output for the first (warm-up) iteration
-		if (!skipOutput) {
-			// Print the output
-			for (uint32_t i = 0; i < deviceList.size(); i++) {
-				std::string outputLine = "";
-				for (uint32_t j = 0; j < dumpArgs.size(); j++) {
-					// Construct a std::string which has comma separated values of all the output lines
-					outputLine += argsList[i * dumpArgs.size() + j]->outputLine;
-					if (j < dumpArgs.size() - 1) {
-						outputLine += ", ";
-					}
-				}
-				std::string timestampStr = getTimestamp(showDate);
-				if (useFile) {
-					// Write to file
-					dumpFile << timestampStr << ", " << std::setw(8) << argsList[i * dumpArgs.size()]->d->index << ", "
-							 << outputLine << std::endl;
-					dumpFile.flush(); // Ensure data is written immediately
-				} else {
-					// Print to screen
-					PRINT("{}, {:8}, {}\n", timestampStr.c_str(), argsList[i * dumpArgs.size()]->d->index,
-						  outputLine.c_str());
-				}
-			}
-
-			// If the user specified an iteration count, decrement it only after printing actual data
-			if (iter > 0) {
-				iter--;
-				if (iter == 0) {
-					running->store(false); // Stop the loop after the specified number of iterations
-				}
-			}
-		} else {
-			// Mark that we've completed the warm-up iteration
-			skipOutput = false;
-		}
-
-		std::this_thread::sleep_for(interval);
-
-		// Check if we've exceeded the total time limit
-		if (dumpTotalTime > 0) {
-			auto currentTime = std::chrono::steady_clock::now();
-			auto elapsedSeconds = std::chrono::duration_cast<std::chrono::seconds>(currentTime - startTime).count();
-			if (elapsedSeconds >= dumpTotalTime) {
-				running->store(false); // Stop the loop after the specified time
-			}
-		}
-	}
-
-	// Close the file if it was opened
-	if (useFile) {
-		dumpFile.close();
-		PRINT("\nDumping is stopped.\n");
-	}
-
-	// Clean up input thread
-	// If the thread has already exited (user key press), join it.
-	// If it is still blocked on GETCH() (time limit or iteration count reached), detach it.
-	if (inputThread.joinable()) {
-		if (inputThreadExited->load()) {
-			inputThread.join();
+		if (!opts.time.has_value() && STDIN_ISATTY()) {
+			PRINT("Dump data to file {}. Press q or ESC to stop.\n", opts.file->c_str());
 		} else {
-			inputThread.detach();
+			PRINT("Dump data to file {}.\n", opts.file->c_str());
 		}
+	} else if (!opts.json) {
+		// TTY: aligned header emitted by DumpOutput::onBegin().
 	}
 
-	for (int i = 0; i < total; i++) {
-		if (argsList[i]) {
-			delete argsList[i]; // Clean up any previously allocated memory
-		}
-	}
-
-	// Clean up allocated memory
-	delete[] tidList;
-	delete[] argsList;
-
-	// Restore terminal settings to ensure echo is re-enabled
-	// This is necessary when the input thread is detached and may have left the terminal in raw mode
-	RESTORE_TERMINAL();
-
-	return result;
+	DumpOutput out{opts.date, useFile, useFile ? &dumpFile : nullptr};
+	out.json = opts.json;
+	out.noheader = opts.noheader;
+	out.nounits = opts.nounits;
+	out.aligned = !useFile && !opts.json && !opts.csvFormat && STDIN_ISATTY();
+	return runOutputLoop(out, fields, deviceList, *timing, useFile, dumpFile);
 }
diff --git a/ial/cmn/cmd_dump.h b/ial/cmn/cmd_dump.h
index b29a2583f..c8cd7cfdb 100644
--- a/ial/cmn/cmd_dump.h
+++ b/ial/cmn/cmd_dump.h
@@ -10,7 +10,7 @@
 #include "cmds.h"
 #include <os.h>
 #include <chrono>
-#include <span>
+#include <string>
 
 constexpr auto DEFAULT_INTERVAL = std::chrono::seconds{1};
 constexpr auto MAX_INTERVAL = std::chrono::seconds{20};
@@ -18,177 +18,35 @@ constexpr auto MAX_INTERVAL = std::chrono::seconds{20};
 // This limit prevents extremely long-running dump tasks that could consume excessive resources
 constexpr int64_t MAX_DUMP_TIME_SECONDS = 100000000;
 
-enum dumpCmdType
+/** Output format flags for cmdDump::runQuery. */
+struct QueryFormat
 {
-	DUMP_HELP,
-	DUMP_JSON,
-	DUMP_DEVICE,
-	DUMP_TILE,
-	DUMP_METRICS,
-	DUMP_FILE,
-	DUMP_IMS,
-	DUMP_TIME,
-	DUMP_DATE,
-	DUMP_INTERVAL,
-	DUMP_NUMBER,
-	TOTAL_DUMP,
-};
-
-enum dumpCmdSubType
-{
-	DUMP_GPU_UTILIZATION,
-	DUMP_GPU_POWER,
-	DUMP_GPU_FREQUENCY,
-	DUMP_GPU_CORE_TEMPERATURE,
-	DUMP_GPU_MEMORY_TEMPERATURE,
-	DUMP_GPU_MEMORY_UTILIZATION,
-	DUMP_GPU_MEMORY_READ,
-	DUMP_GPU_MEMORY_WRITE,
-	DUMP_GPU_ENERGY_CONSUMED,
-	DUMP_GPU_EU_ARRAY_ACTIVE,
-	DUMP_GPU_EU_ARRAY_STALL,
-	DUMP_GPU_EU_ARRAY_IDLE,
-	DUMP_GPU_EU_ARRAY_RESET_COUNTER,
-	DUMP_GPU_EU_ARRAY_PROGRAMMING_ERRORS,
-	DUMP_GPU_EU_ARRAY_DRIVER_ERRORS,
-	DUMP_GPU_EU_ARRAY_CACHE_ERRORS_CORRECTABLE,
-	DUMP_GPU_EU_ARRAY_CACHE_ERRORS_UNCORRECTABLE,
-	DUMP_GPU_MEMORY_BANDWIDTH_UTILIZATION,
-	DUMP_GPU_MEMORY_USED,
-	DUMP_PCIE_READ,
-	DUMP_PCIE_WRITE,
-	DUMP_COMPUTE_ENGINE_UTILIZATION,
-	DUMP_RENDER_ENGINE_UTILIZATION,
-	DUMP_MEDIA_DECODER_ENGINE_UTILIZATION,
-	DUMP_MEDIA_ENCODER_ENGINE_UTILIZATION,
-	DUMP_COPY_ENGINE_UTILIZATION,
-	DUMP_MEDIA_ENHANCEMENT_ENGINE_UTILIZATION,
-	DUMP_3D_ENGINE_UTILIZATION,
-	DUMP_GPU_MEMORY_ERRORS_CORRECTABLE,
-	DUMP_GPU_MEMORY_ERRORS_UNCORRECTABLE,
-	DUMP_COMPUTE_ENGINE_GROUP_UTILIZATION,
-	DUMP_RENDER_ENGINE_GROUP_UTILIZATION,
-	DUMP_MEDIA_ENGINE_GROUP_UTILIZATION,
-	DUMP_COPY_ENGINE_GROUP_UTILIZATION,
-	DUMP_THROTTLE_REASON,
-	DUMP_MEDIA_ENGINE_FREQUENCY,
-	TOTAL_DUMP_SUBTYPE
-};
-
-struct dumpCmdStruct;
-
-struct utilData
-{
-	uint64_t utilization;
-	uint64_t timeStamp;
-};
-
-struct powerData
-{
-	uint64_t power;
-	uint64_t timeStamp;
-};
-
-struct memData
-{
-	uint64_t read;
-	uint64_t write;
-	uint64_t timeStamp;
-};
-
-struct pciData
-{
-	zes_pci_stats_t pciStats;
-};
-
-struct threadData
-{
-	utilData u[2];
-	powerData p[2];
-	memData m[2];
-	pciData pci[2];
+	bool noheader = false; /**< Suppress the header row */
+	bool nounits = false;  /**< Omit unit suffixes like "(W)", "(C)" from header */
+	bool json = false;	   /**< Emit JSON Lines instead of CSV */
+	int loopMs = 0;		   /**< Loop interval in ms (0 = single shot) */
+	int count = 0;		   /**< Number of iterations (0 = run until Ctrl-C) */
 };
 
 class cmdDump : public cmds
 {
-
 public:
-	cmdDump() { STRCPY_S(name, MAX_PATH, "dump"); };
-	~cmdDump(){};
-	void help(HELP helpType = FULL_HELP);
-
-	ze_result_t gpuUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuPower(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuFrequency(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuCoreTemperature(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryTemperature(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryRead(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryWrite(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEnergyConsumed(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayActive(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayStall(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayIdle(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayResetCounter(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayProgrammingErrors(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayDriverErrors(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayCacheErrorsCorrectable(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuEuArrayCacheErrorsUncorrectable(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryBandwidthUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryUsed(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t pcieRead(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t pcieWrite(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t computeEngineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t renderEngineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t mediaDecoderEngineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t mediaEncoderEngineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t copyEngineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t mediaEnhancementEngineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t engineUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryErrorsCorrectable(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t gpuMemoryErrorsUncorrectable(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t computeEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t renderEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t mediaEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t copyEngineGroupUtilization(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t throttleReason(devInfo *d, std::string *outputLine, threadData *td);
-	ze_result_t mediaEngineFrequency(devInfo *d, std::string *outputLine, threadData *td);
-
-	ze_result_t utilization(devInfo *d, std::span<const zes_engine_group_t> typeTable, std::string *outputLine,
-							threadData *td);
-	ze_result_t utilization(devInfo *d, zes_engine_group_t type, std::string *outputLine, threadData *td);
-	ze_result_t gpuPowerIter(devInfo *d, uint64_t *gpuPower, uint64_t *timeStamp, bool forGPU);
-	std::string getFreqThrottleString(zes_freq_throttle_reason_flags_t flags);
-
-	static THREAD_RET metrics(void *args);
-	int run(arg_struct *args);
-};
-
-using dumpSubCmdFunc = ze_result_t (cmdDump::*)(devInfo *d, std::string *outputLine, threadData *td);
-using dumpHeadingFunc = ze_result_t (cmdDump::*)();
-
-struct dumpCmdStruct
-{
-	option opt;
-	funcptr func;
-	bool enabled;
-	std::string val;
-};
-
-struct dumpCmdSubStruct
-{
-	dumpSubCmdFunc func;
-	std::string heading;
-	bool availableForIGPU;
-};
-
-struct threadArgs
-{
-	cmdDump *cmdDumpInstance;
-	devInfo *d;
-	std::string cmdName;
-	std::string outputLine;
-	threadData td;
+	cmdDump() { name = "dump"; }
+	~cmdDump() override = default;
+	void help(HELP helpType = FULL_HELP) override;
+	int run(arg_struct *args) override;
+
+	// Single-shot query: resolves `metrics` (comma-separated field names / legacy IDs),
+	// samples all devices (filtered by `deviceSpec`, empty = all), and prints one row.
+	static int runQuery(const std::string &metrics, const std::string &deviceSpec, arg_struct *args,
+						QueryFormat fmt = QueryFormat{});
+
+	// prints one line per GPU in the format:
+	//   GPU <index>: <name> (UUID: <uuid>)
+	static int listGpus(arg_struct *args);
+
+	// prints all available --query-gpu fields with descriptions
+	static void printQueryHelp();
 };
 
 #endif
diff --git a/ial/cmn/cmd_group.cpp b/ial/cmn/cmd_group.cpp
deleted file mode 100644
index 59aee6533..000000000
--- a/ial/cmn/cmd_group.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "cmd_group.h"
-#include "debug.h"
-
-static std::unordered_map<groupCmdType, groupCmdStruct> groupCmds = {
-	{groupCmdType::GROUP_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{groupCmdType::GROUP_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{groupCmdType::GROUP_CREATE, {{"create", no_argument, 0, 'c'}, &cmdGroup::create, false, ""}},
-	{groupCmdType::GROUP_DELETE, {{"delete", no_argument, 0, 'D'}, &cmdGroup::deleteGroup, false, ""}},
-	{groupCmdType::GROUP_LIST, {{"list", no_argument, 0, 'l'}, &cmdGroup::listGroup, false, ""}},
-	{groupCmdType::GROUP_ADD, {{"add", no_argument, 0, 'a'}, &cmdGroup::add, false, ""}},
-	{groupCmdType::GROUP_REMOVE, {{"remove", no_argument, 0, 'r'}, &cmdGroup::remove, false, ""}},
-	{groupCmdType::GROUP_GROUP, {{"group", required_argument, 0, 'g'}, nullptr, false, ""}},
-	{groupCmdType::GROUP_NAME1, {{"name", required_argument, 0, 'n'}, nullptr, false, ""}},
-	{groupCmdType::GROUP_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-};
-
-/**
- * @brief Displays help information for the group command
- *
- * This function provides comprehensive help information for the group command,
- * including usage examples, descriptions of options, and subcommand explanations
- * for managing GPU device groups.
- *
- * @param helpType Type of help to display (FULL_HELP or SHORT_HELP)
- */
-void cmdGroup::help(HELP helpType)
-{
-	TRACING();
-	std::vector<helpCmd> helpList;
-
-	helpList.push_back(helpCmd(TITLE, "Group the managed GPU devices"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s group [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s group -c -n [groupName]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s group -a -g [groupId] -d [deviceIds]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s group -r -d [deviceIds] -g [groupId]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s group -D -g [groupId]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s group -l", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s group -l -g [groupId]", progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-c,--create                 Create a group."));
-	helpList.push_back(helpCmd(HEADING, "-D,--delete                 Delete a group."));
-	helpList.push_back(helpCmd(HEADING, "-l,--list                   List the groups info."));
-	helpList.push_back(helpCmd(HEADING, "-a,--add                    Add devices to a group."));
-	helpList.push_back(helpCmd(HEADING, "-r,--remove                 Remove devices from group."));
-	helpList.push_back(helpCmd(HEADING, "-g,--group                  Group ID."));
-	helpList.push_back(helpCmd(HEADING, "-n,--name                   Group name."));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 Device IDs."));
-
-	printHelp(helpList, helpType);
-	helpList.clear();
-}
-
-/**
- * @brief Creates a new GPU device group
- *
- * This function implements the logic to create a new group for managed GPU devices.
- * Currently implemented as a placeholder for future group creation functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful group creation
- */
-ze_result_t cmdGroup::create(UNUSED devInfo *d)
-{
-	TRACING();
-	DBG("Creating group...\n");
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Deletes an existing GPU device group
- *
- * This function implements the logic to delete a specified group of managed GPU devices.
- * Currently implemented as a placeholder for future group deletion functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful group deletion
- */
-ze_result_t cmdGroup::deleteGroup(UNUSED devInfo *d)
-{
-	TRACING();
-	DBG("Deleting group...\n");
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Lists all GPU device groups or specific group details
- *
- * This function implements the logic to list all groups or details of a specific group.
- * Currently implemented as a placeholder for future group listing functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful group listing
- */
-ze_result_t cmdGroup::listGroup(UNUSED devInfo *d)
-{
-	TRACING();
-	DBG("Listing group...\n");
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Adds a device to a GPU device group
- *
- * This function implements the logic to add a device to an existing group.
- * Currently implemented as a placeholder for future device addition functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful device addition
- */
-ze_result_t cmdGroup::add(UNUSED devInfo *d)
-{
-	TRACING();
-	DBG("Adding to group...\n");
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Removes a device from a GPU device group
- *
- * This function implements the logic to remove a device from an existing group.
- * Currently implemented as a placeholder for future device removal functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful device removal
- */
-ze_result_t cmdGroup::remove(UNUSED devInfo *d)
-{
-	TRACING();
-	DBG("Removing from group...\n");
-	return ZE_RESULT_SUCCESS;
-}
-
-/**
- * @brief Runs the group command with specified arguments
- *
- * This function parses command line arguments and executes the appropriate group operation
- * (create, delete, list, add, or remove) on the specified GPU devices.
- *
- * @param args Pointer to argument structure containing command line arguments and system manager
- * @return int Returns 0 on success, non-zero on failure
- */
-int cmdGroup::run(arg_struct *args)
-{
-	TRACING();
-	std::vector<devInfo> deviceList;
-	ze_result_t result;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(groupCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return 0;
-		case 'j':
-			groupCmds[groupCmdType::GROUP_JSON].enabled = true;
-			break;
-		case 'c':
-			groupCmds[groupCmdType::GROUP_CREATE].enabled = true;
-			break;
-		case 'D':
-			groupCmds[groupCmdType::GROUP_DELETE].enabled = true;
-			break;
-		case 'l':
-			groupCmds[groupCmdType::GROUP_LIST].enabled = true;
-			break;
-		case 'a':
-			groupCmds[groupCmdType::GROUP_ADD].enabled = true;
-			break;
-		case 'r':
-			groupCmds[groupCmdType::GROUP_REMOVE].enabled = true;
-			break;
-		case 'g':
-			groupCmds[groupCmdType::GROUP_GROUP].enabled = true;
-			groupCmds[groupCmdType::GROUP_GROUP].val = optarg;
-			break;
-		case 'n':
-			groupCmds[groupCmdType::GROUP_NAME1].enabled = true;
-			groupCmds[groupCmdType::GROUP_NAME1].val = optarg;
-			break;
-		case 'd':
-			groupCmds[groupCmdType::GROUP_DEVICE].enabled = true;
-			groupCmds[groupCmdType::GROUP_DEVICE].val = optarg;
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	result = args->sm.findDevice(groupCmds[groupCmdType::GROUP_DEVICE].val.c_str(), &deviceList);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Error: Device handle not found for device ID '{}'.\n", groupCmds[groupCmdType::GROUP_DEVICE].val.c_str());
-		return result;
-	}
-
-	ze_result_t firstError = ZE_RESULT_SUCCESS;
-
-	// Iterate through the device list and execute the command
-	for (auto &device : deviceList) {
-		// Call the appropriate command function based on the command type
-		for (const auto &cmd : groupCmds) {
-			if (cmd.second.enabled && cmd.second.func != nullptr) {
-				DBG("Running command: {}\n", cmd.second.opt.name);
-				ze_result_t cmdResult = (this->*cmd.second.func)(&device);
-				if (cmdResult != ZE_RESULT_SUCCESS && firstError == ZE_RESULT_SUCCESS) {
-					firstError = cmdResult;
-				}
-			}
-		}
-	}
-
-	return firstError;
-}
diff --git a/ial/cmn/cmd_group.h b/ial/cmn/cmd_group.h
deleted file mode 100644
index 55b2e3d91..000000000
--- a/ial/cmn/cmd_group.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _CMD_GROUP_H
-#define _CMD_GROUP_H
-
-#include "cmds.h"
-#include <os.h>
-
-enum groupCmdType
-{
-	GROUP_HELP,
-	GROUP_JSON,
-	GROUP_CREATE,
-	GROUP_DELETE,
-	GROUP_LIST,
-	GROUP_ADD,
-	GROUP_REMOVE,
-	GROUP_GROUP,
-	GROUP_NAME1,
-	GROUP_DEVICE,
-	TOTAL_GROUP,
-};
-
-struct groupCmdStruct;
-
-class cmdGroup : public cmds
-{
-public:
-	cmdGroup() { STRCPY_S(name, MAX_PATH, "group"); };
-	~cmdGroup(){};
-	void help(HELP helpType = FULL_HELP);
-
-	ze_result_t create(devInfo *d);
-	ze_result_t deleteGroup(devInfo *d);
-	ze_result_t listGroup(devInfo *d);
-	ze_result_t add(devInfo *d);
-	ze_result_t remove(devInfo *d);
-	int run(arg_struct *args);
-};
-
-using groupSubCmdFunc = ze_result_t (cmdGroup::*)(devInfo *d);
-
-struct groupCmdStruct
-{
-	option opt;
-	groupSubCmdFunc func;
-	bool enabled;
-	std::string val;
-};
-
-#endif
\ No newline at end of file
diff --git a/ial/cmn/cmd_health.cpp b/ial/cmn/cmd_health.cpp
index c3f9b11ef..f6fa8625f 100644
--- a/ial/cmn/cmd_health.cpp
+++ b/ial/cmn/cmd_health.cpp
@@ -9,6 +9,7 @@
 #include "debug.h"
 #include "table_builder.h"
 #include <assert.h>
+#include <CLI/CLI.hpp>
 #include <temperature.h>
 #include <memory.h>
 #include <sstream>
@@ -17,11 +18,11 @@
 #include <inttypes.h>
 
 static std::unordered_map<healthCmdType, healthCmdStruct> healthCmds = {
-	{healthCmdType::HEALTH_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{healthCmdType::HEALTH_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{healthCmdType::HEALTH_LIST, {{"list", no_argument, 0, 'l'}, nullptr, false, ""}},
-	{healthCmdType::HEALTH_DEVICE, {{"device", required_argument, 0, 'd'}, &cmdHealth::allComponents, false, ""}},
-	{healthCmdType::HEALTH_COMPONENT, {{"component", required_argument, 0, 'c'}, &cmdHealth::component, false, ""}},
+	{healthCmdType::HEALTH_HELP, {}},
+	{healthCmdType::HEALTH_JSON, {}},
+	{healthCmdType::HEALTH_LIST, {}},
+	{healthCmdType::HEALTH_DEVICE, {.func = &cmdHealth::allComponents}},
+	{healthCmdType::HEALTH_COMPONENT, {.func = &cmdHealth::component}},
 };
 
 healthSubCmdStruct componentCmds[] = {
@@ -29,6 +30,7 @@ healthSubCmdStruct componentCmds[] = {
 	{healthSubCmdType::HEALTH_MEMORYTEMPERATURE, &cmdHealth::memoryTemperature},
 	{healthSubCmdType::HEALTH_POWER, &cmdHealth::gpuPower},
 	{healthSubCmdType::HEALTH_MEMORY, &cmdHealth::healthMemory},
+	{healthSubCmdType::HEALTH_UNSUPPORTED0, &cmdHealth::unsupported},
 	{healthSubCmdType::HEALTH_FREQUENCY, &cmdHealth::frequency},
 };
 
@@ -59,13 +61,14 @@ void cmdHealth::help(HELP helpType)
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(HEADING, "-l,--list                   Display health info for all devices"));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address"));
+	helpList.push_back(helpCmd(HEADING, "--device,--id               The device ID or PCI BDF address"));
 	helpList.push_back(helpCmd(HEADING, "-c,--component              Component types"));
 	helpList.push_back(helpCmd(SUB_HEADING2, "1. GPU Core Temperature"));
 	helpList.push_back(helpCmd(SUB_HEADING2, "2. GPU Memory Temperature"));
 	helpList.push_back(helpCmd(SUB_HEADING2, "3. GPU Power"));
 	helpList.push_back(helpCmd(SUB_HEADING2, "4. GPU Memory"));
-	helpList.push_back(helpCmd(SUB_HEADING2, "5. GPU Frequency"));
+	helpList.push_back(helpCmd(SUB_HEADING2, "5. Reserved"));
+	helpList.push_back(helpCmd(SUB_HEADING2, "6. GPU Frequency"));
 
 	printHelp(helpList, helpType);
 	helpList.clear();
@@ -104,6 +107,8 @@ void HealthTextPrinter::printDeviceInfo(nlohmann::ordered_json *jsonObj)
 			std::string value;
 			if (subitem.value().is_string()) {
 				value = subitem.value().get<std::string>();
+			} else if (subitem.value().is_number_integer() && subitem.value().get<int64_t>() == -1) {
+				value = "N/A";
 			} else {
 				value = subitem.value().dump();
 			}
@@ -141,15 +146,13 @@ void HealthTextPrinter::print(nlohmann::ordered_json *jsonObj)
  *
  * This function iterates through all discovered devices and runs comprehensive
  * health checks on each one. For every device, it executes all available component
- * tests including temperature monitoring, power assessment, memory health evaluation,
- * Xe Link port status, and frequency subsystem checks. Results are stored in the provided
- * JSON object.
+ * tests including temperature monitoring, power assessment, memory health evaluation
+ * and frequency subsystem checks. Results are stored in the provided JSON object.
  *
  * @param devList Pointer to vector of device information structures
  * @param jsonObj Pointer to a JSON object where results will be stored
  * @return ze_result_t ZE_RESULT_SUCCESS if all checks pass, or the first encountered error code
  */
-
 ze_result_t cmdHealth::allComponentsAllDevices(std::vector<devInfo> *devList, nlohmann::ordered_json *jsonObj)
 {
 	TRACING();
@@ -179,15 +182,13 @@ ze_result_t cmdHealth::allComponentsAllDevices(std::vector<devInfo> *devList, nl
  *
  * This function iterates through all available component health tests and
  * executes them for the specified device. It provides a comprehensive health
- * assessment covering core temperature, memory temperature, power, memory health,
- * Xe Link ports, and frequency subsystems. Results are stored in the provided
- * JSON object.
+ * assessment covering core temperature, memory temperature, power, memory health
+ * and frequency subsystems. Results are stored in the provided JSON object.
  *
  * @param d Pointer to device information structure containing device handles and properties
  * @param jsonObj Pointer to a JSON object where results will be stored
  * @return ze_result_t ZE_RESULT_SUCCESS if all health checks pass, or the first encountered error code
  */
-
 ze_result_t cmdHealth::allComponents(devInfo *d, nlohmann::ordered_json *jsonObj)
 {
 	TRACING();
@@ -459,7 +460,9 @@ xpumHealthStatus cmdHealth::getHealthStatus(zes_mem_health_t health)
  * It provides consistent string formatting across the health monitoring system.
  *
  * @param status The XPUM health status enumeration value to convert
- * @return std::string Human-readable health status string ("OK", "WARNING", "CRITICAL", "UNKNOWN")
+ * @return std::string Human-readable health status string ("OK", "Warning", "Critical", "Unknown").
+ *         TitleCase is intentional: it matches the documented health JSON
+ *         schema enum.
  */
 std::string cmdHealth::getHealthStatusString(xpumHealthStatus status)
 {
@@ -467,13 +470,13 @@ std::string cmdHealth::getHealthStatusString(xpumHealthStatus status)
 	case XPUM_HEALTH_STATUS_OK:
 		return "OK";
 	case XPUM_HEALTH_STATUS_WARNING:
-		return "WARNING";
+		return "Warning";
 	case XPUM_HEALTH_STATUS_CRITICAL:
-		return "CRITICAL";
+		return "Critical";
 	case XPUM_HEALTH_STATUS_UNKNOWN:
-		return "UNKNOWN";
+		return "Unknown";
 	default:
-		return "UNKNOWN";
+		return "Unknown";
 	}
 }
 
@@ -546,6 +549,26 @@ ze_result_t cmdHealth::healthMemory(devInfo *d, nlohmann::ordered_json *jsonObj)
 	return ZE_RESULT_SUCCESS;
 }
 
+/**
+ * @brief Performs unsupported feature health assessment
+ *
+ * This function evaluates the health status of unsupported item.
+ *
+ * @param d Pointer to device information structure (currently unused)
+ * @param jsonObj Pointer to a JSON object where results will be stored
+ * @return ze_result_t ZE_RESULT_SUCCESS indicating successful assessment
+ */
+ze_result_t cmdHealth::unsupported(UNUSED devInfo *d, nlohmann::ordered_json *jsonObj)
+{
+	TRACING();
+	std::string description = "Unsupported.";
+	xpumHealthStatus status = xpumHealthStatus::XPUM_HEALTH_STATUS_UNKNOWN;
+
+	(*jsonObj)["unsupported_item_health"] = {{"status", getHealthStatusString(status)}, {"description", description}};
+
+	return ZE_RESULT_SUCCESS;
+}
+
 /**
  * @brief Converts frequency throttle reason flags to descriptive string
  *
@@ -692,49 +715,30 @@ int cmdHealth::run(arg_struct *args)
 	TRACING();
 	std::vector<devInfo> deviceList;
 	ze_result_t result;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
 	std::unique_ptr<Printer> printer;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(healthCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			healthCmds[healthCmdType::HEALTH_JSON].enabled = true;
-			break;
-		case 'l':
-			healthCmds[healthCmdType::HEALTH_LIST].enabled = true;
-			break;
-		case 'd':
-			healthCmds[healthCmdType::HEALTH_DEVICE].enabled = true;
-			healthCmds[healthCmdType::HEALTH_DEVICE].val = optarg;
-			break;
-		case 'c':
-			healthCmds[healthCmdType::HEALTH_COMPONENT].enabled = true;
-			healthCmds[healthCmdType::HEALTH_COMPONENT].val = optarg;
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
+
+	// Reset state
+	for (auto &[k, v] : healthCmds) {
+		v.enabled = false;
+		v.val.clear();
 	}
 
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	CLI::App sub{"Check GPU component health", "health"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", healthCmds[healthCmdType::HEALTH_JSON].enabled, "Print result in JSON format");
+	sub.add_flag("-l,--list", healthCmds[healthCmdType::HEALTH_LIST].enabled, "List all available components");
+	sub.add_option("-d,--device,--id", healthCmds[healthCmdType::HEALTH_DEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { healthCmds[healthCmdType::HEALTH_DEVICE].enabled = true; });
+	sub.add_option("-c,--component", healthCmds[healthCmdType::HEALTH_COMPONENT].val, "Component type ID")
+		->each([&](const std::string &) { healthCmds[healthCmdType::HEALTH_COMPONENT].enabled = true; });
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
diff --git a/ial/cmn/cmd_health.h b/ial/cmn/cmd_health.h
index 2630d48fe..ada6db3aa 100644
--- a/ial/cmn/cmd_health.h
+++ b/ial/cmn/cmd_health.h
@@ -47,6 +47,7 @@ enum healthSubCmdType
 	HEALTH_MEMORYTEMPERATURE,
 	HEALTH_POWER,
 	HEALTH_MEMORY,
+	HEALTH_UNSUPPORTED0,
 	HEALTH_FREQUENCY,
 	TOTAL_HEALTH_SUBCMD
 };
@@ -57,7 +58,7 @@ class cmdHealth : public cmds
 {
 
 public:
-	cmdHealth() { STRCPY_S(name, MAX_PATH, "health"); };
+	cmdHealth() { name = "health"; };
 	~cmdHealth(){};
 	void help(HELP helpType = FULL_HELP);
 	ze_result_t getTemperatureHealth(devInfo *d, nlohmann::ordered_json *jsonObj, const std::string &jsonKey,
@@ -70,6 +71,7 @@ class cmdHealth : public cmds
 	ze_result_t gpuPower(devInfo *d, nlohmann::ordered_json *jsonObj = nullptr);
 	ze_result_t healthMemory(devInfo *d, nlohmann::ordered_json *jsonObj = nullptr);
 	std::string getHealthStatusString(xpumHealthStatus status);
+	ze_result_t unsupported(devInfo *d, nlohmann::ordered_json *jsonObj = nullptr);
 	ze_result_t frequency(devInfo *d, nlohmann::ordered_json *jsonObj = nullptr);
 
 	ze_result_t component(devInfo *d, nlohmann::ordered_json *jsonObj = nullptr);
@@ -86,10 +88,9 @@ using healthSubCmdFunc = ze_result_t (cmdHealth::*)(devInfo *d, nlohmann::ordere
 
 struct healthCmdStruct
 {
-	option opt;
-	healthSubCmdFunc func;
-	bool enabled;
-	std::string val;
+	healthSubCmdFunc func{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
 struct healthSubCmdStruct
diff --git a/ial/cmn/cmd_listgpu.h b/ial/cmn/cmd_listgpu.h
deleted file mode 100644
index 126646b19..000000000
--- a/ial/cmn/cmd_listgpu.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _CMD_LISTGPU_H
-#define _CMD_LISTGPU_H
-
-#include "cmds.h"
-#include "printer.h"
-#include <os.h>
-#include <string>
-
-/**
- * @brief Text printer for the listgpu command output
- */
-class ListgpuTextPrinter : public TextPrinter
-{
-public:
-	ListgpuTextPrinter();
-	void print(nlohmann::ordered_json *jsonObj) override;
-};
-
-enum listgpuCmdType
-{
-	LISTGPU_HELP,
-	LISTGPU_BDF,
-	LISTGPU_JSON,
-};
-
-struct listgpuCmdStruct
-{
-	option opt;
-	bool enabled;
-	std::string val;
-};
-
-/**
- * @brief Command that accepts a BDF address and returns PCI properties via
- *        GET_XE_DEV_PCI_PROPS.
- *
- * Usage:
- *   xpu-smi listgpu --bdf <BDF>  Query a single device by BDF address
- *   xpu-smi listgpu              List all xe-bound devices
- *   xpu-smi listgpu -j           JSON output
- */
-class cmdListgpu : public cmds
-{
-public:
-	cmdListgpu() { STRCPY_S(name, MAX_PATH, "listgpu"); }
-	~cmdListgpu() {}
-	void help(HELP helpType = FULL_HELP) override;
-	int run(arg_struct *args) override;
-};
-
-#endif // _CMD_LISTGPU_H
diff --git a/ial/cmn/cmd_listgpu.cpp b/ial/cmn/cmd_listpciinfo.cpp
similarity index 62%
rename from ial/cmn/cmd_listgpu.cpp
rename to ial/cmn/cmd_listpciinfo.cpp
index a7de8aa34..459636b94 100644
--- a/ial/cmn/cmd_listgpu.cpp
+++ b/ial/cmn/cmd_listpciinfo.cpp
@@ -4,32 +4,33 @@
  *
  */
 
-#include "cmd_listgpu.h"
+#include "cmd_listpciinfo.h"
 #include "debug.h"
 #include "table_builder.h"
+#include <CLI/CLI.hpp>
 #include <format>
 #include <memory>
 
-static std::unordered_map<listgpuCmdType, listgpuCmdStruct> listgpuCmds = {
-	{listgpuCmdType::LISTGPU_HELP, {{"help", no_argument, 0, 'h'}, false, ""}},
-	{listgpuCmdType::LISTGPU_BDF, {{"bdf", required_argument, 0, 'b'}, false, ""}},
-	{listgpuCmdType::LISTGPU_JSON, {{"json", no_argument, 0, 'j'}, false, ""}},
+static std::unordered_map<listpciinfoCmdType, listpciinfoCmdStruct> listpciinfoCmds = {
+	{listpciinfoCmdType::LISTPCIINFO_HELP, {}},
+	{listpciinfoCmdType::LISTPCIINFO_BDF, {}},
+	{listpciinfoCmdType::LISTPCIINFO_JSON, {}},
 };
 
 /**
- * @brief Prints help for the listgpu command
+ * @brief Prints help for the listpciinfo command
  */
-void cmdListgpu::help(HELP helpType)
+void cmdListpciinfo::help(HELP helpType)
 {
 	TRACING();
 	std::vector<helpCmd> helpList;
 
 	helpList.push_back(helpCmd(TITLE, "Query PCI properties for xe-bound GPU(s)"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s listgpu [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s listgpu", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s listgpu --bdf [BDF address]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s listgpu --bdf [BDF address] -j", progName.c_str()));
+	helpList.push_back(helpCmd(TITLE, "Usage: %s listpciinfo [Options]", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s listpciinfo", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s listpciinfo --bdf [BDF address]", progName.c_str()));
+	helpList.push_back(helpCmd(HEADING, "%s listpciinfo --bdf [BDF address] -j", progName.c_str()));
 	helpList.push_back(helpCmd(BLANK));
 	helpList.push_back(helpCmd(TITLE, "BDF:      PCI Bus:Device.Function address (e.g. 0000:03:00.0)"));
 	helpList.push_back(helpCmd(TITLE, "PCIe Gen: PCIe generation (1-6)"));
@@ -64,7 +65,7 @@ ListgpuTextPrinter::ListgpuTextPrinter() : TextPrinter() {}
 void ListgpuTextPrinter::print(nlohmann::ordered_json *jsonObj)
 {
 	if (jsonObj->contains("error")) {
-		PRINT("Error: %s\n", (*jsonObj)["error"].get<std::string>().c_str());
+		PRINT("Error: {}\n", (*jsonObj)["error"].get<std::string>().c_str());
 		return;
 	}
 
@@ -83,16 +84,19 @@ void ListgpuTextPrinter::print(nlohmann::ordered_json *jsonObj)
 		.addColumn(headers[4], static_cast<int>(headers[4].size()));
 
 	for (auto &item : (*jsonObj)["bdf_device_list"]) {
-		table.addRow(item["bdf"].get<std::string>(), item["pci_slot"].get<std::string>(),
-					 item["pcie_generation"].get<int>(), item["max_link_width"].get<int>(),
-					 std::format("{:.2f}", item["max_bandwidth_gbps"].get<double>()));
+		const std::string slot = item["pci_slot"].get<std::string>();
+		const int gen = item["pcie_generation"].get<int>();
+		const int width = item["max_link_width"].get<int>();
+		const double bw = item["max_bandwidth_gbps"].get<double>();
+		table.addRow(item["bdf"].get<std::string>(), slot.empty() ? "N/A" : slot, gen > 0 ? std::to_string(gen) : "N/A",
+					 width > 0 ? std::to_string(width) : "N/A", bw > 0.0 ? std::format("{:.2f}", bw) : "N/A");
 	}
 
-	PRINT("%s", table.toString().c_str());
+	PRINT("{}", table.toString());
 }
 
 /**
- * @brief Runs the listgpu command
+ * @brief Runs the listpciinfo command
  *
  * Parses arguments, calls GET_XE_DEV_PCI_PROPS to enumerate all xe-bound
  * devices from sysfs, optionally filters by the requested BDF address, and
@@ -101,48 +105,33 @@ void ListgpuTextPrinter::print(nlohmann::ordered_json *jsonObj)
  * @param [in] args Pointer to arg_struct containing argc/argv
  * @return 0 on success, non-zero on error
  */
-int cmdListgpu::run(arg_struct *args)
+int cmdListpciinfo::run(arg_struct *args)
 {
 	TRACING();
 
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
 	// Reset state so the command is re-entrant if the instance is reused
-	for (auto &[k, v] : listgpuCmds) {
+	for (auto &[k, v] : listpciinfoCmds) {
 		v.enabled = false;
 		v.val.clear();
 	}
 
-	processOptions(listgpuCmds, shortOpts, longOptsVec);
-	const struct option *longOptions = longOptsVec.data();
-
-	optind = 2;
-	int opt = 0;
-	int optionIndex = 0;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOptions, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return 0;
-		case 'b':
-			listgpuCmds[listgpuCmdType::LISTGPU_BDF].enabled = true;
-			listgpuCmds[listgpuCmdType::LISTGPU_BDF].val = optarg;
-			break;
-		case 'j':
-			listgpuCmds[listgpuCmdType::LISTGPU_JSON].enabled = true;
-			break;
-		default:
-			ERR("The following argument was not expected: '%s'.\n", args->argv[optind - 1]);
-			ERR("Run with --help for more information.\n");
-			return 1;
-		}
-	}
-
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '%s'.\n", args->argv[optind]);
+	CLI::App sub{"Query PCI properties for xe-bound GPU(s)", "listpciinfo"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_option("-b,--bdf", listpciinfoCmds[listpciinfoCmdType::LISTPCIINFO_BDF].val,
+				   "PCI BDF address to query (e.g. 0000:03:00.0)")
+		->each([&](const std::string &) { listpciinfoCmds[listpciinfoCmdType::LISTPCIINFO_BDF].enabled = true; });
+	sub.add_flag("-j,--json", listpciinfoCmds[listpciinfoCmdType::LISTPCIINFO_JSON].enabled,
+				 "Print result in JSON format");
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
-		return 1;
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
 	// Discover all xe-bound devices and collect their PCI properties
@@ -155,8 +144,8 @@ int cmdListgpu::run(arg_struct *args)
 	auto jsonObj = std::make_unique<nlohmann::ordered_json>();
 	nlohmann::ordered_json deviceArray = nlohmann::ordered_json::array();
 
-	const std::string &filterBdf = listgpuCmds[listgpuCmdType::LISTGPU_BDF].val;
-	bool filtered = listgpuCmds[listgpuCmdType::LISTGPU_BDF].enabled;
+	const std::string &filterBdf = listpciinfoCmds[listpciinfoCmdType::LISTPCIINFO_BDF].val;
+	bool filtered = listpciinfoCmds[listpciinfoCmdType::LISTPCIINFO_BDF].enabled;
 	bool found = false;
 
 	for (const auto &info : pciPropsList) {
@@ -180,7 +169,7 @@ int cmdListgpu::run(arg_struct *args)
 	}
 
 	std::unique_ptr<Printer> printer;
-	if (listgpuCmds[listgpuCmdType::LISTGPU_JSON].enabled) {
+	if (listpciinfoCmds[listpciinfoCmdType::LISTPCIINFO_JSON].enabled) {
 		printer = std::make_unique<JsonPrinter>();
 	} else {
 		printer = std::make_unique<ListgpuTextPrinter>();
diff --git a/ial/cmn/cmd_listpciinfo.h b/ial/cmn/cmd_listpciinfo.h
new file mode 100644
index 000000000..2d197d12f
--- /dev/null
+++ b/ial/cmn/cmd_listpciinfo.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#ifndef _CMD_LISTPCIINFO_H
+#define _CMD_LISTPCIINFO_H
+
+#include "cmds.h"
+#include "printer.h"
+#include <os.h>
+#include <string>
+
+/**
+ * @brief Text printer for the listpciinfo command output
+ */
+class ListgpuTextPrinter : public TextPrinter
+{
+public:
+	ListgpuTextPrinter();
+	void print(nlohmann::ordered_json *jsonObj) override;
+};
+
+enum listpciinfoCmdType
+{
+	LISTPCIINFO_HELP,
+	LISTPCIINFO_BDF,
+	LISTPCIINFO_JSON,
+};
+
+struct listpciinfoCmdStruct
+{
+	bool enabled{false};
+	std::string val{};
+};
+
+/**
+ * @brief Command that accepts a BDF address and returns PCI properties via
+ *        GET_XE_DEV_PCI_PROPS.
+ *
+ * Usage:
+ *   xpu-smi listpciinfo --bdf <BDF>  Query a single device by BDF address
+ *   xpu-smi listpciinfo              List all xe-bound devices
+ *   xpu-smi listpciinfo -j           JSON output
+ */
+class cmdListpciinfo : public cmds
+{
+public:
+	cmdListpciinfo() { name = "listpciinfo"; }
+	~cmdListpciinfo() {}
+	void help(HELP helpType = FULL_HELP) override;
+	int run(arg_struct *args) override;
+};
+
+#endif // _CMD_LISTPCIINFO_H
diff --git a/ial/cmn/cmd_log.cpp b/ial/cmn/cmd_log.cpp
index dd227dc3f..be019450b 100644
--- a/ial/cmn/cmd_log.cpp
+++ b/ial/cmn/cmd_log.cpp
@@ -7,6 +7,7 @@
 #include "cmd_log.h"
 #include "debug.h"
 #include <assert.h>
+#include <CLI/CLI.hpp>
 #include <filesystem>
 
 /**
@@ -42,44 +43,22 @@ void cmdLogs::help(HELP helpType)
 int cmdLogs::run(arg_struct *args)
 {
 	TRACING();
-	static struct option longOpts[] = {{"help", no_argument, 0, 'h'},
-									   {"json", no_argument, 0, 'j'},
-									   {"file", required_argument, 0, 'f'},
-									   {0, 0, 0, 0}};
-
-	int opt;
-	int optionIndex = 0;
 	std::string fileName;
 	bool jsonOutput = false;
 	ze_result_t result;
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
 
-	while ((opt = getopt_long(args->argc, args->argv, "hjf:", longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			jsonOutput = true;
-			break;
-		case 'f':
-			if (optarg)
-				fileName = optarg;
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
+	CLI::App sub{"Collect GPU debug logs", "log"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", jsonOutput, "Print result in JSON format");
+	sub.add_option("-f,--file", fileName, "The file to write all the debug logs into");
 
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
diff --git a/ial/cmn/cmd_log.h b/ial/cmn/cmd_log.h
index b9f661bef..31f15b8b9 100644
--- a/ial/cmn/cmd_log.h
+++ b/ial/cmn/cmd_log.h
@@ -14,7 +14,7 @@ class cmdLogs : public cmds
 {
 
 public:
-	cmdLogs() { STRCPY_S(name, MAX_PATH, "log"); };
+	cmdLogs() { name = "log"; };
 	~cmdLogs(){};
 	void help(HELP helpType = FULL_HELP);
 	int run(arg_struct *args);
diff --git a/ial/cmn/cmd_policy.cpp b/ial/cmn/cmd_policy.cpp
deleted file mode 100644
index 1c60bef16..000000000
--- a/ial/cmn/cmd_policy.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "cmd_policy.h"
-#include "debug.h"
-
-static std::unordered_map<policyCmdType, policyCmdStruct> policyCmds = {
-	{POLICY_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{POLICY_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{POLICY_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{POLICY_GROUP, {{"group", required_argument, 0, 'g'}, nullptr, false, ""}},
-	{POLICY_LIST, {{"list", no_argument, 0, 'l'}, &cmdPolicy::listPolicies, false, ""}},
-	{POLICY_LISTALLTYPES, {{"listalltypes", no_argument, 0, 0}, &cmdPolicy::listTypes, false, ""}},
-	{POLICY_CREATE, {{"create", no_argument, 0, 'c'}, &cmdPolicy::create, false, ""}},
-	{POLICY_REMOVE, {{"remove", no_argument, 0, 'r'}, &cmdPolicy::remove, false, ""}},
-	{POLICY_TYPE, {{"type", required_argument, 0, 0}, nullptr, false, ""}},
-	{POLICY_CONDITION, {{"condition", required_argument, 0, 0}, nullptr, false, ""}},
-	{POLICY_THRESHOLD, {{"threshold", required_argument, 0, 0}, nullptr, false, ""}},
-	{POLICY_ACTION, {{"action", required_argument, 0, 0}, nullptr, false, ""}},
-	{POLICY_THROTTLEFREQUENCYMIN, {{"throttlefrequencymin", required_argument, 0, 0}, nullptr, false, ""}},
-	{POLICY_THROTTLEFREQUENCYMAX, {{"throttlefrequencymax", required_argument, 0, 0}, nullptr, false, ""}},
-};
-
-void cmdPolicy::help(HELP helpType)
-{
-	TRACING();
-	std::vector<helpCmd> helpList;
-	helpList.push_back(helpCmd(TITLE, "Get and set the GPU policies."));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s policy [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -l", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy --listalltypes", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -d [deviceId] -l", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -d [deviceId] -l -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -g [groupId] -l", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -g [groupId] -l -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING,
-							   "%s policy -c -d [deviceId] --type 1 --condition 1"
-							   " --threshold [threshold]  --action 1 --throttlefrequencymin [frequencyMinValue]"
-							   " --throttlefrequencymax [frequencyMaxValue]",
-							   progName.c_str()));
-	helpList.push_back(helpCmd(HEADING,
-							   "%s policy -c -g [groupId] --type 1 --condition 1 --threshold [threshold]"
-							   "  --action 1 --throttlefrequencymin [frequencyMinValue]"
-							   " --throttlefrequencymax [frequencyMaxValue]",
-							   progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -r -d [deviceId] --type [policyTypeValue]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s policy -r -g [groupId] --type [policyTypeValue]", progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address"));
-	helpList.push_back(helpCmd(HEADING, "-g,--group                  The group ID."));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-l,--list                   List all policies."));
-	helpList.push_back(helpCmd(
-		HEADING, "--listalltypes              List all policy types, including the supported condition and action."));
-	helpList.push_back(helpCmd(HEADING, "-c,--create                 Create one policy."));
-	helpList.push_back(helpCmd(HEADING, "-r,--remove                 Remove one policy. Only the policy is removed and "
-										"the changed GPU settings will not be resumed."));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "--type                      Policy types."));
-	helpList.push_back(helpCmd(SUB_HEADING2, "1. GPU Core Temperature"));
-	helpList.push_back(helpCmd(HEADING, "--condition                 Conditions."));
-	helpList.push_back(helpCmd(SUB_HEADING2, "1. More than"));
-	helpList.push_back(helpCmd(HEADING, "--threshold                 Threshold"));
-	helpList.push_back(helpCmd(HEADING, "--action                    Policy action."));
-	helpList.push_back(helpCmd(SUB_HEADING2, "1. Throttle GPU"));
-	helpList.push_back(helpCmd(HEADING, "--throttlefrequencymin      Throttle GPU frequency to min value"));
-	helpList.push_back(helpCmd(HEADING, "--throttlefrequencymax      Throttle GPU frequency to max value"));
-
-	printHelp(helpList, helpType);
-	helpList.clear();
-}
-
-/**
- * @brief Creates a new GPU policy
- *
- * This function implements the logic to create a new policy for GPU management.
- * Currently implemented as a placeholder for future policy creation functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful policy creation
- */
-ze_result_t cmdPolicy::create(UNUSED devInfo *d)
-{
-	TRACING();
-	ze_result_t result = ZE_RESULT_SUCCESS;
-
-	return result;
-}
-
-/**
- * @brief Lists all existing GPU policies
- *
- * This function retrieves and displays all configured GPU policies.
- * Currently implemented as a placeholder for future policy listing functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful policy retrieval
- */
-ze_result_t cmdPolicy::listPolicies(UNUSED devInfo *d)
-{
-	TRACING();
-	ze_result_t result = ZE_RESULT_SUCCESS;
-
-	return result;
-}
-
-/**
- * @brief Lists all available GPU policy types
- *
- * This function retrieves and displays all available policy types that can be
- * configured for GPU management. Currently implemented as a placeholder.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful policy type retrieval
- */
-ze_result_t cmdPolicy::listTypes(UNUSED devInfo *d)
-{
-	TRACING();
-	ze_result_t result = ZE_RESULT_SUCCESS;
-
-	return result;
-}
-
-/**
- * @brief Removes an existing GPU policy
- *
- * This function implements the logic to remove an existing GPU policy.
- * Currently implemented as a placeholder for future policy removal functionality.
- *
- * @param d Pointer to device information structure (currently unused)
- * @return ze_result_t ZE_RESULT_SUCCESS on successful policy removal
- */
-ze_result_t cmdPolicy::remove(UNUSED devInfo *d)
-{
-	TRACING();
-	ze_result_t result = ZE_RESULT_SUCCESS;
-
-	return result;
-}
-
-/**
- * @brief Runs the policy command with specified arguments
- *
- * This function parses command line arguments and executes the appropriate policy operation
- * (create, list policies, list types, or remove) on the specified GPU devices.
- *
- * @param args Pointer to argument structure containing command line arguments and system manager
- * @return int Returns 0 on success, non-zero on failure
- */
-int cmdPolicy::run(arg_struct *args)
-{
-	TRACING();
-	std::vector<devInfo> deviceList;
-	ze_result_t result;
-	bool found = false;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(policyCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			policyCmds[POLICY_JSON].enabled = true;
-			break;
-		case 'd':
-			policyCmds[POLICY_DEVICE].enabled = true;
-			policyCmds[POLICY_DEVICE].val = optarg;
-			break;
-		case 'g':
-			policyCmds[POLICY_GROUP].enabled = true;
-			policyCmds[POLICY_GROUP].val = optarg;
-			break;
-		case 'l':
-			policyCmds[POLICY_LIST].enabled = true;
-			break;
-		case 'c':
-			policyCmds[POLICY_CREATE].enabled = true;
-			break;
-		case 'r':
-			policyCmds[POLICY_REMOVE].enabled = true;
-			break;
-		case 0:
-			for (auto &cmd : policyCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
-
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	result = args->sm.findDevice(policyCmds[POLICY_DEVICE].val.c_str(), &deviceList);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Error: Device handle not found for device ID '{}'.\n", policyCmds[POLICY_DEVICE].val.c_str());
-		return result;
-	}
-
-	// Iterate through the device list and execute the command
-	for (auto &device : deviceList) {
-		// Call the appropriate command function based on the command type
-		for (const auto &cmd : policyCmds) {
-			if (cmd.second.enabled && cmd.second.func != nullptr) {
-				DBG("Running command: {}\n", cmd.second.opt.name);
-				result = (this->*cmd.second.func)(&device);
-				break;
-			}
-		}
-	}
-	return result;
-}
diff --git a/ial/cmn/cmd_policy.h b/ial/cmn/cmd_policy.h
deleted file mode 100644
index d0b6d509f..000000000
--- a/ial/cmn/cmd_policy.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _CMD_POLICY_H
-#define _CMD_POLICY_H
-
-#include "cmds.h"
-#include <os.h>
-
-enum policyCmdType
-{
-	POLICY_HELP,
-	POLICY_JSON,
-	POLICY_DEVICE,
-	POLICY_GROUP,
-	POLICY_LIST,
-	POLICY_LISTALLTYPES,
-	POLICY_CREATE,
-	POLICY_REMOVE,
-	POLICY_TYPE,
-	POLICY_CONDITION,
-	POLICY_THRESHOLD,
-	POLICY_ACTION,
-	POLICY_THROTTLEFREQUENCYMIN,
-	POLICY_THROTTLEFREQUENCYMAX,
-	TOTAL_POLICY,
-};
-
-struct policyCmdStruct;
-
-class cmdPolicy : public cmds
-{
-public:
-	cmdPolicy() { STRCPY_S(name, MAX_PATH, "policy"); };
-	~cmdPolicy(){};
-	void help(HELP helpType = FULL_HELP);
-	ze_result_t create(devInfo *d);
-	ze_result_t listPolicies(devInfo *d);
-	ze_result_t listTypes(devInfo *d);
-	ze_result_t remove(devInfo *d);
-	int run(arg_struct *args);
-};
-
-using policySubCmdFunc = ze_result_t (cmdPolicy::*)(devInfo *d);
-
-struct policyCmdStruct
-{
-	option opt;
-	policySubCmdFunc func;
-	bool enabled;
-	std::string val;
-};
-
-#endif
\ No newline at end of file
diff --git a/ial/cmn/cmd_ps.cpp b/ial/cmn/cmd_ps.cpp
index 2923fa3c6..351ab5546 100644
--- a/ial/cmn/cmd_ps.cpp
+++ b/ial/cmn/cmd_ps.cpp
@@ -6,14 +6,15 @@
 
 #include "cmd_ps.h"
 #include "debug.h"
+#include <CLI/CLI.hpp>
 #include "table_builder.h"
 #include <assert.h>
 #include <sysprocess.h>
 
 static std::unordered_map<psCmdType, psCmdStruct> psCmds = {
-	{psCmdType::PS_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{psCmdType::PS_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{psCmdType::PS_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
+	{psCmdType::PS_HELP, {}},
+	{psCmdType::PS_JSON, {}},
+	{psCmdType::PS_DEVICE, {}},
 };
 
 /**
@@ -45,7 +46,7 @@ void cmdPs::help(HELP helpType)
 	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address"));
+	helpList.push_back(helpCmd(HEADING, "--device,--id               The device ID or PCI BDF address"));
 
 	printHelp(helpList, helpType);
 	helpList.clear();
@@ -162,45 +163,28 @@ int cmdPs::run(arg_struct *args)
 	TRACING();
 	ze_result_t result;
 	std::vector<devInfo> deviceList;
-	int opt;
-	int optionIndex = 0;
-	std::string deviceId;
 	std::unique_ptr<Printer> printer;
 	std::vector<zes_process_state_t> processList;
 
-	static struct option longOptions[] = {{"help", no_argument, 0, 'h'},
-										  {"json", no_argument, 0, 'j'},
-										  {"device", required_argument, 0, 'd'},
-										  {0, 0, 0, 0}};
-
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, "hjd:", longOptions, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			psCmds[psCmdType::PS_JSON].enabled = true;
-			break;
-		case 'd':
-			psCmds[psCmdType::PS_DEVICE].enabled = true;
-			psCmds[psCmdType::PS_DEVICE].val = optarg;
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
+	// Reset state
+	for (auto &[k, v] : psCmds) {
+		v.enabled = false;
+		v.val.clear();
 	}
 
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	CLI::App sub{"List running GPU processes", "ps"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", psCmds[psCmdType::PS_JSON].enabled, "Print result in JSON format");
+	sub.add_option("-d,--device,--id", psCmds[psCmdType::PS_DEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { psCmds[psCmdType::PS_DEVICE].enabled = true; });
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
diff --git a/ial/cmn/cmd_ps.h b/ial/cmn/cmd_ps.h
index 0a7a67285..8f19d8d95 100644
--- a/ial/cmn/cmd_ps.h
+++ b/ial/cmn/cmd_ps.h
@@ -32,7 +32,7 @@ class cmdPs : public cmds
 {
 
 public:
-	cmdPs() { STRCPY_S(name, MAX_PATH, "ps"); };
+	cmdPs() { name = "ps"; };
 	~cmdPs(){};
 	void help(HELP helpType = FULL_HELP);
 	int run(arg_struct *args);
@@ -43,10 +43,9 @@ using psSubCmdFunc = ze_result_t (cmdPs::*)(devInfo *d, nlohmann::ordered_json *
 
 struct psCmdStruct
 {
-	option opt;
-	psSubCmdFunc func;
-	bool enabled;
-	std::string val;
+	psSubCmdFunc func{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
 struct psSubCmdStruct
diff --git a/ial/cmn/cmd_smi.cpp b/ial/cmn/cmd_smi.cpp
index 3ad2567fc..6208d14d0 100644
--- a/ial/cmn/cmd_smi.cpp
+++ b/ial/cmn/cmd_smi.cpp
@@ -349,8 +349,7 @@ TableBuilder cmdSmi::buildGpuTable(const std::vector<SmiDeviceStats> &devStats,
 	constexpr int fanDisplayWidth = static_cast<int>(sizeof("100% (20000RPM)") - 1);
 	constexpr int tempDisplayWidth = 4;
 
-	TableBuilder table;
-	table.enableAutoSizing();
+	TableBuilder table = TableBuilder::bordered();
 	// Header text spacing mirrors the data format strings:
 	//   col1 line1: "{:>3}  {:<22}  Off" → "Persistence-M" must start at offset 3+2+22+2=29
 	//   col2 line1: "{:<16}  Off"         → "Disp.A"         must start at offset 16+2=18
@@ -374,11 +373,14 @@ TableBuilder cmdSmi::buildGpuTable(const std::vector<SmiDeviceStats> &devStats,
 	table.addPreHeaderSpanRow(banner);
 
 	for (const auto &s : devStats) {
-		// Truncate name to fit W1 column (leave room for "  0  " prefix and "  Off" suffix)
-		std::string name = s.name.size() > 22 ? s.name.substr(0, 22) : s.name;
+		// Build col-0 lines: name wraps in 22-char chunks rather than truncating.
+		constexpr size_t kNameWidth = 22;
+		std::vector<std::string> col0Lines;
+		col0Lines.push_back(std::format("{:>3}  {:<{}}  Off", s.devIndex, s.name.substr(0, kNameWidth), kNameWidth));
+		for (size_t off = kNameWidth; off < s.name.size(); off += kNameWidth) {
+			col0Lines.push_back(std::format("     {}", s.name.substr(off, kNameWidth)));
+		}
 
-		// Row 1: identity info per column
-		std::string gpuNameLine = std::format("{:>3}  {:<22}  Off", s.devIndex, name);
 		std::string bdfLine = std::format("{:<16}  Off", s.pciBdf);
 		std::string eccLine = s.eccEnabled ? "Enabled" : "Disabled";
 
@@ -388,17 +390,28 @@ TableBuilder cmdSmi::buildGpuTable(const std::vector<SmiDeviceStats> &devStats,
 		std::string pwrStr = fmtPower(s.powerValid ? s.powerCurrentW : 0.0, s.powerTdpW);
 		std::string fanTempPwrLine =
 			std::format("{:<{}}  {:>{}}  {}", fanStr, fanDisplayWidth, tempStr, tempDisplayWidth, pwrStr);
+		col0Lines.push_back(fanTempPwrLine);
+
+		// Align memory/util on the same line as fan/temp/pwr by padding cols 1 & 2
+		// with empty strings for each name-overflow line.
+		const size_t numWraps = col0Lines.size() - 2;
 		std::string memLine = s.memValid ? fmtMem(s.memUsedMiB, s.memTotalMiB) : "N/A";
 		// Left-pad util% to 10 chars so "Default" aligns under "Compute M." in the header
 		// Header extra: "GPU-Util  Compute M." → "Compute M." starts at col 10
 		// Data:          "{:<10}Default"        → "Default"    starts at col 10
 		std::string utilStr = s.utilValid ? std::format("{:.0f}%", s.gpuUtilPercent) : "N/A";
 		std::string utilComputeLine = std::format("{:<10}{}", utilStr, "Default");
+		std::vector<std::string> col1Lines = {bdfLine};
+		col1Lines.insert(col1Lines.end(), numWraps, "");
+		col1Lines.push_back(memLine);
+		std::vector<std::string> col2Lines = {eccLine};
+		col2Lines.insert(col2Lines.end(), numWraps, "");
+		col2Lines.push_back(utilComputeLine);
 
 		table.addMultiLineRow({
-			{gpuNameLine, fanTempPwrLine},
-			{bdfLine, memLine},
-			{eccLine, utilComputeLine},
+			col0Lines,
+			col1Lines,
+			col2Lines,
 		});
 
 		if (&s != &devStats.back()) {
@@ -414,8 +427,7 @@ TableBuilder cmdSmi::buildGpuTable(const std::vector<SmiDeviceStats> &devStats,
  */
 TableBuilder cmdSmi::buildProcessTable(const std::vector<devInfo> &deviceList)
 {
-	TableBuilder procTable;
-	procTable.enableAutoSizing();
+	TableBuilder procTable = TableBuilder::bordered();
 	procTable.addColumn("GPU", Align::Right)
 		.addColumn("PID", Align::Right)
 		.addColumn("Type", Align::Center)
diff --git a/ial/cmn/cmd_smi.h b/ial/cmn/cmd_smi.h
index b849f9eca..64e2186cb 100644
--- a/ial/cmn/cmd_smi.h
+++ b/ial/cmn/cmd_smi.h
@@ -73,7 +73,7 @@ struct SmiDeviceStats
 class cmdSmi : public cmds
 {
 public:
-	cmdSmi() { STRCPY_S(name, MAX_PATH, "smi"); }
+	cmdSmi() { name = "smi"; }
 	~cmdSmi() {}
 	void help(HELP helpType = FULL_HELP);
 	int run(arg_struct *args);
diff --git a/ial/cmn/cmd_stats.cpp b/ial/cmn/cmd_stats.cpp
index 56495483e..803972abd 100644
--- a/ial/cmn/cmd_stats.cpp
+++ b/ial/cmn/cmd_stats.cpp
@@ -6,6 +6,7 @@
 
 #include "cmd_stats.h"
 #include "debug.h"
+#include <CLI/CLI.hpp>
 #include "memory.h"
 #include "fan.h"
 #include "metric.h"
@@ -1427,11 +1428,10 @@ void StatsTextPrinter::printDeviceTable(const nlohmann::ordered_json &deviceJson
 	}
 
 	table.addRow("Device ID", std::to_string(deviceIndex));
-	table.addSeparator();
+
 	table.addRow("PCI BDF", pciBdf);
 	table.addRow("Device Type", deviceType);
 
-	table.addSeparator();
 	table.addRow("Start Time", startTime);
 	table.addRow("End Time", endTime);
 	table.addRow("Elapsed Time (seconds)", std::format("{:.2f}", elapsedSeconds));
@@ -1456,72 +1456,56 @@ void StatsTextPrinter::printDeviceTable(const nlohmann::ordered_json &deviceJson
 	}
 
 	if (deviceJson.contains("ras_errors")) {
-		table.addSeparator();
+
 		addRasCounterRows(table, deviceJson);
 	}
 
-	table.addSeparator();
-
 	addPerTileMetricRows(table, deviceJson, "GPU Power (W)", {"power", "gpu_power_w"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Frequency (MHz)", {"frequency", "gpu_frequency_mhz"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "Media Frequency (MHz)", {"frequency", "media_frequency_mhz"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Core Temperature", {"temperature", "gpu_core_celsius"}, 0);
 	table.addRow("(Degrees Celsius)", "");
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Memory Temperature", {"temperature", "memory_celsius"}, 0);
 	table.addRow("(Degrees Celsius)", "");
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU VR Temperature", {"temperature", "vr_celsius"}, 0);
 	table.addRow("(Degrees Celsius)", "");
-	table.addSeparator();
 
 	addPerFanMetricRows(table, deviceJson, "Fan Speed (%)", {"fan", "speed_percent"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Memory Read (kB/s)", {"memory", "read_kbps"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Memory Write (kB/s)", {"memory", "write_kbps"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Memory Bandwidth (%)", {"memory", "bandwidth_percent"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Memory Used (MiB)", {"memory", "used_mib"}, 0);
-	table.addSeparator();
 
 	addPerTileMetricRows(table, deviceJson, "GPU Memory Util (%)", {"memory", "util_percent"}, 0);
-	table.addSeparator();
 
 	if (deviceJson.contains("offline_page_count")) {
 		uint32_t offlineCount = deviceJson["offline_page_count"].get<uint32_t>();
 		table.addRow("Offline Memory Pages", std::to_string(offlineCount));
-		table.addSeparator();
 	}
 
 	addMetricRow(table, deviceJson, "PCIe Read (kB/s)", {"pcie", "read_kbps"});
-	table.addSeparator();
+
 	addMetricRow(table, deviceJson, "PCIe Write (kB/s)", {"pcie", "write_kbps"});
-	table.addSeparator();
 
 	addEngineInstanceRows(table, deviceJson, "Compute Engine Util (%)", {"utilization", "compute_engines"});
-	table.addSeparator();
+
 	addEngineInstanceRows(table, deviceJson, "Render Engine Util (%)", {"utilization", "render_engines"});
-	table.addSeparator();
+
 	addEngineInstanceRows(table, deviceJson, "Decoder Engine Util (%)", {"utilization", "decoder_engines"});
-	table.addSeparator();
+
 	addEngineInstanceRows(table, deviceJson, "Encoder Engine Util (%)", {"utilization", "encoder_engines"});
-	table.addSeparator();
+
 	addEngineInstanceRows(table, deviceJson, "Copy Engine Util (%)", {"utilization", "copy_engines"});
-	table.addSeparator();
+
 	addEngineInstanceRows(table, deviceJson, "Media EM Engine Util (%)", {"utilization", "media_em_engines"});
 
 	PRINT("{}", table.toString().c_str());
@@ -1903,14 +1887,14 @@ void StatsTextPrinter::addRasCounterRows(TableBuilder &table, const nlohmann::or
 }
 
 static std::unordered_map<statsCmdType, statsCmdStruct> statsCmds = {
-	{statsCmdType::STATS_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{statsCmdType::STATS_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{statsCmdType::STATS_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{statsCmdType::STATS_EU, {{"eu", no_argument, 0, 'e'}, &cmdStats::eu, false, ""}},
-	{statsCmdType::STATS_RAS, {{"ras", no_argument, 0, 'r'}, &cmdStats::ras, false, ""}},
-	{statsCmdType::STATS_SAMPLES, {{"samples", required_argument, 0, 0}, nullptr, false, ""}},
-	{statsCmdType::STATS_INTERVAL, {{"interval", required_argument, 0, 0}, nullptr, false, ""}},
-	{statsCmdType::STATS_LIST_OFFLINE_PAGES, {{"list-offline-pages", no_argument, 0, 0}, nullptr, false, ""}},
+	{statsCmdType::STATS_HELP, {}},
+	{statsCmdType::STATS_JSON, {}},
+	{statsCmdType::STATS_DEVICE, {}},
+	{statsCmdType::STATS_EU, {.func = &cmdStats::eu}},
+	{statsCmdType::STATS_RAS, {.func = &cmdStats::ras}},
+	{statsCmdType::STATS_SAMPLES, {}},
+	{statsCmdType::STATS_INTERVAL, {}},
+	{statsCmdType::STATS_LIST_OFFLINE_PAGES, {}},
 };
 
 /**
@@ -1944,13 +1928,14 @@ void cmdStats::help(HELP helpType)
 	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address to query"));
+	helpList.push_back(helpCmd(HEADING, "--device,--id               The device ID or PCI BDF address to query"));
 	helpList.push_back(helpCmd(HEADING, "-e,--eu                     Show EU metrics"));
 	helpList.push_back(helpCmd(HEADING, "-r,--ras                    Show RAS error metrics"));
 	helpList.push_back(
 		helpCmd(HEADING, "--list-offline-pages        List offline memory pages (exclusive, no other stats)"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "--samples                   Number of samples to collect (default: 2)"));
+	helpList.push_back(
+		helpCmd(HEADING, "--samples                   Number of samples to collect (minimum 1, default: 2)"));
 	helpList.push_back(
 		helpCmd(HEADING, "--interval                  Sampling interval in milliseconds (default: 100)"));
 
@@ -2103,66 +2088,34 @@ int cmdStats::run(arg_struct *args)
 	TRACING();
 	std::vector<devInfo> deviceList;
 	ze_result_t result;
-	bool found = false;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(statsCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			statsCmds[STATS_JSON].enabled = true;
-			break;
-		case 'd':
-			statsCmds[STATS_DEVICE].enabled = true;
-			statsCmds[STATS_DEVICE].val = optarg;
-			break;
-		case 'e':
-			statsCmds[STATS_EU].enabled = true;
-			break;
-		case 'r':
-			statsCmds[STATS_RAS].enabled = true;
-			break;
-		case 0:
-			for (auto &cmd : statsCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
 
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	// Reset state
+	for (auto &[k, v] : statsCmds) {
+		v.enabled = false;
+		v.val.clear();
+	}
+
+	CLI::App sub{"Show GPU statistics", "stats"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", statsCmds[STATS_JSON].enabled, "Print result in JSON format");
+	sub.add_option("-d,--device,--id", statsCmds[STATS_DEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { statsCmds[STATS_DEVICE].enabled = true; });
+	sub.add_flag("-e,--eu", statsCmds[STATS_EU].enabled, "Show EU statistics");
+	sub.add_flag("-r,--ras", statsCmds[STATS_RAS].enabled, "Show RAS error statistics");
+	sub.add_option("--samples", statsCmds[STATS_SAMPLES].val, "Number of samples to collect (minimum 1, default: 2)")
+		->each([&](const std::string &) { statsCmds[STATS_SAMPLES].enabled = true; });
+	sub.add_option("--interval", statsCmds[STATS_INTERVAL].val, "Sampling interval in milliseconds")
+		->each([&](const std::string &) { statsCmds[STATS_INTERVAL].enabled = true; });
+	sub.add_flag("--list-offline-pages", statsCmds[STATS_LIST_OFFLINE_PAGES].enabled,
+				 "List offline memory pages (exclusive; cannot be combined with other stats options)");
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
@@ -2197,8 +2150,14 @@ int cmdStats::run(arg_struct *args)
 	if (statsCmds[STATS_SAMPLES].enabled && !statsCmds[STATS_SAMPLES].val.empty()) {
 		try {
 			size_t parsed = static_cast<size_t>(std::stoull(statsCmds[STATS_SAMPLES].val));
-			if (parsed < 2) {
-				ERR("Sample count must be at least 2.\n");
+			// --samples is the number of user-requested readings; the documented
+			// minimum is 1. Delta-based metrics need two raw readings to form one
+			// utilization/bandwidth value, but that is an internal detail handled
+			// by clamping to >=2 in collectDeviceStats() (see actualSampleCount).
+			// Rejecting --samples 1 here would break the single-shot stats
+			// workflow that the api_stats_* validation tests rely on.
+			if (parsed < 1) {
+				ERR("Sample count must be at least 1.\n");
 				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 			}
 			sampleCount = parsed;
diff --git a/ial/cmn/cmd_stats.h b/ial/cmn/cmd_stats.h
index 3989d68a0..ab1619eec 100644
--- a/ial/cmn/cmd_stats.h
+++ b/ial/cmn/cmd_stats.h
@@ -271,7 +271,7 @@ class cmdStats : public cmds
 {
 
 public:
-	cmdStats() { STRCPY_S(name, MAX_PATH, "stats"); }
+	cmdStats() { name = "stats"; }
 	~cmdStats() {}
 	void help(HELP helpType = FULL_HELP);
 	ze_result_t eu(devInfo *d);
@@ -327,10 +327,9 @@ using statsSubCmdFunc = ze_result_t (cmdStats::*)(devInfo *d);
 
 struct statsCmdStruct
 {
-	option opt;
-	statsSubCmdFunc func;
-	bool enabled;
-	std::string val;
+	statsSubCmdFunc func{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ial/cmn/cmd_topdown.cpp b/ial/cmn/cmd_topdown.cpp
deleted file mode 100644
index bad8a8001..000000000
--- a/ial/cmn/cmd_topdown.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "cmd_topdown.h"
-#include "debug.h"
-
-/**
- * @brief Displays help information for the topdown command
- *
- * This function provides comprehensive help information for the topdown command,
- * including usage examples, detailed descriptions of GPU performance metrics,
- * and available command-line options. The topdown analysis provides hierarchical
- * performance bottleneck analysis for Intel GPU execution units and compute engines.
- *
- * @param helpType Type of help to display (FULL_HELP or SHORT_HELP)
- */
-void cmdTopdown::help(HELP helpType)
-{
-	TRACING();
-	std::vector<helpCmd> helpList;
-
-	helpList.push_back(helpCmd(TITLE, "Show topdown information"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s topdown [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topdown -d [deviceId]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topdown -d [deviceId] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topdown -d [deviceId] -t [tileId]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topdown -d [deviceId] -t [tileId] -j", progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "EU in Use:               Contribution to throughput (observed) when EUs are in "
-									  "use with EU threads placed (higher is better)"));
-	helpList.push_back(helpCmd(TITLE, "EU Active:               Contribution to throughput (observed) when EUs are "
-									  "processing instructions from some EU threads (higher is better)"));
-	helpList.push_back(helpCmd(TITLE, "ALU Active:              Contribution to throughput (estimated) with ALU "
-									  "instructions being processed (higher is better)"));
-	helpList.push_back(helpCmd(TITLE, "FPU Active:              Contribution to throughput (estimated) with "
-									  "floating-point or int64 instructions being processed (higher is better)"));
-	helpList.push_back(helpCmd(TITLE, "Em Int Only:             Contribution to throughput (estimated) with extended "
-									  "math or integer instructions being processed (higher is better)"));
-	helpList.push_back(
-		helpCmd(TITLE, "Xmx Active:              Contribution to throughput (estimated) with Xe Matrix Extension "
-					   "(i.e., systolic array) instructions being processed (higher is better)"));
-	helpList.push_back(helpCmd(TITLE, "FPU Idle:                Loss of throughput (estimated) without floating-point "
-									  "or int64 instructions being processed (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "Em Int Idle:             Loss of throughput (estimated) without extended math "
-									  "or integer instructions being processed (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "Xmx Idle:                Loss of throughput (estimated) without Xe Matrix "
-									  "Extension (systolic array) instructions being processed (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "Other Instructions:      Loss of throughput (estimated) without ALU "
-									  "instructions being processed (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "EU Stall:                Loss of throughput (observed) when EUs are not "
-									  "actively processing instructions from any EU threads (lower is better)"));
-	helpList.push_back(helpCmd(
-		TITLE, "Low Occupancy:           Loss of throughput (estimated) when there are not enough EU threads on EUs to "
-			   "hide stalls from long-latency instructions, degrading EU active percentage (lower is better)"));
-	helpList.push_back(
-		helpCmd(TITLE, "ALU Dep.:                Loss of throughput (estimated) when some EU threads stall due to the "
-					   "dependency from ALU operations, degrading EU active percentage (lower is better)"));
-	helpList.push_back(
-		helpCmd(TITLE, "Barrier:                 Loss of throughput (estimated) when some EU threads stall due to "
-					   "synchronization barriers, degrading EU active percentage (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "Dependency/SFU/SBID:     Loss of throughput (estimated) when some EU threads "
-									  "stall due to different internal dependencies (e.g., memory, shared function "
-									  "unit, sampler, etc.), degrading EU active percentage (lower is better)"));
-	helpList.push_back(helpCmd(
-		TITLE, "Other(EoT):              Loss of throughput (estimated) when some EU threads stall due to other "
-			   "reasons such as conditional flags or End-of-Thread signals degrading EU percentage (lower is better)"));
-	helpList.push_back(
-		helpCmd(TITLE, "Instruction Fetch:       Loss of throughput (estimated) when some EU threads stall due to the "
-					   "fetch of instructions, degrading EU percentage (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "EU Not In Use:           Loss of throughput (observed) due to the case that EUs "
-									  "are not used at all without EU threads placed (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "Workload Parallelism:    Loss of throughput (estimated) due to the lack of "
-									  "concurrency of a workload at a time, degrading the EU usage (lower is better)"));
-	helpList.push_back(helpCmd(TITLE, "Engine Inefficiency:     Loss of throughput (estimated) due to the inefficiency "
-									  "use of computer/render engines, degrading the EU usage (lower is better)"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address"));
-	helpList.push_back(helpCmd(HEADING, "-t,--tile                   The device tile ID to query. If the device has "
-										"only one tile, this parameter should not be specified."));
-	helpList.push_back(helpCmd(HEADING, "-s,--samplingInterval       Set the time interval (in milliseconds) by which "
-										"XPU Manager daemon monitors gpu component utilization statistics."));
-
-	printHelp(helpList, helpType);
-	helpList.clear();
-}
-
-/**
- * @brief Executes the topdown command with parsed command-line arguments
- *
- * This function implements the main execution logic for the topdown performance
- * analysis command. It parses command-line arguments to configure device selection,
- * tile targeting, sampling intervals, and output formatting. The function performs
- * hierarchical GPU performance analysis to identify bottlenecks in execution units,
- * compute engines, and workload parallelism for Intel graphics devices.
- *
- * @param args Pointer to argument structure containing argc, argv, and system manager
- * @return int ZE_RESULT_SUCCESS on successful execution, error code on failure
- */
-int cmdTopdown::run(arg_struct *args)
-{
-	TRACING();
-	static struct option longOptions[] = {{"help", no_argument, 0, 'h'},
-										  {"json", no_argument, 0, 'j'},
-										  {"device", required_argument, 0, 'd'},
-										  {"tile", required_argument, 0, 't'},
-										  {"samplingInterval", required_argument, 0, 's'},
-										  {0, 0, 0, 0}};
-
-	ze_result_t result;
-	std::vector<devInfo> deviceList;
-	int opt;
-	int optionIndex = 0;
-	std::string deviceId;
-	std::string tileId;
-	std::string samplingInterval;
-	bool jsonOutput = false;
-
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, "hjd:t:s:", longOptions, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			jsonOutput = true;
-			break;
-		case 'd':
-			deviceId = optarg;
-			break;
-		case 't':
-			tileId = optarg;
-			break;
-		case 's':
-			samplingInterval = optarg;
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
-		ERR("Run with --help for more information.\n");
-		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-	}
-
-	result = args->sm.findDevice(deviceId.c_str(), &deviceList);
-	if (result != ZE_RESULT_SUCCESS) {
-		ERR("Error: Device handle not found for device ID '{}'.\n", deviceId.c_str());
-		return result;
-	}
-
-	UNUSED_VAR(jsonOutput);
-
-	return ZE_RESULT_SUCCESS;
-}
diff --git a/ial/cmn/cmd_topdown.h b/ial/cmn/cmd_topdown.h
deleted file mode 100644
index 86b4f42bc..000000000
--- a/ial/cmn/cmd_topdown.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#ifndef _CMD_TOPDOWN_H
-#define _CMD_TOPDOWN_H
-
-#include "cmds.h"
-#include <os.h>
-
-class cmdTopdown : public cmds
-{
-public:
-	cmdTopdown() { STRCPY_S(name, MAX_PATH, "topdown"); };
-	~cmdTopdown(){};
-	void help(HELP helpType = FULL_HELP);
-	int run(arg_struct *args);
-};
-
-#endif
\ No newline at end of file
diff --git a/ial/cmn/cmd_topology.cpp b/ial/cmn/cmd_topology.cpp
index 0e31a8522..b6a37cf41 100644
--- a/ial/cmn/cmd_topology.cpp
+++ b/ial/cmn/cmd_topology.cpp
@@ -6,15 +6,23 @@
 
 #include "cmd_topology.h"
 #include "debug.h"
+#include <CLI/CLI.hpp>
 #include "printer.h"
 #include "table_builder.h"
-#include <assert.h>
+#include "ze_api.h"
+#include <cassert>
+#include <cstdint>
+#include <cstddef>
 #include <format>
 #include <algorithm>
+#include <memory>
+#include <map>
 #include <ranges>
-#include <concepts>
 #include <optional>
-#include <os.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <variant>
 
 namespace {
 constexpr int MATRIX_TILE_COL_WIDTH = 9;
@@ -70,7 +78,7 @@ struct CpuInfo
  * @brief Constructor for TopologyTextPrinter
  * @ingroup topology_printers
  */
-TopologyTextPrinter::TopologyTextPrinter() : TextPrinter() {}
+TopologyTextPrinter::TopologyTextPrinter() = default;
 
 /**
  * @brief Custom text printer for topology command output (legacy JSON support)
@@ -212,11 +220,9 @@ void TopologyTextPrinter::print(const TopologyInfo &info)
 }
 
 static std::unordered_map<topologyCmdType, TopologyCmdStruct> topologyCmds = {
-	{topologyCmdType::TOPOLOGY_HELP, {{"help", no_argument, 0, 'h'}, false, ""}},
-	{topologyCmdType::TOPOLOGY_JSON, {{"json", no_argument, 0, 'j'}, false, ""}},
-	{topologyCmdType::TOPOLOGY_DEVICE, {{"device", required_argument, 0, 'd'}, false, ""}},
-	{topologyCmdType::TOPOLOGY_FILE, {{"file", required_argument, 0, 'f'}, false, ""}},
-	{topologyCmdType::TOPOLOGY_MATRIX, {{"matrix", no_argument, 0, 'm'}, false, ""}},
+	{topologyCmdType::TOPOLOGY_HELP, {}},	{topologyCmdType::TOPOLOGY_JSON, {}},
+	{topologyCmdType::TOPOLOGY_DEVICE, {}}, {topologyCmdType::TOPOLOGY_FILE, {}},
+	{topologyCmdType::TOPOLOGY_MATRIX, {}},
 };
 
 /**
@@ -239,27 +245,30 @@ void cmdTopology::help(HELP helpType)
 	TRACING();
 	std::vector<helpCmd> helpList;
 
-	helpList.push_back(helpCmd(TITLE, "Get the system topology"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Usage: %s topology [Options]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topology -d [deviceId]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topology -d [pciBdfAddress]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topology -d [deviceId] -j", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topology -f [filename]", progName.c_str()));
-	helpList.push_back(helpCmd(HEADING, "%s topology -m", progName.c_str()));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(TITLE, "Options:"));
-	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
-	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
-	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address to query"));
-	helpList.push_back(
-		helpCmd(HEADING, "-f,--file                   Generate the system topology with the GPU info to a XML file"));
-	helpList.push_back(helpCmd(HEADING, "-m,--matrix                 Print the CPU/GPU topology matrix"));
-	helpList.push_back(helpCmd(SUB_HEADING, "S: Self"));
-	helpList.push_back(helpCmd(SUB_HEADING, "MDF: Connected with Multi-Die Fabric Interface"));
-	helpList.push_back(helpCmd(SUB_HEADING, "NODE: Connected with PCIe within a NUMA node"));
-	helpList.push_back(helpCmd(SUB_HEADING, "SYS: Connected with PCIe between NUMA nodes"));
+	helpList.emplace_back(TITLE, "Get the system topology");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Usage: %s topology [Options]", progName.c_str());
+	helpList.emplace_back(HEADING, "%s topology --device [deviceId]", progName.c_str());
+	helpList.emplace_back(HEADING, "%s topology --device [pciBdfAddress]", progName.c_str());
+	helpList.emplace_back(HEADING, "%s topology --device [deviceId] -j", progName.c_str());
+	helpList.emplace_back(HEADING, "%s topology -f [filename]", progName.c_str());
+	helpList.emplace_back(HEADING, "%s topology -m", progName.c_str());
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(TITLE, "Options:");
+	helpList.emplace_back(HEADING, "-h,--help                   Print this help message and exit");
+	helpList.emplace_back(HEADING, "-j,--json                   Print result in JSON format");
+	helpList.emplace_back(BLANK);
+	helpList.emplace_back(HEADING, "--device,--id               The device ID or PCI BDF address to query");
+	helpList.emplace_back(HEADING,
+						  "-f,--file                   Generate the system topology with the GPU info to a XML file");
+	helpList.emplace_back(HEADING, "-m,--matrix                 Print the CPU/GPU/NIC topology matrix");
+	helpList.emplace_back(SUB_HEADING, "S: Self");
+	helpList.emplace_back(SUB_HEADING, "MDF: Connected with Multi-Die Fabric Interface");
+	helpList.emplace_back(SUB_HEADING, "PIX:  Connected via PCIe switch");
+	helpList.emplace_back(SUB_HEADING, "PXB:  Connected via multiple PCIe bridges");
+	helpList.emplace_back(SUB_HEADING, "PHB:  Connected via PCIe host bridge");
+	helpList.emplace_back(SUB_HEADING, "NODE: Connected with PCIe within a NUMA node");
+	helpList.emplace_back(SUB_HEADING, "SYS: Connected with PCIe between NUMA nodes");
 
 	printHelp(helpList, helpType);
 	helpList.clear();
@@ -398,41 +407,24 @@ ze_result_t cmdTopology::generateFile(const std::string &filename, bool useJson)
  * @ingroup topology_matrix
  *
  * Constructs a comprehensive topology matrix showing connectivity between all GPU tiles
- * in the system. Examines PCIe topology and CPU affinity to determine link types (MDF, PCIe).
- * Generates both a flat topology list for JSON output and a 2D matrix for text display.
- *
- * @param[in]  args    Pointer to argument structure containing system manager for device queries.
- *                     Must not be nullptr. The args->sm field must be valid.
- * @param[out] jsonObj Pointer to JSON object that will be populated with topology data.
- *                     Must not be nullptr. On success, contains:
- *                     - "topo_list": Flat array of topology entries for JSON compatibility
- *                     - "headers": Array of tile labels (e.g., "GPU 0/0", "GPU 0/1")
- *                     - "matrix": 2D array of connection data for text printing
- *                     On error, contains:
- *                     - "error": Error message string
+ * and NICs. Uses two data sources:
+ *   1. sysfs @c numa_node file — for NODE / SYS classification
+ *   2. sysfs canonical path walk — for PIX / PXB / PHB classification (when available)
  *
- * @retval ZE_RESULT_SUCCESS           Matrix built successfully
- * @retval ZE_RESULT_ERROR_DEVICE_LOST No devices found in the system
- * @retval Other                       Device enumeration failed (from findDevice)
- *
- * @pre args and args->sm must be initialized and valid
- * @pre jsonObj must point to valid nlohmann::ordered_json object
+ * @param[in]  args    Pointer to argument structure containing system manager.
+ * @param[out] jsonObj Populated with:
+ *                     - @c "topo_list": flat array of per-pair topology entries
+ *                     - @c "headers":   tile/NIC label array
+ *                     - @c "matrix":    2-D connection-type array for text display
+ *                     On error: @c "error" string.
  *
- * @post On success, jsonObj contains complete topology matrix data
- * @post allTiles vector contains all tile information
- *
- * @note Link type determination:
- *       - "S": Self (same tile)
- *       - "MDF": Multi-Die Fabric (same device, different tiles)
- *       - "NODE": PCIe within same NUMA node
- *       - "SYS": PCIe across NUMA nodes
- * @note Matrix is NxN where N = total number of tiles across all devices
- * @note CPU affinity determines NUMA node relationships
+ * @retval ZE_RESULT_SUCCESS           Matrix built successfully
+ * @retval ZE_RESULT_ERROR_DEVICE_LOST No devices found
  *
- * @see determineLinkType() for link type determination algorithm
- * @see TileInfo structure for tile metadata
+ * @note Connection symbols: S, MDF, PIX, PXB, PHB, NODE, SYS
+ * @see determineLinkType() for classification algorithm
  */
-ze_result_t cmdTopology::buildTopologyMatrix(arg_struct *args, nlohmann::ordered_json *jsonObj)
+ze_result_t cmdTopology::buildTopologyMatrix(arg_struct *args, nlohmann::ordered_json *jsonObj) const
 {
 	TRACING();
 	// Get all devices from system manager
@@ -443,188 +435,251 @@ ze_result_t cmdTopology::buildTopologyMatrix(arg_struct *args, nlohmann::ordered
 		return result != ZE_RESULT_SUCCESS ? result : ZE_RESULT_ERROR_DEVICE_LOST;
 	}
 
-	// Collect all tiles across all devices
-	std::vector<TileInfo> allTiles;
-	std::vector<std::string> deviceHeaders;
-	std::map<int, bool> deviceHasSubdevices; // Track which devices have subdevices
+	// Collect all GPU tiles as topology nodes
+	std::vector<TopoNode> allNodes;
 
 	for (auto &device : deviceList) {
-		const auto cpuAffinity = device.dev->getCPUList(); // Use getCPUList() for range format like "0-31"
+		const auto cpuAffinity = device.dev->getCPUList();
+		const auto bdf = device.dev->getBDFStr();
 		std::map<uint32_t, std::vector<portInfo>> portsByTile;
 
-		// It doesn't mean "has multiple tiles", it means "this is a tile-level view"
-		const bool hasSubdevices = true;
+		// Read PCIe max bandwidth once per device; shared by all tiles on this device.
+		std::optional<int64_t> gpuMaxBwBps;
+		if (pci *const pciObj = device.dev->getPCI()) {
+			zes_pci_properties_t pciProps{};
+			if (pciObj->getProperties(device.zesDeviceHdl, &pciProps) == ZE_RESULT_SUCCESS &&
+				pciProps.maxSpeed.maxBandwidth > 0) {
+				gpuMaxBwBps = static_cast<int64_t>(pciProps.maxSpeed.maxBandwidth);
+			}
+		}
 
 		fabric *f = device.dev->getFabric();
 		if (f != nullptr) {
 			std::vector<portInfo> portInfoList;
-			const auto fabricResult = f->getFabricPorts(device.zesDeviceHdl, portInfoList);
-
-			if (fabricResult == ZE_RESULT_SUCCESS) {
-				// Group ports by subdevice/tile
+			if (f->getFabricPorts(device.zesDeviceHdl, portInfoList) == ZE_RESULT_SUCCESS) {
 				for (const auto &pi : portInfoList) {
-					if (pi.portProps.onSubdevice) {
-						portsByTile[pi.portProps.subdeviceId].push_back(pi);
-					} else {
-						portsByTile[0].push_back(pi);
-					}
+					const uint32_t tileId = (pi.portProps.onSubdevice != 0u) ? pi.portProps.subdeviceId : 0U;
+					portsByTile[tileId].push_back(pi);
 				}
 			}
 		}
 
-		deviceHasSubdevices[device.index] = hasSubdevices;
-
-		// If no fabric ports or fabric not available, add device with single tile
 		if (portsByTile.empty()) {
-			TileInfo tile{
-				.deviceId = static_cast<int>(device.index), .tileId = 0, .cpuAffinity = cpuAffinity, .ports = {}};
-			allTiles.push_back(tile);
-			deviceHeaders.push_back(std::format("GPU {}/0", device.index));
+			allNodes.push_back(
+				TopoNode{.label = std::format("GPU {}/0", device.index),
+						 .cpuAffinity = cpuAffinity,
+						 .bdfAddress = bdf,
+						 .maxBandwidthBps = gpuMaxBwBps,
+						 .data = GpuData{.deviceId = static_cast<int>(device.index), .tileId = 0, .ports = {}}});
 		} else {
-			// Create tile entries with fabric port information
 			for (const auto &[tileId, ports] : portsByTile) {
-				TileInfo tile{.deviceId = static_cast<int>(device.index),
-							  .tileId = static_cast<int>(tileId),
-							  .cpuAffinity = cpuAffinity,
-							  .ports = ports};
-				allTiles.push_back(tile);
-				deviceHeaders.push_back(std::format("GPU {}/{}", device.index, tileId));
+				allNodes.push_back(TopoNode{.label = std::format("GPU {}/{}", device.index, tileId),
+											.cpuAffinity = cpuAffinity,
+											.bdfAddress = bdf,
+											.maxBandwidthBps = gpuMaxBwBps,
+											.data = GpuData{.deviceId = static_cast<int>(device.index),
+															.tileId = static_cast<int>(tileId),
+															.ports = ports}});
+			}
+		}
+	}
+
+	// Append NIC nodes
+	if (const auto nicsOpt = GET_SYSTEM_NICS()) {
+		for (auto nicIdx = size_t{0}; nicIdx < nicsOpt->size(); ++nicIdx) {
+			const auto &nic = (*nicsOpt)[nicIdx];
+			allNodes.push_back(TopoNode{.label = std::format("NIC{}", nicIdx),
+										.cpuAffinity = nic.cpuAffinity,
+										.bdfAddress = nic.bdfAddress,
+										.data = NicData{.nicIndex = static_cast<int>(nicIdx)}});
+		}
+	}
+
+	// Resolve NUMA and PCIe bridge paths — de-duplicate BDFs first to avoid
+	// redundant sysfs reads for multi-tile GPUs that share a BDF.
+	{
+		std::vector<std::string> bdfs;
+		bdfs.reserve(allNodes.size());
+		for (const auto &node : allNodes) {
+			bdfs.push_back(node.bdfAddress);
+		}
+		std::sort(bdfs.begin(), bdfs.end());
+		bdfs.erase(std::unique(bdfs.begin(), bdfs.end()), bdfs.end());
+
+		const auto numaMap = GET_NUMA_NODES(bdfs);
+		for (auto &node : allNodes) {
+			if (const auto it = numaMap.find(node.bdfAddress); it != numaMap.end()) {
+				node.numaNode = it->second;
 			}
 		}
+
+		const auto pcieMap = GET_PCIE_PATHS(bdfs);
+		for (auto &node : allNodes) {
+			if (const auto it = pcieMap.find(node.bdfAddress); it != pcieMap.end()) {
+				node.pciePath = it->second;
+			}
+		}
+	}
+
+	// Build header list
+	std::vector<std::string> headers;
+	headers.reserve(allNodes.size());
+	for (const auto &node : allNodes) {
+		headers.push_back(node.label);
 	}
 
 	// Build topology list (for JSON) and matrix (for text display)
-	const auto tileCount = allTiles.size();
+	const auto nodeCount = allNodes.size();
 	std::vector<nlohmann::ordered_json> topoList;
 	std::vector<nlohmann::ordered_json> matrixData;
 
-	for (const auto row : std::views::iota(size_t{0}, tileCount)) {
+	for (const auto row : std::views::iota(size_t{0}, nodeCount)) {
 		nlohmann::ordered_json rowData;
-		rowData["tile"] = deviceHeaders[row];
-		rowData["cpu_affinity"] = allTiles[row].cpuAffinity;
+		rowData["tile"] = allNodes[row].label;
+		rowData["cpu_affinity"] = allNodes[row].cpuAffinity;
 
 		std::vector<std::string> connections;
-		for (const auto col : std::views::iota(size_t{0}, tileCount)) {
-			std::string linkType;
-			if (row == col) {
-				linkType = "S";
-			} else {
-				linkType = determineLinkType(allTiles[row], allTiles[col]);
-			}
+		for (const auto col : std::views::iota(size_t{0}, nodeCount)) {
+			const std::string linkType = determineLinkType(allNodes[row], allNodes[col]);
 			connections.push_back(linkType);
 
-			// Add to flat topology list for JSON output
 			nlohmann::ordered_json topoEntry;
+			const auto *rowGpu = std::get_if<GpuData>(&allNodes[row].data);
+			const auto *colGpu = std::get_if<GpuData>(&allNodes[col].data);
 			topoEntry["link_type"] = linkType;
-			topoEntry["local_cpu_affinity"] = allTiles[row].cpuAffinity;
-			topoEntry["local_device_id"] = allTiles[row].deviceId;
-			topoEntry["local_numa_index"] = 0; // Would need proper NUMA detection
-			topoEntry["local_on_subdevice"] = deviceHasSubdevices[allTiles[row].deviceId];
-			topoEntry["local_subdevice_id"] = allTiles[row].tileId;
-			topoEntry["max_bit_rate"] = -1; // Would need to calculate from port info
-			topoEntry["remote_device_id"] = allTiles[col].deviceId;
-			topoEntry["remote_subdevice_id"] = allTiles[col].tileId;
+			topoEntry["local_node_type"] = rowGpu != nullptr ? "GPU" : "NIC";
+			topoEntry["local_cpu_affinity"] = allNodes[row].cpuAffinity;
+			topoEntry["local_device_id"] =
+				rowGpu != nullptr ? nlohmann::ordered_json(rowGpu->deviceId) : nlohmann::ordered_json(nullptr);
+			topoEntry["local_numa_index"] = allNodes[row].numaNode.has_value()
+												? nlohmann::ordered_json(*allNodes[row].numaNode)
+												: nlohmann::ordered_json(nullptr);
+			topoEntry["local_on_subdevice"] = (rowGpu != nullptr);
+			topoEntry["local_subdevice_id"] =
+				rowGpu != nullptr ? nlohmann::ordered_json(rowGpu->tileId) : nlohmann::ordered_json(nullptr);
+			topoEntry["max_bit_rate"] = allNodes[row].maxBandwidthBps.has_value()
+											? nlohmann::ordered_json(*allNodes[row].maxBandwidthBps)
+											: nlohmann::ordered_json(nullptr);
+			topoEntry["remote_node_type"] = colGpu != nullptr ? "GPU" : "NIC";
+			topoEntry["remote_device_id"] =
+				colGpu != nullptr ? nlohmann::ordered_json(colGpu->deviceId) : nlohmann::ordered_json(nullptr);
+			topoEntry["remote_subdevice_id"] =
+				colGpu != nullptr ? nlohmann::ordered_json(colGpu->tileId) : nlohmann::ordered_json(nullptr);
 			topoList.push_back(topoEntry);
 		}
 		rowData["connections"] = connections;
 		matrixData.push_back(rowData);
 	}
 
-	// Build final JSON structure - use old format for compatibility
 	(*jsonObj)["topo_list"] = topoList;
-
-	// Store matrix data for text printer
-	(*jsonObj)["headers"] = deviceHeaders;
+	(*jsonObj)["headers"] = headers;
 	(*jsonObj)["matrix"] = matrixData;
 
 	return ZE_RESULT_SUCCESS;
 }
 
 /**
- * @brief Determines the link type between two GPU tiles
+ * @brief Determines the connection type between two topology nodes
  * @ingroup topology_matrix
  *
- * Analyzes the connectivity between two tiles by examining device topology
- * and CPU affinity. Uses a hierarchical decision process to classify the
- * connection type.
- *
- * Algorithm:
- * 1. Check if same tile → Self (S)
- * 2. Check if same device but different tiles → MDF
- * 3. For PCIe connections, compare CPU affinity:
- *    - Same affinity → NODE (within NUMA node)
- *    - Different affinity → SYS (across NUMA nodes)
- *
- * @param[in] tile1 First tile information. Contains:
- *                  - deviceId: Device index
- *                  - tileId: Tile/subdevice index within device
- *                  - cpuAffinity: CPU list string (e.g., "0-31")
- *                  - ports: Vector of fabric port information (unused)
- * @param[in] tile2 Second tile information. Same structure as tile1.
- *
- * @return std::string Link type symbol:
- *         - "S": Self (same tile)
- *         - "MDF": Multi-Die Fabric Interface (same device, different tiles)
- *         - "NODE": PCIe within same NUMA node
- *         - "SYS": PCIe across NUMA nodes
- *
- * @pre tile1 and tile2 must contain valid device and tile IDs
- *
- * @note CPU affinity comparison is simplified - full NUMA parsing would be more accurate
- * @note This is a const method as it only reads tile information
- *
- * @see buildTopologyMatrix() for usage context
- * @see TileInfo structure definition
+ * Uses a priority-ordered decision chain:
+ *
+ *  1. **S**   — same stable identity (GPU: matching deviceId/tileId; NIC: matching nicIndex)
+ *  2. **MDF** — both GPU tiles on the same physical device
+ *  3. **PIX** — PCIe paths share ≥ 3 common bridge ancestors (same PCIe switch)
+ *  4. **PXB** — PCIe paths share exactly 2 common ancestors (same root port)
+ *  5. **PHB** — PCIe paths share exactly 1 common ancestor (same host bridge)
+ *  6. **SYS** — both PCIe paths present but share no common ancestor
+ *  7. **NODE** — at least one PCIe path absent; both nodes resolve to the same NUMA index
+ *  8. **SYS** — everything else (different NUMA nodes, or NUMA unknown)
+ *
+ * PCIe path data comes from the sysfs canonical path walk (unavailable on Windows),
+ * in which case the fallback NODE / SYS classification is used.
+ *
+ * @param[in] node1 First topology node
+ * @param[in] node2 Second topology node
+ * @return One of: "S", "MDF", "PIX", "PXB", "PHB", "NODE", "SYS"
  */
-std::string cmdTopology::determineLinkType(const TileInfo &tile1, const TileInfo &tile2) const
+std::string cmdTopology::determineLinkType(const TopoNode &node1, const TopoNode &node2)
 {
 	TRACING();
-	// Same tile - Self
-	if (tile1.deviceId == tile2.deviceId && tile1.tileId == tile2.tileId) {
-		return "S";
+
+	// Self — compare stable node identity rather than display label
+	if (const auto *g1 = std::get_if<GpuData>(&node1.data)) {
+		if (const auto *g2 = std::get_if<GpuData>(&node2.data)) {
+			if (g1->deviceId == g2->deviceId && g1->tileId == g2->tileId) {
+				return "S";
+			}
+		}
+	} else if (const auto *n1 = std::get_if<NicData>(&node1.data)) {
+		if (const auto *n2 = std::get_if<NicData>(&node2.data)) {
+			if (n1->nicIndex == n2->nicIndex) {
+				return "S";
+			}
+		}
+	}
+
+	// MDF: two GPU tiles on the same physical device
+	if (const auto *g1 = std::get_if<GpuData>(&node1.data)) {
+		if (const auto *g2 = std::get_if<GpuData>(&node2.data)) {
+			if (g1->deviceId == g2->deviceId && g1->tileId != g2->tileId) {
+				return "MDF";
+			}
+		}
 	}
 
-	// Same device, different tiles - MDF (Multi-Die Fabric)
-	if (tile1.deviceId == tile2.deviceId && tile1.tileId != tile2.tileId) {
-		return "MDF";
+	// PCIe path comparison: find the deepest common bridge ancestor.
+	// Path is root-first (index 0 = root complex, index 1 = root port, ...).
+	//   commonLen == 1  → PHB (share only the root complex)
+	//   commonLen == 2  → PXB (share root complex + root port)
+	//   commonLen >= 3  → PIX (share a PCIe switch)
+	if (node1.pciePath.has_value() && node2.pciePath.has_value()) {
+		const auto &p1 = *node1.pciePath;
+		const auto &p2 = *node2.pciePath;
+		size_t commonLen = 0;
+		for (size_t i = 0; i < std::min(p1.size(), p2.size()); ++i) {
+			if (p1[i].bdf == p2[i].bdf) {
+				commonLen = i + 1;
+			} else {
+				break;
+			}
+		}
+		if (commonLen >= 3) {
+			return "PIX";
+		}
+		if (commonLen == 2) {
+			return "PXB";
+		}
+		if (commonLen == 1) {
+			return "PHB";
+		}
+		// commonLen == 0: both paths exist but share no common ancestor → SYS
+		return "SYS";
 	}
 
-	// PCIe connections - check if same NUMA node
-	// Simplified: would need to parse CPU affinity to determine NUMA
-	if (tile1.cpuAffinity == tile2.cpuAffinity) {
-		return "NODE";
+	// Fall back to NUMA comparison only when PCIe path data is absent for at
+	// least one node. Two nullopt nodes must not be treated as co-located.
+	if (!node1.pciePath.has_value() || !node2.pciePath.has_value()) {
+		if (node1.numaNode.has_value() && node1.numaNode == node2.numaNode) {
+			return "NODE";
+		}
 	}
 
 	return "SYS";
 }
 
 /**
- * @brief Displays the topology connectivity matrix for all GPU devices
+ * @brief Displays the topology connectivity matrix for all GPU devices and NICs
  * @ingroup topology_matrix
  *
- * Generates and displays a comprehensive topology matrix showing connectivity
- * between all GPU tiles in the system. The matrix shows link types between
- * each pair of tiles, including MDF and PCIe connections.
- *
- * Output format depends on useJson parameter:
- * - JSON mode: Outputs structured JSON with topo_list and matrix arrays
- * - Text mode: Displays formatted table with headers and connection symbols
- *
  * @param[in] useJson If true, output JSON format; if false, output text table
  *
  * @retval ZE_RESULT_SUCCESS           Matrix displayed successfully
  * @retval ZE_RESULT_ERROR_DEVICE_LOST No devices found in system
- * @retval ZE_RESULT_ERROR_UNINITIALIZED currentArgs not set (run() must be called first)
+ * @retval ZE_RESULT_ERROR_UNINITIALIZED currentArgs not set
  *
- * @pre currentArgs must be set by run() before calling this function
- * @post Matrix is printed to stdout via appropriate printer
- *
- * @note Uses buildTopologyMatrix() to generate the topology data
- * @note Connection symbols: S (self), MDF, NODE, SYS
- * @note Requires at least one device in the system
- *
- * @see buildTopologyMatrix() for matrix generation algorithm
- * @see determineLinkType() for link type classification
+ * @note Connection symbols: S, MDF, PIX, PXB, PHB, NODE, SYS
+ * @see buildTopologyMatrix(), determineLinkType()
  */
 ze_result_t cmdTopology::showMatrix(bool useJson)
 {
@@ -673,7 +728,7 @@ ze_result_t cmdTopology::showMatrix(bool useJson)
  * Command line options:
  * - -h, --help: Display help information
  * - -j, --json: Output in JSON format instead of text
- * - -d, --device <id>: Query topology for specific device (by ID or PCI BDF)
+ * - --device,--id <id>: Query topology for specific device (by ID or PCI BDF)
  * - -f, --file <path>: Generate topology XML file
  * - -m, --matrix: Display topology connectivity matrix
  *
@@ -690,7 +745,6 @@ ze_result_t cmdTopology::showMatrix(bool useJson)
  *
  * @note If no specific command is given, displays help information
  * @note Device queries can be performed on multiple devices matching the criteria
- * @note Uses getopt_long for command line parsing
  * @note Sets currentArgs for use by subcommands (generateFile, showMatrix)
  */
 int cmdTopology::run(arg_struct *args)
@@ -702,64 +756,32 @@ int cmdTopology::run(arg_struct *args)
 
 	std::vector<devInfo> deviceList;
 	ze_result_t result;
-	bool found = false;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
-
-	processOptions(topologyCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			topologyCmds[topologyCmdType::TOPOLOGY_JSON].enabled = true;
-			break;
-		case 'd':
-			topologyCmds[topologyCmdType::TOPOLOGY_DEVICE].val = optarg;
-			topologyCmds[topologyCmdType::TOPOLOGY_DEVICE].enabled = true;
-			break;
-		case 'f':
-			topologyCmds[topologyCmdType::TOPOLOGY_FILE].val = optarg;
-			topologyCmds[topologyCmdType::TOPOLOGY_FILE].enabled = true;
-			xmlFilename = optarg; // Store filename for use in generateFile()
-			break;
-		case 'm':
-			topologyCmds[topologyCmdType::TOPOLOGY_MATRIX].enabled = true;
-			break;
-		case 0:
-			for (auto &[cmdType, cmdStruct] : topologyCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmdStruct.opt.name) == 0) {
-					cmdStruct.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmdStruct.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			break;
-		}
-		startind++;
+
+	// Reset all cmd states before parsing
+	for (auto &[k, v] : topologyCmds) {
+		v.enabled = false;
+		v.val.clear();
 	}
 
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	CLI::App sub{"Show GPU topology information", "topology"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", topologyCmds[topologyCmdType::TOPOLOGY_JSON].enabled, "Output in JSON format");
+	sub.add_option("-d,--device,--id", topologyCmds[topologyCmdType::TOPOLOGY_DEVICE].val, "Device ID")
+		->each([&](const std::string &) { topologyCmds[topologyCmdType::TOPOLOGY_DEVICE].enabled = true; });
+	sub.add_option("-f,--file", topologyCmds[topologyCmdType::TOPOLOGY_FILE].val, "Output XML file path")
+		->each([&](const std::string &val) {
+			topologyCmds[topologyCmdType::TOPOLOGY_FILE].enabled = true;
+			xmlFilename = val;
+		});
+	sub.add_flag("-m,--matrix", topologyCmds[topologyCmdType::TOPOLOGY_MATRIX].enabled, "Show topology matrix");
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}\n", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
diff --git a/ial/cmn/cmd_topology.h b/ial/cmn/cmd_topology.h
index e5a1061a0..df9808e0c 100644
--- a/ial/cmn/cmd_topology.h
+++ b/ial/cmn/cmd_topology.h
@@ -9,6 +9,8 @@
 
 #include "cmds.h"
 #include "printer.h"
+#include <optional>
+#include <variant>
 #include <os.h>
 #include <string>
 #include <format>
@@ -16,15 +18,45 @@
 // Forward declarations
 struct portInfo;
 
-// Tile information for topology matrix
-struct TileInfo
+/**
+ * @brief GPU-tile-specific data within a topology node
+ */
+struct GpuData
 {
 	int deviceId;
 	int tileId;
-	std::string cpuAffinity;
 	std::vector<portInfo> ports;
 };
 
+/**
+ * @brief NIC-specific data within a topology node
+ */
+struct NicData
+{
+	int nicIndex; ///< Index of this NIC in the discovered NIC list — stable self-identity
+};
+
+/**
+ * @brief Unified topology node — represents either a GPU tile or a NIC in the matrix.
+ *
+ * The active alternative in @c data determines the node kind:
+ *   - @c GpuData  → GPU tile (possibly a subdevice)
+ *   - @c NicData  → Physical network interface card
+ */
+struct TopoNode
+{
+	std::string label;		 ///< Display label, e.g. "GPU 0/1" or "NIC0"
+	std::string cpuAffinity; ///< Local CPU list string (e.g. "0-31"), used for display
+	std::string bdfAddress;	 ///< PCI BDF address (e.g. "0000:03:00.0"), used for NUMA lookup
+
+	std::optional<int> numaNode{std::nullopt}; ///< sysfs NUMA node index (nullopt = unknown)
+	std::optional<PciePath> pciePath{}; ///< PCIe bridge chain from sysfs canonical path walk (nullopt = not resolved)
+	std::optional<int64_t> maxBandwidthBps{
+		std::nullopt}; ///< PCIe max bandwidth in bytes/sec from ZES (nullopt = unknown or NIC)
+
+	std::variant<GpuData, NicData> data; ///< Kind-specific payload; holds_alternative<GpuData> ↔ GPU
+};
+
 /**
  * @brief Device topology information structure
  *
@@ -109,16 +141,16 @@ enum class topologyCmdType
 class cmdTopology : public cmds // NOLINT(readability-identifier-naming) // camelBack for consistency
 {
 private:
-	ze_result_t buildTopologyMatrix(arg_struct *args, nlohmann::ordered_json *jsonObj);
+	ze_result_t buildTopologyMatrix(arg_struct *args, nlohmann::ordered_json *jsonObj) const;
 	std::string xmlFilename; // Store filename for XML export
 
 public:
 	// NOLINTNEXTLINE(readability-identifier-naming) // camelBack for consistency
-	cmdTopology() { STRCPY_S(name, MAX_PATH, "topology"); };
+	cmdTopology() { name = "topology"; };
 	void help(HELP helpType = FULL_HELP) final;
 
 	// Public for unit testing
-	std::string determineLinkType(const TileInfo &tile1, const TileInfo &tile2) const;
+	static std::string determineLinkType(const TopoNode &node1, const TopoNode &node2);
 
 	/**
 	 * @brief Generates an XML topology file with system topology information
@@ -164,7 +196,7 @@ class cmdTopology : public cmds // NOLINT(readability-identifier-naming) // came
 	 * @param[out] info Output parameter to receive topology information
 	 * @return ZE_RESULT_SUCCESS on success, error code on failure
 	 */
-	[[nodiscard]] ze_result_t showTopology(devInfo *d, TopologyInfo *info);
+	[[nodiscard]] static ze_result_t showTopology(devInfo *d, TopologyInfo *info);
 };
 
 /**
@@ -175,9 +207,8 @@ class cmdTopology : public cmds // NOLINT(readability-identifier-naming) // came
  */
 struct TopologyCmdStruct
 {
-	option opt;		 ///< GNU getopt option specification
-	bool enabled;	 ///< Whether this option was provided by the user
-	std::string val; ///< Value associated with the option (if required_argument)
+	bool enabled{false}; ///< Whether this option was provided by the user
+	std::string val{};	 ///< Value associated with the option (if required)
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ial/cmn/cmd_updatefw.cpp b/ial/cmn/cmd_updatefw.cpp
index 26fbfa4c6..7b1e9a75b 100644
--- a/ial/cmn/cmd_updatefw.cpp
+++ b/ial/cmn/cmd_updatefw.cpp
@@ -8,6 +8,7 @@
 #include <fs_lock.h>
 #include <debug.h>
 #include <assert.h>
+#include <CLI/CLI.hpp>
 #include <thread>
 #include <atomic>
 #include <cerrno>
@@ -15,6 +16,24 @@
 #include <fstream>
 #include <sys/stat.h>
 
+static const char *validFwTypes[] = {"GFX", "GFX_DATA", "FDO", "AMC", "OP_CODE", "OP_DATA"};
+
+/**
+ * @brief Returns a comma-separated string of valid firmware type names
+ *
+ * @return std::string Formatted list of supported firmware types
+ */
+static std::string validFwTypesStr()
+{
+	std::string s;
+	for (const auto &t : validFwTypes) {
+		if (!s.empty())
+			s += ", ";
+		s += t;
+	}
+	return s;
+}
+
 static ze_result_t validateFirmwareImageFile(const std::string &filePath)
 {
 	struct stat fileStat;
@@ -64,14 +83,10 @@ void cmdUpdateFW::help(HELP helpType)
 	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 The device ID or PCI BDF address. If it is not "
+	helpList.push_back(helpCmd(HEADING, "--device,--id               The device ID or PCI BDF address. If it is not "
 										"specified, all devices will be updated"));
-	helpList.push_back(helpCmd(HEADING, "-t,--type                   The firmware name. Valid options: GFX, GFX_DATA, "
-										"FDO, GFX_CODE_DATA, GFX_PSCBIN, AMC, OP_CODE, OP_DATA."));
-	helpList.push_back(helpCmd(
-		SUB_HEADING, "AMC firmware update just works on Intel M50CYP server (BMC firmware version is 2.82 or newer)"));
-	helpList.push_back(
-		helpCmd(SUB_HEADING, "and Supermicro SYS-620C-TN12R server (BMC firmware version is 11.01 or newer)"));
+	std::string typeHelp = "-t,--type                   The firmware name. Valid options: " + validFwTypesStr() + ".";
+	helpList.push_back(helpCmd(HEADING, "%s", typeHelp.c_str()));
 	helpList.push_back(helpCmd(HEADING, "-f,--file                   The firmware image file path on this server"));
 	helpList.push_back(helpCmd(
 		HEADING, "-y,--assumeyes              Assume that the answer to any question which would be asked is yes"));
@@ -105,58 +120,25 @@ int cmdUpdateFW::run(arg_struct *args)
 	std::atomic<uint32_t> curThread{0};
 	std::atomic<ze_result_t> firstError{ZE_RESULT_SUCCESS};
 	std::vector<std::thread> workers;
-	int opt;
-	int optionIndex = 0;
-	const char *optString = "hjd:t:f:y";
-	struct option longOpts[] = {{"help", no_argument, nullptr, 'h'},		 {"json", no_argument, nullptr, 'j'},
-								{"device", required_argument, nullptr, 'd'}, {"type", required_argument, nullptr, 't'},
-								{"file", required_argument, nullptr, 'f'},	 {"assumeyes", no_argument, nullptr, 'y'},
-								{"force", no_argument, nullptr, 0},			 {nullptr, 0, nullptr, 0}};
-
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = GETOPT_LONG(args->argc, args->argv, optString, longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			fwInfo.jsonOutput = true;
-			break;
-		case 'd':
-			fwInfo.deviceId = optarg;
-			break;
-		case 't':
-			fwInfo.firmwareType = optarg;
-			break;
-		case 'f':
-			fwInfo.filePath = optarg;
-			break;
-		case 'y':
-			fwInfo.assumeYes = true;
-			break;
-		case 0:
-			if (STRCASECMP("force", longOpts[optionIndex].name) == 0) {
-				fwInfo.forceUpdate = true;
-			} else {
-				ERR("Unknown command: {}\n", longOpts[optionIndex].name);
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-		}
-		startind++;
-	}
 
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	CLI::App sub{"Update GPU firmware", "updatefw"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", fwInfo.jsonOutput, "Print result in JSON format");
+	sub.add_option("-d,--device,--id", fwInfo.deviceId,
+				   "Device ID or PCI BDF address. If not specified, all devices are updated");
+	std::string typeDesc = "Firmware name. Valid options: " + validFwTypesStr();
+	sub.add_option("-t,--type", fwInfo.firmwareType, typeDesc);
+	sub.add_option("-f,--file", fwInfo.filePath, "Firmware image file path");
+	sub.add_flag("-y,--assumeyes", fwInfo.assumeYes, "Assume yes to all questions");
+	sub.add_flag("--force", fwInfo.forceUpdate, "Force GFX firmware update");
+
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
@@ -167,6 +149,19 @@ int cmdUpdateFW::run(arg_struct *args)
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
 
+	bool validType = false;
+	for (const auto &t : validFwTypes) {
+		if (STRCASECMP(fwInfo.firmwareType.c_str(), t) == 0) {
+			validType = true;
+			break;
+		}
+	}
+	if (!validType) {
+		ERR("Error: Invalid firmware type '{}'. Valid options: {}.\n", fwInfo.firmwareType.c_str(),
+			validFwTypesStr().c_str());
+		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+	}
+
 	// Validate file path
 	if (fwInfo.filePath.empty()) {
 		ERR("Error: Missing required argument --file.\n");
diff --git a/ial/cmn/cmd_updatefw.h b/ial/cmn/cmd_updatefw.h
index 8ef634686..79980088b 100644
--- a/ial/cmn/cmd_updatefw.h
+++ b/ial/cmn/cmd_updatefw.h
@@ -15,7 +15,7 @@ class cmdUpdateFW : public cmds
 {
 
 public:
-	cmdUpdateFW() { STRCPY_S(name, MAX_PATH, "updatefw"); };
+	cmdUpdateFW() { name = "updatefw"; };
 	~cmdUpdateFW(){};
 	void help(HELP helpType = FULL_HELP);
 	int run(arg_struct *args);
diff --git a/ial/cmn/cmd_vgpu.cpp b/ial/cmn/cmd_vgpu.cpp
index e4f0096ac..7de2f073f 100644
--- a/ial/cmn/cmd_vgpu.cpp
+++ b/ial/cmn/cmd_vgpu.cpp
@@ -7,6 +7,7 @@
 #include "cmd_vgpu.h"
 #include "debug.h"
 #include "printer.h"
+#include <CLI/CLI.hpp>
 #include "table_builder.h"
 #include <osvf.h>
 #include <algorithm>
@@ -14,16 +15,16 @@
 #include <cinttypes>
 
 static std::unordered_map<vgpuCmdType, vgpuCmdStruct> vgpuCmds = {
-	{VGPU_HELP, {{"help", no_argument, 0, 'h'}, nullptr, false, ""}},
-	{VGPU_JSON, {{"json", no_argument, 0, 'j'}, nullptr, false, ""}},
-	{VGPU_DEVICE, {{"device", required_argument, 0, 'd'}, nullptr, false, ""}},
-	{VGPU_PRECHECK, {{"precheck", no_argument, 0, 0}, &cmdVgpu::precheck, false, ""}},
-	{VGPU_NUMBER, {{"number", required_argument, 0, 'n'}, nullptr, false, ""}},
-	{VGPU_CREATE, {{"create", no_argument, 0, 'c'}, &cmdVgpu::create, false, ""}},
-	{VGPU_REMOVE, {{"remove", no_argument, 0, 'r'}, &cmdVgpu::remove, false, ""}},
-	{VGPU_LIST, {{"list", no_argument, 0, 'l'}, &cmdVgpu::listGpus, false, ""}},
-	{VGPU_STATS, {{"stats", no_argument, 0, 's'}, &cmdVgpu::stats, false, ""}},
-	{VGPU_LMEM, {{"lmem", required_argument, 0, 0}, nullptr, false, ""}},
+	{VGPU_HELP, {}},
+	{VGPU_JSON, {}},
+	{VGPU_DEVICE, {}},
+	{VGPU_PRECHECK, {.func = &cmdVgpu::precheck}},
+	{VGPU_NUMBER, {}},
+	{VGPU_CREATE, {.func = &cmdVgpu::create}},
+	{VGPU_REMOVE, {.func = &cmdVgpu::remove}},
+	{VGPU_LIST, {.func = &cmdVgpu::listGpus}},
+	{VGPU_STATS, {.func = &cmdVgpu::stats}},
+	{VGPU_LMEM, {}},
 };
 
 /**
@@ -54,7 +55,7 @@ void cmdVgpu::help(HELP helpType)
 	helpList.push_back(helpCmd(HEADING, "-h,--help                   Print this help message and exit"));
 	helpList.push_back(helpCmd(HEADING, "-j,--json                   Print result in JSON format"));
 	helpList.push_back(helpCmd(BLANK));
-	helpList.push_back(helpCmd(HEADING, "-d,--device                 Device ID or PCI BDF address"));
+	helpList.push_back(helpCmd(HEADING, "--device,--id               Device ID or PCI BDF address"));
 	helpList.push_back(
 		helpCmd(HEADING, "--precheck                  Check if BIOS settings are ready to create virtual GPUs"));
 	helpList.push_back(helpCmd(HEADING, "-c,--create                 Create the virtual GPUs"));
@@ -64,9 +65,7 @@ void cmdVgpu::help(HELP helpType)
 	helpList.push_back(
 		helpCmd(HEADING, "-r,--remove                 Remove all virtual GPUs on the specified physical GPU"));
 	helpList.push_back(
-		helpCmd(HEADING, "-l,--list                   List all virtual GPUs on the specified phytsical GPU"));
-	helpList.push_back(helpCmd(
-		HEADING, "-y,--assumeyes              Assume that the answer to any question which would be asked is yes"));
+		helpCmd(HEADING, "-l,--list                   List all virtual GPUs on the specified physical GPU"));
 	helpList.push_back(helpCmd(HEADING, "-s,--stats                  Show statistics data of all virtual GPUs"));
 
 	printHelp(helpList, helpType);
@@ -345,82 +344,35 @@ int cmdVgpu::run(arg_struct *args)
 	TRACING();
 	std::vector<devInfo> deviceList;
 	ze_result_t result;
-	bool found = false;
-	int opt;
-	int optionIndex = 0;
-	std::string shortOpts;
-	std::vector<struct option> longOptsVec;
 
+	// Reset state
 	for (auto &[k, v] : vgpuCmds) {
 		v.enabled = false;
 		v.val.clear();
 	}
 
-	processOptions(vgpuCmds, shortOpts, longOptsVec);
-	const struct option *longOpts = longOptsVec.data();
-	// Skip the first two arguments (process and command name)
-	int startind = 2;
-	optind = 2;
-
-	while ((opt = getopt_long(args->argc, args->argv, shortOpts.c_str(), longOpts, &optionIndex)) != -1) {
-		switch (opt) {
-		case 'h':
-			help();
-			return ZE_RESULT_SUCCESS;
-		case 'j':
-			vgpuCmds[vgpuCmdType::VGPU_JSON].enabled = true;
-			break;
-		case 'd':
-			vgpuCmds[vgpuCmdType::VGPU_DEVICE].val = optarg;
-			vgpuCmds[vgpuCmdType::VGPU_DEVICE].enabled = true;
-			break;
-		case 'c':
-			vgpuCmds[vgpuCmdType::VGPU_CREATE].enabled = true;
-			break;
-		case 'r':
-			vgpuCmds[vgpuCmdType::VGPU_REMOVE].enabled = true;
-			break;
-		case 'l':
-			vgpuCmds[vgpuCmdType::VGPU_LIST].enabled = true;
-			break;
-		case 'n':
-			vgpuCmds[vgpuCmdType::VGPU_NUMBER].enabled = true;
-			vgpuCmds[vgpuCmdType::VGPU_NUMBER].val = optarg;
-			break;
-		case 's':
-			vgpuCmds[vgpuCmdType::VGPU_STATS].enabled = true;
-			break;
-		case 0:
-			for (auto &cmd : vgpuCmds) {
-				if (STRCASECMP(longOpts[optionIndex].name, cmd.second.opt.name) == 0) {
-					cmd.second.enabled = true;
-					if (longOpts[optionIndex].has_arg == required_argument) {
-						cmd.second.val = optarg;
-					}
-					found = true;
-					break;
-				}
-			}
+	CLI::App sub{"Manage virtual GPUs (vGPU)", "vgpu"};
+	sub.set_help_flag("-h,--help", "Print this help message and exit");
+	sub.add_flag("-j,--json", vgpuCmds[VGPU_JSON].enabled, "Print result in JSON format");
+	sub.add_option("-d,--device,--id", vgpuCmds[VGPU_DEVICE].val, "Device ID or PCI BDF address")
+		->each([&](const std::string &) { vgpuCmds[VGPU_DEVICE].enabled = true; });
+	sub.add_flag("--precheck", vgpuCmds[VGPU_PRECHECK].enabled, "Check vGPU readiness");
+	sub.add_option("-n,--number", vgpuCmds[VGPU_NUMBER].val, "Number of vGPUs to create")
+		->each([&](const std::string &) { vgpuCmds[VGPU_NUMBER].enabled = true; });
+	sub.add_flag("-c,--create", vgpuCmds[VGPU_CREATE].enabled, "Create vGPUs");
+	sub.add_flag("-r,--remove", vgpuCmds[VGPU_REMOVE].enabled, "Remove vGPUs");
+	sub.add_flag("-l,--list", vgpuCmds[VGPU_LIST].enabled, "List vGPUs");
+	sub.add_flag("-s,--stats", vgpuCmds[VGPU_STATS].enabled, "Show vGPU stats");
+	sub.add_option("--lmem", vgpuCmds[VGPU_LMEM].val, "Local memory size per vGPU (MB)")
+		->each([&](const std::string &) { vgpuCmds[VGPU_LMEM].enabled = true; });
 
-			if (!found) {
-				ERR("The following argument was not expected: '{}'.\n", longOpts[optionIndex].name);
-				ERR("Run with --help for more information.\n");
-				return ZE_RESULT_ERROR_INVALID_ARGUMENT;
-			}
-
-			break;
-		default:
-			ERR("The following argument was not expected: '{}'.\n", args->argv[startind]);
-			ERR("Run with --help for more information.\n");
-			break;
-		}
-		startind++;
-	}
-
-	// If optind is not equal to args->argc, it means there are extra arguments
-	// that were not processed by getopt_long.
-	if (optind != args->argc) {
-		ERR("The following argument was not expected: '{}'.\n", args->argv[optind]);
+	try {
+		sub.parse(args->argc - 1, args->argv + 1);
+	} catch (const CLI::CallForHelp &) {
+		help();
+		return ZE_RESULT_SUCCESS;
+	} catch (const CLI::ParseError &e) {
+		ERR("{}", e.what());
 		ERR("Run with --help for more information.\n");
 		return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 	}
@@ -444,7 +396,7 @@ int cmdVgpu::run(arg_struct *args)
 		// Call the appropriate command function based on the command type
 		for (const auto &cmd : vgpuCmds) {
 			if (cmd.second.enabled && cmd.second.func != nullptr) {
-				DBG("Running command: {}\n", cmd.second.opt.name);
+				DBG("Running command: {}\n", vgpuCmdName(cmd.first));
 				result = (this->*cmd.second.func)(&device);
 				break;
 			}
diff --git a/ial/cmn/cmd_vgpu.h b/ial/cmn/cmd_vgpu.h
index c5e1a2ad2..2b6776d59 100644
--- a/ial/cmn/cmd_vgpu.h
+++ b/ial/cmn/cmd_vgpu.h
@@ -9,6 +9,7 @@
 
 #include "cmds.h"
 #include <os.h>
+#include <string_view>
 
 enum vgpuCmdType
 {
@@ -31,7 +32,7 @@ class cmdVgpu : public cmds
 {
 
 public:
-	cmdVgpu() { STRCPY_S(name, MAX_PATH, "vgpu"); };
+	cmdVgpu() { name = "vgpu"; };
 	~cmdVgpu(){};
 	void help(HELP helpType = FULL_HELP);
 	ze_result_t precheck(devInfo *d);
@@ -46,10 +47,27 @@ using vgpuSubCmdFunc = ze_result_t (cmdVgpu::*)(devInfo *d);
 
 struct vgpuCmdStruct
 {
-	option opt;
-	vgpuSubCmdFunc func;
-	bool enabled;
-	std::string val;
+	vgpuSubCmdFunc func{nullptr};
+	bool enabled{false};
+	std::string val{};
 };
 
-#endif
\ No newline at end of file
+constexpr std::string_view vgpuCmdName(vgpuCmdType t) noexcept
+{
+	switch (t) {
+	case vgpuCmdType::VGPU_PRECHECK:
+		return "precheck";
+	case vgpuCmdType::VGPU_CREATE:
+		return "create";
+	case vgpuCmdType::VGPU_REMOVE:
+		return "remove";
+	case vgpuCmdType::VGPU_LIST:
+		return "list";
+	case vgpuCmdType::VGPU_STATS:
+		return "stats";
+	default:
+		return "";
+	}
+}
+
+#endif
diff --git a/ial/cmn/cmds.h b/ial/cmn/cmds.h
index 1d959b06c..5fb88c9d5 100644
--- a/ial/cmn/cmds.h
+++ b/ial/cmn/cmds.h
@@ -14,14 +14,6 @@
 #include <unordered_map>
 #include <vector>
 
-enum DAEMONCAP
-{
-	DAEMONLESS,
-	DAEMON,
-	BOTH,
-};
-
-extern DAEMONCAP curDaemonMode;
 extern std::string progName;
 
 enum GAP
@@ -74,11 +66,11 @@ struct arg_struct
 class cmds
 {
 protected:
-	char name[MAX_PATH];
+	std::string name;
 
 public:
 	cmds(){};
-	char *getName() { return name; }
+	const std::string &getName() { return name; }
 	virtual ~cmds(){};
 	void printHelp(std::vector<helpCmd> helpList, HELP helpType = FULL_HELP);
 	virtual void help(HELP helpType = FULL_HELP) = 0;
@@ -94,39 +86,4 @@ struct cmd_struct
 	runFunc rf;
 };
 
-template <typename T>
-concept HasOpt = requires(T t) {
-	t.opt;
-	t.opt.val;
-	t.opt.has_arg;
-	requires std::is_same_v<decltype(t.opt.val), int>;
-	requires std::is_convertible_v<decltype(t.opt.has_arg), int>;
-};
-
-template <typename Container>
-concept IsUnorderedMap = requires(Container c) {
-	typename Container::key_type;
-	typename Container::mapped_type;
-	c.begin();
-	c.end();
-	requires HasOpt<typename Container::mapped_type>;
-};
-
-template <IsUnorderedMap MapType>
-void processOptions(const MapType &mapData, std::string &shortOpts, std::vector<struct option> &longOptsVec)
-{
-	for (const auto &pair : mapData) {
-		longOptsVec.push_back(pair.second.opt);
-
-		char val = (char)pair.second.opt.val;
-		if (val == 0)
-			continue; // skip if no short option
-		shortOpts += val;
-		if (pair.second.opt.has_arg == required_argument)
-			shortOpts += ":";
-		else if (pair.second.opt.has_arg == optional_argument)
-			shortOpts += "::";
-	}
-	longOptsVec.push_back({0, 0, 0, 0}); // Null-terminate the array
-}
 #endif
diff --git a/ial/cmn/meson.build b/ial/cmn/meson.build
index 7aeff5be1..80255e91f 100644
--- a/ial/cmn/meson.build
+++ b/ial/cmn/meson.build
@@ -4,33 +4,47 @@
 # IAL common (Command implementations) build
 
 ial_cmn_sources = files(
-  'cmd_agentset.cpp',
+  '../../hal/core/debug.cpp',
+  'metrics/clock.cpp',
+  'metrics/temperature_metrics.cpp',
+  'metrics/utilization.cpp',
+  'metrics/pci.cpp',
+  'metrics/power.cpp',
+  'metrics/ecc.cpp',
   'cmd_amc.cpp',
-  'cmd_listgpu.cpp',
   'cmd_config.cpp',
-  'cmd_diag.cpp',
   'cmd_discovery.cpp',
   'cmd_dump.cpp',
-  'cmd_group.cpp',
   'cmd_health.cpp',
+  'cmd_listpciinfo.cpp',
   'cmd_log.cpp',
-  'cmd_policy.cpp',
   'cmd_ps.cpp',
+  'cmd_smi.cpp',
   'cmd_stats.cpp',
-  'cmd_topdown.cpp',
   'cmd_topology.cpp',
-  'cmd_smi.cpp',
   'cmd_updatefw.cpp',
   'cmd_vgpu.cpp',
   'cmds.cpp',
+  'metrics_registry.cpp',
   'printer.cpp',
-  '../../hal/core/debug.cpp',
+  'metrics/eu_array.cpp',
+  'metrics/fan.cpp',
+  'metrics/memory.cpp',
 )
 
 ial_cmn_inc = include_directories('.')
 
 # Platform-specific dependencies
-ial_cmn_deps = [libxpum_dep, oal_dep, nlohmann_json_dep, amc_dep, fwupd_dep, table_dep, bdf_dep]
+ial_cmn_deps = [
+  libxpum_dep,
+  oal_dep,
+  nlohmann_json_dep,
+  cli11_dep,
+  amc_dep,
+  fwupd_dep,
+  table_dep,
+  bdf_dep,
+]
 if is_linux
   ial_cmn_deps += [pciaccess_dep]
 endif
@@ -39,15 +53,16 @@ endif
 ial_cmn_cpp_args = []
 if is_windows
   ial_cmn_cpp_args += [
-    '/wd4100',  # Disable C4100: unreferenced parameter (from hwloc headers)
-    '-D_CRT_SECURE_NO_WARNINGS',  # Disable CRT security warnings
+    '/wd4100', # Disable C4100: unreferenced parameter (from hwloc headers)
+    '-D_CRT_SECURE_NO_WARNINGS', # Disable CRT security warnings
   ]
 endif
 
 # Common commands static library
-ial_cmn_lib = static_library('ial_cmn',
+ial_cmn_lib = static_library(
+  'ial_cmn',
   ial_cmn_sources,
-  include_directories : [
+  include_directories: [
     global_inc,
     ial_cmn_inc,
     oal_inc_dirs,
@@ -56,14 +71,18 @@ ial_cmn_lib = static_library('ial_cmn',
     include_directories('../../hal/amc'),
     include_directories('../../utility/table'),
   ],
-  dependencies : ial_cmn_deps,
-  cpp_args : ial_cmn_cpp_args,
-  install : false
+  dependencies: ial_cmn_deps,
+  cpp_args: ial_cmn_cpp_args,
+  install: false,
 )
 
 # IAL common dependency for CLI and daemon
 ial_cmn_dep = declare_dependency(
-  link_with : ial_cmn_lib,
-  include_directories : ial_cmn_inc,
-  dependencies : [table_dep]
+  link_with: ial_cmn_lib,
+  include_directories: ial_cmn_inc,
+  dependencies: [table_dep],
 )
+
+if get_option('with_tests')
+  subdir('test')
+endif
diff --git a/ial/cmn/metrics/clock.cpp b/ial/cmn/metrics/clock.cpp
new file mode 100644
index 000000000..621a01378
--- /dev/null
+++ b/ial/cmn/metrics/clock.cpp
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Clock metrics: current and maximum GPU/media engine frequencies and throttle reason.
+ * clocks.current.graphics, clocks.current.media, and clocks.throttle.reason are Live
+ * metrics queried from the frequency HAL at each sampling tick.
+ * clocks.max.graphics and clocks.max.media are Static metrics queried once per getter call.
+ */
+
+#include "clock.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "zes_api.h"
+#include <frequency.h>
+#include <array>
+#include <format>
+#include <string>
+#include <string_view>
+#include <utility>
+
+namespace metrics::clock {
+
+namespace {
+
+/**
+ * @brief Reads the current GPU (graphics) core clock frequency.
+ *
+ * Queries the frequency HAL for the active clock on @c ZES_FREQ_DOMAIN_GPU and
+ * formats the result as a decimal string in MHz.
+ *
+ * @param[in]  d      Device to query. Returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ *                    if the frequency HAL sub-object is @c nullptr.
+ * @param[out] out    On success, set to the current GPU frequency in MHz as a
+ *                    decimal string (e.g. @c "1600"). Unchanged on failure.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @retval ZE_RESULT_SUCCESS               The frequency was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The frequency HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the frequency
+ *                                         HAL @c getCurFreq() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t gpuCurFreqGetter(devInfo &d, MetricValue &out, const MetricCache &)
+{
+	auto *freq = d.dev->getFrequency();
+	if (freq == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	double val = 0.0;
+	auto const result = freq->getCurFreq(&val, ZES_FREQ_DOMAIN_GPU);
+	if (result == ZE_RESULT_SUCCESS) {
+		out = std::format("{}", val);
+	}
+	return result;
+}
+
+/**
+ * @brief Reads the current media engine clock frequency.
+ *
+ * Queries the frequency HAL for the active clock on @c ZES_FREQ_DOMAIN_MEDIA and
+ * formats the result as a decimal string in MHz.
+ *
+ * @param[in]  d      Device to query. Returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ *                    if the frequency HAL sub-object is @c nullptr.
+ * @param[out] out    On success, set to the current media frequency in MHz as a
+ *                    decimal string (e.g. @c "1200"). Unchanged on failure.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @retval ZE_RESULT_SUCCESS               The frequency was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The frequency HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the frequency
+ *                                         HAL @c getCurFreq() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t mediaCurFreqGetter(devInfo &d, MetricValue &out, const MetricCache &)
+{
+	auto *freq = d.dev->getFrequency();
+	if (freq == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	double val = 0.0;
+	auto const result = freq->getCurFreq(&val, ZES_FREQ_DOMAIN_MEDIA);
+	if (result == ZE_RESULT_SUCCESS) {
+		out = std::format("{}", val);
+	}
+	return result;
+}
+
+/**
+ * @brief Reads the maximum configurable GPU (graphics) core clock frequency.
+ *
+ * Queries the frequency HAL for the hardware maximum on @c ZES_FREQ_DOMAIN_GPU.
+ * This represents the upper bound of the frequency range that can be requested;
+ * the actual running frequency may be lower due to thermal or power throttling.
+ *
+ * @param[in]  d      Device to query. Returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ *                    if the frequency HAL sub-object is @c nullptr.
+ * @param[out] out    On success, set to the maximum GPU frequency in MHz as a
+ *                    decimal string (e.g. @c "2050"). Unchanged on failure.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @retval ZE_RESULT_SUCCESS               The maximum frequency was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The frequency HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the frequency
+ *                                         HAL @c getMaxFreqForDomain() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t gpuMaxFreqGetter(devInfo &d, MetricValue &out, const MetricCache &)
+{
+	auto *freq = d.dev->getFrequency();
+	if (freq == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	double maxMHz = 0.0;
+	auto const result = freq->getMaxFreqForDomain(ZES_FREQ_DOMAIN_GPU, maxMHz);
+	if (result == ZE_RESULT_SUCCESS) {
+		out = std::format("{}", maxMHz);
+	}
+	return result;
+}
+
+/**
+ * @brief Reads the maximum configurable media engine clock frequency.
+ *
+ * Queries the frequency HAL for the hardware maximum on @c ZES_FREQ_DOMAIN_MEDIA.
+ *
+ * @param[in]  d      Device to query. Returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ *                    if the frequency HAL sub-object is @c nullptr.
+ * @param[out] out    On success, set to the maximum media frequency in MHz as a
+ *                    decimal string (e.g. @c "1600"). Unchanged on failure.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @retval ZE_RESULT_SUCCESS               The maximum frequency was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The frequency HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the frequency
+ *                                         HAL @c getMaxFreqForDomain() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t mediaMaxFreqGetter(devInfo &d, MetricValue &out, const MetricCache &)
+{
+	auto *freq = d.dev->getFrequency();
+	if (freq == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	double maxMHz = 0.0;
+	auto const result = freq->getMaxFreqForDomain(ZES_FREQ_DOMAIN_MEDIA, maxMHz);
+	if (result == ZE_RESULT_SUCCESS) {
+		out = std::format("{}", maxMHz);
+	}
+	return result;
+}
+
+/**
+ * @brief Reads the current GPU frequency throttle reason flags.
+ *
+ * Queries the frequency HAL for active throttle reason flags and maps each set bit
+ * to a human-readable name (e.g. @c "Thermal", @c "Power", @c "Voltage").
+ * Multiple active reasons are joined with commas. Returns @c "None" when no throttle
+ * is active.
+ *
+ * @param[in]  d      Device to query. Returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ *                    if the frequency HAL sub-object is @c nullptr.
+ * @param[out] out    On success, set to a comma-separated list of active throttle
+ *                    reason names, or @c "None" if no throttle is active.
+ *                    Unchanged on failure.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @retval ZE_RESULT_SUCCESS               The throttle reason was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The frequency HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the frequency
+ *                                         HAL @c getThrottleReason() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t throttleReasonGetter(devInfo &d, MetricValue &out, const MetricCache &)
+{
+	auto *freq = d.dev->getFrequency();
+	if (freq == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	zes_freq_throttle_reason_flags_t flags{};
+	auto const result = freq->getThrottleReason(&flags);
+	if (result != ZE_RESULT_SUCCESS) {
+		return result;
+	}
+	using Entry = std::pair<zes_freq_throttle_reason_flags_t, std::string_view>;
+	static constexpr auto table = std::to_array<Entry>({
+		{ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT, "Thermal"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP, "Power"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_BURST_PWR_CAP, "PowerBurst"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_CURRENT_LIMIT, "Current"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_SW_RANGE, "SW"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_HW_RANGE, "HW"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_VOLTAGE, "Voltage"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_THERMAL, "ThermalAlert"},
+		{ZES_FREQ_THROTTLE_REASON_FLAG_POWER, "PowerAlert"},
+	});
+	std::string resultStr;
+	for (const auto &[bit, name] : table) {
+		if ((flags & bit) != 0U) {
+			if (!resultStr.empty()) {
+				resultStr += ',';
+			}
+			resultStr += name;
+		}
+	}
+	out = resultStr.empty() ? "None" : resultStr;
+	return ZE_RESULT_SUCCESS;
+}
+
+constexpr auto GRAPHICS_ALIASES = std::to_array<std::string_view>({"clocks.current.sm", "clocks.gr"});
+constexpr auto MEDIA_ALIASES = std::to_array<std::string_view>({"clocks.current.video", "clocks.mem"});
+constexpr auto MAX_GRAPHICS_ALIASES = std::to_array<std::string_view>({"clocks.max.sm"});
+constexpr auto MAX_MEDIA_ALIASES = std::to_array<std::string_view>({"clocks.max.video"});
+
+constexpr auto CLOCK_METRICS = std::to_array<QueryMetric>({
+	{
+		.name = "clocks.current.graphics",
+		.aliases = GRAPHICS_ALIASES,
+		.unit = "MHz",
+		.description = "Current GPU core clock",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::CLOCK,
+		.getter = gpuCurFreqGetter,
+	},
+	{
+		.name = "clocks.current.media",
+		.aliases = MEDIA_ALIASES,
+		.unit = "MHz",
+		.description = "Current media engine clock",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::CLOCK,
+		.getter = mediaCurFreqGetter,
+	},
+	{
+		.name = "clocks.throttle.reason",
+		.unit = "",
+		.description = "GPU frequency throttle reason (comma-separated if multiple active)",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::CLOCK,
+		.getter = throttleReasonGetter,
+	},
+	// ── Maximum hardware clock frequencies ───────────────────────────────────
+	{
+		.name = "clocks.max.graphics",
+		.aliases = MAX_GRAPHICS_ALIASES,
+		.unit = "MHz",
+		.description = "Maximum GPU core (graphics) clock",
+		.source = MetricSource::Static,
+		.groups = MetricGroup::CLOCK,
+		.getter = gpuMaxFreqGetter,
+	},
+	{
+		.name = "clocks.max.media",
+		.aliases = MAX_MEDIA_ALIASES,
+		.unit = "MHz",
+		.description = "Maximum media engine clock",
+		.source = MetricSource::Static,
+		.groups = MetricGroup::CLOCK,
+		.getter = mediaMaxFreqGetter,
+	},
+});
+
+} // namespace
+
+/**
+ * @brief Returns the compile-time array of all clock @c QueryMetric descriptors.
+ *
+ * Exposes the following metrics, all belonging to @c MetricGroup::CLOCK:
+ * - @c clocks.current.graphics (Live)   — current GPU core clock in MHz
+ * - @c clocks.current.media    (Live)   — current media engine clock in MHz
+ * - @c clocks.throttle.reason  (Live)   — active throttle reason(s), comma-separated
+ * - @c clocks.max.graphics     (Static) — maximum GPU core clock in MHz
+ * - @c clocks.max.media        (Static) — maximum media engine clock in MHz
+ *
+ * @return A non-owning @c std::span over the internal @c CLOCK_METRICS array. The span
+ *         is valid for the lifetime of the program (the backing array has static storage
+ *         duration).
+ *
+ * @throws None — @c noexcept; the array is statically allocated and the span
+ *                constructor cannot throw.
+ *
+ * @note This function is intended to be called once during registry initialisation.
+ */
+std::span<const QueryMetric> getClockMetrics() noexcept { return CLOCK_METRICS; }
+
+} // namespace metrics::clock
diff --git a/ial/cmn/metrics/clock.h b/ial/cmn/metrics/clock.h
new file mode 100644
index 000000000..24eedbcf5
--- /dev/null
+++ b/ial/cmn/metrics/clock.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Clock metrics: current GPU/media frequencies, throttle reason, and
+ * maximum hardware clock frequencies. Aliases for nvidia-smi-compatible
+ * field names (clocks.current.sm, clocks.current.video, clocks.max.sm)
+ * are attached to their canonical counterparts and invisible to group
+ * expansion but resolvable by name.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::clock {
+
+[[nodiscard]] std::span<const QueryMetric> getClockMetrics() noexcept;
+
+} // namespace metrics::clock
diff --git a/ial/cmn/metrics/ecc.cpp b/ial/cmn/metrics/ecc.cpp
new file mode 100644
index 000000000..6968978ec
--- /dev/null
+++ b/ial/cmn/metrics/ecc.cpp
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * ECC metrics: current ECC mode, correctable/uncorrectable/aggregate cache error totals,
+ * and individual RAS error category counters (reset, programming, driver, cache, non-compute).
+ * ecc.mode.current is a Static metric that queries the ECC HAL directly at getter time.
+ * All error-count metrics are Live metrics queried from the RAS HAL.
+ */
+
+#include "ecc.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include "zes_api.h"
+#include <ras.h>
+#include <array>
+#include <format>
+#include <span>
+
+namespace metrics::ecc {
+
+namespace {
+
+/**
+ * @brief Reads the current ECC enable/disable state from the device ECC HAL.
+ *
+ * Queries the ECC HAL for the current device state and maps it to a human-readable
+ * string: @c "Enabled", @c "Disabled", or @c "Unavailable" for any unrecognised state.
+ *
+ * @param[in]  d   Device to query. Must have been initialised; returns
+ *                 @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE if the ECC HAL sub-object
+ *                 is @c nullptr.
+ * @param[out] out On success, set to @c "Enabled", @c "Disabled", or @c "Unavailable".
+ *                 Unchanged on failure.
+ * @param      unused Unused metric cache parameter; ECC state is always queried live.
+ *
+ * @retval ZE_RESULT_SUCCESS               The ECC state was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The ECC HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the ECC HAL
+ *                                         @c getState() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t eccModeGetter(devInfo &d, MetricValue &out, const MetricCache & /*unused*/)
+{
+	auto *ecc = d.dev->getECC();
+	if (ecc == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	zes_device_ecc_properties_t props{};
+	props.stype = ZES_STRUCTURE_TYPE_DEVICE_ECC_PROPERTIES;
+	auto const r = ecc->getState(d.zesDeviceHdl, &props);
+	if (r != ZE_RESULT_SUCCESS) {
+		return r;
+	}
+	switch (props.currentState) {
+	case ZES_DEVICE_ECC_STATE_ENABLED:
+		out = "Enabled";
+		break;
+	case ZES_DEVICE_ECC_STATE_DISABLED:
+		out = "Disabled";
+		break;
+	default:
+		out = "Unavailable";
+		break;
+	}
+	return ZE_RESULT_SUCCESS;
+}
+
+// Sum only the cache-error category for correctable/uncorrectable typed totals.
+// The HAL only type-filters cache errors; including other categories would make
+// both totals identical (and therefore misleading).
+/**
+ * @brief Sums RAS errors for a specific cache-error type (correctable or uncorrectable).
+ *
+ * Queries the RAS HAL for the @c ZES_RAS_ERROR_CAT_CACHE_ERRORS category filtered by
+ * @p cacheErrorType. Only cache errors are type-filtered; including other categories
+ * would make correctable and uncorrectable totals identical and therefore misleading.
+ *
+ * @param[in]  d              Device to query. Returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+ *                            if the RAS HAL sub-object is @c nullptr.
+ * @param[in]  cacheErrorType The error type filter: @c ZES_RAS_ERROR_TYPE_CORRECTABLE
+ *                            or @c ZES_RAS_ERROR_TYPE_UNCORRECTABLE.
+ * @param[out] out            On success, set to the decimal string representation of
+ *                            the error count. Unchanged on failure.
+ *
+ * @retval ZE_RESULT_SUCCESS               The count was read and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The RAS HAL sub-object is @c nullptr.
+ * @retval Other                           Any error code propagated from the RAS HAL
+ *                                         @c getErrors() call.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t aggregateRasErrors(devInfo &d, zes_ras_error_type_t cacheErrorType, MetricValue &out)
+{
+	auto *ras = d.dev->getRAS();
+	if (ras == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	uint64_t n = 0;
+	auto const res = ras->getErrors(ZES_RAS_ERROR_CAT_CACHE_ERRORS, cacheErrorType, &n);
+	if (res == ZE_RESULT_SUCCESS) {
+		out = std::format("{}", n);
+	}
+	return res;
+}
+
+// Sum all categories for the untyped grand total, querying correctable and
+// uncorrectable separately to avoid the undefined ZES_RAS_ERROR_TYPE_FORCE_UINT32 sentinel.
+// Categories that return UNSUPPORTED_FEATURE for one type (e.g. RESET is always
+// uncorrectable) are treated as zero for that type so accumulation continues.
+ze_result_t aggregateAllRasErrors(devInfo &d, MetricValue &out)
+{
+	auto *ras = d.dev->getRAS();
+	if (ras == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	static constexpr auto cats =
+		std::to_array<zes_ras_error_cat_t>({ZES_RAS_ERROR_CAT_CACHE_ERRORS, ZES_RAS_ERROR_CAT_COMPUTE_ERRORS,
+											ZES_RAS_ERROR_CAT_NON_COMPUTE_ERRORS, ZES_RAS_ERROR_CAT_DISPLAY_ERRORS});
+	uint64_t total = 0;
+	for (const auto cat : cats) {
+		uint64_t corr = 0, uncorr = 0;
+		const auto rc = ras->getErrors(cat, ZES_RAS_ERROR_TYPE_CORRECTABLE, &corr);
+		if (rc != ZE_RESULT_SUCCESS && rc != ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+			return rc;
+		}
+		const auto ru = ras->getErrors(cat, ZES_RAS_ERROR_TYPE_UNCORRECTABLE, &uncorr);
+		if (ru != ZE_RESULT_SUCCESS && ru != ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+			return ru;
+		}
+		total += corr + uncorr;
+	}
+	out = std::format("{}", total);
+	return ZE_RESULT_SUCCESS;
+}
+
+/**
+ * @brief Getter for @c ecc.errors.corrected.aggregate.total — correctable cache ECC errors.
+ *
+ * Delegates to aggregateRasErrors() with @c ZES_RAS_ERROR_TYPE_CORRECTABLE.
+ *
+ * @param[in]  d      Device to query.
+ * @param[out] out    On success, set to the decimal string of the correctable error count.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @return @c ZE_RESULT_SUCCESS on success; error code on failure.
+ */
+ze_result_t errCorrectedTotalGetter(devInfo &d, MetricValue &out, const MetricCache & /*unused*/)
+{
+	return aggregateRasErrors(d, ZES_RAS_ERROR_TYPE_CORRECTABLE, out);
+}
+
+/**
+ * @brief Getter for @c ecc.errors.uncorrected.aggregate.total — uncorrectable cache ECC errors.
+ *
+ * Delegates to aggregateRasErrors() with @c ZES_RAS_ERROR_TYPE_UNCORRECTABLE.
+ *
+ * @param[in]  d      Device to query.
+ * @param[out] out    On success, set to the decimal string of the uncorrectable error count.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @return @c ZE_RESULT_SUCCESS on success; error code on failure.
+ */
+ze_result_t errUncorrectedTotalGetter(devInfo &d, MetricValue &out, const MetricCache & /*unused*/)
+{
+	return aggregateRasErrors(d, ZES_RAS_ERROR_TYPE_UNCORRECTABLE, out);
+}
+
+/**
+ * @brief Getter for @c ecc.errors.aggregate.total — total RAS errors across all categories.
+ *
+ * Delegates to aggregateAllRasErrors().
+ *
+ * @param[in]  d      Device to query.
+ * @param[out] out    On success, set to the decimal string of the total error count.
+ * @param      unused Unused metric cache parameter.
+ *
+ * @return @c ZE_RESULT_SUCCESS on success; error code on failure.
+ */
+ze_result_t errAggregateTotalGetter(devInfo &d, MetricValue &out, const MetricCache & /*unused*/)
+{
+	return aggregateAllRasErrors(d, out);
+}
+
+// Generic getter for a single RAS error category and explicit type (CORRECTABLE or UNCORRECTABLE).
+template <zes_ras_error_cat_t CAT, zes_ras_error_type_t TYPE>
+ze_result_t rasErrorGetter(devInfo &d, MetricValue &out, const MetricCache & /*unused*/)
+{
+	static_assert(TYPE == ZES_RAS_ERROR_TYPE_CORRECTABLE || TYPE == ZES_RAS_ERROR_TYPE_UNCORRECTABLE,
+				  "Use rasAllTypesGetter for unfiltered totals; do not pass FORCE_UINT32");
+	auto *r = d.dev->getRAS();
+	if (r == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	uint64_t n = 0;
+	auto const res = r->getErrors(CAT, TYPE, &n);
+	if (res == ZE_RESULT_SUCCESS) {
+		out = std::format("{}", n);
+	}
+	return res;
+}
+
+// Getter for an unfiltered per-category total: sums correctable + uncorrectable.
+// Categories that only define one type (e.g. RESET) return UNSUPPORTED for the
+// other type; that is treated as zero so the sum is still correct.
+template <zes_ras_error_cat_t CAT>
+ze_result_t rasAllTypesGetter(devInfo &d, MetricValue &out, const MetricCache & /*unused*/)
+{
+	auto *r = d.dev->getRAS();
+	if (r == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	uint64_t corr = 0, uncorr = 0;
+	const auto rc = r->getErrors(CAT, ZES_RAS_ERROR_TYPE_CORRECTABLE, &corr);
+	if (rc != ZE_RESULT_SUCCESS && rc != ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+		return rc;
+	}
+	const auto ru = r->getErrors(CAT, ZES_RAS_ERROR_TYPE_UNCORRECTABLE, &uncorr);
+	if (ru != ZE_RESULT_SUCCESS && ru != ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+		return ru;
+	}
+	out = std::format("{}", corr + uncorr);
+	return ZE_RESULT_SUCCESS;
+}
+
+constexpr auto ECC_METRICS = std::to_array<QueryMetric>({
+	{
+		.name = "ecc.mode.current",
+		.unit = "",
+		.description = "Current ECC state (Enabled/Disabled/Unavailable)",
+		.source = MetricSource::Static,
+		.groups = MetricGroup::ECC,
+		.getter = eccModeGetter,
+	},
+	{
+		.name = "ecc.errors.corrected.aggregate.total",
+		.unit = "",
+		.description = "Correctable (single-bit) cache ECC errors",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = errCorrectedTotalGetter,
+	},
+	{
+		.name = "ecc.errors.uncorrected.aggregate.total",
+		.unit = "",
+		.description = "Uncorrectable (double-bit) cache ECC errors",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = errUncorrectedTotalGetter,
+	},
+	{
+		.name = "ecc.errors.aggregate.total",
+		.unit = "",
+		.description = "Total ECC errors across all categories (correctable + uncorrectable)",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = errAggregateTotalGetter,
+	},
+	{
+		.name = "ras.reset",
+		.unit = "",
+		.description = "GPU reset count",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = rasAllTypesGetter<ZES_RAS_ERROR_CAT_RESET>,
+	},
+	{
+		.name = "ras.programming.errors",
+		.unit = "",
+		.description = "Programming error count",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = rasAllTypesGetter<ZES_RAS_ERROR_CAT_PROGRAMMING_ERRORS>,
+	},
+	{
+		.name = "ras.driver.errors",
+		.unit = "",
+		.description = "Driver error count",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = rasAllTypesGetter<ZES_RAS_ERROR_CAT_DRIVER_ERRORS>,
+	},
+	{
+		.name = "ras.cache.errors.correctable",
+		.unit = "",
+		.description = "Correctable cache ECC errors",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = rasErrorGetter<ZES_RAS_ERROR_CAT_CACHE_ERRORS, ZES_RAS_ERROR_TYPE_CORRECTABLE>,
+	},
+	{
+		.name = "ras.cache.errors.uncorrectable",
+		.unit = "",
+		.description = "Uncorrectable cache ECC errors",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = rasErrorGetter<ZES_RAS_ERROR_CAT_CACHE_ERRORS, ZES_RAS_ERROR_TYPE_UNCORRECTABLE>,
+	},
+	{
+		.name = "ras.non_compute.errors.total",
+		.unit = "",
+		.description = "Non-compute error count (correctable + uncorrectable; HAL does not differentiate)",
+		.source = MetricSource::Live,
+		.groups = MetricGroup::ECC,
+		.getter = rasAllTypesGetter<ZES_RAS_ERROR_CAT_NON_COMPUTE_ERRORS>,
+	},
+});
+} // namespace
+
+std::span<const QueryMetric> getEccMetrics() noexcept { return ECC_METRICS; }
+
+} // namespace metrics::ecc
diff --git a/ial/cmn/metrics/ecc.h b/ial/cmn/metrics/ecc.h
new file mode 100644
index 000000000..b5c7fe688
--- /dev/null
+++ b/ial/cmn/metrics/ecc.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * ECC / RAS metrics: ECC mode, aggregate error counts, and per-category RAS counters.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::ecc {
+
+[[nodiscard]] std::span<const QueryMetric> getEccMetrics() noexcept;
+
+} // namespace metrics::ecc
diff --git a/ial/cmn/metrics/eu_array.cpp b/ial/cmn/metrics/eu_array.cpp
new file mode 100644
index 000000000..5edc7584c
--- /dev/null
+++ b/ial/cmn/metrics/eu_array.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * EU Array metrics: Xe EU active/stall/idle fractions.
+ *
+ * getEuActiveStallIdle is called once per tick by populateMetricCacheEnd and
+ * stored in MetricCache::euSample.  All three fields read from that cached
+ * value so the HAL is invoked exactly once regardless of how many EU fields
+ * are included in the query.
+ */
+
+#include "eu_array.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include <array>
+#include <format>
+#include <span>
+
+namespace metrics::eu_array {
+
+namespace {
+
+constexpr auto ACTIVE = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "eu.active",
+	.unit = "%",
+	.description = "Xe EU Array Active: fraction of time EUs were actively executing (Intel-only; dump -m 9)",
+	.source = MetricSource::Live,
+	.groups = MetricGroup::EU_ARRAY | MetricGroup::UTILIZATION,
+	.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+		if (!cache.euAvail || cache.euSample.scaleFactor == 0) {
+			return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+		}
+		out = std::format("{}", static_cast<double>(cache.euSample.euActive) /
+									static_cast<double>(cache.euSample.scaleFactor));
+		return ZE_RESULT_SUCCESS;
+	}};
+
+constexpr auto STALL = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "eu.stall",
+	.unit = "%",
+	.description = "Xe EU Array Stall: fraction of time EUs were stalled with a thread loaded (Intel-only; dump -m 10)",
+	.source = MetricSource::Live,
+	.groups = MetricGroup::EU_ARRAY | MetricGroup::UTILIZATION,
+	.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+		if (!cache.euAvail || cache.euSample.scaleFactor == 0) {
+			return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+		}
+		out = std::format("{}", static_cast<double>(cache.euSample.euStall) /
+									static_cast<double>(cache.euSample.scaleFactor));
+		return ZE_RESULT_SUCCESS;
+	}};
+
+constexpr auto IDLE = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "eu.idle",
+	.unit = "%",
+	.description = "Xe EU Array Idle: fraction of time no threads were scheduled on any EU (Intel-only; dump -m 11)",
+	.source = MetricSource::Live,
+	.groups = MetricGroup::EU_ARRAY | MetricGroup::UTILIZATION,
+	.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+		if (!cache.euAvail || cache.euSample.scaleFactor == 0) {
+			return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+		}
+		out = std::format("{}",
+						  static_cast<double>(cache.euSample.euIdle) / static_cast<double>(cache.euSample.scaleFactor));
+		return ZE_RESULT_SUCCESS;
+	}};
+
+constexpr auto ALL = std::to_array<QueryMetric>({ACTIVE, STALL, IDLE});
+
+} // namespace
+
+std::span<const QueryMetric> getEuArrayMetrics() noexcept { return ALL; }
+
+} // namespace metrics::eu_array
diff --git a/ial/cmn/metrics/eu_array.h b/ial/cmn/metrics/eu_array.h
new file mode 100644
index 000000000..75e570c14
--- /dev/null
+++ b/ial/cmn/metrics/eu_array.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * EU Array metrics: Xe EU active/stall/idle fractions.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::eu_array {
+
+[[nodiscard]] std::span<const QueryMetric> getEuArrayMetrics() noexcept;
+
+} // namespace metrics::eu_array
diff --git a/ial/cmn/metrics/fan.cpp b/ial/cmn/metrics/fan.cpp
new file mode 100644
index 000000000..73d28954f
--- /dev/null
+++ b/ial/cmn/metrics/fan.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Fan metrics: speed as a percentage of maximum.
+ */
+
+#include "fan.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include <cstdint>
+#include <fan.h>
+#include <array>
+#include <span>
+#include <string>
+
+namespace metrics::fan {
+
+namespace {
+
+constexpr auto speed = QueryMetric{// NOLINT(readability-identifier-naming)
+								   .name = "fan.speed",
+								   .unit = "%",
+								   .description = "Fan speed (averaged across all fans)",
+								   .source = MetricSource::Live,
+								   .groups = MetricGroup::FAN,
+								   .getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+									   auto *f = d.dev->getFan();
+									   if (f == nullptr) {
+										   return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+									   }
+									   int32_t pct = 0;
+									   auto const r = f->getSpeedPercent(pct);
+									   if (r == ZE_RESULT_SUCCESS) {
+										   out = std::to_string(pct);
+									   }
+									   return r;
+								   }};
+
+constexpr auto ALL = std::to_array<QueryMetric>({speed});
+
+} // namespace
+
+std::span<const QueryMetric> getFanMetrics() noexcept { return ALL; }
+
+} // namespace metrics::fan
diff --git a/ial/cmn/metrics/fan.h b/ial/cmn/metrics/fan.h
new file mode 100644
index 000000000..27f4f77b7
--- /dev/null
+++ b/ial/cmn/metrics/fan.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Fan metrics: speed as a percentage of maximum.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::fan {
+
+[[nodiscard]] std::span<const QueryMetric> getFanMetrics() noexcept;
+
+} // namespace metrics::fan
diff --git a/ial/cmn/metrics/identity.h b/ial/cmn/metrics/identity.h
new file mode 100644
index 000000000..273d951d7
--- /dev/null
+++ b/ial/cmn/metrics/identity.h
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Identity metrics: device name, index, UUID, serial, driver/firmware versions,
+ * and the PCI identity fields that carry both IDENTITY and PCI group membership.
+ */
+
+#pragma once
+
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include "zes_api.h"
+#include <cstdint>
+#include <firmware.h>
+#include <pci.h>
+#include <array>
+#include <chrono>
+#include <cstring>
+#include <format>
+#include <span>
+#include <string>
+#include <utility>
+
+namespace metrics::identity {
+
+inline std::span<const QueryMetric> getIdentityMetrics() noexcept
+{
+	static constexpr auto nameAliases = std::to_array<std::string_view>({"gpu_name"});
+	static constexpr auto indexAliases = std::to_array<std::string_view>({"gpu_index"});
+	static constexpr auto uuidAliases = std::to_array<std::string_view>({"gpu_uuid"});
+	static constexpr auto serialAliases = std::to_array<std::string_view>({"gpu_serial"});
+	static constexpr auto pciBusIdAliases = std::to_array<std::string_view>({"gpu_bus_id"});
+	static constexpr auto metrics = std::to_array<QueryMetric>({
+		{
+			.name = "timestamp",
+			.unit = "",
+			.description = "The timestamp of when the query was made, in format 'YYYY/MM/DD HH:MM:SS.msec'.",
+			.source = MetricSource::Live,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &) -> ze_result_t {
+				out = std::format("{:%Y/%m/%d %H:%M:%S}",
+								  std::chrono::floor<std::chrono::milliseconds>(std::chrono::system_clock::now()));
+				return ZE_RESULT_SUCCESS;
+			},
+		},
+		{
+			.name = "name",
+			.aliases = nameAliases,
+			.unit = "",
+			.description = "The official product name of the GPU. This is an alphanumeric string.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				ze_device_properties_t props{};
+				props.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+				auto const r = d.dev->getDevProps(d.deviceHdl, &props);
+				if (r == ZE_RESULT_SUCCESS) {
+					out = props.name;
+				}
+				return r;
+			},
+		},
+		{
+			.name = "index",
+			.aliases = indexAliases,
+			.unit = "",
+			.description = "Zero based index of the GPU. Can change at each boot.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				out = std::format("{}", d.index);
+				return ZE_RESULT_SUCCESS;
+			},
+		},
+		{
+			.name = "uuid",
+			.aliases = uuidAliases,
+			.unit = "",
+			.description = "Globally unique immutable identifier of the GPU derived from the SoC UUID. Does not "
+						   "correspond to any physical label on the board.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				ze_device_properties_t props{};
+				props.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+				auto const r = d.dev->getDevProps(d.deviceHdl, &props);
+				if (r != ZE_RESULT_SUCCESS) {
+					return r;
+				}
+				std::string s;
+				s.reserve(36);
+				for (int i = 0; i < ZE_MAX_DEVICE_UUID_SIZE; ++i) {
+					if (i == 4 || i == 6 || i == 8 || i == 10) {
+						s += '-';
+					}
+					s += std::format("{:02x}", props.uuid.id[i]);
+				}
+				out = std::move(s);
+				return ZE_RESULT_SUCCESS;
+			},
+		},
+		{
+			.name = "serial",
+			.aliases = serialAliases,
+			.unit = "",
+			.description =
+				"The serial number physically printed on the board. A globally unique immutable alphanumeric value.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				zes_device_properties_t p{};
+				p.stype = ZES_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+				auto const r = d.dev->zesGetDevProps(d.zesDeviceHdl, &p);
+				if (r == ZE_RESULT_SUCCESS) {
+					out = p.serialNumber;
+				}
+				return r;
+			},
+		},
+		{
+			.name = "driver_version",
+			.unit = "",
+			.description = "The version of the installed GPU driver. This is an alphanumeric string.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				zes_device_properties_t props{};
+				props.stype = ZES_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+				auto const r = d.dev->zesGetDevProps(d.zesDeviceHdl, &props);
+				if (r == ZE_RESULT_SUCCESS) {
+					out = props.driverVersion;
+				}
+				return r;
+			},
+		},
+		{
+			.name = "vbios_version",
+			.unit = "",
+			.description = "The version of the GFX firmware currently running on the GPU board.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				auto *fw = d.dev->getFirmware();
+				if (fw == nullptr) {
+					return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+				}
+				auto *p = d.dev->getPCI();
+				if (p == nullptr) {
+					return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+				}
+				std::array<char, 256> ver{};
+				auto const r = fw->getFWversion(fwType::GFX, p->getBDFStr().c_str(), ver.data(),
+												static_cast<uint32_t>(ver.size()));
+				if (r == ZE_RESULT_SUCCESS) {
+					out = std::string(ver.data(), strnlen(ver.data(), ver.size()));
+				}
+				return r;
+			},
+		},
+		{
+			.name = "pci.bus_id",
+			.aliases = pciBusIdAliases,
+			.unit = "",
+			.description = "PCI bus address as 'domain:bus:device.function', in hex.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY | MetricGroup::PCI,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				auto *p = d.dev->getPCI();
+				if (p == nullptr) {
+					return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+				}
+				out = p->getBDFStr();
+				return ZE_RESULT_SUCCESS;
+			},
+		},
+		{
+			.name = "pci.device_id",
+			.unit = "",
+			.description = "PCI device id, in hex.",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY | MetricGroup::PCI,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				ze_device_properties_t props{};
+				props.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+				auto const r = d.dev->getDevProps(d.deviceHdl, &props);
+				if (r == ZE_RESULT_SUCCESS) {
+					out = std::format("0x{:04X}", props.deviceId);
+				}
+				return r;
+			},
+		},
+		{
+			.name = "pci.sub_device_id",
+			.unit = "",
+			.description = "Board number as reported by the Sysman device properties (used as the PCI sub-device slot "
+						   "identifier).",
+			.source = MetricSource::Static,
+			.groups = MetricGroup::IDENTITY | MetricGroup::PCI,
+			.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+				zes_device_properties_t p{};
+				p.stype = ZES_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+				auto const r = d.dev->zesGetDevProps(d.zesDeviceHdl, &p);
+				if (r == ZE_RESULT_SUCCESS) {
+					out = p.boardNumber;
+				}
+				return r;
+			},
+		},
+	});
+	return metrics;
+}
+
+} // namespace metrics::identity
diff --git a/ial/cmn/metrics/memory.cpp b/ial/cmn/metrics/memory.cpp
new file mode 100644
index 000000000..74860cb1c
--- /dev/null
+++ b/ial/cmn/metrics/memory.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Memory metrics: total/used/free capacity and read/write bandwidth.
+ */
+
+#include "memory.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include <cstdint>
+#include <memory.h>
+#include <array>
+#include <format>
+#include <span>
+#include <string>
+
+namespace metrics::memory {
+
+namespace {
+
+constexpr auto total = QueryMetric{// NOLINT(readability-identifier-naming)
+								   .name = "memory.total",
+								   .unit = "MiB",
+								   .description = "Total GPU memory",
+								   .source = MetricSource::Live,
+								   .groups = MetricGroup::MEMORY,
+								   .getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+									   auto *mem = d.dev->getMemory();
+									   if (mem == nullptr) {
+										   return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+									   }
+									   auto size = uint64_t{0};
+									   auto const r = mem->getMemorySize(&size);
+									   if (r == ZE_RESULT_SUCCESS) {
+										   out = std::format("{}", static_cast<double>(size) / (1024.0 * 1024.0));
+									   }
+									   return r;
+								   }};
+
+constexpr auto used = QueryMetric{// NOLINT(readability-identifier-naming)
+								  .name = "memory.used",
+								  .unit = "MiB",
+								  .description = "Used GPU memory",
+								  .source = MetricSource::Live,
+								  .groups = MetricGroup::MEMORY,
+								  .getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+									  auto *mem = d.dev->getMemory();
+									  if (mem == nullptr) {
+										  return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+									  }
+									  auto usedBytes = uint64_t{0};
+									  auto const r = mem->getMemoryUsed(&usedBytes, nullptr);
+									  if (r == ZE_RESULT_SUCCESS) {
+										  out = std::format("{}", static_cast<double>(usedBytes) / (1024.0 * 1024.0));
+									  }
+									  return r;
+								  }};
+
+constexpr auto FREE =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "memory.free",
+				.unit = "MiB",
+				.description = "Free GPU memory",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::MEMORY,
+				.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+					auto *mem = d.dev->getMemory();
+					if (mem == nullptr) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					auto totalBytes = uint64_t{0};
+					uint64_t usedBytes = 0;
+					auto r = mem->getMemorySize(&totalBytes);
+					if (r != ZE_RESULT_SUCCESS) {
+						return r;
+					}
+					r = mem->getMemoryUsed(&usedBytes, nullptr);
+					if (r != ZE_RESULT_SUCCESS) {
+						return r;
+					}
+					const auto freeBytes = static_cast<int64_t>(totalBytes) - static_cast<int64_t>(usedBytes);
+					out = std::format("{}", static_cast<double>(freeBytes > 0 ? freeBytes : 0) / (1024.0 * 1024.0));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto READ_BANDWIDTH =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "memory.read.bandwidth",
+				.unit = "kB/s",
+				.description = "GPU memory read bandwidth (Intel-only; dump -m 6)",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::MEMORY,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.memAvail || cache.memAfter.ts <= cache.memBefore.ts) {
+						out = "N/A";
+						return ZE_RESULT_SUCCESS;
+					}
+					const auto dt = static_cast<double>(cache.memAfter.ts - cache.memBefore.ts);
+					const auto rd = static_cast<double>(cache.memAfter.read - cache.memBefore.read);
+					out = std::format("{}", 1000000.0 * rd / dt / 1024.0);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto WRITE_BANDWIDTH =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "memory.write.bandwidth",
+				.unit = "kB/s",
+				.description = "GPU memory write bandwidth (Intel-only; dump -m 7)",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::MEMORY,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.memAvail || cache.memAfter.ts <= cache.memBefore.ts) {
+						out = "N/A";
+						return ZE_RESULT_SUCCESS;
+					}
+					const auto dt = static_cast<double>(cache.memAfter.ts - cache.memBefore.ts);
+					const auto wr = static_cast<double>(cache.memAfter.write - cache.memBefore.write);
+					out = std::format("{}", 1000000.0 * wr / dt / 1024.0);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto BANDWIDTH_UTILIZATION = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "memory.bandwidth.utilization",
+	.unit = "%",
+	.description = "GPU memory bandwidth utilization as % of peak (Intel-only; dump -m 17)",
+	.source = MetricSource::Live,
+	.groups = MetricGroup::MEMORY,
+	.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+		if (!cache.memAvail || cache.memAfter.ts <= cache.memBefore.ts || cache.memMaxBandwidth == 0) {
+			out = "N/A";
+			return ZE_RESULT_SUCCESS;
+		}
+		const auto dt = static_cast<double>(cache.memAfter.ts - cache.memBefore.ts);
+		const auto deltaBytes = static_cast<double>(cache.memAfter.read + cache.memAfter.write) -
+								static_cast<double>(cache.memBefore.read + cache.memBefore.write);
+		out = std::format("{}", 100.0 * deltaBytes * 1.0e6 / dt / static_cast<double>(cache.memMaxBandwidth));
+		return ZE_RESULT_SUCCESS;
+	}};
+
+constexpr auto ALL =
+	std::to_array<QueryMetric>({total, used, FREE, READ_BANDWIDTH, WRITE_BANDWIDTH, BANDWIDTH_UTILIZATION});
+
+} // namespace
+
+std::span<const QueryMetric> getMemoryMetrics() noexcept { return ALL; }
+
+} // namespace metrics::memory
diff --git a/ial/cmn/metrics/memory.h b/ial/cmn/metrics/memory.h
new file mode 100644
index 000000000..3244f3766
--- /dev/null
+++ b/ial/cmn/metrics/memory.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Memory metrics: total/used/free capacity and read/write bandwidth.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::memory {
+
+[[nodiscard]] std::span<const QueryMetric> getMemoryMetrics() noexcept;
+
+} // namespace metrics::memory
diff --git a/ial/cmn/metrics/pci.cpp b/ial/cmn/metrics/pci.cpp
new file mode 100644
index 000000000..c051a1d1f
--- /dev/null
+++ b/ial/cmn/metrics/pci.cpp
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * PCI metrics: link speed/width (max and negotiated), Rx/Tx throughput, and replay counter.
+ * NOTE: bytes/µs == MB/s because zes_pci_stats_t timestamps are in microseconds.
+ */
+
+#include "pci.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include "zes_api.h"
+#include <cstdint>
+#include <pci.h>
+#include <array>
+#include <format>
+#include <span>
+#include <string>
+
+namespace metrics::pci {
+
+namespace {
+
+constexpr auto LINK_GEN_MAX =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.link.gen.max",
+				.unit = "",
+				.description = "Maximum PCIe generation supported",
+				.source = MetricSource::Static,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+					auto *p = d.dev->getPCI();
+					if (p == nullptr) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					zes_pci_properties_t props{};
+					auto const r = p->getProperties(d.zesDeviceHdl, &props);
+					if (r == ZE_RESULT_SUCCESS) {
+						out = std::format("{}", props.maxSpeed.gen);
+					}
+					return r;
+				}};
+
+constexpr auto LINK_WIDTH_MAX =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.link.width.max",
+				.unit = "",
+				.description = "Maximum PCIe link width supported",
+				.source = MetricSource::Static,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+					auto *p = d.dev->getPCI();
+					if (p == nullptr) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					zes_pci_properties_t props{};
+					auto const r = p->getProperties(d.zesDeviceHdl, &props);
+					if (r == ZE_RESULT_SUCCESS) {
+						out = std::format("{}", props.maxSpeed.width);
+					}
+					return r;
+				}};
+
+constexpr auto LINK_GEN_CURRENT =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.link.gen.current",
+				.unit = "",
+				.description = "Current PCIe generation (negotiated)",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+					auto *p = d.dev->getPCI();
+					if (p == nullptr) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					zes_pci_speed_t speed{};
+					auto const r = p->getCurrentLinkSpeed(d.zesDeviceHdl, speed);
+					if (r == ZE_RESULT_SUCCESS) {
+						out = std::format("{}", speed.gen);
+					}
+					return r;
+				}};
+
+constexpr auto LINK_WIDTH_CURRENT =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.link.width.current",
+				.unit = "",
+				.description = "Current PCIe link width (negotiated)",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+					auto *p = d.dev->getPCI();
+					if (p == nullptr) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					zes_pci_speed_t speed{};
+					auto const r = p->getCurrentLinkSpeed(d.zesDeviceHdl, speed);
+					if (r == ZE_RESULT_SUCCESS) {
+						out = std::format("{}", speed.width);
+					}
+					return r;
+				}};
+
+constexpr auto TX_THROUGHPUT =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.tx.throughput",
+				.unit = "MB/s",
+				.description = "PCIe transmit throughput",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.pcieAvail || !cache.pcieBandwidthAvail) {
+						return ZE_RESULT_NOT_READY;
+					}
+					const auto dt = static_cast<double>(cache.pcieAfter.timeUs - cache.pcieBefore.timeUs);
+					const auto tx = static_cast<double>(cache.pcieAfter.tx - cache.pcieBefore.tx);
+					out = std::format("{}", tx / dt);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto RX_THROUGHPUT =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.rx.throughput",
+				.unit = "MB/s",
+				.description = "PCIe receive throughput",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.pcieAvail || !cache.pcieBandwidthAvail) {
+						return ZE_RESULT_NOT_READY;
+					}
+					const auto dt = static_cast<double>(cache.pcieAfter.timeUs - cache.pcieBefore.timeUs);
+					const auto rx = static_cast<double>(cache.pcieAfter.rx - cache.pcieBefore.rx);
+					out = std::format("{}", rx / dt);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto REPLAY_COUNTER =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.replay.counter",
+				.unit = "",
+				.description = "PCIe replay error count",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.pcieAvail || !cache.pcieReplayAvail) {
+						return ZE_RESULT_NOT_READY;
+					}
+					out = std::format("{}", cache.pcieReplay);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto RX_THROUGHPUT_KBS =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.rx.throughput.kbs",
+				.unit = "kB/s",
+				.description = "PCIe receive throughput (kB/s)",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.pcieAvail || !cache.pcieBandwidthAvail) {
+						return ZE_RESULT_NOT_READY;
+					}
+					const uint64_t dt = cache.pcieAfter.timeUs - cache.pcieBefore.timeUs;
+					const uint64_t rx = cache.pcieAfter.rx - cache.pcieBefore.rx;
+					out = std::format("{}", 1000000ULL * rx / dt / 1000ULL);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto TX_THROUGHPUT_KBS =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "pcie.tx.throughput.kbs",
+				.unit = "kB/s",
+				.description = "PCIe transmit throughput (kB/s)",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::PCI,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (!cache.pcieAvail || !cache.pcieBandwidthAvail) {
+						return ZE_RESULT_NOT_READY;
+					}
+					const uint64_t dt = cache.pcieAfter.timeUs - cache.pcieBefore.timeUs;
+					const uint64_t tx = cache.pcieAfter.tx - cache.pcieBefore.tx;
+					out = std::format("{}", 1000000ULL * tx / dt / 1000ULL);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto ALL = std::to_array<QueryMetric>({
+	LINK_GEN_MAX,
+	LINK_WIDTH_MAX,
+	LINK_GEN_CURRENT,
+	LINK_WIDTH_CURRENT,
+	TX_THROUGHPUT,
+	RX_THROUGHPUT,
+	REPLAY_COUNTER,
+	RX_THROUGHPUT_KBS,
+	TX_THROUGHPUT_KBS,
+});
+
+} // namespace
+
+std::span<const QueryMetric> getPciMetrics() noexcept { return ALL; }
+
+} // namespace metrics::pci
diff --git a/ial/cmn/metrics/pci.h b/ial/cmn/metrics/pci.h
new file mode 100644
index 000000000..d2b6fecb4
--- /dev/null
+++ b/ial/cmn/metrics/pci.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * PCI metrics: link speed/width (max and negotiated), Rx/Tx throughput, and replay counter.
+ * NOTE: bytes/µs == MB/s because zes_pci_stats_t timestamps are in microseconds.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::pci {
+
+[[nodiscard]] std::span<const QueryMetric> getPciMetrics() noexcept;
+
+} // namespace metrics::pci
diff --git a/ial/cmn/metrics/power.cpp b/ial/cmn/metrics/power.cpp
new file mode 100644
index 000000000..d081dfdf9
--- /dev/null
+++ b/ial/cmn/metrics/power.cpp
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Power metrics: instantaneous draw (card and GPU domain), accumulated energy, and power limits.
+ * CARD_DRAW, CARD_DRAW_GPU, and ENERGY_CONSUMED are Live metrics read from MetricCache.
+ * power.limit and power.max_limit are Static metrics that query the power HAL directly at getter time.
+ */
+
+#include "power.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include "zes_api.h"
+#include <algorithm>
+#include <array>
+#include <cstdint>
+#include <format>
+#include <power.h>
+#include <ranges>
+#include <span>
+#include <string>
+#include <vector>
+
+namespace metrics::power {
+
+namespace {
+
+/**
+ * @brief Computes instantaneous power draw in watts from a pair of energy snapshots.
+ *
+ * Calculates the average power delivered over the interval [before, after] by dividing
+ * the energy delta (µJ) by the time delta (µs), yielding a dimensionless ratio in watts.
+ *
+ * @param[in] before Energy snapshot taken at the start of the sampling interval.
+ * @param[in] after  Energy snapshot taken at the end of the sampling interval.
+ *
+ * @return Power draw in watts as a @c double.
+ *
+ * @pre @p after.ts > @p before.ts — time must have advanced; callers are responsible
+ *      for verifying this before calling to avoid division by zero.
+ * @pre @p after.energy >= @p before.energy — the energy counter must not have
+ *      regressed; callers must verify this to avoid unsigned underflow in the subtraction.
+ *
+ * @note This function is @c constexpr and @c noexcept; it performs no memory allocation
+ *       and cannot throw exceptions.
+ */
+[[nodiscard]] constexpr double powerDrawWatts(const EnergySnapshot &before, const EnergySnapshot &after) noexcept
+{
+	return static_cast<double>(after.energy - before.energy) / static_cast<double>(after.ts - before.ts);
+}
+
+/**
+ * @brief Queries the best available currently-enforced power limit for the device.
+ *
+ * Retrieves all extended power limits via the power HAL, filters out entries with a
+ * zero limit (unavailable or disabled), then selects the one with the highest priority
+ * level: sustained (lowest index) > burst > peak > other.
+ *
+ * @param[in]  d   Device to query. Must have been initialised; the function safely
+ *                 returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE if the power HAL
+ *                 sub-object is @c nullptr.
+ * @param[out] out On success, set to a string formatted as @c "%.2f" watts
+ *                 (e.g. @c "150.00"). Unchanged on failure.
+ *
+ * @retval ZE_RESULT_SUCCESS               A valid, positive power limit was found and
+ *                                         written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The power HAL is unavailable, the
+ *                                         @c getLimitsExt() call failed, the returned
+ *                                         list is empty, or all entries have a zero
+ *                                         limit value.
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ */
+ze_result_t getBestLimitW(devInfo &d, MetricValue &out)
+{
+	auto *pw = d.dev->getPower();
+	if (pw == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	std::vector<PowerLimitExt> limits;
+	if (pw->getLimitsExt(limits) != ZE_RESULT_SUCCESS || limits.empty()) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	auto priority = [](zes_power_level_t l) noexcept -> int {
+		switch (l) {
+		case ZES_POWER_LEVEL_SUSTAINED:
+			return 0;
+		case ZES_POWER_LEVEL_BURST:
+			return 1;
+		case ZES_POWER_LEVEL_PEAK:
+			return 2;
+		default:
+			return 3;
+		}
+	};
+	auto valid = limits | std::views::filter([](const auto &l) { return l.limitMw != 0; });
+	const auto it = std::ranges::min_element(valid, {}, [&](const auto &l) { return priority(l.level); });
+	if (it == std::ranges::end(valid)) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	out = std::format("{:.2f}", static_cast<double>(it->limitMw) / 1000.0);
+	return ZE_RESULT_SUCCESS;
+}
+
+/**
+ * @brief Queries the device for the maximum configurable power limit.
+ *
+ * Iterates over all power domain handles returned by the power HAL and returns the
+ * maximum power limit from the first card-level (non-subdevice) domain that reports
+ * a positive @c maxLimit value.
+ *
+ * @param[in]  d   Device to query. Must have been initialised; the function safely
+ *                 returns @c ZE_RESULT_ERROR_UNSUPPORTED_FEATURE if the power HAL
+ *                 sub-object is @c nullptr or returns no handles.
+ * @param[out] out On success, set to a string formatted as @c "%.2f" watts
+ *                 (e.g. @c "300.00"). Unchanged on failure.
+ *
+ * @retval ZE_RESULT_SUCCESS               A card-domain handle with a positive
+ *                                         @c maxLimit was found and written to @p out.
+ * @retval ZE_RESULT_ERROR_UNSUPPORTED_FEATURE The power HAL is unavailable, no handles
+ *                                         are exposed, or no card-domain handle reports
+ *                                         a positive @c maxLimit.
+ *
+ * @pre @p d.dev must not be @c nullptr (undefined behaviour otherwise).
+ *
+ * @throws None — all HAL calls return @c ze_result_t error codes; no exceptions
+ *                are thrown by this function.
+ *
+ * @note A local @c zes_power_ext_properties_t is always passed to @c getProperties
+ *       because the HAL implementation dereferences it unconditionally
+ *       (memset + pNext assignment).
+ */
+ze_result_t getMaxLimitW(devInfo &d, MetricValue &out)
+{
+	auto *pw = d.dev->getPower();
+	if (pw == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	const uint32_t count = pw->getPowerCount();
+	auto *handles = pw->getPowerHandles();
+	if (handles == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	for (uint32_t i = 0; i < count; ++i) {
+		zes_power_properties_t props{};
+		zes_power_ext_properties_t extProps{};
+		props.stype = ZES_STRUCTURE_TYPE_POWER_PROPERTIES;
+		extProps.stype = ZES_STRUCTURE_TYPE_POWER_EXT_PROPERTIES;
+		if (pw->getProperties(handles[i], &props, &extProps) == ZE_RESULT_SUCCESS && (props.onSubdevice == 0U) &&
+			props.maxLimit > 0) {
+			out = std::format("{:.2f}", static_cast<double>(props.maxLimit) / 1000.0);
+			return ZE_RESULT_SUCCESS;
+		}
+	}
+	return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}
+
+constexpr auto CARD_DRAW =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "power.draw",
+				.unit = "W",
+				.description = "Card-domain power draw averaged over the sampling interval; computed from energy "
+							   "counter deltas between cache snapshots",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::POWER,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (cache.cardPowerBefore.ts == 0 || cache.cardPowerAfter.ts < cache.cardPowerBefore.ts) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					if (cache.cardPowerAfter.ts == cache.cardPowerBefore.ts) {
+						out = "N/A";
+						return ZE_RESULT_SUCCESS;
+					}
+					if (cache.cardPowerAfter.energy < cache.cardPowerBefore.energy) {
+						out = "N/A";
+						return ZE_RESULT_SUCCESS;
+					}
+					out = std::format("{:.2f}", powerDrawWatts(cache.cardPowerBefore, cache.cardPowerAfter));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto CARD_DRAW_GPU =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "power.draw.gpu",
+				.unit = "W",
+				.description = "GPU-domain power draw averaged over the sampling interval; covers compute engines "
+							   "only, excluding memory and other card subsystems",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::POWER,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (cache.gpuPowerBefore.ts == 0 || cache.gpuPowerAfter.ts < cache.gpuPowerBefore.ts) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					if (cache.gpuPowerAfter.ts == cache.gpuPowerBefore.ts) {
+						out = "N/A";
+						return ZE_RESULT_SUCCESS;
+					}
+					if (cache.gpuPowerAfter.energy < cache.gpuPowerBefore.energy) {
+						out = "N/A";
+						return ZE_RESULT_SUCCESS;
+					}
+					out = std::format("{:.2f}", powerDrawWatts(cache.gpuPowerBefore, cache.gpuPowerAfter));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto ENERGY_CONSUMED =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "energy.consumed",
+				.unit = "J",
+				.description = "Cumulative GPU-domain energy consumed since the last counter reset; monotonically "
+							   "increasing until counter wrap",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::POWER,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					if (cache.gpuPowerAfter.ts == 0) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					out = std::format("{:.2f}", static_cast<double>(cache.gpuPowerAfter.energy) / 1'000'000.0);
+					return ZE_RESULT_SUCCESS;
+				}};
+
+// ── Power limit metrics ──────────────────────────────────────────────────────
+// power.limit     = current enforced power limit (sustained, with fallback to best available)
+// power.max_limit = maximum configurable power limit from device properties
+
+constexpr auto POWER_LIMIT_ALIASES =
+	std::to_array<std::string_view>({"power.management.limit", "power.management.limit.default"});
+
+constexpr auto LIMIT = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "power.limit",
+	.aliases = POWER_LIMIT_ALIASES,
+	.unit = "W",
+	.description =
+		"Currently enforced power limit; reports the sustained limit when available, with fallback to burst or peak",
+	.source = MetricSource::Static,
+	.groups = MetricGroup::POWER,
+	.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t { return getBestLimitW(d, out); }};
+
+constexpr auto MAX_LIMIT = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "power.max_limit",
+	.unit = "W",
+	.description = "Maximum configurable power limit as reported by device properties; the upper bound for any "
+				   "user-settable power limit",
+	.source = MetricSource::Static,
+	.groups = MetricGroup::POWER,
+	.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t { return getMaxLimitW(d, out); }};
+
+constexpr auto ALL = std::to_array<QueryMetric>({CARD_DRAW, CARD_DRAW_GPU, ENERGY_CONSUMED, LIMIT, MAX_LIMIT});
+
+} // namespace
+
+/**
+ * @brief Returns the compile-time array of all power @c QueryMetric descriptors.
+ *
+ * Exposes the following metrics, all belonging to @c MetricGroup::POWER:
+ * - @c power.draw         (Live)   — card-domain instantaneous draw in watts
+ * - @c power.draw.gpu     (Live)   — GPU-domain instantaneous draw in watts
+ * - @c energy.consumed    (Live)   — cumulative GPU-domain energy in joules
+ * - @c power.limit        (Static) — current enforced power limit in watts
+ * - @c power.max_limit    (Static) — maximum configurable power limit in watts
+ *
+ * @return A non-owning @c std::span over the internal @c ALL array. The span is valid
+ *         for the lifetime of the program (the backing array has static storage duration).
+ *
+ * @throws None — @c noexcept; the array is statically allocated and the span
+ *                constructor cannot throw.
+ *
+ * @note This function is intended to be called once during registry initialisation.
+ *       Callers should not hold the span across a reload or re-registration event.
+ */
+std::span<const QueryMetric> getPowerMetrics() noexcept { return ALL; }
+
+} // namespace metrics::power
diff --git a/ial/cmn/metrics/power.h b/ial/cmn/metrics/power.h
new file mode 100644
index 000000000..110565bbb
--- /dev/null
+++ b/ial/cmn/metrics/power.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Power metrics: instantaneous draw (card and GPU domain), accumulated energy, and power limits.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::power {
+
+[[nodiscard]] std::span<const QueryMetric> getPowerMetrics() noexcept;
+
+} // namespace metrics::power
diff --git a/ial/cmn/metrics/temperature_metrics.cpp b/ial/cmn/metrics/temperature_metrics.cpp
new file mode 100644
index 000000000..8541aa6b9
--- /dev/null
+++ b/ial/cmn/metrics/temperature_metrics.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Temperature metrics: GPU core and memory temperatures.
+ * Getters call the HAL directly — no MetricCache involvement.
+ */
+
+#include "temperature_metrics.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include <temperature.h>
+#include <array>
+#include <format>
+#include <span>
+#include <string>
+
+namespace metrics::temperature {
+
+namespace {
+
+// Getter template: each specialization is a unique function pointer — no capture, no heap.
+template <ze_result_t (::temperature::*Fn)(double *)>
+ze_result_t tempGetter(devInfo &d, MetricValue &out, const MetricCache &)
+{
+	auto *t = d.dev->getTemperature();
+	if (t == nullptr) {
+		return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+	}
+	auto val = 0.0;
+	const auto r = (t->*Fn)(&val);
+	if (r == ZE_RESULT_SUCCESS) {
+		out = std::format("{:.2f}", val);
+	}
+	return r;
+}
+
+constexpr auto gpu = // NOLINT(readability-identifier-naming)
+	QueryMetric{.name = "temperature.gpu",
+				.unit = "C",
+				.description =
+					"GPU core temperature per tile or device; device-level is the tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::TEMPERATURE,
+				.getter = tempGetter<&::temperature::getCoreTemp>};
+
+constexpr auto mem = // NOLINT(readability-identifier-naming)
+	QueryMetric{.name = "temperature.memory",
+				.unit = "C",
+				.description =
+					"GPU memory temperature per tile or device; device-level is the tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::TEMPERATURE,
+				.getter = tempGetter<&::temperature::getMemoryTemp>};
+
+constexpr auto ALL = std::to_array<QueryMetric>({gpu, mem});
+
+} // namespace
+
+std::span<const QueryMetric> getTemperatureMetrics() noexcept { return ALL; }
+
+} // namespace metrics::temperature
diff --git a/ial/cmn/metrics/temperature_metrics.h b/ial/cmn/metrics/temperature_metrics.h
new file mode 100644
index 000000000..824882ceb
--- /dev/null
+++ b/ial/cmn/metrics/temperature_metrics.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Temperature metrics: GPU core and memory temperatures.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::temperature {
+
+[[nodiscard]] std::span<const QueryMetric> getTemperatureMetrics() noexcept;
+
+} // namespace metrics::temperature
diff --git a/ial/cmn/metrics/utilization.cpp b/ial/cmn/metrics/utilization.cpp
new file mode 100644
index 000000000..b523445d3
--- /dev/null
+++ b/ial/cmn/metrics/utilization.cpp
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Utilization metrics: engine groups (ALL/compute/render/media/copy) and memory utilization %.
+ *
+ * utilization.compute, .render, and .copy carry aliases for the legacy xpum-style
+ * .single and .group suffixes; .media uses sub-engine forms (.decode.single,
+ * .encode.single, .enhancement.single, .group).  The aliases are resolved by
+ * findMetric/resolveQuery but are excluded from getMetricsByGroup results,
+ * so -d UTILIZATION does not produce duplicate columns.
+ */
+
+#include "utilization.h"
+#include "debug.h"
+#include "device.h"
+#include "metrics_registry.h"
+#include "ze_api.h"
+#include <memory.h>
+#include <array>
+#include <format>
+#include <span>
+#include <string>
+#include <string_view>
+
+namespace metrics::utilization {
+
+namespace {
+
+// Precondition: callers must verify s.before.ts != 0 && s.after.ts > s.before.ts
+// before calling this function.
+[[nodiscard]] double utilFromCache(const EngineSample &s)
+{
+	if (s.after.active < s.before.active) {
+		DBG("utilization: engine counter regression (active {} -> {}), reporting 0\n", s.before.active, s.after.active);
+		return 0.0;
+	}
+	return (static_cast<double>(s.after.active) - static_cast<double>(s.before.active)) * 100.0 /
+		   (static_cast<double>(s.after.ts) - static_cast<double>(s.before.ts));
+}
+
+// ── Alias name arrays ─────────────────────────────────────────────────────────
+
+constexpr auto COMPUTE_ALIASES = std::to_array<std::string_view>({
+	"utilization.compute.single",
+	"utilization.compute.group",
+});
+constexpr auto RENDER_ALIASES = std::to_array<std::string_view>({
+	"utilization.render.single",
+	"utilization.render.group",
+});
+constexpr auto MEDIA_ALIASES = std::to_array<std::string_view>({
+	"utilization.media.decode.single",
+	"utilization.media.encode.single",
+	"utilization.media.enhancement.single",
+	"utilization.media.group",
+});
+constexpr auto COPY_ALIASES = std::to_array<std::string_view>({
+	"utilization.copy.single",
+	"utilization.copy.group",
+});
+
+constexpr auto GPU =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "utilization.gpu",
+				.unit = "%",
+				.description = "GPU active time as a fraction of elapsed time; per tile or device, device-level is the "
+							   "tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::UTILIZATION,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					const auto &s = cache.engines.all;
+					if (s.before.ts == 0 || s.after.ts <= s.before.ts) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					out = std::format("{:.2f}", utilFromCache(s));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto COMPUTE =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "utilization.compute",
+				.aliases = COMPUTE_ALIASES,
+				.unit = "%",
+				.description = "Compute engine group: active time as a fraction of elapsed time; per tile or device, "
+							   "device-level is the tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::UTILIZATION,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					const auto &s = cache.engines.compute;
+					if (s.before.ts == 0 || s.after.ts <= s.before.ts) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					out = std::format("{:.2f}", utilFromCache(s));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto RENDER =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "utilization.render",
+				.aliases = RENDER_ALIASES,
+				.unit = "%",
+				.description = "Render engine group: active time as a fraction of elapsed time; per tile or device, "
+							   "device-level is the tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::UTILIZATION,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					const auto &s = cache.engines.render;
+					if (s.before.ts == 0 || s.after.ts <= s.before.ts) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					out = std::format("{:.2f}", utilFromCache(s));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto MEDIA = QueryMetric{
+	// NOLINT(readability-identifier-naming)
+	.name = "utilization.media",
+	.aliases = MEDIA_ALIASES,
+	.unit = "%",
+	.description = "Media engine group: active time as a fraction of elapsed time (decode, encode, and enhancement "
+				   "engines); per tile or device, device-level is the tile average for multi-tile GPUs",
+	.source = MetricSource::Live,
+	.groups = MetricGroup::UTILIZATION,
+	.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+		const auto &s = cache.engines.media;
+		if (s.before.ts == 0 || s.after.ts <= s.before.ts) {
+			return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+		}
+		out = std::format("{:.2f}", utilFromCache(s));
+		return ZE_RESULT_SUCCESS;
+	}};
+
+constexpr auto COPY =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "utilization.copy",
+				.aliases = COPY_ALIASES,
+				.unit = "%",
+				.description = "Copy engine group: active time as a fraction of elapsed time; per tile or device, "
+							   "device-level is the tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::UTILIZATION,
+				.getter = [](devInfo & /*d*/, MetricValue &out, const MetricCache &cache) -> ze_result_t {
+					const auto &s = cache.engines.copy;
+					if (s.before.ts == 0 || s.after.ts <= s.before.ts) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					out = std::format("{:.2f}", utilFromCache(s));
+					return ZE_RESULT_SUCCESS;
+				}};
+
+constexpr auto MEM_UTIL =
+	QueryMetric{// NOLINT(readability-identifier-naming)
+				.name = "utilization.memory",
+				.unit = "%",
+				.description = "GPU memory utilization as a fraction of elapsed time memory was being read or written; "
+							   "per tile or device, device-level is the tile average for multi-tile GPUs",
+				.source = MetricSource::Live,
+				.groups = MetricGroup::MEMORY | MetricGroup::UTILIZATION,
+				.getter = [](devInfo &d, MetricValue &out, const MetricCache &) -> ze_result_t {
+					auto *mem = d.dev->getMemory();
+					if (mem == nullptr) {
+						return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+					}
+					auto val = 0.0;
+					const auto r = mem->getMemoryUsed(nullptr, &val);
+					if (r == ZE_RESULT_SUCCESS) {
+						out = std::format("{:.2f}", val);
+					}
+					return r;
+				}};
+
+constexpr auto ALL = std::to_array<QueryMetric>({GPU, COMPUTE, RENDER, MEDIA, COPY, MEM_UTIL});
+
+} // namespace
+
+std::span<const QueryMetric> getUtilizationMetrics() noexcept { return ALL; }
+
+} // namespace metrics::utilization
diff --git a/ial/cmn/metrics/utilization.h b/ial/cmn/metrics/utilization.h
new file mode 100644
index 000000000..b6a3cf51f
--- /dev/null
+++ b/ial/cmn/metrics/utilization.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Utilization metrics: engine groups (ALL/compute/render/media/copy) and memory utilization %.
+ */
+
+#pragma once
+
+#include "metrics_registry.h"
+#include <span>
+
+namespace metrics::utilization {
+
+[[nodiscard]] std::span<const QueryMetric> getUtilizationMetrics() noexcept;
+
+} // namespace metrics::utilization
diff --git a/ial/cmn/metrics_registry.cpp b/ial/cmn/metrics_registry.cpp
new file mode 100644
index 000000000..132105e20
--- /dev/null
+++ b/ial/cmn/metrics_registry.cpp
@@ -0,0 +1,392 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "metrics_registry.h"
+#include "metrics/temperature_metrics.h"
+#include "metrics/utilization.h"
+#include "metrics/pci.h"
+#include "metrics/eu_array.h"
+#include "metrics/fan.h"
+#include "metrics/memory.h"
+#include "metrics/power.h"
+#include "metrics/ecc.h"
+#include "metrics/identity.h"
+#include "metrics/clock.h"
+#include "device.h"
+#include "zes_api.h"
+#include "ze_api.h"
+#include <enginegroup.h>
+#include <functional>
+#include <iterator>
+#include <memory.h>
+#include <metric.h>
+#include <numeric>
+#include <optional>
+#include <pci.h>
+#include <power.h>
+#include <algorithm>
+#include <cctype>
+#include <chrono>
+#include <iterator>
+#include <numeric>
+#include <ranges>
+#include <span>
+#include <string>
+#include <string_view>
+#include <thread>
+#include <vector>
+
+namespace {
+
+bool iequal(std::string_view a, std::string_view b) noexcept
+{
+	return std::ranges::equal(
+		a, b, {}, [](char c) noexcept { return std::tolower(static_cast<unsigned char>(c)); },
+		[](char c) noexcept { return std::tolower(static_cast<unsigned char>(c)); });
+}
+
+} // namespace
+
+namespace metrics {
+
+using EngineSlot = EngineSample EngineCache::*;
+
+struct EngineEntry
+{
+	EngineSlot slot;
+	zes_engine_group_t group;
+};
+
+static constexpr auto ENGINE_MAP = std::to_array<EngineEntry>({
+	{&EngineCache::all, ZES_ENGINE_GROUP_ALL},
+	{&EngineCache::compute, ZES_ENGINE_GROUP_COMPUTE_ALL},
+	{&EngineCache::render, ZES_ENGINE_GROUP_RENDER_ALL},
+	{&EngineCache::media, ZES_ENGINE_GROUP_MEDIA_ALL},
+	{&EngineCache::copy, ZES_ENGINE_GROUP_COPY_ALL},
+});
+
+MetricCache populateMetricCacheBegin(devInfo &dev)
+{
+	MetricCache cache;
+	enginegroup *eg = dev.dev->getEngineGroup();
+	auto *pw = dev.dev->getPower();
+	auto *mem = dev.dev->getMemory();
+	auto *p = dev.dev->getPCI();
+
+	for (const auto &entry : ENGINE_MAP) {
+		auto &s = cache.engines.*entry.slot;
+		if (eg != nullptr) {
+			const auto [r, active, ts] = eg->getUtilization(std::span{&entry.group, 1});
+			if (r == ZE_RESULT_SUCCESS) {
+				s.before.active = active;
+				s.before.ts = ts;
+			}
+		}
+	}
+	if (pw != nullptr) {
+		pw->getEnergy(&cache.cardPowerBefore.energy, &cache.cardPowerBefore.ts, false);
+		pw->getEnergy(&cache.gpuPowerBefore.energy, &cache.gpuPowerBefore.ts, true);
+	}
+	zes_pci_stats_t ps{};
+	const bool pcieBeginOk =
+		(p != nullptr && dev.zesDeviceHdl != nullptr && p->getStats(dev.zesDeviceHdl, &ps) == ZE_RESULT_SUCCESS);
+	cache.pcieAvail = pcieBeginOk;
+	if (pcieBeginOk) {
+		cache.pcieBefore.tx = ps.txCounter;
+		cache.pcieBefore.rx = ps.rxCounter;
+		cache.pcieBefore.timeUs = ps.timestamp;
+	}
+	if (p != nullptr && dev.zesDeviceHdl != nullptr) {
+		zes_pci_properties_t props{};
+		if (p->getProperties(dev.zesDeviceHdl, &props) == ZE_RESULT_SUCCESS) {
+			cache.pcieBandwidthAvail = props.haveBandwidthCounters;
+			cache.pcieReplayAvail = props.haveReplayCounters;
+		}
+	}
+	if (mem != nullptr) {
+		mem->getMemoryRW(&cache.memBefore.read, &cache.memBefore.write, &cache.memMaxBandwidth, &cache.memBefore.ts);
+	}
+	return cache;
+}
+
+void populateMetricCacheEnd(devInfo &dev, MetricCache &cache)
+{
+	enginegroup *eg = dev.dev->getEngineGroup();
+	auto *pw = dev.dev->getPower();
+	auto *mem = dev.dev->getMemory();
+	auto *p = dev.dev->getPCI();
+
+	for (const auto &entry : ENGINE_MAP) {
+		auto &s = cache.engines.*entry.slot;
+		if (eg != nullptr) {
+			const auto [r, active, ts] = eg->getUtilization(std::span{&entry.group, 1});
+			if (r == ZE_RESULT_SUCCESS) {
+				s.after.active = active;
+				s.after.ts = ts;
+			}
+		}
+	}
+	bool cardPowerAfterOk = false;
+	if (pw != nullptr) {
+		cardPowerAfterOk =
+			(pw->getEnergy(&cache.cardPowerAfter.energy, &cache.cardPowerAfter.ts, false) == ZE_RESULT_SUCCESS);
+		pw->getEnergy(&cache.gpuPowerAfter.energy, &cache.gpuPowerAfter.ts, true);
+	}
+	zes_pci_stats_t ps{};
+	const bool pcieEndOk =
+		(p != nullptr && dev.zesDeviceHdl != nullptr && p->getStats(dev.zesDeviceHdl, &ps) == ZE_RESULT_SUCCESS);
+	if (pcieEndOk) {
+		cache.pcieAfter.tx = ps.txCounter;
+		cache.pcieAfter.rx = ps.rxCounter;
+		cache.pcieAfter.timeUs = ps.timestamp;
+		cache.pcieReplay = ps.replayCounter;
+	} else {
+		// Reset replay count so a stale value is never visible alongside pcieAvail=false.
+		cache.pcieReplay = 0;
+	}
+	cache.pcieAvail = cache.pcieAvail && pcieEndOk && (cache.pcieAfter.timeUs > cache.pcieBefore.timeUs);
+	if (mem != nullptr) {
+		const bool ok = (mem->getMemoryRW(&cache.memAfter.read, &cache.memAfter.write, nullptr, &cache.memAfter.ts) ==
+						 ZE_RESULT_SUCCESS);
+		cache.memAvail = ok && (cache.memBefore.ts != 0) && (cache.memAfter.ts > cache.memBefore.ts);
+	}
+	cache.engineAvail = (eg != nullptr) && (cache.engines.all.before.ts != 0) &&
+						(cache.engines.all.after.ts > cache.engines.all.before.ts);
+	// Mirror pcieAvail/memAvail: require a successful HAL call in both Begin and End, plus
+	// advancing timestamps. cardPowerBefore.ts == 0 when the Begin call failed or Begin was
+	// never called, which correctly prevents powerAvail from being set.
+	cache.powerAvail =
+		cardPowerAfterOk && (cache.cardPowerBefore.ts != 0) && (cache.cardPowerAfter.ts > cache.cardPowerBefore.ts);
+
+	// EU active/stall/idle — sampled once per tick so all three getters share one HAL call.
+	// Unconditionally reset before the attempt so a reused or pre-populated cache never
+	// leaks stale EU data when the HAL call fails.
+	cache.euAvail = false;
+	cache.euSample = {};
+	{
+		metric *m = dev.dev->getMetric();
+		if (m != nullptr && dev.deviceHdl != nullptr) {
+			std::vector<EuMetricsData> euVec;
+			if (m->getEuActiveStallIdle(dev.deviceHdl, dev.dev->getDriverHandle(), euVec) == ZE_RESULT_SUCCESS &&
+				!euVec.empty()) {
+				cache.euSample = euVec[0];
+				cache.euAvail = true;
+			}
+		}
+	}
+
+	cache.populated = true;
+}
+
+MetricCache populateMetricCache(devInfo &dev, std::chrono::milliseconds window)
+{
+	const auto deadline = std::chrono::steady_clock::now() + window;
+	MetricCache cache = populateMetricCacheBegin(dev);
+	std::this_thread::sleep_until(deadline);
+	populateMetricCacheEnd(dev, cache);
+	return cache;
+}
+
+MetricCache populateMetricCacheContinuous(devInfo &dev, const MetricCache &prev)
+{
+	MetricCache curr;
+
+	// Promote prev's after-snapshots into curr's before-slots (no sleep needed).
+	for (const auto &entry : ENGINE_MAP) {
+		(curr.engines.*entry.slot).before = (prev.engines.*entry.slot).after;
+	}
+	curr.cardPowerBefore = prev.cardPowerAfter;
+	curr.gpuPowerBefore = prev.gpuPowerAfter;
+	curr.pcieBefore = prev.pcieAfter;
+	// Derive before-validity from whether prev.pcieAfter actually holds a snapshot,
+	// not from prev.pcieAvail (which reflects the previous *delta*, not the snapshot).
+	// Using prev.pcieAvail would permanently latch pcieAvail=false after any single
+	// bad tick (non-advancing timestamp, HAL failure, etc.).
+	curr.pcieAvail = (prev.pcieAfter.timeUs != 0);
+	curr.pcieBandwidthAvail = prev.pcieBandwidthAvail;
+	curr.pcieReplayAvail = prev.pcieReplayAvail;
+
+	curr.memBefore = prev.memAfter;
+	curr.memMaxBandwidth = prev.memMaxBandwidth;
+	// EU metrics are re-sampled fresh each tick; no before/after state to carry over.
+
+	populateMetricCacheEnd(dev, curr);
+	return curr;
+}
+
+//  Metric registry — assembled from per-group metric headers
+//
+//  Registry API implementations
+
+// Each metrics/X.h owns one group and exposes getXMetrics() returning a span.
+
+std::span<const QueryMetric> getQueryMetrics() noexcept
+{
+	static const std::vector<QueryMetric> registry = [] {
+		const auto identity = identity::getIdentityMetrics();
+		const auto temperature = temperature::getTemperatureMetrics();
+		const auto utilization = utilization::getUtilizationMetrics();
+		const auto pci = pci::getPciMetrics();
+		const auto euArray = eu_array::getEuArrayMetrics();
+		const auto fan = fan::getFanMetrics();
+		const auto memory = memory::getMemoryMetrics();
+		const auto power = power::getPowerMetrics();
+		const auto ecc = ecc::getEccMetrics();
+		const auto clock = clock::getClockMetrics();
+
+		std::vector<QueryMetric> metricVec;
+		for (const std::span<const QueryMetric> s :
+			 {identity, temperature, utilization, pci, euArray, fan, memory, power, ecc, clock}) {
+			metricVec.insert(metricVec.end(), s.begin(), s.end());
+		}
+		return metricVec;
+	}();
+	return registry;
+}
+
+std::vector<const QueryMetric *> getMetricsByGroup(MetricGroup mask)
+{
+	// MetricGroup::NONE matches nothing by definition.
+	if (mask == MetricGroup::NONE) {
+		return {};
+	}
+	const auto all = getQueryMetrics();
+	// MetricGroup::ALL means "every metric": bypass the overlap filter so that
+	// metrics whose groups == MetricGroup::NONE are included rather than excluded
+	// (NONE & ALL == NONE, which would fail the hasGroup test).
+	if (mask == MetricGroup::ALL) {
+		std::vector<const QueryMetric *> result;
+		result.reserve(all.size());
+		for (const auto &f : all) {
+			result.push_back(&f);
+		}
+		return result;
+	}
+	std::vector<const QueryMetric *> result;
+	for (const auto &f : all) {
+		if (hasGroup(f.groups, mask)) {
+			result.push_back(&f);
+		}
+	}
+	return result;
+}
+
+// Case-insensitive glob match against a metric name.
+//   '*' — matches zero or more characters (e.g. "power.*" matches "power.gpu.sustained")
+//   '?' — matches exactly one character  (e.g. "temperature.?pu" matches "temperature.gpu" but not
+//   "temperature.memory")
+// Uses the standard O(n*m) iterative backtracking algorithm.
+static bool globMatch(std::string_view pattern, std::string_view text) noexcept
+{
+	const auto toLower = [](char c) noexcept -> char { return (c >= 'A' && c <= 'Z') ? static_cast<char>(c + 32) : c; };
+	size_t patternPos = 0, textPos = 0;
+	size_t lastStarPatternPos = std::string_view::npos, lastStarTextPos = 0;
+	while (textPos < text.size()) {
+		if (patternPos < pattern.size() &&
+			(pattern[patternPos] == '?' || toLower(pattern[patternPos]) == toLower(text[textPos]))) {
+			++patternPos;
+			++textPos;
+		} else if (patternPos < pattern.size() && pattern[patternPos] == '*') {
+			lastStarPatternPos = patternPos++;
+			lastStarTextPos = textPos;
+		} else if (lastStarPatternPos != std::string_view::npos) {
+			patternPos = lastStarPatternPos + 1;
+			textPos = ++lastStarTextPos;
+		} else {
+			return false;
+		}
+	}
+	while (patternPos < pattern.size() && pattern[patternPos] == '*') {
+		++patternPos;
+	}
+	return patternPos == pattern.size();
+}
+
+std::optional<QueryMetric> findMetric(std::string_view name)
+{
+	const auto allMetrics = getQueryMetrics();
+	auto it = std::ranges::find_if(allMetrics, [&](const QueryMetric &f) noexcept {
+		if (iequal(f.name, name)) {
+			return true;
+		}
+		return std::ranges::any_of(f.aliases, [&](std::string_view alias) noexcept { return iequal(alias, name); });
+	});
+	return it != allMetrics.end() ? std::optional<QueryMetric>{*it} : std::nullopt;
+}
+
+std::vector<const QueryMetric *> resolveQuery(std::string_view csv)
+{
+	const std::span<const QueryMetric> allMetrics = getQueryMetrics();
+	std::vector<const QueryMetric *> result;
+
+	const auto addUnique = [&](const QueryMetric &f) {
+		if (std::ranges::none_of(result, [&f](const QueryMetric *r) { return r->name == f.name; })) {
+			result.push_back(&f);
+		}
+	};
+
+	const auto findInAll = [&](std::string_view name) -> const QueryMetric * {
+		auto it = std::ranges::find_if(allMetrics, [&](const QueryMetric &f) noexcept {
+			return iequal(f.name, name) ||
+				   std::ranges::any_of(f.aliases, [&](std::string_view a) noexcept { return iequal(a, name); });
+		});
+		return it != allMetrics.end() ? &*it : nullptr;
+	};
+
+	for (const auto tokenRange : csv | std::views::split(',')) {
+		const auto token = detail::trim(std::string_view{tokenRange.begin(), tokenRange.end()});
+		if (token.empty()) {
+			continue;
+		}
+		if (token.find_first_of("*?") != std::string_view::npos) {
+			// Wildcard pattern: match against all metric names and aliases.
+			for (const QueryMetric &f : allMetrics) {
+				if (globMatch(token, f.name) ||
+					std::ranges::any_of(f.aliases, [&](std::string_view a) noexcept { return globMatch(token, a); })) {
+					addUnique(f);
+				}
+			}
+		} else if (token.find('.') != std::string_view::npos) {
+			// Dotted token → individual metric lookup (canonical name or alias).
+			if (const auto *f = findInAll(token)) {
+				addUnique(*f);
+			}
+		} else {
+			// Group name / shortcut → expand via parseGroupMask (includes per-char expansion).
+			const MetricGroup mask = parseGroupMask(token);
+			if (mask != MetricGroup::NONE) {
+				const bool matchAll = (mask == MetricGroup::ALL);
+				for (const QueryMetric &f : allMetrics) {
+					if (matchAll || hasGroup(f.groups, mask)) {
+						addUnique(f);
+					}
+				}
+			} else {
+				// Fall back to individual lookup for dotless names like "timestamp", "name".
+				if (const auto *f = findInAll(token)) {
+					addUnique(*f);
+				}
+			}
+		}
+	}
+	return result;
+}
+
+std::string formatGroups(MetricGroup groups)
+{
+	std::string result;
+	for (const auto &name : detail::GROUP_TABLE | std::views::filter([groups](const detail::MetricGroupEntry &e) {
+								return e.group != MetricGroup::ALL && hasGroup(groups, e.group);
+							}) | std::views::transform([](const detail::MetricGroupEntry &e) { return e.name; })) {
+		if (!result.empty()) {
+			result += ", ";
+		}
+		result.append(name);
+	}
+	return result;
+}
+
+} // namespace metrics
diff --git a/ial/cmn/metrics_registry.h b/ial/cmn/metrics_registry.h
new file mode 100644
index 000000000..c31159395
--- /dev/null
+++ b/ial/cmn/metrics_registry.h
@@ -0,0 +1,531 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#ifndef METRICS_REGISTRY_H
+#define METRICS_REGISTRY_H
+
+#include "device.h"
+#include "ze_api.h"
+#include <cstddef>
+#include <algorithm>
+#include <array>
+#include <chrono>
+#include <cstdint>
+#include <functional>
+#include <metric.h>
+#include <optional>
+#include <span>
+#include <string>
+#include <string_view>
+#include <thread>
+#include <type_traits>
+#include <vector>
+
+namespace metrics {
+
+namespace detail {
+
+/** Duration of the measurement window used by populateMetricCache() and runMetrics(). */
+inline constexpr auto SAMPLE_WINDOW = std::chrono::milliseconds{200};
+
+/** Generic underlying-type cast — equivalent to C++23 std::to_underlying. */
+template <typename Enum> [[nodiscard]] constexpr auto toUnderlying(Enum e) noexcept
+{
+	return static_cast<std::underlying_type_t<Enum>>(e);
+}
+
+/** Trim leading and trailing ASCII spaces and tabs from a string_view. */
+[[nodiscard]] constexpr std::string_view trim(std::string_view s) noexcept
+{
+	const auto first = s.find_first_not_of(" \t");
+	if (first == std::string_view::npos) {
+		return {};
+	}
+	const auto last = s.find_last_not_of(" \t");
+	return s.substr(first, last - first + 1);
+}
+
+} // namespace detail
+
+// ── MetricGroup: display-section bitmask (-d style) ─────────────────────────────
+
+enum class MetricGroup : uint32_t
+{
+	NONE = 0,
+	IDENTITY = 1U << 0,	   /**< name, index, uuid, serial, driver_version, vbios_version + PCI IDs */
+	MEMORY = 1U << 1,	   /**< memory.total/used/free, utilization.memory */
+	UTILIZATION = 1U << 2, /**< utilization.gpu/compute/render/media/copy */
+	TEMPERATURE = 1U << 3, /**< temperature.gpu/memory */
+	POWER = 1U << 4,	   /**< power.draw, energy.consumed */
+	CLOCK = 1U << 5,	   /**< clocks.current.graphics/memory */
+	PCI = 1U << 6,		   /**< pci.*, pcie.link.*, pcie.tx/rx.throughput, pcie.replay */
+	ECC = 1U << 7,		   /**< ecc.mode.current, ecc.errors.corrected/uncorrected; analogous to dmon -s e */
+	EU_ARRAY = 1U << 8,	   /**< eu.active/stall/idle (Intel Xe-only) */
+	FAN = 1U << 9,		   /**< fan.speed */
+	ALL = ~0U,
+};
+
+[[nodiscard]] constexpr MetricGroup operator|(MetricGroup a, MetricGroup b) noexcept
+{
+	return static_cast<MetricGroup>(detail::toUnderlying(a) | detail::toUnderlying(b));
+}
+[[nodiscard]] constexpr MetricGroup operator&(MetricGroup a, MetricGroup b) noexcept
+{
+	return static_cast<MetricGroup>(detail::toUnderlying(a) & detail::toUnderlying(b));
+}
+[[nodiscard]] constexpr bool hasGroup(MetricGroup field, MetricGroup mask) noexcept
+{
+	return (field & mask) != MetricGroup::NONE;
+}
+
+// ── MetricSource ───────────────────────────────────────────────────────────────
+
+enum class MetricSource
+{
+	Static, /**< Device identity / firmware — cheap, no sampling delay */
+	Live,	/**< Runtime telemetry — may require a measurement window */
+};
+
+// ── MetricCache: one set of before/after delta samples per device per tick ────
+//
+// Fields that need a measurement window (utilization, power.draw) read from
+// this cache, which is populated ONCE per device per tick by runMetrics()
+// before any getters are called.  Static fields ignore it.
+
+// ── Snapshot types: a single point-in-time reading ────────────────────────────
+
+/** Single engine utilisation reading. */
+struct EngineSnapshot
+{
+	uint64_t active = 0, ts = 0;
+};
+
+/** Single energy reading for one power domain. */
+struct EnergySnapshot
+{
+	uint64_t energy = 0, ts = 0;
+};
+
+/** PCIe byte counters and timestamp at a single point in time. */
+struct PcieSnapshot
+{
+	uint64_t tx = 0, rx = 0, timeUs = 0;
+};
+
+/** Memory bandwidth counters and timestamp at a single point in time. */
+struct MemSnapshot
+{
+	uint64_t read = 0, write = 0, ts = 0;
+};
+
+// ── Delta sample types: before/after snapshot pair for rate calculation ────────
+
+/** Before/after pair for a single engine group, used to compute utilisation %. */
+struct EngineSample
+{
+	EngineSnapshot before{};
+	EngineSnapshot after{};
+};
+
+/** Named slots for each sampled engine group. */
+struct EngineCache
+{
+	EngineSample all{};
+	EngineSample compute{};
+	EngineSample render{};
+	EngineSample media{};
+	EngineSample copy{};
+};
+
+struct MetricCache
+{
+	EngineCache engines{};
+	EnergySnapshot cardPowerBefore{}, cardPowerAfter{}; /**< whole-card energy domain (forGPU=false) */
+	EnergySnapshot gpuPowerBefore{}, gpuPowerAfter{};	/**< GPU energy domain (forGPU=true) */
+	PcieSnapshot pcieBefore{}, pcieAfter{};				/**< PCIe Rx/Tx byte counters + µs timestamp */
+	uint64_t pcieReplay = 0;
+	bool pcieAvail = false;
+	bool pcieBandwidthAvail = false;	 /**< true when device reports PCIe bandwidth counters */
+	bool pcieReplayAvail = false;		 /**< true when device reports PCIe replay counters */
+	MemSnapshot memBefore{}, memAfter{}; /**< memory read/write counters + µs timestamp */
+	uint64_t memMaxBandwidth = 0;		 /**< peak bandwidth in bytes/s */
+	bool memAvail = false;
+	bool engineAvail = false; /**< true when engine HAL present and both snapshots taken */
+	bool powerAvail = false;  /**< true when power HAL is present */
+	/** EU active/stall/idle — populated once per tick by populateMetricCacheEnd */
+	EuMetricsData euSample{};
+	bool euAvail = false; /**< true when getEuActiveStallIdle succeeded */
+	bool populated = false;
+};
+
+/**
+ * Convenience one-shot wrapper: takes before-samples, sleeps @ref detail::SAMPLE_WINDOW, then takes
+ * after-samples. Suitable for one-shot / single-device use.
+ *
+ * @param dev  Device to sample. Must not be null.
+ * @return     A fully-populated MetricCache with @c populated == true.
+ * @param window  How long to sleep between before- and after-samples. Defaults to
+ *                @ref detail::SAMPLE_WINDOW. Pass a shorter value (e.g. zero) in unit tests
+ *                to keep the suite fast.
+ * @note         Blocks for approximately @p window. For multi-device use, prefer
+ *               @ref populateMetricCacheBegin / @ref populateMetricCacheEnd to amortise
+ *               the sleep across all devices.
+ */
+[[nodiscard]] MetricCache populateMetricCache(devInfo &dev, std::chrono::milliseconds window = detail::SAMPLE_WINDOW);
+
+/**
+ * Take the "before" half of a delta sample. Returns immediately without sleeping.
+ * Pair with @ref populateMetricCacheEnd after waiting at least @ref detail::SAMPLE_WINDOW.
+ *
+ * @param dev  Device to sample. Must not be null.
+ * @return     A partially-populated MetricCache containing only before-samples.
+ *             @c populated is @c false until @ref populateMetricCacheEnd is called.
+ */
+[[nodiscard]] MetricCache populateMetricCacheBegin(devInfo &dev);
+
+/**
+ * Take the "after" half of a delta sample and mark the cache as ready.
+ * Must be called after at least @ref detail::SAMPLE_WINDOW has elapsed since the matching
+ * @ref populateMetricCacheBegin call.
+ *
+ * @param dev    Device to sample. Must be the same device passed to the matching
+ *               @ref populateMetricCacheBegin call.
+ * @param cache  In/out. The MetricCache returned by @ref populateMetricCacheBegin.
+ *               On return, all after-sample fields are written and
+ *               @c cache.populated is set to @c true.
+ * @note         All availability flags are recomputed from scratch on each call.
+ *               @c powerAvail requires both @c populateMetricCacheBegin and this call
+ *               to have produced valid, advancing timestamps.
+ */
+void populateMetricCacheEnd(devInfo &dev, MetricCache &cache);
+
+/**
+ * Persistent-delta variant for continuous / dmon-loop mode.
+ * Copies @p prev's after-samples into the before-slots of a fresh cache, then
+ * immediately takes new after-samples from the device — no sleep overhead.
+ *
+ * @param dev   Device to sample. Must not be null.
+ * @param prev  The cache from the previous iteration. After-samples are
+ *              promoted to before-samples in the returned cache.
+ * @return      A fully-populated MetricCache representing the interval
+ *              [prev's after-sample timestamp, now].
+ * @pre         @p prev must have been produced by a prior call that set
+ *              @c prev.populated == true.
+ */
+[[nodiscard]] MetricCache populateMetricCacheContinuous(devInfo &dev, const MetricCache &prev);
+
+// ── MetricValue ───────────────────────────────────────────────────────────────
+
+/** The output type written by every getter lambda. */
+using MetricValue = std::string;
+
+// ── QueryMetric ────────────────────────────────────────────────────────────────
+
+struct QueryMetric
+{
+	std::string_view name; /**< xpu-smi query field name, e.g. "temperature.gpu" */
+	std::span<const std::string_view> aliases =
+		{};						  /**< Alternative names resolved by findMetric; invisible to group expansion */
+	std::string_view unit;		  /**< "C", "W", "MHz", "%", "MiB", or "" for dimensionless */
+	std::string_view description; /**< Shown by --list-fields / --help-query-gpu */
+	MetricSource source;
+	MetricGroup groups; /**< Bitmask of display sections this field belongs to */
+	ze_result_t (*getter)(devInfo &d, MetricValue &out, const MetricCache &cache);
+};
+
+// ── Group name table (detail — not part of the public API) ──────────────────────
+
+namespace detail {
+
+struct MetricGroupEntry
+{
+	std::string_view name;	   /**< canonical long name for -d filtering and --list-fields */
+	std::string_view shortcut; /**< xpu-smi dmon single-letter code ("" if none) */
+	MetricGroup group;
+};
+
+/**
+ * All recognised section names with their optional single-letter shortcuts.
+ * "p" appears on both POWER and TEMPERATURE so that parsing "p" yields POWER|TEMPERATURE
+ * (parseGroupMask does not break on first match).
+ * "v" (throttle violations) is intentionally omitted — use "c" (CLOCK) instead.
+ */
+inline constexpr auto GROUP_TABLE = std::to_array<MetricGroupEntry>({
+	{"IDENTITY", "", MetricGroup::IDENTITY},
+	{"MEMORY", "m", MetricGroup::MEMORY},
+	{"UTILIZATION", "u", MetricGroup::UTILIZATION},
+	{"TEMPERATURE", "p", MetricGroup::TEMPERATURE}, /**< "p" shared with POWER */
+	{"POWER", "p", MetricGroup::POWER},				/**< "p" shared with TEMPERATURE */
+	{"CLOCK", "c", MetricGroup::CLOCK},
+	{"PCI", "t", MetricGroup::PCI},
+	{"ECC", "e", MetricGroup::ECC},
+	{"EU_ARRAY", "x", MetricGroup::EU_ARRAY},
+	{"FAN", "f", MetricGroup::FAN},
+	{"ALL", "", MetricGroup::ALL},
+});
+
+} // namespace detail
+
+/**
+ * Parse a comma-separated list of section names into a @ref MetricGroup bitmask.
+ *
+ * Tokens are matched case-insensitively against both canonical long names
+ * (e.g. @c MEMORY) and single-letter shortcuts (e.g. @c m). Unknown tokens are
+ * silently ignored. Leading and trailing whitespace around each token is stripped.
+ *
+ * Multi-character shorthand strings (e.g. @c "pu") are expanded character-by-character
+ * when the whole token has no match, contains no dot, and every character individually
+ * maps to a known single-letter shortcut.
+ *
+ * @note The shortcut @c "p" matches both @c POWER and @c TEMPERATURE in one token.
+ *
+ * @param sv  Comma-separated token list, e.g. @c "MEMORY,u" or @c "power, ECC".
+ * @return    Bitmask of all matched MetricGroup values, or @c MetricGroup::NONE if
+ *            no token matched.
+ */
+[[nodiscard]] constexpr MetricGroup parseGroupMask(std::string_view sv) noexcept
+{
+	// Case-insensitive single-character comparison (no capture — usable in constexpr).
+	constexpr auto icharEq = [](char a, char b) constexpr noexcept {
+		constexpr auto up = [](char c) constexpr noexcept -> char {
+			return (c >= 'a' && c <= 'z') ? static_cast<char>(c - 32) : c;
+		};
+		return up(a) == up(b);
+	};
+
+	constexpr auto toLower = [](char x) constexpr noexcept -> char {
+		return (x >= 'A' && x <= 'Z') ? static_cast<char>(x + 32) : x;
+	};
+
+	MetricGroup result = MetricGroup::NONE;
+	while (!sv.empty()) {
+		const auto comma = sv.find(',');
+		const auto token = detail::trim(sv.substr(0, comma));
+
+		bool matched = false;
+		for (const auto &entry : detail::GROUP_TABLE) {
+			// Match single-letter shortcut.
+			const bool shortcutMatch = !entry.shortcut.empty() && entry.shortcut.size() == token.size() &&
+									   std::equal(entry.shortcut.begin(), entry.shortcut.end(), token.begin(), icharEq);
+			// Match canonical long name.
+			const bool nameMatch = entry.name.size() == token.size() &&
+								   std::equal(entry.name.begin(), entry.name.end(), token.begin(), icharEq);
+			if (shortcutMatch || nameMatch) {
+				result = result | entry.group;
+				matched = true;
+			}
+		}
+		// Multi-char shorthand (e.g. "pu" → POWER | TEMPERATURE | UTILIZATION):
+		// expand each character only when the whole token had no match, contains no dot,
+		// and *every* character individually maps to a known single-char shortcut.
+		if (!matched && !token.empty() && token.find('.') == std::string_view::npos) {
+			bool allKnown = true;
+			for (char const ch : token) {
+				const char lo = toLower(ch);
+				bool found = false;
+				for (const auto &entry : detail::GROUP_TABLE) {
+					if (!entry.shortcut.empty() && icharEq(entry.shortcut[0], lo)) {
+						found = true;
+						break;
+					}
+				}
+				if (!found) {
+					allKnown = false;
+					break;
+				}
+			}
+			if (allKnown) {
+				for (char const ch : token) {
+					const char lo = toLower(ch);
+					for (const auto &entry : detail::GROUP_TABLE) {
+						if (!entry.shortcut.empty() && icharEq(entry.shortcut[0], lo)) {
+							result = result | entry.group;
+						}
+					}
+				}
+			}
+		}
+
+		if (comma == std::string_view::npos) {
+			break;
+		}
+		sv.remove_prefix(comma + 1);
+	}
+	return result;
+}
+
+// ── Registry API ──────────────────────────────────────────────────────────────
+
+/**
+ * Returns all registered metrics in declaration order.
+ *
+ * The returned span is valid for the lifetime of the program (backed by a
+ * static singleton built on first call).  Pointers into this span are stable
+ * and may be stored safely by callers.
+ *
+ * @return  Stable span of all metrics assembled from the per-group headers,
+ *          in declaration order.
+ */
+[[nodiscard]] std::span<const QueryMetric> getQueryMetrics() noexcept;
+
+/**
+ * Returns pointers to all metrics whose group bitmask overlaps @p mask.
+ *
+ * Two special values are handled before the overlap test:
+ * - @c MetricGroup::NONE — always returns an empty vector.
+ * - @c MetricGroup::ALL  — returns every metric regardless of its own group
+ *   membership (including metrics whose @c groups field is @c MetricGroup::NONE).
+ *
+ * @param mask  A @ref MetricGroup bitmask.
+ * @return      Pointers into the stable metric registry, in declaration order.
+ *              Never contains null pointers.
+ */
+[[nodiscard]] std::vector<const QueryMetric *> getMetricsByGroup(MetricGroup mask);
+
+/**
+ * Case-insensitive lookup by metric name or alias.
+ *
+ * @param name  Metric name to search for, e.g. @c "temperature.gpu".
+ *              Also matches entries in @c QueryMetric::aliases.
+ * @return      Copy of the matching @ref QueryMetric, or empty optional if not found.
+ */
+[[nodiscard]] std::optional<QueryMetric> findMetric(std::string_view name);
+
+/**
+ * Unified query resolver: handles field names, aliases, and group tokens in one call.
+ *
+ * Each comma-separated token is resolved as follows:
+ *  - Token containing @c '.' → individual metric lookup via @ref findMetric
+ *    (canonical name and aliases are both matched).
+ *  - Token without @c '.' → group name / alias expansion via @ref parseGroupMask
+ *    (including multi-character expansion). If no group matches, falls back to
+ *    @ref findMetric for dotless names like @c "timestamp" or @c "name".
+ *
+ * Duplicate entries (matched by name) are removed; declaration order is preserved.
+ *
+ * @param csv  Comma-separated query string, e.g. @c "temperature.gpu,POWER" or @c "pu".
+ * @return     Deduplicated, ordered list of pointers into the stable metric registry.
+ *             Unknown tokens are silently ignored.  Pointers remain valid for the
+ *             lifetime of the program.
+ */
+[[nodiscard]] std::vector<const QueryMetric *> resolveQuery(std::string_view csv);
+
+/**
+ * Format the canonical group names for the given bitmask as a comma-separated string.
+ *
+ * Only canonical long names (e.g. @c POWER, @c MEMORY) are emitted; aliases and
+ * @c ALL are excluded.
+ *
+ * @param groups  Bitmask of @ref MetricGroup values.
+ * @return        Comma-separated string, e.g. @c "POWER, TEMPERATURE".
+ *                Returns an empty string for @c MetricGroup::NONE.
+ */
+[[nodiscard]] std::string formatGroups(MetricGroup groups);
+
+// ── MetricOutput concept ───────────────────────────────────────────────────────
+
+/** Any type satisfying MetricOutput can serve as a sink for evaluated metric results.
+ *  Pass an instance to @ref runMetrics() or @ref runMetricsWithCaches(). */
+template <typename T>
+concept MetricOutput =
+	requires(T &t, std::span<const QueryMetric *> fields, devInfo &dev, const QueryMetric &f, const std::string &val) {
+		t.onBegin(fields);
+		t.onBeginDevice(dev);
+		t.onMetric(f, val);
+		t.onEndDevice(dev);
+		t.onEnd();
+	};
+
+// ── Metric evaluation free functions ──────────────────────────────────────────
+
+namespace detail {
+
+/**
+ * Inner loop shared by runMetrics and runMetricsWithCaches.
+ * Not part of the public API — call runMetrics() or runMetricsWithCaches() instead.
+ */
+template <MetricOutput Output>
+void emitMetrics(Output &output, std::span<const QueryMetric *> fields, std::span<devInfo> devices,
+				 std::span<const MetricCache> caches)
+{
+	output.onBegin(fields);
+	for (std::size_t i = 0; i < devices.size(); ++i) {
+		output.onBeginDevice(devices[i]);
+		for (const QueryMetric *f : fields) {
+			std::string val{"N/A"};
+			if (f->getter(devices[i], val, caches[i]) != ZE_RESULT_SUCCESS) {
+				val = "N/A";
+			}
+			output.onMetric(*f, val);
+		}
+		output.onEndDevice(devices[i]);
+	}
+	output.onEnd();
+}
+
+} // namespace detail
+
+/**
+ * Evaluate every metric for every device and route results to @p output.
+ *
+ * All before-samples are taken for every device first, then a single
+ * @ref detail::SAMPLE_WINDOW sleep is observed, then all after-samples are taken.
+ * This keeps the total blocking time constant regardless of device count.
+ *
+ * Metrics tagged @ref MetricSource::Static skip sampling entirely.
+ * Metrics whose getter returns a non-success result emit @c "N/A".
+ *
+ * @tparam Output  Any type satisfying @ref MetricOutput.
+ * @param output   Sink that receives the structured results.
+ * @param fields   Ordered list of metrics to evaluate. Must not contain null pointers.
+ * @param devices  Devices to iterate over. May be empty.
+ * @note  Blocks for approximately @ref detail::SAMPLE_WINDOW if any @c Live metric is selected.
+ */
+template <MetricOutput Output>
+void runMetrics(Output &output, std::span<const QueryMetric *> fields, std::span<devInfo> devices)
+{
+	const bool hasLive =
+		std::ranges::any_of(fields, [](const QueryMetric *f) { return f->source == MetricSource::Live; });
+
+	std::vector<MetricCache> caches(devices.size());
+	if (hasLive) {
+		const auto deadline = std::chrono::steady_clock::now() + detail::SAMPLE_WINDOW;
+		for (std::size_t i = 0; i < devices.size(); ++i) {
+			caches[i] = populateMetricCacheBegin(devices[i]);
+		}
+		std::this_thread::sleep_until(deadline);
+		for (std::size_t i = 0; i < devices.size(); ++i) {
+			populateMetricCacheEnd(devices[i], caches[i]);
+		}
+	}
+
+	detail::emitMetrics(output, fields, devices, caches);
+}
+
+/**
+ * Evaluate metrics using pre-built caches — for continuous / dmon-loop mode.
+ *
+ * Unlike @ref runMetrics, this overload does not perform any sampling or sleeping;
+ * the caller is responsible for keeping @p caches up to date (e.g. via
+ * @ref populateMetricCacheContinuous).
+ *
+ * @tparam Output  Any type satisfying @ref MetricOutput.
+ * @param output   Sink that receives the structured results.
+ * @param fields   Ordered list of metrics to evaluate.
+ * @param devices  Devices to iterate over.
+ * @param caches   Pre-populated caches, one per device.
+ * @pre   @c caches.size() >= @c devices.size().
+ */
+template <MetricOutput Output>
+void runMetricsWithCaches(Output &output, std::span<const QueryMetric *> fields, std::span<devInfo> devices,
+						  std::span<const MetricCache> caches)
+{
+	detail::emitMetrics(output, fields, devices, caches);
+}
+
+} // namespace metrics
+
+#endif // METRICS_REGISTRY_H
diff --git a/ial/cmn/test/meson.build b/ial/cmn/test/meson.build
new file mode 100644
index 000000000..72a2e8952
--- /dev/null
+++ b/ial/cmn/test/meson.build
@@ -0,0 +1,42 @@
+# Copyright (C) 2026 Intel Corporation
+# SPDX-License-Identifier: MIT
+
+# IAL common unit tests (doctest)
+
+doctest_dep = dependency('doctest', required: true)
+
+ial_cmn_test_deps = ial_cmn_deps + [doctest_dep]
+
+metrics_registry_test = executable(
+  'metrics_registry_test',
+  'metrics_registry_test.cpp',
+  include_directories: [
+    global_inc,
+    ial_cmn_inc,
+  ],
+  link_with: ial_cmn_lib,
+  dependencies: ial_cmn_test_deps,
+  link_args: is_linux ? ['-pie'] : [],
+  build_by_default: true,
+  install: false,
+)
+
+test('metrics_registry_test', metrics_registry_test)
+
+if is_linux
+  topology_test = executable(
+    'topology_test',
+    'topology_test.cpp',
+    include_directories: [
+      global_inc,
+      ial_cmn_inc,
+    ],
+    link_with: [ial_cmn_lib],
+    dependencies: ial_cmn_test_deps,
+    link_args: ['-pie'],
+    build_by_default: true,
+    install: false,
+  )
+
+  test('topology_test', topology_test)
+endif
\ No newline at end of file
diff --git a/ial/cmn/test/metrics_registry_test.cpp b/ial/cmn/test/metrics_registry_test.cpp
new file mode 100644
index 000000000..a799eb3b1
--- /dev/null
+++ b/ial/cmn/test/metrics_registry_test.cpp
@@ -0,0 +1,758 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include <doctest/doctest.h>
+
+#ifdef INFO
+#undef INFO
+#endif
+
+#include "metrics_registry.h"
+#include "metrics/temperature_metrics.h"
+#include "metrics/utilization.h"
+#include "metrics/clock.h"
+#include "metrics/eu_array.h"
+#include "metrics/power.h"
+#include <algorithm>
+#include <array>
+#include <ranges>
+#include <span>
+#include <string>
+#include <string_view>
+#include <vector>
+
+using namespace metrics; // NOLINT(google-build-using-namespace)
+
+// ── parseGroupMask / formatGroups ─────────────────────────────────────────────
+// These functions operate only on the compile-time GROUP_TABLE — no registered
+// metrics are needed.
+
+TEST_CASE("parseGroupMask parses canonical names case-insensitively")
+{
+	CHECK(hasGroup(parseGroupMask("MEMORY"), MetricGroup::MEMORY));
+	CHECK(hasGroup(parseGroupMask("memory"), MetricGroup::MEMORY));
+	CHECK(hasGroup(parseGroupMask("Memory"), MetricGroup::MEMORY));
+}
+
+TEST_CASE("parseGroupMask parses single-letter aliases")
+{
+	CHECK(hasGroup(parseGroupMask("m"), MetricGroup::MEMORY));
+	CHECK(hasGroup(parseGroupMask("u"), MetricGroup::UTILIZATION));
+	CHECK(hasGroup(parseGroupMask("c"), MetricGroup::CLOCK));
+	CHECK(hasGroup(parseGroupMask("e"), MetricGroup::ECC));
+	CHECK(hasGroup(parseGroupMask("f"), MetricGroup::FAN));
+	CHECK(hasGroup(parseGroupMask("t"), MetricGroup::PCI));
+	CHECK(hasGroup(parseGroupMask("x"), MetricGroup::EU_ARRAY));
+}
+
+TEST_CASE("parseGroupMask: alias 'p' matches both POWER and TEMPERATURE")
+{
+	const MetricGroup mask = parseGroupMask("p");
+	CHECK(hasGroup(mask, MetricGroup::POWER));
+	CHECK(hasGroup(mask, MetricGroup::TEMPERATURE));
+}
+
+TEST_CASE("parseGroupMask handles comma-separated tokens and unknown tokens")
+{
+	const MetricGroup mask = parseGroupMask("memory, UTILIZATION, unknown");
+	CHECK(hasGroup(mask, MetricGroup::MEMORY));
+	CHECK(hasGroup(mask, MetricGroup::UTILIZATION));
+	CHECK_FALSE(hasGroup(mask, MetricGroup::CLOCK));
+
+	CHECK(parseGroupMask("unknown_only") == MetricGroup::NONE);
+}
+
+TEST_CASE("parseGroupMask expands multi-character alias shorthands")
+{
+	const MetricGroup mask = parseGroupMask("pu");
+	CHECK(hasGroup(mask, MetricGroup::POWER));
+	CHECK(hasGroup(mask, MetricGroup::TEMPERATURE));
+	CHECK(hasGroup(mask, MetricGroup::UTILIZATION));
+}
+
+TEST_CASE("formatGroups emits canonical group names")
+{
+	const std::string names = formatGroups(MetricGroup::POWER | MetricGroup::TEMPERATURE);
+	CHECK(names.find("POWER") != std::string::npos);
+	CHECK(names.find("TEMPERATURE") != std::string::npos);
+}
+
+TEST_CASE("formatGroups returns empty string for NONE") { CHECK(formatGroups(MetricGroup::NONE).empty()); }
+
+// ── Shared fixture ────────────────────────────────────────────────────────────
+// A zero-initialised device has default-constructed HAL sub-objects.
+// All HAL calls fail gracefully and write zeros, so availability flags stay false.
+
+struct ZeroDeviceFixture
+{
+	device dev; // default-constructed; safe without calling device::init()
+	devInfo di{0, &dev, nullptr, nullptr};
+};
+
+// ── Registry API ──────────────────────────────────────────────────────────────
+
+TEST_CASE("getQueryMetrics returns non-empty span")
+{
+	const auto all = getQueryMetrics();
+	CHECK_FALSE(all.empty());
+	// >= because multiple metric groups are registered
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::IDENTITY).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::TEMPERATURE).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::UTILIZATION).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::PCI).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::EU_ARRAY).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::FAN).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::MEMORY).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::POWER).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::ECC).size());
+	CHECK(all.size() >= getMetricsByGroup(MetricGroup::CLOCK).size());
+}
+
+TEST_CASE("getMetricsByGroup ALL returns non-empty, NONE returns empty")
+{
+	CHECK_FALSE(getMetricsByGroup(MetricGroup::ALL).empty());
+	CHECK(getMetricsByGroup(MetricGroup::NONE).empty());
+}
+
+TEST_CASE("getMetricsByGroup UTILIZATION returns all utilization metrics")
+{
+	CHECK(getMetricsByGroup(MetricGroup::UTILIZATION).size() ==
+		  metrics::utilization::getUtilizationMetrics().size() + metrics::eu_array::getEuArrayMetrics().size());
+}
+
+TEST_CASE("findMetric resolves identity metric names")
+{
+	CHECK(findMetric("name").has_value());
+	CHECK(findMetric("index").has_value());
+	CHECK(findMetric("uuid").has_value());
+	CHECK(findMetric("serial").has_value());
+	CHECK(findMetric("timestamp").has_value());
+	CHECK(findMetric("driver_version").has_value());
+	CHECK(findMetric("vbios_version").has_value());
+	CHECK(findMetric("pci.bus_id").has_value());
+	CHECK(findMetric("pci.device_id").has_value());
+	CHECK(findMetric("pci.sub_device_id").has_value());
+}
+
+TEST_CASE("findMetric resolves PCI metric names")
+{
+	CHECK(findMetric("pcie.link.gen.max").has_value());
+	CHECK(findMetric("pcie.link.width.max").has_value());
+	CHECK(findMetric("pcie.link.gen.current").has_value());
+	CHECK(findMetric("pcie.link.width.current").has_value());
+	CHECK(findMetric("pcie.tx.throughput").has_value());
+	CHECK(findMetric("pcie.rx.throughput").has_value());
+	CHECK(findMetric("pcie.replay.counter").has_value());
+	CHECK(findMetric("pcie.rx.throughput.kbs").has_value());
+	CHECK(findMetric("pcie.tx.throughput.kbs").has_value());
+}
+
+TEST_CASE("PCI group contains exactly 12 canonical entries")
+{
+	const auto byPci = getMetricsByGroup(MetricGroup::PCI);
+	CHECK(byPci.size() == 12); // 9 from pci.cpp + 3 from identity.h (pci.bus_id, pci.device_id, pci.sub_device_id)
+}
+
+TEST_CASE("findMetric resolves Power metric names")
+{
+	CHECK(findMetric("power.draw").has_value());
+	CHECK(findMetric("power.draw.gpu").has_value());
+	CHECK(findMetric("energy.consumed").has_value());
+	CHECK(findMetric("power.limit").has_value());
+	CHECK(findMetric("power.max_limit").has_value());
+}
+
+TEST_CASE("Power group contains all expected metric names")
+{
+	const auto byPow = getMetricsByGroup(MetricGroup::POWER);
+	const std::vector<std::string_view> expected = {"power.draw", "power.draw.gpu", "energy.consumed", "power.limit",
+													"power.max_limit"};
+	for (const auto name : expected) {
+		CHECK_MESSAGE(std::ranges::any_of(byPow, [name](const auto *m) { return m->name == name; }), name,
+					  " not found in POWER group");
+	}
+	// Relative order: power.draw before power.draw.gpu before energy.consumed
+	const auto pos = [&](std::string_view n) {
+		return std::ranges::find_if(byPow, [n](const auto *m) { return m->name == n; }) - byPow.begin();
+	};
+	CHECK(pos("power.draw") < pos("power.draw.gpu"));
+	CHECK(pos("power.draw.gpu") < pos("energy.consumed"));
+}
+
+TEST_CASE("getMetricsByGroup UTILIZATION returns only canonical names, no aliases")
+{
+	// Aliases (.single / .group / .decode.single etc.) must be excluded so that
+	// '-d UTILIZATION' does not produce duplicate columns.
+	// EU Array metrics also carry UTILIZATION so they appear here too.
+	static constexpr std::array canonicalNames{
+		std::string_view{"utilization.gpu"},
+		std::string_view{"utilization.compute"},
+		std::string_view{"utilization.render"},
+		std::string_view{"utilization.media"},
+		std::string_view{"utilization.copy"},
+		std::string_view{"utilization.memory"},
+		std::string_view{"eu.active"},
+		std::string_view{"eu.stall"},
+		std::string_view{"eu.idle"},
+	};
+	const auto byUtil = getMetricsByGroup(MetricGroup::UTILIZATION);
+	REQUIRE(byUtil.size() == canonicalNames.size());
+	for (std::size_t i = 0; i < canonicalNames.size(); ++i) {
+		CHECK(byUtil[i]->name == canonicalNames[i]);
+	}
+}
+
+TEST_CASE("getMetricsByGroup MEMORY includes utilization.memory")
+{
+	const auto byMem = getMetricsByGroup(MetricGroup::MEMORY);
+	// utilization.memory is registered first (before memory.cpp metrics)
+	REQUIRE_FALSE(byMem.empty());
+	CHECK(byMem[0]->name == "utilization.memory");
+}
+
+TEST_CASE("findMetric resolves Temperature metric names")
+{
+	CHECK(findMetric("temperature.gpu").has_value());
+	CHECK(findMetric("temperature.memory").has_value());
+}
+
+TEST_CASE("getMetricsByGroup TEMPERATURE matches getTemperatureMetrics")
+{
+	const auto byTemp = getMetricsByGroup(MetricGroup::TEMPERATURE);
+	REQUIRE(byTemp.size() == metrics::temperature::getTemperatureMetrics().size());
+	CHECK(byTemp[0]->name == "temperature.gpu");
+	CHECK(byTemp[1]->name == "temperature.memory");
+}
+
+TEST_CASE("findMetric resolves clock metric names")
+{
+	CHECK(findMetric("clocks.current.graphics").has_value());
+	CHECK(findMetric("clocks.current.media").has_value());
+	CHECK(findMetric("clocks.throttle.reason").has_value());
+	CHECK(findMetric("clocks.max.graphics").has_value());
+	CHECK(findMetric("clocks.max.media").has_value());
+}
+
+TEST_CASE("findMetric resolves clock aliases")
+{
+	CHECK(findMetric("clocks.current.sm").has_value());
+	CHECK(findMetric("clocks.current.video").has_value());
+	CHECK(findMetric("clocks.max.sm").has_value());
+	CHECK(findMetric("clocks.max.video").has_value());
+}
+
+TEST_CASE("clock aliases do not appear as separate entries in group expansion")
+{
+	const auto byClock = getMetricsByGroup(MetricGroup::CLOCK);
+	// 5 canonical entries; sm/video/max.sm/max.video are aliases, not separate rows.
+	CHECK(byClock.size() == 5);
+}
+
+TEST_CASE("findMetric resolves Utilization canonical names")
+{
+	CHECK(findMetric("utilization.gpu").has_value());
+	CHECK(findMetric("utilization.compute").has_value());
+	CHECK(findMetric("utilization.render").has_value());
+	CHECK(findMetric("utilization.media").has_value());
+	CHECK(findMetric("utilization.copy").has_value());
+	CHECK(findMetric("utilization.memory").has_value());
+}
+
+TEST_CASE("findMetric resolves Utilization aliases")
+{
+	// compute
+	CHECK(findMetric("utilization.compute.single").has_value());
+	CHECK(findMetric("utilization.compute.group").has_value());
+	// render
+	CHECK(findMetric("utilization.render.single").has_value());
+	CHECK(findMetric("utilization.render.group").has_value());
+	// media (sub-engine forms)
+	CHECK(findMetric("utilization.media.decode.single").has_value());
+	CHECK(findMetric("utilization.media.encode.single").has_value());
+	CHECK(findMetric("utilization.media.enhancement.single").has_value());
+	CHECK(findMetric("utilization.media.group").has_value());
+	// copy
+	CHECK(findMetric("utilization.copy.single").has_value());
+	CHECK(findMetric("utilization.copy.group").has_value());
+}
+
+TEST_CASE("findMetric resolves EU Array metric names")
+{
+	CHECK(findMetric("eu.active").has_value());
+	CHECK(findMetric("eu.stall").has_value());
+	CHECK(findMetric("eu.idle").has_value());
+}
+
+TEST_CASE("EU Array group contains exactly 3 canonical entries")
+{
+	const auto byEu = getMetricsByGroup(MetricGroup::EU_ARRAY);
+	CHECK(byEu.size() == 3);
+}
+
+TEST_CASE("findMetric resolves Fan metric names") { CHECK(findMetric("fan.speed").has_value()); }
+
+TEST_CASE("Fan group contains exactly 1 canonical entry")
+{
+	const auto byFan = getMetricsByGroup(MetricGroup::FAN);
+	CHECK(byFan.size() == 1);
+}
+
+TEST_CASE("findMetric resolves Memory metric names")
+{
+	CHECK(findMetric("memory.total").has_value());
+	CHECK(findMetric("memory.used").has_value());
+	CHECK(findMetric("memory.free").has_value());
+	CHECK(findMetric("memory.read.bandwidth").has_value());
+	CHECK(findMetric("memory.write.bandwidth").has_value());
+	CHECK(findMetric("memory.bandwidth.utilization").has_value());
+}
+
+TEST_CASE("Memory group contains exactly 7 canonical entries")
+{
+	const auto byMem = getMetricsByGroup(MetricGroup::MEMORY);
+	CHECK(byMem.size() == 7); // 6 from memory.cpp + utilization.memory
+}
+
+TEST_CASE("findMetric resolves ECC metric names")
+{
+	CHECK(findMetric("ecc.mode.current").has_value());
+	CHECK(findMetric("ecc.errors.corrected.aggregate.total").has_value());
+	CHECK(findMetric("ecc.errors.uncorrected.aggregate.total").has_value());
+	CHECK(findMetric("ecc.errors.aggregate.total").has_value());
+	CHECK(findMetric("ras.reset").has_value());
+	CHECK(findMetric("ras.programming.errors").has_value());
+	CHECK(findMetric("ras.driver.errors").has_value());
+	CHECK(findMetric("ras.cache.errors.correctable").has_value());
+	CHECK(findMetric("ras.cache.errors.uncorrectable").has_value());
+	CHECK(findMetric("ras.non_compute.errors.total").has_value());
+}
+
+TEST_CASE("ECC group contains exactly 10 canonical entries")
+{
+	const auto byEcc = getMetricsByGroup(MetricGroup::ECC);
+	CHECK(byEcc.size() == 10);
+}
+
+TEST_CASE("findMetric returns nullopt for unregistered metrics")
+{
+	CHECK_FALSE(findMetric("__no_such_metric__").has_value());
+}
+
+TEST_CASE(
+	"resolveQuery expands IDENTITY, TEMPERATURE, UTILIZATION, PCI, EU Array, Fan, Memory, POWER, ECC, and CLOCK groups")
+{
+	CHECK_FALSE(resolveQuery("IDENTITY").empty());
+	CHECK_FALSE(resolveQuery("TEMPERATURE").empty());
+	CHECK_FALSE(resolveQuery("UTILIZATION").empty());
+	const auto byQuery = resolveQuery("POWER");
+	const std::vector<std::string_view> expectedPower = {"power.draw", "power.draw.gpu", "energy.consumed",
+														 "power.limit", "power.max_limit"};
+	for (const auto name : expectedPower) {
+		CHECK_MESSAGE(std::ranges::any_of(byQuery, [name](const auto *m) { return m->name == name; }), name,
+					  " not found in resolveQuery(\"POWER\")");
+	}
+	CHECK_FALSE(resolveQuery("CLOCK").empty());
+	CHECK_FALSE(resolveQuery("p").empty()); // 'p' expands to POWER|TEMPERATURE
+	CHECK_FALSE(resolveQuery("u").empty()); // single-letter alias for UTILIZATION
+	CHECK_FALSE(resolveQuery("PCI").empty());
+	CHECK_FALSE(resolveQuery("t").empty()); // single-letter shortcut for PCI
+	CHECK_FALSE(resolveQuery("EU_ARRAY").empty());
+	CHECK_FALSE(resolveQuery("x").empty()); // single-letter alias for EU_ARRAY
+	CHECK_FALSE(resolveQuery("FAN").empty());
+	CHECK_FALSE(resolveQuery("f").empty()); // single-letter alias for FAN
+	CHECK_FALSE(resolveQuery("MEMORY").empty());
+	CHECK_FALSE(resolveQuery("m").empty()); // single-letter alias for MEMORY
+	CHECK_FALSE(resolveQuery("POWER").empty());
+	CHECK_FALSE(resolveQuery("ECC").empty());
+	CHECK_FALSE(resolveQuery("e").empty()); // single-letter alias for ECC
+	CHECK_FALSE(resolveQuery("CLOCK").empty());
+	CHECK_FALSE(resolveQuery("c").empty()); // single-letter alias for CLOCK
+}
+
+TEST_CASE("resolveQuery returns empty for group tokens with no registered metrics")
+{
+	// All previously-unregistered groups (CLOCK, ECC, POWER, FAN) are now registered.
+}
+
+TEST_CASE("resolveQuery TEMPERATURE returns registered metrics")
+{
+	CHECK_FALSE(resolveQuery("TEMPERATURE").empty());
+	CHECK(resolveQuery("TEMPERATURE").size() == metrics::temperature::getTemperatureMetrics().size());
+}
+
+TEST_CASE("resolveQuery pu expands to Temperature, Utilization, and Power metrics")
+{
+	// 'p' maps to POWER|TEMPERATURE; 'u' maps to UTILIZATION. All three groups are registered.
+	const auto result = resolveQuery("pu");
+	CHECK(result.size() ==
+		  metrics::power::getPowerMetrics().size() + metrics::temperature::getTemperatureMetrics().size() +
+			  metrics::utilization::getUtilizationMetrics().size() + metrics::eu_array::getEuArrayMetrics().size());
+}
+
+TEST_CASE("resolveQuery returns empty vector for unknown tokens")
+{
+	CHECK(resolveQuery("__no_such_metric__").empty());
+	CHECK(resolveQuery("UNKNOWN_GROUP").empty());
+}
+
+TEST_CASE("power QueryMetric fields: unit, source, and group membership")
+{
+	for (const auto name : std::to_array<std::string_view>({"power.draw", "power.draw.gpu"})) {
+		auto found = findMetric(name);
+		REQUIRE(found.has_value());
+		CHECK(found->unit == "W");
+		CHECK(found->source == MetricSource::Live);
+		CHECK(hasGroup(found->groups, MetricGroup::POWER));
+	}
+	{
+		auto found = findMetric("energy.consumed");
+		REQUIRE(found.has_value());
+		CHECK(found->unit == "J");
+		CHECK(found->source == MetricSource::Live);
+		CHECK(hasGroup(found->groups, MetricGroup::POWER));
+	}
+	for (const auto name : std::to_array<std::string_view>({"power.limit", "power.max_limit"})) {
+		auto found = findMetric(name);
+		REQUIRE(found.has_value());
+		CHECK(found->unit == "W");
+		CHECK(found->source == MetricSource::Static);
+		CHECK(hasGroup(found->groups, MetricGroup::POWER));
+	}
+}
+
+// ── Power getter logic ────────────────────────────────────────────────────────
+// Live metrics (DRAW, DRAW_GPU, ENERGY_CONSUMED) ignore devInfo entirely,
+// so a zero-device is sufficient — no HAL calls occur.
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw getter: UNSUPPORTED when cardPowerBefore.ts is zero")
+{
+	MetricValue out;
+	MetricCache c; // all zeros — before.ts == 0
+	CHECK(findMetric("power.draw").value().getter(di, out, c) == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw getter: UNSUPPORTED when after.ts < before.ts")
+{
+	MetricValue out;
+	MetricCache c;
+	c.cardPowerBefore.ts = 200;
+	c.cardPowerAfter.ts = 100;
+	CHECK(findMetric("power.draw").value().getter(di, out, c) == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw getter: N/A when timestamps are equal")
+{
+	MetricValue out;
+	MetricCache c;
+	c.cardPowerBefore.ts = c.cardPowerAfter.ts = 100;
+	CHECK(findMetric("power.draw").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "N/A");
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw getter: N/A when energy counter regresses")
+{
+	MetricValue out;
+	MetricCache c;
+	c.cardPowerBefore = {.energy = 500, .ts = 100};
+	c.cardPowerAfter = {.energy = 400, .ts = 200};
+	CHECK(findMetric("power.draw").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "N/A");
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw getter: computes watts (delta 2 000 000 µJ / 2 000 000 µs == 1.00 W)")
+{
+	MetricValue out;
+	MetricCache c;
+	c.cardPowerBefore = {.energy = 0, .ts = 1};
+	c.cardPowerAfter = {.energy = 2'000'000, .ts = 2'000'001};
+	CHECK(findMetric("power.draw").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "1.00");
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw.gpu getter: UNSUPPORTED when gpuPowerBefore.ts is zero")
+{
+	MetricValue out;
+	MetricCache c;
+	CHECK(findMetric("power.draw.gpu").value().getter(di, out, c) == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw.gpu getter: UNSUPPORTED when after.ts < before.ts")
+{
+	MetricValue out;
+	MetricCache c;
+	c.gpuPowerBefore.ts = 200;
+	c.gpuPowerAfter.ts = 100;
+	CHECK(findMetric("power.draw.gpu").value().getter(di, out, c) == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "power.draw.gpu getter: N/A when timestamps are equal")
+{
+	MetricValue out;
+	MetricCache c;
+	c.gpuPowerBefore.ts = c.gpuPowerAfter.ts = 100;
+	CHECK(findMetric("power.draw.gpu").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "N/A");
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture,
+				  "power.draw.gpu getter: computes watts (delta 4 000 000 µJ / 2 000 000 µs == 2.00 W)")
+{
+	MetricValue out;
+	MetricCache c;
+	c.gpuPowerBefore = {.energy = 0, .ts = 1};
+	c.gpuPowerAfter = {.energy = 4'000'000, .ts = 2'000'001};
+	CHECK(findMetric("power.draw.gpu").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "2.00");
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "energy.consumed getter: UNSUPPORTED when gpuPowerAfter.ts is zero")
+{
+	MetricValue out;
+	MetricCache c;
+	CHECK(findMetric("energy.consumed").value().getter(di, out, c) == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "energy.consumed getter: converts µJ to J (5 000 000 000 µJ == 5000.00 J)")
+{
+	MetricValue out;
+	MetricCache c;
+	c.gpuPowerAfter = {.energy = 5'000'000'000ULL, .ts = 1};
+	CHECK(findMetric("energy.consumed").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "5000.00");
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "energy.consumed getter: zero energy formats as 0.00 J")
+{
+	MetricValue out;
+	MetricCache c;
+	c.gpuPowerAfter = {.energy = 0, .ts = 1}; // ts != 0, so it is available
+	CHECK(findMetric("energy.consumed").value().getter(di, out, c) == ZE_RESULT_SUCCESS);
+	CHECK(out == "0.00");
+}
+
+TEST_CASE("MetricCache default values are zero and all flags false")
+{
+	const MetricCache cache;
+	CHECK_FALSE(cache.populated);
+	CHECK_FALSE(cache.pcieAvail);
+	CHECK_FALSE(cache.memAvail);
+	CHECK_FALSE(cache.engineAvail);
+	CHECK_FALSE(cache.powerAvail);
+	CHECK_FALSE(cache.euAvail);
+	CHECK(cache.pcieBefore.tx == 0);
+	CHECK(cache.pcieAfter.tx == 0);
+	CHECK(cache.cardPowerBefore.energy == 0);
+	CHECK(cache.cardPowerAfter.energy == 0);
+	CHECK(cache.memBefore.read == 0);
+	CHECK(cache.memBefore.ts == 0);
+	CHECK(cache.engines.all.before.active == 0);
+	CHECK(cache.engines.all.before.ts == 0);
+	CHECK(cache.euSample.euActive == 0);
+	CHECK(cache.euSample.euStall == 0);
+	CHECK(cache.euSample.euIdle == 0);
+}
+
+// ── populateMetricCache* ──────────────────────────────────────────────────────
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCacheBegin returns unpopulated cache")
+{
+	const MetricCache cache = populateMetricCacheBegin(di);
+	CHECK_FALSE(cache.populated);
+	CHECK_FALSE(cache.pcieAvail);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCacheEnd marks cache as populated")
+{
+	MetricCache cache = populateMetricCacheBegin(di);
+	REQUIRE_FALSE(cache.populated);
+	populateMetricCacheEnd(di, cache);
+	CHECK(cache.populated);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCacheEnd: availability flags are false when HAL data is absent")
+{
+	MetricCache cache = populateMetricCacheBegin(di);
+	populateMetricCacheEnd(di, cache);
+
+	CHECK_FALSE(cache.engineAvail);
+	CHECK_FALSE(cache.pcieAvail);
+	CHECK_FALSE(cache.memAvail);
+	CHECK_FALSE(cache.euAvail);
+	// powerAvail requires advancing timestamps from both Begin and End; the zero device
+	// returns constant/zero timestamps, so powerAvail is false.
+	CHECK_FALSE(cache.powerAvail);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture,
+				  "populateMetricCacheEnd: stale euAvail/euSample are cleared even when HAL call fails")
+{
+	// Simulate a cache that already holds EU data from a previous tick (e.g. the caller
+	// reuses a MetricCache rather than constructing a fresh one via populateMetricCacheBegin).
+	MetricCache cache;
+	cache.euAvail = true;
+	cache.euSample.euActive = 999;
+	cache.euSample.euStall = 111;
+	cache.euSample.euIdle = 222;
+
+	// ZeroDeviceFixture has a null deviceHdl, so the EU HAL call will fail.
+	populateMetricCacheEnd(di, cache);
+
+	// The stale values must be overwritten, not preserved.
+	CHECK_FALSE(cache.euAvail);
+	CHECK(cache.euSample.euActive == 0);
+	CHECK(cache.euSample.euStall == 0);
+	CHECK(cache.euSample.euIdle == 0);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCacheContinuous promotes prev after-samples into curr before-slots")
+{
+	MetricCache prev;
+	prev.cardPowerAfter.energy = 12345;
+	prev.cardPowerAfter.ts = 67890;
+	prev.gpuPowerAfter.energy = 11111;
+	prev.gpuPowerAfter.ts = 22222;
+	prev.pcieAfter.tx = 33333;
+	prev.pcieAfter.rx = 44444;
+	prev.pcieAfter.timeUs = 55555;
+	prev.pcieReplay = 99;
+	prev.pcieAvail = true;
+	prev.memAfter.read = 66666;
+	prev.memAfter.write = 77777;
+	prev.memAfter.ts = 88888;
+	prev.memMaxBandwidth = 10000;
+	prev.engines.all.after.active = 500;
+	prev.engines.all.after.ts = 1000;
+	prev.engines.compute.after.active = 600;
+	prev.engines.compute.after.ts = 1100;
+	prev.engines.render.after.active = 400;
+	prev.engines.render.after.ts = 900;
+	prev.engines.media.after.active = 300;
+	prev.engines.media.after.ts = 800;
+	prev.engines.copy.after.active = 200;
+	prev.engines.copy.after.ts = 700;
+	prev.populated = true;
+
+	const MetricCache curr = populateMetricCacheContinuous(di, prev);
+
+	CHECK(curr.cardPowerBefore.energy == prev.cardPowerAfter.energy);
+	CHECK(curr.cardPowerBefore.ts == prev.cardPowerAfter.ts);
+	CHECK(curr.gpuPowerBefore.energy == prev.gpuPowerAfter.energy);
+	CHECK(curr.gpuPowerBefore.ts == prev.gpuPowerAfter.ts);
+	CHECK(curr.pcieBefore.tx == prev.pcieAfter.tx);
+	CHECK(curr.pcieBefore.rx == prev.pcieAfter.rx);
+	CHECK(curr.pcieBefore.timeUs == prev.pcieAfter.timeUs);
+	// pcieReplay is always overwritten by populateMetricCacheEnd (new counter on success,
+	// zero on failure). With a null device handle the end sample fails, so it is zero here.
+	CHECK(curr.pcieReplay == 0ULL);
+	CHECK(curr.memBefore.read == prev.memAfter.read);
+	CHECK(curr.memBefore.write == prev.memAfter.write);
+	CHECK(curr.memBefore.ts == prev.memAfter.ts);
+	CHECK(curr.memMaxBandwidth == prev.memMaxBandwidth);
+	CHECK(curr.engines.all.before.active == prev.engines.all.after.active);
+	CHECK(curr.engines.all.before.ts == prev.engines.all.after.ts);
+	CHECK(curr.engines.compute.before.active == prev.engines.compute.after.active);
+	CHECK(curr.engines.compute.before.ts == prev.engines.compute.after.ts);
+	CHECK(curr.engines.render.before.active == prev.engines.render.after.active);
+	CHECK(curr.engines.render.before.ts == prev.engines.render.after.ts);
+	CHECK(curr.engines.media.before.active == prev.engines.media.after.active);
+	CHECK(curr.engines.media.before.ts == prev.engines.media.after.ts);
+	CHECK(curr.engines.copy.before.active == prev.engines.copy.after.active);
+	CHECK(curr.engines.copy.before.ts == prev.engines.copy.after.ts);
+	CHECK(curr.populated);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture,
+				  "populateMetricCacheContinuous: EU metrics are re-sampled fresh, not carried over from prev")
+{
+	MetricCache prev;
+	prev.euSample.euActive = 800;
+	prev.euSample.euStall = 100;
+	prev.euSample.euIdle = 100;
+	prev.euAvail = true;
+	prev.populated = true;
+
+	const MetricCache curr = populateMetricCacheContinuous(di, prev);
+
+	// EU data must NOT be promoted from prev. With a null device handle the
+	// fresh HAL sample fails, so the EU fields revert to their zero defaults.
+	CHECK_FALSE(curr.euAvail);
+	CHECK(curr.euSample.euActive == 0);
+	CHECK(curr.euSample.euStall == 0);
+	CHECK(curr.euSample.euIdle == 0);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCacheContinuous: pcieAvail is cleared when the end HAL call fails")
+{
+	MetricCache prev;
+	prev.pcieAfter.tx = 100;
+	prev.pcieAfter.rx = 200;
+	prev.pcieAfter.timeUs = 500;
+	prev.pcieAvail = true;
+	prev.populated = true;
+
+	const MetricCache curr = populateMetricCacheContinuous(di, prev);
+
+	CHECK(curr.pcieBefore.tx == 100ULL);
+	CHECK(curr.pcieBefore.rx == 200ULL);
+	CHECK(curr.pcieBefore.timeUs == 500ULL);
+	// End sample failed (null zesDeviceHdl), so the availability flag is cleared.
+	CHECK_FALSE(curr.pcieAvail);
+	// pcieReplay must be zero — not the stale value carried from prev — when end sample fails.
+	CHECK(curr.pcieReplay == 0ULL);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCacheContinuous: pcieAvail recovers after a bad tick (no latch)")
+{
+	// Simulate a tick where pcieAvail was false (e.g. non-advancing timestamp),
+	// but prev.pcieAfter holds a valid snapshot (timeUs != 0).
+	// pcieAvail for the NEW interval must be derived from the snapshot validity,
+	// not from prev.pcieAvail — otherwise a single bad tick latches it false forever.
+	MetricCache prev;
+	prev.pcieAfter.tx = 400;
+	prev.pcieAfter.rx = 500;
+	prev.pcieAfter.timeUs = 1000; // non-zero: snapshot is usable as a before-sample
+	prev.pcieAvail = false;		  // previous delta was invalid (e.g. timestamp didn't advance)
+	prev.populated = true;
+
+	const MetricCache curr = populateMetricCacheContinuous(di, prev);
+
+	// before-slots must be promoted from prev.pcieAfter regardless of prev.pcieAvail.
+	CHECK(curr.pcieBefore.tx == 400ULL);
+	CHECK(curr.pcieBefore.rx == 500ULL);
+	CHECK(curr.pcieBefore.timeUs == 1000ULL);
+	// With a null zesDeviceHdl the end sample still fails, so curr.pcieAvail is false here,
+	// but the path leading to false is "end failed", not "before was invalid".
+	// The key invariant: curr would become available once a real device provides a valid end sample.
+	CHECK_FALSE(curr.pcieAvail); // end sample failed on ZeroDeviceFixture, as expected
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture,
+				  "populateMetricCacheContinuous: engineAvail is false when after.ts does not advance beyond before.ts")
+{
+	MetricCache prev;
+	prev.engines.all.after.ts = 1000;
+	prev.populated = true;
+
+	const MetricCache curr = populateMetricCacheContinuous(di, prev);
+
+	// curr.engines.all.before.ts = 1000 (promoted), after.ts = 0 (HAL failure).
+	// Condition: (before.ts != 0) && (after.ts > before.ts) ≡ true && (0 > 1000) = false.
+	CHECK_FALSE(curr.engineAvail);
+}
+
+TEST_CASE_FIXTURE(ZeroDeviceFixture, "populateMetricCache one-shot wrapper returns populated cache")
+{
+	// Pass a zero window so this test does not block in CI.
+	const MetricCache cache = populateMetricCache(di, std::chrono::milliseconds{0});
+	CHECK(cache.populated);
+	CHECK_FALSE(cache.engineAvail);
+	CHECK_FALSE(cache.pcieAvail);
+	CHECK_FALSE(cache.memAvail);
+	CHECK_FALSE(cache.euAvail);
+	// powerAvail requires advancing timestamps; zero device returns constant timestamps.
+	CHECK_FALSE(cache.powerAvail);
+}
diff --git a/ial/cmn/test/topology_test.cpp b/ial/cmn/test/topology_test.cpp
new file mode 100644
index 000000000..3ebc524b2
--- /dev/null
+++ b/ial/cmn/test/topology_test.cpp
@@ -0,0 +1,571 @@
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include <doctest/doctest.h>
+
+#ifdef INFO
+#undef INFO
+#endif
+
+// progName is an extern defined by the CLI executable; provide a stub for tests.
+#include <string>
+std::string progName = "test";
+#ifdef INFO
+#undef INFO
+#endif
+// cmd_topology.h pulls in cmds.h → zes_api.h (level-zero), so we just need
+// the NIC-related public surface: TopoNode, TopoNodeKind, and determineLinkType.
+// discoverNics lives in the oal_lin library and can be called directly.
+#include "cmd_topology.h"
+#include "topology.h"
+
+#include <filesystem>
+#include <fstream>
+#include <optional>
+#include <stdlib.h>
+#include <string>
+#include <vector>
+
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+
+namespace {
+
+/// Build a minimal GPU TopoNode.
+struct GpuArgs
+{
+	int deviceId;
+	int tileId;
+	std::optional<int> numaNode{};
+	std::optional<PciePath> pciePath{};
+};
+
+TopoNode makeGpu(GpuArgs args)
+{
+	return TopoNode{.label = std::format("GPU {}/{}", args.deviceId, args.tileId),
+					.cpuAffinity = {},
+					.bdfAddress = {},
+					.numaNode = args.numaNode,
+					.pciePath = args.pciePath,
+					.data = GpuData{.deviceId = args.deviceId, .tileId = args.tileId, .ports = {}}};
+}
+
+/// Build a minimal NIC TopoNode.
+struct NicArgs
+{
+	int nicIdx;
+	std::optional<int> numaNode{};
+	std::optional<PciePath> pciePath{};
+};
+
+TopoNode makeNic(NicArgs args)
+{
+	return TopoNode{.label = std::format("NIC{}", args.nicIdx),
+					.cpuAffinity = {},
+					.bdfAddress = {},
+					.numaNode = args.numaNode,
+					.pciePath = args.pciePath,
+					.data = NicData{.nicIndex = args.nicIdx}};
+}
+
+/// Build a PciePath using canonical sysfs segment strings.
+/// rc = root complex (e.g. "pci0000:00"), rp = root port BDF, sw = switch upstream BDF.
+/// Omit trailing elements by passing an empty string.
+PciePath makePath(std::string rc, std::string rp = "", std::string sw = "")
+{
+	PciePath p;
+	p.push_back(PcieBridgeLink{.bdf = std::move(rc), .isHostBridge = true});
+	if (!rp.empty())
+		p.push_back(PcieBridgeLink{.bdf = std::move(rp), .isHostBridge = false});
+	if (!sw.empty())
+		p.push_back(PcieBridgeLink{.bdf = std::move(sw), .isHostBridge = false});
+	return p;
+}
+
+/// RAII temporary directory that removes itself on destruction.
+struct TempDir
+{
+	std::filesystem::path path;
+
+	TempDir()
+	{
+		path = std::filesystem::temp_directory_path() / std::filesystem::path{"topology_test_XXXXXX"};
+		// Use mkdtemp for a unique name.
+		std::string tmpl = path.string();
+		const char *const result = mkdtemp(tmpl.data());
+		REQUIRE(result != nullptr);
+		path = result;
+	}
+
+	~TempDir()
+	{
+		std::error_code err;
+		std::filesystem::remove_all(path, err);
+	}
+
+	// non-copyable
+	TempDir(const TempDir &) = delete;
+	TempDir &operator=(const TempDir &) = delete;
+};
+
+/// Write text to a file, creating parent directories as needed.
+void writeFile(const std::filesystem::path &filePath, const std::string &content)
+{
+	std::filesystem::create_directories(filePath.parent_path());
+	std::ofstream ofs{filePath};
+	REQUIRE(ofs);
+	ofs << content;
+}
+
+/// Create a symlink at linkPath pointing to target (creating parent dirs).
+void createSymlink(const std::filesystem::path &target, const std::filesystem::path &linkPath)
+{
+	std::filesystem::create_directories(linkPath.parent_path());
+	std::filesystem::create_symlink(target, linkPath);
+}
+
+} // namespace
+
+// ─── determineLinkType tests ──────────────────────────────────────────────────
+
+TEST_SUITE("determineLinkType")
+{
+	// determineLinkType is a static method; call it as cmdTopology::determineLinkType.
+
+	TEST_CASE("Self: same node identity returns S")
+	{
+		const auto node = makeGpu({.deviceId = 0, .tileId = 0, .numaNode = 0});
+		CHECK(cmdTopology::determineLinkType(node, node) == "S");
+	}
+
+	TEST_CASE("MDF: same GPU device, different tiles")
+	{
+		const auto tile0 = makeGpu({.deviceId = 0, .tileId = 0, .numaNode = 0});
+		const auto tile1 = makeGpu({.deviceId = 0, .tileId = 1, .numaNode = 0});
+		CHECK(cmdTopology::determineLinkType(tile0, tile1) == "MDF");
+		CHECK(cmdTopology::determineLinkType(tile1, tile0) == "MDF");
+	}
+
+	TEST_CASE("MDF does not apply to NIC nodes on the same NUMA node")
+	{
+		// Two NICs happen to share NUMA node 0 — there's no MDF link between NICs.
+		const auto nic0 = makeNic({.nicIdx = 0, .numaNode = 0});
+		const auto nic1 = makeNic({.nicIdx = 1, .numaNode = 0});
+		// Different labels, not GPU/GPU same device → NODE (same NUMA)
+		CHECK(cmdTopology::determineLinkType(nic0, nic1) == "NODE");
+	}
+
+	TEST_CASE("PIX: same PCIe switch (3 common ancestors)")
+	{
+		const PciePath shared = makePath("pci0000:00", "0000:00:01.0", "0000:01:00.0");
+		const auto gpu0 = makeGpu({.deviceId = 0, .tileId = 0, .pciePath = shared});
+		const auto gpu1 = makeGpu({.deviceId = 1, .tileId = 0, .pciePath = shared});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "PIX");
+		CHECK(cmdTopology::determineLinkType(gpu1, gpu0) == "PIX");
+	}
+
+	TEST_CASE("PIX beats NODE: same NUMA and same switch still reports PIX")
+	{
+		const PciePath shared = makePath("pci0000:00", "0000:00:01.0", "0000:01:00.0");
+		const auto gpu0 = makeGpu({.deviceId = 0, .tileId = 0, .numaNode = 0, .pciePath = shared});
+		const auto gpu1 = makeGpu({.deviceId = 1, .tileId = 0, .numaNode = 0, .pciePath = shared});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "PIX");
+	}
+
+	TEST_CASE("PXB: same root port, different switches (2 common ancestors)")
+	{
+		const auto gpu0 =
+			makeGpu({.deviceId = 0, .tileId = 0, .pciePath = makePath("pci0000:00", "0000:00:01.0", "0000:01:00.0")});
+		const auto gpu1 =
+			makeGpu({.deviceId = 1, .tileId = 0, .pciePath = makePath("pci0000:00", "0000:00:01.0", "0000:01:10.0")});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "PXB");
+		CHECK(cmdTopology::determineLinkType(gpu1, gpu0) == "PXB");
+	}
+
+	TEST_CASE("PHB: same host bridge, different root ports (1 common ancestor)")
+	{
+		const auto gpu0 = makeGpu({.deviceId = 0, .tileId = 0, .pciePath = makePath("pci0000:00", "0000:00:01.0")});
+		const auto gpu1 = makeGpu({.deviceId = 1, .tileId = 0, .pciePath = makePath("pci0000:00", "0000:00:08.0")});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "PHB");
+		CHECK(cmdTopology::determineLinkType(gpu1, gpu0) == "PHB");
+	}
+
+	TEST_CASE("PHB: GPU and NIC behind same host bridge")
+	{
+		const auto gpu = makeGpu({.deviceId = 0, .tileId = 0, .pciePath = makePath("pci0000:00", "0000:00:01.0")});
+		const auto nic = makeNic({.nicIdx = 0, .pciePath = makePath("pci0000:00", "0000:00:04.0")});
+		CHECK(cmdTopology::determineLinkType(gpu, nic) == "PHB");
+	}
+
+	TEST_CASE("NODE: same NUMA, no PCIe path info")
+	{
+		const auto gpu0 = makeGpu({.deviceId = 0, .tileId = 0, .numaNode = 0});
+		const auto gpu1 = makeGpu({.deviceId = 1, .tileId = 0, .numaNode = 0});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "NODE");
+		CHECK(cmdTopology::determineLinkType(gpu1, gpu0) == "NODE");
+	}
+
+	TEST_CASE("SYS: no PCIe path, different NUMA nodes")
+	{
+		const auto gpu0 = makeGpu({.deviceId = 0, .tileId = 0, .numaNode = 0});
+		const auto gpu1 = makeGpu({.deviceId = 1, .tileId = 0, .numaNode = 1});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "SYS");
+	}
+
+	TEST_CASE("SYS: no common PCIe bridge (different host bridges)")
+	{
+		const auto gpu0 = makeGpu({.deviceId = 0, .tileId = 0, .pciePath = makePath("pci0000:00")});
+		const auto gpu1 = makeGpu({.deviceId = 1, .tileId = 0, .pciePath = makePath("pci0001:00")});
+		CHECK(cmdTopology::determineLinkType(gpu0, gpu1) == "SYS");
+	}
+}
+
+// ─── discoverNics tests ────────────────────────────────────────────────────────
+
+TEST_SUITE("discoverNics")
+{
+	TEST_CASE("Returns nullopt when netRoot does not exist")
+	{
+		const auto result = discoverNics(SysfsPaths{.netRoot = "/nonexistent/path/that/cannot/exist"});
+		CHECK_FALSE(result.has_value());
+	}
+
+	TEST_CASE("Returns empty vector when netRoot exists but has no interfaces")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		std::filesystem::create_directories(netRoot);
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = tmp.path / "pci"});
+		REQUIRE(result.has_value());
+		CHECK(result->empty());
+	}
+
+	TEST_CASE("Skips loopback interface")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		createSymlink("../../../0000:00:00.0", netRoot / "lo" / "device");
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = tmp.path / "pci"});
+		REQUIRE(result.has_value());
+		CHECK(result->empty());
+	}
+
+	TEST_CASE("Skips virtual interfaces (no device symlink)")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		std::filesystem::create_directories(netRoot / "virbr0");
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = tmp.path / "pci"});
+		REQUIRE(result.has_value());
+		CHECK(result->empty());
+	}
+
+	TEST_CASE("Discovers a single NIC with correct BDF and CPU affinity")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+
+		createSymlink(std::filesystem::path{"../../pci"} / bdf, netRoot / "eth0" / "device");
+		writeFile(pciRoot / bdf / "local_cpulist", "0-15");
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = pciRoot});
+		REQUIRE(result.has_value());
+		REQUIRE(result->size() == 1U);
+		CHECK((*result)[0].name == "eth0");
+		CHECK((*result)[0].bdfAddress == bdf);
+		CHECK((*result)[0].cpuAffinity == "0-15");
+	}
+
+	TEST_CASE("Returns empty cpuAffinity when local_cpulist file is absent")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:04:00.0";
+
+		// Create the PCI device directory (target of the symlink) but no local_cpulist inside it
+		std::filesystem::create_directories(pciRoot / bdf);
+		createSymlink(std::filesystem::path{"../../pci"} / bdf, netRoot / "eth0" / "device");
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = pciRoot});
+		REQUIRE(result.has_value());
+		REQUIRE(result->size() == 1U);
+		CHECK((*result)[0].cpuAffinity.empty());
+	}
+
+	TEST_CASE("Discovers multiple NICs sorted by name")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		const auto pciRoot = tmp.path / "pci";
+
+		createSymlink(std::filesystem::path{"../../pci/0000:05:00.0"}, netRoot / "ens3f0" / "device");
+		createSymlink(std::filesystem::path{"../../pci/0000:03:00.0"}, netRoot / "eth0" / "device");
+		createSymlink(std::filesystem::path{"../../pci/0000:07:00.0"}, netRoot / "ens3f1" / "device");
+		writeFile(pciRoot / "0000:03:00.0" / "local_cpulist", "0-15");
+		writeFile(pciRoot / "0000:05:00.0" / "local_cpulist", "16-31");
+		writeFile(pciRoot / "0000:07:00.0" / "local_cpulist", "16-31");
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = pciRoot});
+		REQUIRE(result.has_value());
+		REQUIRE(result->size() == 3U);
+
+		// Sorted alphabetically: ens3f0, ens3f1, eth0
+		CHECK((*result)[0].name == "ens3f0");
+		CHECK((*result)[1].name == "ens3f1");
+		CHECK((*result)[2].name == "eth0");
+	}
+
+	TEST_CASE("Ignores loopback but keeps other interfaces")
+	{
+		const TempDir tmp;
+		const auto netRoot = tmp.path / "net";
+		const auto pciRoot = tmp.path / "pci";
+
+		createSymlink(std::filesystem::path{"../../pci/0000:03:00.0"}, netRoot / "eth0" / "device");
+		createSymlink(std::filesystem::path{"../../pci/0000:00:00.0"}, netRoot / "lo" / "device");
+		writeFile(pciRoot / "0000:03:00.0" / "local_cpulist", "0-31");
+
+		const auto result = discoverNics(SysfsPaths{.netRoot = netRoot, .pciDevRoot = pciRoot});
+		REQUIRE(result.has_value());
+		REQUIRE(result->size() == 1U);
+		CHECK((*result)[0].name == "eth0");
+	}
+}
+
+// ─── getNumaNodes tests ────────────────────────────────────────────────────────
+
+TEST_SUITE("getNumaNodes")
+{
+	TEST_CASE("Returns empty map for empty BDF list")
+	{
+		const auto result = getNumaNodes({});
+		CHECK(result.empty());
+	}
+
+	TEST_CASE("Resolves NUMA node from sysfs numa_node file")
+	{
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+		writeFile(pciRoot / bdf / "numa_node", "1");
+
+		const auto result = getNumaNodes({bdf}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf));
+		CHECK(result.at(bdf) == std::optional{1});
+	}
+
+	TEST_CASE("Returns nullopt when numa_node file is absent")
+	{
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+		std::filesystem::create_directories(pciRoot / bdf);
+
+		const auto result = getNumaNodes({bdf}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf));
+		CHECK_FALSE(result.at(bdf).has_value());
+	}
+
+	TEST_CASE("Canonicalises -1 to node 0 on UMA system")
+	{
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const auto nodeRoot = tmp.path / "node";
+		// possible = "0" → only one node → UMA
+		writeFile(nodeRoot / "possible", "0");
+		const std::string bdf = "0000:03:00.0";
+		writeFile(pciRoot / bdf / "numa_node", "-1");
+
+		const auto result = getNumaNodes({bdf}, SysfsPaths{.pciDevRoot = pciRoot, .nodeRoot = nodeRoot});
+		REQUIRE(result.count(bdf));
+		CHECK(result.at(bdf) == std::optional{0});
+	}
+
+	TEST_CASE("Returns nullopt when numa_node is -1 on NUMA system")
+	{
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const auto nodeRoot = tmp.path / "node";
+		// possible = "0-1" → two nodes → multi-NUMA; -1 means no affinity
+		writeFile(nodeRoot / "possible", "0-1");
+		const std::string bdf = "0000:03:00.0";
+		writeFile(pciRoot / bdf / "numa_node", "-1");
+
+		const auto result = getNumaNodes({bdf}, SysfsPaths{.pciDevRoot = pciRoot, .nodeRoot = nodeRoot});
+		REQUIRE(result.count(bdf));
+		CHECK_FALSE(result.at(bdf).has_value());
+	}
+
+	TEST_CASE("Resolves multiple BDFs in one call")
+	{
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		writeFile(pciRoot / "0000:03:00.0" / "numa_node", "0");
+		writeFile(pciRoot / "0000:83:00.0" / "numa_node", "1");
+
+		const auto result = getNumaNodes({"0000:03:00.0", "0000:83:00.0"}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count("0000:03:00.0"));
+		REQUIRE(result.count("0000:83:00.0"));
+		CHECK(result.at("0000:03:00.0") == std::optional{0});
+		CHECK(result.at("0000:83:00.0") == std::optional{1});
+	}
+
+	TEST_CASE("Key is absent when BDF device directory does not exist")
+	{
+		// A BDF that has no directory under pciDevRoot should not appear in the
+		// result map at all (distinguishable from a present-but-unknown NUMA node).
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+		// Intentionally do NOT create pciRoot/bdf
+
+		const auto result = getNumaNodes({bdf}, SysfsPaths{.pciDevRoot = pciRoot});
+		CHECK(result.count(bdf) == 0U);
+	}
+}
+
+// ─── getPciePaths tests ───────────────────────────────────────────────────────
+
+TEST_SUITE("getPciePaths")
+{
+	// Helper: create the real device directory and a symlink at pciRoot/bdf → realDir.
+	// Returns the path to the real device directory.
+	auto makeDevice = [](const std::filesystem::path &pciRoot, const std::filesystem::path &devicesBase,
+						 const std::string &bdf,
+						 const std::vector<std::string> &pathSegments) -> std::filesystem::path {
+		// Build the real canonical path under devicesBase:
+		//   devicesBase / pathSegments[0] / ... / bdf
+		std::filesystem::path realDir = devicesBase;
+		for (const auto &seg : pathSegments) {
+			realDir /= seg;
+		}
+		realDir /= bdf;
+		std::filesystem::create_directories(realDir);
+		// Symlink pciRoot/bdf → realDir
+		std::filesystem::create_directories(pciRoot);
+		std::filesystem::create_symlink(realDir, pciRoot / bdf);
+		return realDir;
+	};
+
+	TEST_CASE("Returns empty map for empty BDF list")
+	{
+		const auto result = getPciePaths({});
+		CHECK(result.empty());
+	}
+
+	TEST_CASE("Key absent when BDF symlink does not exist")
+	{
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		std::filesystem::create_directories(pciRoot);
+
+		const auto result = getPciePaths({"0000:03:00.0"}, SysfsPaths{.pciDevRoot = pciRoot});
+		CHECK(result.count("0000:03:00.0") == 0U);
+	}
+
+	TEST_CASE("Device directly under root complex (no intermediate bridges)")
+	{
+		// Canonical path: .../devices/pci0000:00/0000:03:00.0
+		// Expected PciePath: [ {pci0000:00, host=true} ]
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+		makeDevice(pciRoot, tmp.path / "devices", bdf, {"pci0000:00"});
+
+		const auto result = getPciePaths({bdf}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf));
+		const auto &path = result.at(bdf);
+		REQUIRE(path.size() == 1U);
+		CHECK(path[0].bdf == "pci0000:00");
+		CHECK(path[0].isHostBridge == true);
+	}
+
+	TEST_CASE("One intermediate bridge (root port only)")
+	{
+		// Canonical path: .../devices/pci0000:00/0000:00:1c.0/0000:03:00.0
+		// Expected PciePath: [ {pci0000:00, host}, {0000:00:1c.0, bridge} ]
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+		makeDevice(pciRoot, tmp.path / "devices", bdf, {"pci0000:00", "0000:00:1c.0"});
+
+		const auto result = getPciePaths({bdf}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf));
+		const auto &path = result.at(bdf);
+		REQUIRE(path.size() == 2U);
+		CHECK(path[0].bdf == "pci0000:00");
+		CHECK(path[0].isHostBridge == true);
+		CHECK(path[1].bdf == "0000:00:1c.0");
+		CHECK(path[1].isHostBridge == false);
+	}
+
+	TEST_CASE("Two intermediate bridges (root port + PCIe switch)")
+	{
+		// Canonical path: .../devices/pci0000:00/0000:00:1c.0/0000:01:00.0/0000:03:00.0
+		// Expected PciePath: [ {pci0000:00, host}, {0000:00:1c.0, bridge}, {0000:01:00.0, bridge} ]
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf = "0000:03:00.0";
+		makeDevice(pciRoot, tmp.path / "devices", bdf, {"pci0000:00", "0000:00:1c.0", "0000:01:00.0"});
+
+		const auto result = getPciePaths({bdf}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf));
+		const auto &path = result.at(bdf);
+		REQUIRE(path.size() == 3U);
+		CHECK(path[0].bdf == "pci0000:00");
+		CHECK(path[0].isHostBridge == true);
+		CHECK(path[1].bdf == "0000:00:1c.0");
+		CHECK(path[1].isHostBridge == false);
+		CHECK(path[2].bdf == "0000:01:00.0");
+		CHECK(path[2].isHostBridge == false);
+	}
+
+	TEST_CASE("Two devices share a PCIe switch (PIX classification basis)")
+	{
+		// Both devices share root complex + root port + switch → 3 common ancestors → PIX
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf0 = "0000:03:00.0";
+		const std::string bdf1 = "0000:03:00.1";
+		makeDevice(pciRoot, tmp.path / "devices", bdf0, {"pci0000:00", "0000:00:1c.0", "0000:01:00.0"});
+		makeDevice(pciRoot, tmp.path / "devices", bdf1, {"pci0000:00", "0000:00:1c.0", "0000:01:00.0"});
+
+		const auto result = getPciePaths({bdf0, bdf1}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf0));
+		REQUIRE(result.count(bdf1));
+		// Paths should be identical up to (and including) the switch segment
+		CHECK(result.at(bdf0) == result.at(bdf1));
+		CHECK(result.at(bdf0).size() == 3U);
+	}
+
+	TEST_CASE("Two devices behind different root ports (PHB classification basis)")
+	{
+		// Share root complex only (commonLen == 1) → PHB; root port differs
+		const TempDir tmp;
+		const auto pciRoot = tmp.path / "pci";
+		const std::string bdf0 = "0000:03:00.0";
+		const std::string bdf1 = "0000:05:00.0";
+		makeDevice(pciRoot, tmp.path / "devices", bdf0, {"pci0000:00", "0000:00:1c.0"});
+		makeDevice(pciRoot, tmp.path / "devices", bdf1, {"pci0000:00", "0000:00:1d.0"});
+
+		const auto result = getPciePaths({bdf0, bdf1}, SysfsPaths{.pciDevRoot = pciRoot});
+		REQUIRE(result.count(bdf0));
+		REQUIRE(result.count(bdf1));
+		REQUIRE(result.at(bdf0).size() == 2U);
+		REQUIRE(result.at(bdf1).size() == 2U);
+		// Root complex matches, root port differs
+		CHECK(result.at(bdf0)[0].bdf == "pci0000:00");
+		CHECK(result.at(bdf1)[0].bdf == "pci0000:00");
+		CHECK(result.at(bdf0)[1].bdf == "0000:00:1c.0");
+		CHECK(result.at(bdf1)[1].bdf == "0000:00:1d.0");
+	}
+}
diff --git a/ial/meson.build b/ial/meson.build
index 63356cc97..a8363737e 100644
--- a/ial/meson.build
+++ b/ial/meson.build
@@ -3,6 +3,5 @@
 
 # IAL (Interface Abstraction Layer) build
 
-subdir('api')
 subdir('cmn')
 subdir('cli')
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 8e856c431..fe97a51e5 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,7 @@ project('xpum', 'c', 'cpp',
   license : 'MIT',
   default_options : [
     'cpp_std=c++20',
-    'buildtype=debugoptimized',
+    'buildtype=release',
     'warning_level=3',
     'werror=true',
     'b_lto=true',
@@ -192,6 +192,7 @@ elif is_linux
   link_args += [
     '-Wl,-z,noexecstack',
     '-Wl,-z,relro',
+    '-Wl,-z,now',
   ]
 
   # Disable LTO when sanitizers are enabled (they cause significant false positives)
@@ -228,6 +229,7 @@ thread_dep = dependency('threads')
 levelzero_dep = dependency('level-zero', required : true)
 igsc_dep = dependency('igsc', required : true)
 nlohmann_json_dep = dependency('nlohmann_json', required : true)
+cli11_dep = dependency('CLI11', required : true, include_type : 'system')
 
 # Additional Linux-specific dependencies
 if is_linux
diff --git a/meson_options.txt b/meson_options.txt
index 64b556e83..cc38df890 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,12 +17,6 @@ option('use_system_igsc', type : 'boolean', value : false,
 option('static_library', type : 'boolean', value : false,
        description : 'Install static library (libxpum.a/.lib)')
 
-option('install_headers', type : 'boolean', value : false,
-       description : 'Install development headers')
-
-option('build_examples', type : 'boolean', value : false,
-       description : 'Build API example applications (C, Go)')
-
 option('conan_deps_build_type', type: 'string', value: 'Release',
        description: 'Build type used for Conan dependencies')
 
diff --git a/oal/lin/diag_lin.cpp b/oal/lin/diag_lin.cpp
deleted file mode 100644
index 8b6c6c343..000000000
--- a/oal/lin/diag_lin.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- * Copyright (C) 2025-2026 Intel Corporation
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include <sys/stat.h>
-#include <sys/sysinfo.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <fcntl.h>
-#include <iostream>
-#include <fstream>
-#include <array>
-#include <filesystem>
-#include <dirent.h>
-#include <vector>
-#include <debug.h>
-#include <cstring>
-#include <unistd.h>
-#include <cerrno>
-#include <algorithm>
-#include <thread>
-#include <chrono>
-#include <numeric>
-#include "lin.h"
-
-// std::string_view has no operator+(string, string_view), so use const std::string
-// for constants that participate in command-string concatenation. They remain
-// typed, scoped, and debugger-visible — unlike the #defines they replaced.
-static const std::string MEDIA_CODER_TOOLS = "/usr/bin/sample_multi_transcode";
-static const std::string MEDIA_DATA_PATH = "resources/mediadata/";
-static const std::string MEDIA_CODER_TOOLS_1080P_FILE = "test_stream_1080p.265";
-static const std::string MEDIA_CODER_TOOLS_4K_FILE = "test_stream_4K.265";
-static const std::string MEDIA_CODEC_TOOLS_LIGHT_FILE = "test_stream.264";
-
-struct CpuData
-{
-	bool isLoaded = false;
-	long long user, nice, system, idle, ioWait, irq, softIrq, steal;
-	long long total() const { return user + nice + system + idle + ioWait + irq + softIrq + steal; }
-	long long active() const { return total() - idle; }
-};
-
-/**
- * @brief Checks if the entry name is a renderD related device entry
- *
- * This function determines whether the provided entry name is related
- * to a renderD device entry
- *
- * @param[in] entryName Pointer to entry string
- * @return true if entryName is related to renderD, false otherwise
- */
-bool countDevEntry(const std::string &entryName)
-{
-	constexpr std::string_view prefix = "renderD";
-
-	if (!entryName.starts_with(prefix)) {
-		return false;
-	}
-
-	return std::all_of(entryName.begin() + prefix.size(), entryName.end(), [](char ch) { return std::isdigit(ch); });
-}
-
-/**
- * @brief get CPU stats
- *
- * This function gets the CPU stats from /proc/stat
- * @param null
- * @return CPU stats data
- */
-CpuData getCpuStats()
-{
-	CpuData data;
-	std::ifstream file("/proc/stat");
-	if (file.is_open()) {
-		std::string line;
-		std::getline(file, line); // Read first line
-		// Format: cpu user nice system idle ioWait irq softIrq steal
-		int result = std::sscanf(line.c_str(), "cpu %lld %lld %lld %lld %lld %lld %lld %lld", &data.user, &data.nice,
-								 &data.system, &data.idle, &data.ioWait, &data.irq, &data.softIrq, &data.steal);
-		if (result == 8) {
-			data.isLoaded = true;
-		}
-	}
-	return data;
-}
-
-/**
- * @brief Check host memory size
- *
- * This function determines if can read the sysinfo and get the host memory size
- *
- * @param[in, out] hostMemorySize Pointer to an uint64_t variable
- * @return true if can read sysinfo successfully, false otherwise
- */
-bool checkHostMemorySize(uint64_t *hostMemorySize)
-{
-	struct sysinfo info;
-	if (sysinfo(&info) == 0) {
-		*hostMemorySize = (uint64_t)info.totalram * info.mem_unit;
-		return true;
-	} else {
-		return false;
-	}
-}
-/**
- * @brief check Permission
- *
- * This function check access permission for renderD related folders under /dev/dri.
- * @param null
- * @return true if has the access , false otherwise
- */
-bool checkPermission()
-{
-	constexpr std::string_view dirName = "/dev/dri";
-
-	std::error_code ec;
-	if (!std::filesystem::exists(dirName, ec) || ec) {
-		return false;
-	}
-
-	try {
-		for (const auto &entry : std::filesystem::directory_iterator(dirName, ec)) {
-			if (ec) {
-				return false;
-			}
-
-			const std::string entryName = entry.path().filename().string();
-			if (countDevEntry(entryName)) {
-				if (access(entry.path().c_str(), R_OK) != 0) {
-					return false;
-				}
-			}
-		}
-		return true;
-	} catch (const std::filesystem::filesystem_error &) {
-		return false;
-	}
-}
-
-/**
- * @brief Checks if the device entry name exists in the system uevents
- *
- * This function determines whether the provided device entry name exists in the system uevents
- * and returns the related bdf
- *
- * @param[in] bdf Pointer to device bdf entry string from the system uevent folders
- * @param[in] dName Pointer to entry string
- * @return true if the device entry name exists in the system uevent folders, false otherwise
- */
-bool checkUevent(std::string &bdf, const char *dName)
-{
-	bool ret = false;
-	char buf[1024];
-	char path[PATH_MAX];
-	if (dName == NULL) {
-		return false;
-	}
-	snprintf(path, PATH_MAX, "/sys/class/drm/%s/device/uevent", dName);
-	int fd = open(path, O_RDONLY);
-	if (fd < 0) {
-		return false;
-	}
-	int cnt = static_cast<int>(read(fd, buf, 1024));
-	if (cnt < 0 || cnt >= 1024) {
-		close(fd);
-		return false;
-	}
-	buf[cnt] = 0;
-	std::string str(buf);
-	std::string key = "PCI_ID=8086:";
-	auto pos = str.find(key);
-	if (pos == std::string::npos) {
-		close(fd);
-		return ret;
-	}
-	key = "PCI_SLOT_NAME=";
-	pos = str.find(key);
-	if (pos != std::string::npos) {
-		bdf = str.substr(pos + key.length(), 12);
-	} else {
-		close(fd);
-		return ret;
-	}
-	ret = true;
-	close(fd);
-	return ret;
-}
-
-/**
- * @brief Checks if the device bdf exists in the sys fs and system uevent folder
- *
- * This function determines whether the provided device bdf exists in the sys fs and system uevents
- * and return the related device entry string under /dev/dri
- *
- * @param[in] pciBDFStr the device bdf string
- * @return the related device entry string under /dev/dri
- */
-std::string getDevicePath(std::string pciBDFStr)
-{
-	DIR *pdir = NULL;
-	struct dirent *pdirent = NULL;
-	int len = 0;
-	std::string ret = "";
-	std::string uBDF;
-
-	pdir = opendir("/sys/class/drm");
-	if (pdir == NULL) {
-		return ret;
-	}
-
-	while ((pdirent = readdir(pdir)) != NULL) {
-		if (pdirent->d_name[0] == '.') {
-			continue;
-		}
-		if (strncmp(pdirent->d_name, "render", 6) != 0) {
-			continue;
-		}
-		if (strstr(pdirent->d_name, "-") != NULL) {
-			continue;
-		}
-		if (checkUevent(uBDF, pdirent->d_name) == false) {
-			continue;
-		}
-		len = static_cast<int>(pciBDFStr.size());
-		if (len > 0 && strstr(uBDF.c_str(), pciBDFStr.c_str()) != NULL) {
-			ret = "/dev/dri/";
-			ret += pdirent->d_name;
-			break;
-		}
-	}
-	closedir(pdir);
-	return ret;
-}
-
-/* @brief check Media Codec
- *
- * This function check media codec for a specific device based on device bdf and check needs.
- * @param[in] bdfStr indicates a specific device bdf address string
- * @param[in] functionalCheck indicates the check needs, true for only light requirement, false for full check
- * @param[out] finalResult reference to the final result string
- * @return true if the process successfully, false otherwise
- */
-bool checkMediaCodec(std::string &bdfStr, bool functionalCheck, std::string &finalResult)
-{
-	std::error_code ec;
-	std::string testCommand;
-	std::string desc;
-
-	std::string devicePath = getDevicePath(bdfStr);
-	if (devicePath.empty()) {
-		finalResult = "No device path.";
-		return false;
-	}
-
-	// Find media data directory
-	std::string mediaDataPath = findResourceFile(MEDIA_DATA_PATH);
-	if (!std::filesystem::exists(mediaDataPath, ec) || ec) {
-		finalResult = "No media data path.";
-		return false;
-	}
-
-	std::ifstream fileTranscode(MEDIA_CODER_TOOLS);
-	bool sampleMultiTranscodeToolExist = (fileTranscode.good());
-
-	std::ifstream fileH2651080p(mediaDataPath + MEDIA_CODER_TOOLS_1080P_FILE);
-	bool h2651080pFileExist = (fileH2651080p.good());
-
-	std::ifstream fileH2654k(mediaDataPath + MEDIA_CODER_TOOLS_4K_FILE);
-	bool h2654kFileExist = (fileH2654k.good());
-
-	std::ifstream fileH264Light(mediaDataPath + MEDIA_CODEC_TOOLS_LIGHT_FILE);
-	bool h264LightFileExist = (fileH264Light.good());
-
-	if (!sampleMultiTranscodeToolExist) {
-		finalResult = "No sample multi transcode tool.";
-		return false;
-	}
-
-	if ((!functionalCheck && !h2651080pFileExist && !h2654kFileExist) || (functionalCheck && !h264LightFileExist)) {
-		finalResult = "No Media test file.";
-		return false;
-	}
-
-	if (functionalCheck && h264LightFileExist) {
-		testCommand = MEDIA_CODER_TOOLS + " -device " + devicePath + " -hw -i::h264 " + mediaDataPath +
-					  MEDIA_CODEC_TOOLS_LIGHT_FILE + " -o::h264 null -n 2 2>&1";
-		DBG("Transcoding capability check command: {}\n", testCommand.c_str());
-		SystemCommandResult cResult = execCommand(testCommand.c_str());
-		if (cResult.exitStatus()) {
-			finalResult = MEDIA_CODEC_TOOLS_LIGHT_FILE + ":" + cResult.output();
-			return false;
-		}
-	}
-
-	if (!functionalCheck && h2651080pFileExist) {
-
-		testCommand = MEDIA_CODER_TOOLS + " -device " + devicePath + " -hw -i::h265 " + mediaDataPath +
-					  MEDIA_CODER_TOOLS_1080P_FILE + " -o::h265 /tmp/" + MEDIA_CODER_TOOLS_1080P_FILE + " 2>&1";
-		DBG("Transcoding capability check command: {}\n", testCommand.c_str());
-		SystemCommandResult cResult = execCommand(testCommand.c_str());
-		if (cResult.exitStatus()) {
-			finalResult = MEDIA_CODER_TOOLS_1080P_FILE + ":" + cResult.output();
-			return false;
-		}
-	}
-
-	if (!functionalCheck && h2654kFileExist) {
-		testCommand = MEDIA_CODER_TOOLS + " -device " + devicePath + " -hw -i::h265 " + mediaDataPath +
-					  MEDIA_CODER_TOOLS_4K_FILE + " -o::h265 /tmp/MEDIA_CODER_TOOLS_4K_FILE 2>&1";
-
-		DBG("Transcoding capability check command: {}\n", testCommand.c_str());
-		SystemCommandResult cResult = execCommand(testCommand.c_str());
-		if (cResult.exitStatus()) {
-			finalResult = MEDIA_CODER_TOOLS_4K_FILE + ":" + cResult.output();
-			return false;
-		}
-	}
-
-	finalResult = "Success to pass the media transcode checking in ";
-	finalResult += (functionalCheck) ? "functionalCheck" : "non-functionalCheck";
-	return true;
-}
-
-/* @brief check if path exist
- *
- * This function check if path exist.
- * @param[in] s indicates a file path string
- * @return true if the path exist, false otherwise
- */
-bool isPathExist(const std::string &s)
-{
-	struct stat buffer;
-	return (stat(s.c_str(), &buffer) == 0);
-}
-/* @brief get one line of a file content
- *
- * This function get one line of a file content.
- * @param[in] filePath indicates a file path string
- * @param[in] fileName indicates a file name string
- * @return one line of a file content if the process successfully, null otherwise
- */
-std::string getOneLineFileContent(std::string filePath, std::string fileName)
-{
-	std::string line;
-	std::ifstream file(filePath + "/" + fileName);
-	if (file.is_open()) {
-		getline(file, line);
-		file.close();
-	}
-	return line;
-}
-
-/* @brief get Downgraded PCIe info
- *
- * This function get Downgraded PCIe info for a specific device based on device bdf.
- * @param[in] bdfStr indicates a specific device bdf string
- * @return std::string if the process successfully, null otherwise
- */
-std::string getDowngradedPCIeInfo(std::string &bdfStr)
-{
-	std::string ret;
-	char linkPath[PATH_MAX];
-	DIR *pdir = NULL;
-	struct dirent *pdirent = NULL;
-	int len = 0;
-	std::string cardFullPath = "";
-
-	pdir = opendir("/sys/class/drm");
-	if (pdir == NULL) {
-		return ret;
-	}
-
-	while ((pdirent = readdir(pdir)) != NULL) {
-		if (pdirent->d_name[0] == '.') {
-			continue;
-		}
-		if (strncmp(pdirent->d_name, "card", 4) != 0) {
-			continue;
-		}
-		if (strstr(pdirent->d_name, "-") != NULL) {
-			continue;
-		}
-		len = snprintf(linkPath, PATH_MAX, "/sys/class/drm/%s", pdirent->d_name);
-		if (len <= 0 || len >= PATH_MAX) {
-			break;
-		}
-		char fullPath[PATH_MAX];
-		ssize_t fullLen = ::readlink(linkPath, fullPath, sizeof(fullPath));
-		if (fullLen < 0) {
-			fullLen = 0;
-		}
-		if (fullLen >= PATH_MAX) {
-			fullLen = PATH_MAX - 1;
-		}
-		fullPath[fullLen] = '\0';
-
-		if (strstr(fullPath, bdfStr.c_str()) != NULL) {
-			cardFullPath = "/sys/class/drm/" + std::string(fullPath);
-			break;
-		}
-	}
-	closedir(pdir);
-	std::string cs = "current_link_speed", cw = "current_link_width", ms = "max_link_speed", mw = "max_link_width";
-	while (cardFullPath != "/sys/class/drm") {
-		if (isPathExist(cardFullPath + "/" + cs) && isPathExist(cardFullPath + "/" + cw) &&
-			isPathExist(cardFullPath + "/" + ms) && isPathExist(cardFullPath + "/" + mw)) {
-			std::string currentBridge = cardFullPath.substr(cardFullPath.find_last_of('/') + 1);
-			if (getOneLineFileContent(cardFullPath, cw) != getOneLineFileContent(cardFullPath, mw)) {
-				ret = "Width on " + currentBridge + " downgraded to x" + getOneLineFileContent(cardFullPath, cw) + ".";
-			}
-		}
-
-		while (cardFullPath.back() != '/')
-			cardFullPath.pop_back();
-		cardFullPath.pop_back();
-	}
-
-	return ret;
-}
-
-/**
- * @brief check process exclusive
- *
- * This function check process exclusive for a specific process under /proc.
- * @param[in] processId uint32_t values for a specific process ID
- * @return true if the process is ready, false otherwise
- */
-bool checkProcessExclusive(uint32_t processId)
-{
-	std::ifstream file("/proc/" + std::to_string(processId) + "/cmdline");
-	if (!file.good()) {
-		return false;
-	} else {
-		return true;
-	}
-}
-
-/**
- * @brief check CPU status
- *
- * This function checks CPU status, including checks CPU temperature under /sys/class/thermal first, then checks
- * working state from /proc/stat.
- * @param null
- * @return Pass if temperature is less than threshold and in working state, return Fail or Unknown otherwise
- */
-std::string checkCPUStatus()
-{
-	char thermalType[1024];
-	char thermalValue[1024];
-	char path[PATH_MAX];
-	DIR *pdir = NULL;
-	struct dirent *pdirent = NULL;
-	int val = 0;
-	constexpr int cpuTempThreshold = 85;
-
-	pdir = opendir("/sys/class/thermal");
-	if (pdir == NULL) {
-		return "Unknown";
-	}
-
-	while ((pdirent = readdir(pdir)) != NULL) {
-		if (pdirent->d_name[0] == '.') {
-			continue;
-		}
-		if (strncmp(pdirent->d_name, "thermal_zone", 12) != 0) {
-			continue;
-		}
-		snprintf(path, PATH_MAX, "/sys/class/thermal/%s/type", pdirent->d_name);
-		int fd = open(path, O_RDONLY);
-		if (fd < 0) {
-			continue;
-		}
-		int cntType = static_cast<int>(read(fd, thermalType, 1024));
-		if (cntType < 0 || cntType >= 1024) {
-			close(fd);
-			continue;
-		}
-		close(fd);
-		thermalType[cntType] = 0;
-		if (strncmp(thermalType, "x86_pkg_temp", 12) == 0) {
-			snprintf(path, PATH_MAX, "/sys/class/thermal/%s/temp", pdirent->d_name);
-			fd = open(path, O_RDONLY);
-			if (fd < 0) {
-				continue;
-			}
-			int cnt = static_cast<int>(read(fd, thermalValue, 1024));
-			if (cnt < 0 || cnt >= 1024) {
-				close(fd);
-				continue;
-			}
-			thermalValue[cnt] = 0;
-			close(fd);
-			closedir(pdir);
-			val = std::stoi(thermalValue) / 1000;
-			if (val >= cpuTempThreshold) {
-				return "Fail";
-			} else {
-				// Get initial stats
-				CpuData t1 = getCpuStats();
-				std::this_thread::sleep_for(std::chrono::milliseconds(500));
-				// Get stats after delay
-				CpuData t2 = getCpuStats();
-				if ((t1.isLoaded != true) || (t2.isLoaded != true)) {
-					return "Unknown";
-				}
-				long long totalDiff = t2.total() - t1.total();
-				long long idleDiff = t2.idle - t1.idle;
-
-				if (totalDiff > 0) {
-					//  Calculate percentage
-					float cpuPercentage =
-						100.0f * (1.0f - static_cast<float>(idleDiff) / static_cast<float>(totalDiff));
-					if (cpuPercentage >= 0) {
-						return "Pass";
-					} else {
-						return "Fail";
-					}
-				} else {
-					return "Fail";
-				}
-			}
-		}
-	}
-
-	closedir(pdir);
-	return "Unknown";
-}
-
-/* @brief check PCIe link status
- *
- * This function checks PCIe link status for a specific device based on device bdf
- * @param[in] bdf references to a specific device bdf address string
- * @return true if the link status in good condition, false otherwise
- */
-bool checkPCIeLinkStatus(std::string &bdf)
-{
-	std::error_code ec;
-	// PCI Status Info bits (offset 0x06, 16-bit)
-	constexpr uint16_t statusDetectedParityError = 0x8000;
-	constexpr uint16_t statusSignaledSystemError = 0x4000;
-	constexpr uint16_t statusReceivedMasterAbort = 0x2000;
-	constexpr uint16_t statusReceivedTargetAbort = 0x1000;
-	constexpr uint16_t statusSignaledTargetAbort = 0x0800;
-	constexpr uint16_t statusMasterDataParityError = 0x0100;
-	constexpr uint16_t errorMask = statusDetectedParityError | statusSignaledSystemError | statusReceivedMasterAbort |
-								   statusReceivedTargetAbort | statusSignaledTargetAbort | statusMasterDataParityError;
-
-	std::string configPath = std::string("/sys/bus/pci/devices/") + bdf + std::string("/config");
-
-	if (!std::filesystem::exists(configPath, ec) || ec) {
-		return false;
-	}
-
-	// Read PCI config space status info(offset 0x06, 2 bytes)
-	std::ifstream configFile(configPath, std::ios::binary);
-	uint16_t statusInfo = 0;
-
-	if (!configFile) {
-		return false;
-	}
-	configFile.seekg(0x06);
-	configFile.read(reinterpret_cast<char *>(&statusInfo), sizeof(statusInfo));
-
-	if (!configFile) {
-		return false;
-	}
-
-	// Check if any error
-	if (statusInfo & errorMask) {
-		return false;
-	}
-	return true;
-}
diff --git a/oal/lin/dmi_reader.cpp b/oal/lin/dmi_reader.cpp
index ab301f217..e65ef688c 100644
--- a/oal/lin/dmi_reader.cpp
+++ b/oal/lin/dmi_reader.cpp
@@ -32,7 +32,6 @@ DmiReader::DmiReader()
 		loadDMIData();
 		mIsValid = true;
 	} catch (const std::exception &e) {
-		std::cerr << "DMI Reader initialization failed: " << e.what() << '\n';
 		mIsValid = false;
 		throw;
 	}
diff --git a/oal/lin/http_client.cpp b/oal/lin/http_client.cpp
index 969ec2797..063be7342 100644
--- a/oal/lin/http_client.cpp
+++ b/oal/lin/http_client.cpp
@@ -8,8 +8,8 @@
 #include <debug.h>
 #include <curl/curl.h>
 #include <string>
+#include <string.h>
 #include <vector>
-#include <cstring>
 
 /**
  * @brief Callback function to write HTTP response data
@@ -198,6 +198,12 @@ int HttpClient::performRequest(const std::string &url, const std::string &userna
 	// Perform the request
 	res = curl_easy_perform(curl);
 
+	// Best-effort: scrub local auth string; libcurl-owned internal copies are not reachable
+	if (!authString.empty()) {
+		explicit_bzero(authString.data(), authString.size());
+		authString.clear();
+	}
+
 	if (res == CURLE_OK) {
 		// Get response code
 		long responseCode;
diff --git a/oal/lin/i2c_interface.cpp b/oal/lin/i2c_interface.cpp
index 69cc77bb0..2309b9276 100644
--- a/oal/lin/i2c_interface.cpp
+++ b/oal/lin/i2c_interface.cpp
@@ -6,6 +6,7 @@
 
 #include "os.h"
 #include <algorithm>
+#include <cctype>
 #include <debug.h>
 #include <fcntl.h>
 #include <sys/file.h>
@@ -261,9 +262,14 @@ int amcCardDiscovery(std::vector<amcCardInfo> *amcDeviceList)
 			// Extract the filename portion after the last slash
 			std::string filename = device.substr(device.find_last_of('/') + 1);
 			// Find the hyphen in the filename
-			size_t hyphenPos = filename.find('-');
+			const size_t hyphenPos = filename.find('-');
 			std::string busNumber = (hyphenPos != std::string::npos) ? filename.substr(0, hyphenPos) : "";
-			std::string i2cDevice = "/dev/i2c-" + busNumber;
+			if (busNumber.empty() || !std::all_of(busNumber.begin(), busNumber.end(),
+												  [](char c) { return std::isdigit(static_cast<unsigned char>(c)); })) {
+				ERR("Invalid I2C bus number '{}' from device path: {}\n", busNumber.c_str(), device.c_str());
+				continue;
+			}
+			const std::string i2cDevice = "/dev/i2c-" + busNumber;
 			amcCardInfo info;
 			info.amcDevicePath = i2cDevice;
 			info.gpuParentPath = getGpuDeviceFromI2C("/sys/bus/i2c/devices/i2c-" + busNumber);
diff --git a/oal/lin/lin.cpp b/oal/lin/lin.cpp
index 2fe9eeaca..a2f1d3797 100644
--- a/oal/lin/lin.cpp
+++ b/oal/lin/lin.cpp
@@ -6,8 +6,10 @@
 
 #include <os.h>
 #include <algorithm>
+#include <array>
 #include <cctype>
 #include <cerrno>
+#include <cmath>
 #include <cstring>
 #include <debug.h>
 #include <fcntl.h>
@@ -17,10 +19,10 @@
 #include <functional>
 #include <grp.h>
 #include <iostream>
-#include <math.h>
 #include <pwd.h>
-#include <sys/mman.h>
+#include <spawn.h>
 #include <sys/utsname.h>
+#include <sys/wait.h>
 #include <syncstream>
 #include <termios.h>
 #include <unistd.h>
@@ -51,55 +53,92 @@
 /**
  * @brief Execute a system command and capture its output
  *
- * This function executes a shell command using popen and captures both
- * the output and exit status. It provides a safer alternative to system()
- * by capturing output and providing proper error handling with RAII.
+ * Spawns /bin/sh -c to execute the command string via posix_spawn.
+ * The shell is still in the execution path, so callers must ensure command
+ * components are not derived from untrusted input. All current call sites
+ * use hardcoded paths and hardware-derived values (hex BDF addresses).
  *
- * @param command The shell command to execute
+ * @param command The shell command string to execute
  * @return SystemCommandResult containing the command output and exit status
- *
- * @note Uses RAII with custom deleter for automatic pipe cleanup
- * @note Provides enhanced error handling for I/O operations
- * @note Uses std::fread for efficient buffer reading
  */
 SystemCommandResult execCommand(const std::string &command)
 {
-	std::vector<char> buffer(65536); // 64 KB heap buffer; avoids large stack allocation
-	std::string result;
-	// Custom deleter for pipe(), ensures it is always closed automatically on error
-	struct PipeDeleter
-	{
-		int *pExitCode;
-		explicit PipeDeleter(int *ec) : pExitCode(ec) {}
-		void operator()(FILE *f) const noexcept
-		{
-			if (f && pExitCode) {
-				*pExitCode = pclose(f);
-			}
+	std::array<int, 2> pipeFds{};
+	if (pipe(pipeFds.data()) != 0) {
+		return {"Failed to create pipe", -1};
+	}
+
+	posix_spawn_file_actions_t actions;
+	const int initResult = posix_spawn_file_actions_init(&actions);
+	int fileActionsResult = initResult;
+	if (fileActionsResult == 0) {
+		fileActionsResult = posix_spawn_file_actions_adddup2(&actions, pipeFds[1], STDOUT_FILENO);
+	}
+	if (fileActionsResult == 0) {
+		fileActionsResult = posix_spawn_file_actions_adddup2(&actions, pipeFds[1], STDERR_FILENO);
+	}
+	if (fileActionsResult == 0) {
+		fileActionsResult = posix_spawn_file_actions_addclose(&actions, pipeFds[0]);
+	}
+	if (fileActionsResult == 0) {
+		fileActionsResult = posix_spawn_file_actions_addclose(&actions, pipeFds[1]);
+	}
+	if (fileActionsResult != 0) {
+		if (initResult == 0) {
+			posix_spawn_file_actions_destroy(&actions);
 		}
-	};
-	using safePipe = std::unique_ptr<FILE, PipeDeleter>;
-	int exitcode = -1;
-	safePipe pipe(popen(command.c_str(), "r"), PipeDeleter(&exitcode));
-	if (pipe != nullptr) {
-		try {
-			std::size_t bytesRead;
-			while ((bytesRead = std::fread(buffer.data(), sizeof(char), buffer.size(), pipe.get())) != 0) {
-				result += std::string(buffer.data(), bytesRead);
-			}
-			// std::fread returns 0 both when EOF is reached and when som I/O error occurred. Check for completeness
-			if (std::ferror(pipe.get())) {
-				return SystemCommandResult{"Command output read I/O error", -1}; // Not sure;
-			} else if (!std::feof(pipe.get())) {
-				return SystemCommandResult("Command output read terminated unexpectedly", -1); // Not sure
-			}
-		} catch (...) {
-			return SystemCommandResult("Exception occurred while reading command output", -1);
+		close(pipeFds[0]);
+		close(pipeFds[1]);
+		return {"posix_spawn file actions setup failed", -1};
+	}
+
+	// posix_spawn requires a mutable argv array
+	char shPath[] = "/bin/sh";
+	char shFlag[] = "-c";
+	std::string cmdCopy = command;
+	char *argv[] = {shPath, shFlag, cmdCopy.data(), nullptr}; // NOLINT(cppcoreguidelines-avoid-c-arrays)
+
+	pid_t pid = -1;
+	const int spawnResult = posix_spawn(&pid, "/bin/sh", &actions, nullptr, argv, environ);
+	posix_spawn_file_actions_destroy(&actions);
+
+	close(pipeFds[1]);
+
+	if (spawnResult != 0) {
+		close(pipeFds[0]);
+		return {"posix_spawn failed", -1};
+	}
+
+	std::string result;
+	constexpr size_t kReadBufferSize = 65536;
+	std::vector<char> buffer(kReadBufferSize);
+	bool readError = false;
+	while (true) {
+		const ssize_t bytesRead = read(pipeFds[0], buffer.data(), buffer.size());
+		if (bytesRead > 0) {
+			result.append(buffer.data(), static_cast<size_t>(bytesRead));
+		} else if (bytesRead == 0) {
+			break;
+		} else if (errno != EINTR) {
+			ERR("read() failed during command execution: %s\n", strerror(errno));
+			readError = true;
+			break;
 		}
 	}
-	// RAII/custom deleter will close the pipe and reset the exitcode
-	pipe.reset();
-	return SystemCommandResult(result, WEXITSTATUS(exitcode));
+	close(pipeFds[0]);
+
+	int status = 0;
+	pid_t waitResult = -1;
+	do {
+		waitResult = waitpid(pid, &status, 0);
+	} while (waitResult < 0 && errno == EINTR);
+	if (waitResult < 0) {
+		ERR("waitpid failed: %s\n", strerror(errno));
+		return {result, -1};
+	}
+	const int exitcode = WIFEXITED(status) ? WEXITSTATUS(status) : -1;
+
+	return {result, readError ? -1 : exitcode};
 }
 
 /**
diff --git a/oal/lin/oslin.h b/oal/lin/oslin.h
index cc47f3bdd..73d38cc70 100644
--- a/oal/lin/oslin.h
+++ b/oal/lin/oslin.h
@@ -11,6 +11,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <getopt.h>
 #include <pthread.h>
@@ -26,8 +27,8 @@
 #endif
 
 #define LIBXPUM_API
-#define STRCPY_S(dest, sz, src) strcpy(dest, src)
-#define STRNCPY_S(dest, src, sz) strncpy(dest, src, sz)
+#define STRCPY_S(dest, sz, src) snprintf((dest), (sz), "%s", (src))
+#define STRNCPY_S(dest, src, sz) snprintf((dest), (sz), "%s", (src))
 #define STRCASECMP strcasecmp
 #define THREAD_RET void *
 #define GETOPT_LONG getopt_long
@@ -43,22 +44,27 @@
 #define GET_CPU_LIST(bdf) getCpuList(bdf)
 #define GET_TOPOLOGY getTopology
 #define EXPORT_TOPOLOGY_XML exportTopologyToXml
+inline auto GET_SYSTEM_NICS(const SysfsPaths &paths = {})
+{
+	return discoverNics(paths);
+} // NOLINT(readability-identifier-naming) // Match MACRO style while providing a better interface for navigation
+inline auto GET_NUMA_NODES(const std::vector<std::string> &bdfs)
+{
+	return getNumaNodes(bdfs);
+} // NOLINT(readability-identifier-naming) // Match MACRO style while providing a better interface for navigation
+inline auto GET_PCIE_PATHS(const std::vector<std::string> &bdfs)
+{
+	return getPciePaths(bdfs);
+} // NOLINT(readability-identifier-naming) // Match MACRO style while providing a better interface for navigation
 typedef wchar_t TCHAR;
 #define GETLOGS(f) getLinLogs(f)
 #define GETDRMPATH(bdf) getDrmPath(bdf)
-#define CHECKPERMISSION() checkPermission()
-#define CHECKPROCESSEXCLUSIVE(processId) checkProcessExclusive(processId)
-#define CHECKCPUSTATUS() checkCPUStatus()
 #define CREATEVFS(deviceInfoPtr) linCreateVFs(deviceInfoPtr)
 #define REMOVEVFS(deviceInfoPtr) removeAllVFs(deviceInfoPtr)
 #define LISTVFS(deviceInfoPtr, result) linListVFs(deviceInfoPtr, result)
 #define VMXSUPPORT() isVmxSupported()
 #define IOMMUSUPPORT() isIommuSupported()
 #define SRIOVSUPPORT(deviceInfoPtr) isSriovSupported(deviceInfoPtr)
-#define CHECKMEDIACODEC(bdfStr, functionalCheck, finalResult) checkMediaCodec(bdfStr, functionalCheck, finalResult)
-#define CHECKHOSTMEMORYSIZE(hostMemorySize) checkHostMemorySize(hostMemorySize)
-#define CHECKPCIELINKSTATUS(bdf) checkPCIeLinkStatus(bdf)
-#define GETDOWNGRADEDPCIEINFO(bdfStr) getDowngradedPCIeInfo(bdfStr);
 #define GETKERNELVERSION() getKernelVersion()
 #define GETPCISLOTLABEL(bdf) getPciSlotLabel(bdf)
 #define FINDRESOURCEFILE(relativePath) findResourceFile(relativePath)
@@ -95,9 +101,6 @@ std::string getCpuList(const std::string &bdf);
 int getTopology(bdfID bdf, std::string *switchDevicePath);
 int amcCardDiscovery(std::vector<amcCardInfo> *amcDeviceList);
 int getLinLogs(const std::string &fileName);
-bool checkPermission();
-std::string checkCPUStatus();
-bool checkProcessExclusive(uint32_t processId);
 std::string getDrmPath(const std::string &bdf);
 int linCreateVFs(DeviceSriovInfo *di);
 int removeAllVFs(DeviceSriovInfo *di);
@@ -105,12 +108,8 @@ int linListVFs(DeviceSriovInfo *di, std::vector<DeviceSriovInfo> &result);
 bool isVmxSupported();
 bool isIommuSupported();
 bool isSriovSupported(DeviceSriovInfo *di);
-bool checkMediaCodec(std::string &bdfStr, bool functionalCheck, std::string &finalResult);
-bool checkHostMemorySize(uint64_t *hostMemorySize);
-bool checkPCIeLinkStatus(std::string &bdf);
 std::string getKernelVersion();
 std::string getPciSlotLabel(const std::string &bdf);
-std::string getDowngradedPCIeInfo(std::string &bdfStr);
 std::string findResourceFile(const std::string &relativePath);
 int coldResetViaSysfs(const std::string &gpuBdf);
 std::vector<uint32_t> getGpuProcessesByBdf(const std::string &gpuBdf);
diff --git a/oal/lin/topology.cpp b/oal/lin/topology.cpp
index 22948699d..2e34f31c1 100644
--- a/oal/lin/topology.cpp
+++ b/oal/lin/topology.cpp
@@ -5,8 +5,236 @@
  */
 
 #include "topology.h"
+#include "bdf.h"
 #include <hwloc.h>
+#include <algorithm>
+#include <filesystem>
 #include <format>
+#include <fstream>
+#include <optional>
+#include <string>
+#include <system_error>
+#include <unordered_map>
+#include <vector>
+#include <utility>
+
+/**
+ * @brief Resolves the NUMA node index for each PCI BDF address via sysfs
+ *
+ * Reads /sys/bus/pci/devices/<BDF>/numa_node for each BDF.
+ * This is simpler and faster than the hwloc cpuset walk.
+ *
+ * @param bdfs  List of PCI BDF strings (e.g. "0000:03:00.0")
+ * @param paths Sysfs roots (defaults to live sysfs; override in tests)
+ * @return Map from BDF string to optional NUMA node index:
+ *   - Key absent:           BDF device directory not found in sysfs
+ *   - Key present, nullopt: Device exists but NUMA info unavailable
+ *                           (numa_node file absent, value is -1 on multi-NUMA,
+ *                           or sysfs nodeRoot unreadable)
+ *   - Key present, int:     Resolved NUMA node index; on UMA systems
+ *                           (possible=="0", sysfs readable) numa_node = -1 is
+ *                           canonicalised to 0
+ */
+std::unordered_map<std::string, std::optional<int>> getNumaNodes(const std::vector<std::string> &bdfs,
+																 const SysfsPaths &paths)
+{
+	namespace fs = std::filesystem;
+
+	// Read /sys/devices/system/node/possible to determine if this is a UMA system.
+	// Checking for node1 is unreliable: it may be absent on kernels compiled without
+	// NUMA support (sysfs absent entirely) or before a CXL node hot-plugs in.
+	// "possible" is the authoritative source: "0" means only one node exists (UMA).
+	// If the file is absent or unreadable, leave isUma=false so -1 → nullopt (safe).
+	const bool isUma = [&] {
+		std::ifstream f{paths.nodeRoot / "possible"};
+		std::string line;
+		if (!f || !std::getline(f, line)) {
+			return false;
+		}
+		if (const auto pos = line.find_last_not_of(" \t\r\n"); pos != std::string::npos) {
+			line.resize(pos + 1);
+		}
+		return line == "0";
+	}();
+
+	std::unordered_map<std::string, std::optional<int>> result;
+	for (const auto &bdf : bdfs) {
+		const fs::path devDir = paths.pciDevRoot / bdf;
+		std::error_code ec;
+		if (!fs::exists(devDir, ec)) {
+			continue; // BDF not present in sysfs — leave key absent
+		}
+		const fs::path numaPath = devDir / "numa_node";
+		if (std::ifstream ifs{numaPath}; ifs) {
+			int idx{};
+			if (!(ifs >> idx)) {
+				result[bdf] = std::nullopt;
+			} else if (idx >= 0) {
+				result[bdf] = idx;
+			} else if (idx == -1 && isUma) {
+				result[bdf] = 0; // UMA: canonicalise to node 0
+			} else {
+				result[bdf] = std::nullopt;
+			}
+		} else {
+			result[bdf] = std::nullopt; // device exists but NUMA info unavailable
+		}
+	}
+	return result;
+}
+
+/**
+ * @brief Returns the PCIe bridge chain for each BDF by reading sysfs canonical paths
+ *
+ * See topology.h for full algorithm description.
+ */
+std::unordered_map<std::string, PciePath> getPciePaths(const std::vector<std::string> &bdfs, const SysfsPaths &paths)
+{
+	namespace fs = std::filesystem;
+	std::unordered_map<std::string, PciePath> result;
+
+	for (const auto &bdf : bdfs) {
+		std::error_code ec;
+		const fs::path real = fs::canonical(paths.pciDevRoot / bdf, ec);
+		if (ec) {
+			continue;
+		}
+
+		// Walk canonical path segments. The root complex marker "pciDDDD:BB" is
+		// captured as element 0; intermediate bridges follow; the device BDF itself
+		// is excluded (popped).
+		std::string rootComplexSeg;
+		std::vector<std::string> bridgeSegs;
+		bool foundRoot = false;
+		for (const auto &part : real) {
+			const std::string seg = part.string();
+			if (!foundRoot) {
+				if (seg.starts_with("pci")) {
+					foundRoot = true;
+					rootComplexSeg = seg; // e.g. "pci0000:00"
+				}
+				continue;
+			}
+			bridgeSegs.push_back(seg);
+		}
+		if (!bridgeSegs.empty()) {
+			bridgeSegs.pop_back(); // drop the device BDF itself
+		}
+
+		if (rootComplexSeg.empty()) {
+			continue; // malformed canonical path
+		}
+
+		PciePath path;
+		path.push_back(PcieBridgeLink{.bdf = rootComplexSeg, .isHostBridge = true});
+		for (const auto &seg : bridgeSegs) {
+			path.push_back(PcieBridgeLink{.bdf = seg, .isHostBridge = false});
+		}
+
+		if (!path.empty()) {
+			result[bdf] = std::move(path);
+		}
+	}
+
+	return result;
+}
+
+/**
+ * @brief Discovers physical NICs present on the system via sysfs
+ *
+ * Enumerates /sys/class/net, filters to PCI-backed physical interfaces,
+ * reads each NIC's BDF address and local CPU affinity from sysfs.
+ * Loopback ("lo") and virtual (non-PCI) interfaces are skipped.
+ *
+ * @return std::nullopt if /sys/class/net is unavailable (sysfs error),
+ *         or a (possibly empty) sorted vector of NicInfo
+ */
+std::optional<std::vector<NicInfo>> discoverNics(const SysfsPaths &paths)
+{
+	namespace fs = std::filesystem;
+
+	std::error_code fsErr;
+	if (!fs::exists(paths.netRoot, fsErr)) {
+		return std::nullopt; // sysfs unavailable
+	}
+
+	std::error_code openErr;
+	auto dirIt = fs::directory_iterator(paths.netRoot, openErr);
+	if (openErr) {
+		return std::nullopt; // failed to open directory (e.g. permission denied)
+	}
+
+	const fs::directory_iterator end;
+
+	// Advance the iterator; returns false and sets result to nullopt on error.
+	const auto advance = [&](std::optional<std::vector<NicInfo>> &out) -> bool {
+		std::error_code incErr;
+		dirIt.increment(incErr);
+		if (incErr) {
+			out = std::nullopt;
+			return false;
+		}
+		return true;
+	};
+
+	std::optional<std::vector<NicInfo>> result{std::in_place};
+	while (dirIt != end) {
+		const auto &entry = *dirIt;
+		const std::string name = entry.path().filename().string();
+
+		if (name == "lo") {
+			if (!advance(result)) {
+				return result;
+			}
+			continue; // skip loopback
+		}
+
+		// Only include physical PCI-backed interfaces
+		const fs::path deviceLink = entry.path() / "device";
+		std::error_code existsErr;
+		if (!fs::exists(deviceLink, existsErr)) {
+			if (!advance(result)) {
+				return result;
+			}
+			continue;
+		}
+
+		// Resolve BDF from the symlink target filename
+		std::error_code symlinkErr;
+		const auto target = fs::read_symlink(deviceLink, symlinkErr);
+		if (symlinkErr) {
+			if (!advance(result)) {
+				return result;
+			}
+			continue;
+		}
+		const std::string bdf = target.filename().string();
+
+		// Skip entries whose device symlink doesn't resolve to a PCI BDF
+		if (!isValidBdf(bdf)) {
+			if (!advance(result)) {
+				return result;
+			}
+			continue;
+		}
+
+		// Read local CPU list from sysfs PCI entry
+		std::string cpuAffinity;
+		const fs::path cpuListPath = paths.pciDevRoot / bdf / "local_cpulist";
+		if (std::ifstream ifs{cpuListPath}; ifs) {
+			std::getline(ifs, cpuAffinity);
+		}
+
+		result->push_back(NicInfo{.name = name, .bdfAddress = bdf, .cpuAffinity = cpuAffinity});
+
+		if (!advance(result)) {
+			return result;
+		}
+	}
+
+	std::ranges::sort(*result, {}, &NicInfo::name);
+	return result;
+}
 
 /**
  * @brief Exports system topology to XML file using hwloc
@@ -54,7 +282,7 @@ int exportTopologyToXml(const std::string &filename, const std::vector<GpuDevice
 
 			// Add GPU as misc object with metadata
 			hwloc_obj_t gpu = hwloc_topology_insert_misc_object(topology, root, deviceName.c_str());
-			if (gpu) {
+			if (gpu != nullptr) {
 				hwloc_obj_add_info(gpu, "Type", "GPU");
 				hwloc_obj_add_info(gpu, "PCIBusID", device.bdfAddress.c_str());
 				hwloc_obj_add_info(gpu, "CPUAffinity", device.cpuAffinity.c_str());
diff --git a/oal/lin/topology.h b/oal/lin/topology.h
index 7e00eb563..840ba830f 100644
--- a/oal/lin/topology.h
+++ b/oal/lin/topology.h
@@ -4,10 +4,13 @@
  *
  */
 
-#ifndef _TOPOLOGY_H
-#define _TOPOLOGY_H
+#ifndef TOPOLOGY_H
+#define TOPOLOGY_H
 
+#include <filesystem>
+#include <optional>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 /**
@@ -20,6 +23,90 @@ struct GpuDeviceInfo
 	std::string cpuAffinity;
 };
 
+/**
+ * @brief Network interface card information for topology matrix
+ */
+struct NicInfo
+{
+	std::string name;		 ///< Interface name (e.g. "eth0", "ens3f0")
+	std::string bdfAddress;	 ///< PCIe BDF address (e.g. "0000:03:00.0")
+	std::string cpuAffinity; ///< Local CPU list string (e.g. "0-31")
+};
+
+/**
+ * @brief Sysfs path roots used by discoverNics and getNumaNodes — separated for testability
+ */
+struct SysfsPaths
+{
+	std::filesystem::path netRoot{"/sys/class/net"};		  ///< Network interface directory
+	std::filesystem::path pciDevRoot{"/sys/bus/pci/devices"}; ///< PCI device directory
+	std::filesystem::path nodeRoot{
+		"/sys/devices/system/node"}; ///< NUMA node directory; "possible" file lists available nodes
+};
+
+/**
+ * @brief Resolves the NUMA node index for each PCI BDF address via sysfs
+ *
+ * Reads /sys/bus/pci/devices/<BDF>/numa_node for each BDF.
+ * Distinguishes three cases:
+ * - Key absent:              BDF device directory not found in sysfs
+ * - Key present, nullopt:    Device exists but NUMA info unavailable
+ *                            (numa_node file absent, value is -1 on multi-NUMA, or
+ *                            sysfs nodeRoot unreadable)
+ * - Key present, int value:  Resolved NUMA node index; on UMA systems
+ *                            (possible=="0", sysfs readable) numa_node = -1 is
+ *                            canonicalised to 0
+ *
+ * @param bdfs  List of PCI BDF strings (e.g. "0000:03:00.0")
+ * @param paths Sysfs roots (defaults to live sysfs; override in tests)
+ * @return Map from BDF string to optional NUMA node index
+ */
+std::unordered_map<std::string, std::optional<int>> getNumaNodes(const std::vector<std::string> &bdfs,
+																 const SysfsPaths &paths = {});
+
+/// One hop in the PCIe path from the root complex down toward a PCI device.
+struct PcieBridgeLink
+{
+	std::string bdf;   ///< Canonical sysfs path segment for this hop
+					   ///< (e.g. "pci0000:00" for the root complex, "0000:00:1c.0" for a bridge)
+	bool isHostBridge; ///< true = root complex entry (upstream is CPU), false = PCI-to-PCI bridge
+
+	bool operator==(const PcieBridgeLink &) const = default;
+};
+
+/// PCIe bridge chain from root complex (index 0) down toward the device, outermost first.
+using PciePath = std::vector<PcieBridgeLink>;
+
+/**
+ * @brief Returns the PCIe bridge chain for each BDF by reading sysfs canonical paths
+ *
+ * Resolves the symlink /sys/bus/pci/devices/<BDF> to its canonical realpath, e.g.:
+ *   /sys/devices/pci0000:00/0000:00:1c.0/0000:01:00.0/0000:03:00.0
+ *
+ * The root complex marker (pciDDDD:BB) is included as element 0 (isHostBridge=true),
+ * followed by the intermediate bridge BDFs up to (but not including) the device itself,
+ * outermost-first. This enables determineLinkType to classify connections by finding
+ * the deepest common ancestor:
+ *   - commonLen == 1  → PHB (share only the root complex)
+ *   - commonLen == 2  → PXB (share root complex + root port)
+ *   - commonLen >= 3  → PIX (share root complex + root port + a PCIe switch)
+ *
+ * @param bdfs  List of PCI BDF strings (e.g. "0000:03:00.0")
+ * @param paths Sysfs roots (defaults to live sysfs; override in tests)
+ * @return Map from BDF to PCIe bridge chain; key absent if BDF symlink cannot be resolved
+ */
+std::unordered_map<std::string, PciePath> getPciePaths(const std::vector<std::string> &bdfs,
+													   const SysfsPaths &paths = {});
+
+/**
+ * @brief Discovers physical NICs present on the system via sysfs
+ *
+ * @param paths  sysfs root paths (defaults to live sysfs; override in tests)
+ * @return std::nullopt if netRoot is unavailable (sysfs error),
+ *         or a (possibly empty) sorted vector of discovered physical NICs
+ */
+std::optional<std::vector<NicInfo>> discoverNics(const SysfsPaths &paths = {});
+
 /**
  * @brief Exports system topology to XML file using hwloc (Linux only)
  *
@@ -29,4 +116,4 @@ struct GpuDeviceInfo
  */
 int exportTopologyToXml(const std::string &filename, const std::vector<GpuDeviceInfo> &gpuDevices);
 
-#endif // _TOPOLOGY_H
+#endif // TOPOLOGY_H
diff --git a/oal/meson.build b/oal/meson.build
index 5d859d3d5..35835154b 100644
--- a/oal/meson.build
+++ b/oal/meson.build
@@ -6,6 +6,7 @@
 # Platform-specific source files
 oal_sources = []
 oal_inc_dirs = [include_directories('.')] # Include the oal folder itself
+oal_inc_dirs += [include_directories('../hal/core/logger')]
 oal_deps = [thread_dep, levelzero_dep, bdf_dep]
 
 if is_windows
@@ -17,12 +18,11 @@ if is_windows
     'win/thread.cpp',
     'win/win.cpp',
   )
-  oal_inc_dirs = [include_directories('win'), include_directories('.')]
+  oal_inc_dirs += [include_directories('win')]
   oal_deps += windows_deps
 elif is_linux
   oal_sources = files(
     'lin/dbg_log.cpp',
-    'lin/diag_lin.cpp',
     'lin/dmi_reader.cpp',
     'lin/fs_lock.cpp',
     'lin/http_client.cpp',
@@ -32,7 +32,7 @@ elif is_linux
     'lin/pci_database.cpp',
     'lin/topology.cpp',
   )
-  oal_inc_dirs = [include_directories('lin'), include_directories('.')]
+  oal_inc_dirs += [include_directories('lin')]
   # Add hwloc dependency for Linux topology functionality
   # Treat as system dependency to avoid warnings in hwloc headers
   hwloc_dep = dependency('hwloc', required: true, include_type: 'system')
diff --git a/oal/win/http_client.cpp b/oal/win/http_client.cpp
index 5defeb07a..5109572d2 100644
--- a/oal/win/http_client.cpp
+++ b/oal/win/http_client.cpp
@@ -216,12 +216,20 @@ int HttpClient::performRequest(const std::string &url, const std::string &userna
 
 	// Add authentication if provided
 	if (!username.empty() && !password.empty()) {
-		WCHAR wideUser[256], widePass[256];
-		MultiByteToWideChar(CP_UTF8, 0, username.c_str(), -1, wideUser, sizeof(wideUser) / sizeof(WCHAR));
-		MultiByteToWideChar(CP_UTF8, 0, password.c_str(), -1, widePass, sizeof(widePass) / sizeof(WCHAR));
+		WCHAR wideUser[256] = {}, widePass[256] = {};
+		const int userLen =
+			MultiByteToWideChar(CP_UTF8, 0, username.c_str(), -1, wideUser, sizeof(wideUser) / sizeof(WCHAR));
+		const int passLen =
+			MultiByteToWideChar(CP_UTF8, 0, password.c_str(), -1, widePass, sizeof(widePass) / sizeof(WCHAR));
+
+		if (userLen > 0 && passLen > 0) {
+			WinHttpSetCredentials(hRequest, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, wideUser, widePass,
+								  nullptr);
+		}
 
-		WinHttpSetCredentials(hRequest, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, wideUser, widePass,
-							  nullptr);
+		// Best-effort: scrub local stack copies only; WinHTTP-owned internal copies are not reachable
+		SecureZeroMemory(wideUser, sizeof(wideUser));
+		SecureZeroMemory(widePass, sizeof(widePass));
 	}
 
 	// Send request
diff --git a/oal/win/oswin.h b/oal/win/oswin.h
index be1f67e5d..4d5dd32c5 100644
--- a/oal/win/oswin.h
+++ b/oal/win/oswin.h
@@ -14,6 +14,8 @@
 #include <conio.h>
 #include <io.h>
 #include <vector>
+#include <optional>
+#include <unordered_map>
 
 #ifdef LIBXPUM_EXPORTS
 #define LIBXPUM_API __declspec(dllexport)
@@ -110,11 +112,6 @@ struct option
 #define GET_TOPOLOGY(bdf, e) (UNUSED_VAR(bdf), UNUSED_VAR(e), 0)
 #define EXPORT_TOPOLOGY_XML(filename, gpuDevices) (UNUSED_VAR(filename), UNUSED_VAR(gpuDevices), 0)
 #define GETLOGS(f) 0
-#define CHECKPERMISSION() 0
-#define CHECKPROCESSEXCLUSIVE(processId) (UNUSED_VAR(processId), false)
-static constexpr std::string CHECKCPUSTATUS() { return std::string{"0"}; }
-#define CHECKMEDIACODEC(bdfStr, functionalCheck, finalResult)                                                          \
-	(UNUSED_VAR(bdfStr), UNUSED_VAR(functionalCheck), UNUSED_VAR(finalResult), false)
 #define GETDRMPATH(bdf) ""
 #define CREATEVFS(deviceInfoPtr) (UNUSED_VAR(deviceInfoPtr), 0)
 #define REMOVEVFS(deviceInfoPtr) (UNUSED_VAR(deviceInfoPtr), 0)
@@ -122,12 +119,9 @@ static constexpr std::string CHECKCPUSTATUS() { return std::string{"0"}; }
 #define VMXSUPPORT() 0
 #define IOMMUSUPPORT() 0
 #define SRIOVSUPPORT(deviceInfoPtr) (UNUSED_VAR(deviceInfoPtr), 0)
-#define CHECKHOSTMEMORYSIZE(hostMemorySize) (UNUSED_VAR(hostMemorySize), 0)
-#define CHECKPCIELINKSTATUS(bdf) (UNUSED_VAR(bdf), false)
 #define GETKERNELVERSION() std::string("")
 #define GETPCISLOTLABEL(bdf) (UNUSED_VAR(bdf), std::string(""))
 static constexpr std::string FINDRESOURCEFILE(UNUSED const std::string &relativePath) { return std::string{}; }
-static constexpr std::string GETDOWNGRADEDPCIEINFO(UNUSED const std::string &bdfStr) { return std::string{}; }
 static inline int coldResetViaSysfs(UNUSED const std::string &gpuBdf) { return -1; }
 static inline std::vector<uint32_t> getGpuProcessesByBdf(UNUSED const std::string &gpuBdf) { return {}; }
 static inline std::vector<std::string> getDevicesSharingSlotWith(UNUSED const std::string &gpuBdf) { return {}; }
@@ -136,6 +130,14 @@ typedef DWORD(WINAPI *funcptr)(void *input_params);
 extern char *optarg;
 extern int optind;
 
+// Topology types (Linux implementations not available on Windows)
+struct NicInfo
+{
+	std::string name;
+	std::string bdfAddress;
+	std::string cpuAffinity;
+};
+
 // Forward declaration for topology (command not available on Windows)
 struct GpuDeviceInfo
 {
@@ -144,6 +146,22 @@ struct GpuDeviceInfo
 	std::string cpuAffinity;
 };
 
+inline std::optional<std::vector<NicInfo>> GET_SYSTEM_NICS() { return std::nullopt; }
+inline std::unordered_map<std::string, std::optional<int>> GET_NUMA_NODES(const std::vector<std::string> &)
+{
+	return {};
+} // NOLINT(readability-identifier-naming) // Match MACRO style while providing a better interface for navigation
+struct PcieBridgeLink
+{
+	std::string bdf{};
+	bool isHostBridge{};
+};
+using PciePath = std::vector<PcieBridgeLink>;
+inline std::unordered_map<std::string, PciePath> GET_PCIE_PATHS(const std::vector<std::string> &)
+{
+	return {};
+} // NOLINT(readability-identifier-naming) // Match MACRO style while providing a better interface for navigation
+
 int getopt(int argc, char *argv[], char *optstring);
 int getopt_long(int argc, char *const argv[], const char *optstring, const struct option *longopts, int *longindex);
 void *align_alloc(size_t size);
diff --git a/resources/kernels/LICENSE b/resources/kernels/LICENSE
deleted file mode 100644
index d550e3c53..000000000
--- a/resources/kernels/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Intel Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/resources/kernels/test_multiple_memory_allocations.cl b/resources/kernels/test_multiple_memory_allocations.cl
deleted file mode 100644
index 404f57e44..000000000
--- a/resources/kernels/test_multiple_memory_allocations.cl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Copyright (C) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-kernel void test_device_memory1(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory2(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory3(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory4(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory5(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory6(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory7(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory8(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory9(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
-kernel void test_device_memory10(__global char *src, __global char *dst) {
-    int  tid = get_global_id(0);
-    dst[tid] = src[tid];
-}
\ No newline at end of file
diff --git a/resources/kernels/test_multiple_memory_allocations.spv b/resources/kernels/test_multiple_memory_allocations.spv
deleted file mode 100644
index fc0728fef..000000000
Binary files a/resources/kernels/test_multiple_memory_allocations.spv and /dev/null differ
diff --git a/resources/kernels/ze_dp_compute.cl b/resources/kernels/ze_dp_compute.cl
deleted file mode 100644
index 4f5cb6708..000000000
--- a/resources/kernels/ze_dp_compute.cl
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Copyright (C) 2019-2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#if defined(cl_khr_fp64)
-  #pragma OPENCL EXTENSION cl_khr_fp64 : enable
-  #define DOUBLE_AVAILABLE
-#elif defined(cl_amd_fp64)
-  #pragma OPENCL EXTENSION cl_amd_fp64 : enable
-  #define DOUBLE_AVAILABLE
-#endif
-
-#undef MAD_4
-#undef MAD_16
-#undef MAD_64
-
-#define MAD_4(x, y)     x = mad(y, x, y);   y = mad(x, y, x);   x = mad(y, x, y);   y = mad(x, y, x);
-#define MAD_16(x, y)    MAD_4(x, y);        MAD_4(x, y);        MAD_4(x, y);        MAD_4(x, y);
-#define MAD_64(x, y)    MAD_16(x, y);       MAD_16(x, y);       MAD_16(x, y);       MAD_16(x, y);
-
-#ifdef DOUBLE_AVAILABLE
-
-
-__kernel void compute_dp_v1(__global double *input_value, __global double *output)
-{
-    double x = input_value[0];
-    double y = (double)get_local_id(0);
-
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-
-    output[get_global_id(0)] = y;
-}
-
-
-__kernel void compute_dp_v2(__global double *input_value, __global double *output)
-{
-    double2 x = (double2)(input_value[0], (input_value[0]+1));
-    double2 y = (double2)get_local_id(0);
-
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-
-    output[get_global_id(0)] = (y.S0) + (y.S1);
-}
-
-__kernel void compute_dp_v4(__global double *input_value, __global double *output)
-{
-    double4 x = (double4)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3));
-    double4 y = (double4)get_local_id(0);
-
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-
-    output[get_global_id(0)] = (y.S0) + (y.S1) + (y.S2) + (y.S3);
-}
-
-
-__kernel void compute_dp_v8(__global double *input_value, __global double *output)
-{
-    double8 x = (double8)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3), (input_value[0]+4), (input_value[0]+5), (input_value[0]+6), (input_value[0]+7));
-    double8 y = (double8)get_local_id(0);
-
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-
-    output[get_global_id(0)] = (y.S0) + (y.S1) + (y.S2) + (y.S3) + (y.S4) + (y.S5) + (y.S6) + (y.S7);
-}
-
-__kernel void compute_dp_v16(__global double *input_value, __global double *output)
-{
-    double16 x = (double16)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3), (input_value[0]+4), (input_value[0]+5), (input_value[0]+6), (input_value[0]+7),
-                    (input_value[0]+8), (input_value[0]+9), (input_value[0]+10), (input_value[0]+11), (input_value[0]+12), (input_value[0]+13), (input_value[0]+14), (input_value[0]+15));
-    double16 y = (double16)get_local_id(0);
-
-    MAD_64(x, y);
-    MAD_64(x, y);
-
-    double2 t = (y.S01) + (y.S23) + (y.S45) + (y.S67) + (y.S89) + (y.SAB) + (y.SCD) + (y.SEF);
-    output[get_global_id(0)] = t.S0 + t.S1;
-}
-
-#endif
\ No newline at end of file
diff --git a/resources/kernels/ze_dp_compute.spv b/resources/kernels/ze_dp_compute.spv
deleted file mode 100644
index 4a6f3fb3c..000000000
Binary files a/resources/kernels/ze_dp_compute.spv and /dev/null differ
diff --git a/resources/kernels/ze_global_bw.cl b/resources/kernels/ze_global_bw.cl
deleted file mode 100644
index 69b9d7d8e..000000000
--- a/resources/kernels/ze_global_bw.cl
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Copyright (C) 2019-2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#undef FETCH_2
-#undef FETCH_8
-
-#define FETCH_2(sum, id, A, jumpBy)      sum += A[id];   id += jumpBy;   sum += A[id];   id += jumpBy;
-#define FETCH_4(sum, id, A, jumpBy)      FETCH_2(sum, id, A, jumpBy);   FETCH_2(sum, id, A, jumpBy);
-#define FETCH_8(sum, id, A, jumpBy)      FETCH_4(sum, id, A, jumpBy);   FETCH_4(sum, id, A, jumpBy);
-
-#define FETCH_PER_WI  16
-
-// Kernels fetching by local_size offset
-__kernel void global_bandwidth_v1_local_offset(__global float *A, __global float *B)
-{
-    int id = (get_group_id(0) * get_local_size(0) * FETCH_PER_WI) + get_local_id(0);
-    float sum = 0;
-
-    FETCH_8(sum, id, A, get_local_size(0));
-    FETCH_8(sum, id, A, get_local_size(0));
-
-    B[get_global_id(0)] = sum;
-}
-
-
-__kernel void global_bandwidth_v2_local_offset(__global float2 *A, __global float *B)
-{
-    int id = (get_group_id(0) * get_local_size(0) * FETCH_PER_WI) + get_local_id(0);
-    float2 sum = 0;
-
-    FETCH_8(sum, id, A, get_local_size(0));
-    FETCH_8(sum, id, A, get_local_size(0));
-
-    B[get_global_id(0)] = (sum.S0) + (sum.S1);
-}
-
-
-__kernel void global_bandwidth_v4_local_offset(__global float4 *A, __global float *B)
-{
-    int id = (get_group_id(0) * get_local_size(0) * FETCH_PER_WI) + get_local_id(0);
-    float4 sum = 0;
-
-    FETCH_8(sum, id, A, get_local_size(0));
-    FETCH_8(sum, id, A, get_local_size(0));
-
-    B[get_global_id(0)] = (sum.S0) + (sum.S1) + (sum.S2) + (sum.S3);
-}
-
-
-__kernel void global_bandwidth_v8_local_offset(__global float8 *A, __global float *B)
-{
-    int id = (get_group_id(0) * get_local_size(0) * FETCH_PER_WI) + get_local_id(0);
-    float8 sum = 0;
-
-    FETCH_8(sum, id, A, get_local_size(0));
-    FETCH_8(sum, id, A, get_local_size(0));
-
-    B[get_global_id(0)] = (sum.S0) + (sum.S1) + (sum.S2) + (sum.S3) + (sum.S4) + (sum.S5) + (sum.S6) + (sum.S7);
-}
-
-__kernel void global_bandwidth_v16_local_offset(__global float16 *A, __global float *B)
-{
-    int id = (get_group_id(0) * get_local_size(0) * FETCH_PER_WI) + get_local_id(0);
-    float16 sum = 0;
-
-    FETCH_8(sum, id, A, get_local_size(0));
-    FETCH_8(sum, id, A, get_local_size(0));
-
-    float t = (sum.S0) + (sum.S1) + (sum.S2) + (sum.S3) + (sum.S4) + (sum.S5) + (sum.S6) + (sum.S7);
-    t += (sum.S8) + (sum.S9) + (sum.SA) + (sum.SB) + (sum.SC) + (sum.SD) + (sum.SE) + (sum.SF);
-    B[get_global_id(0)] = t;
-}
-
-
-// Kernels fetching by global_size offset
-__kernel void global_bandwidth_v1_global_offset(__global float *A, __global float *B)
-{
-    int id = get_global_id(0);
-    float sum = 0;
-
-    FETCH_8(sum, id, A, get_global_size(0));
-    FETCH_8(sum, id, A, get_global_size(0));
-
-    B[get_global_id(0)] = sum;
-}
-
-
-__kernel void global_bandwidth_v2_global_offset(__global float2 *A, __global float *B)
-{
-    int id = get_global_id(0);
-    float2 sum = 0;
-
-    FETCH_8(sum, id, A, get_global_size(0));
-    FETCH_8(sum, id, A, get_global_size(0));
-
-    B[get_global_id(0)] = (sum.S0) + (sum.S1);
-}
-
-
-__kernel void global_bandwidth_v4_global_offset(__global float4 *A, __global float *B)
-{
-    int id = get_global_id(0);
-    float4 sum = 0;
-
-    FETCH_8(sum, id, A, get_global_size(0));
-    FETCH_8(sum, id, A, get_global_size(0));
-
-    B[get_global_id(0)] = (sum.S0) + (sum.S1) + (sum.S2) + (sum.S3);
-}
-
-
-__kernel void global_bandwidth_v8_global_offset(__global float8 *A, __global float *B)
-{
-    int id = get_global_id(0);
-    float8 sum = 0;
-
-    FETCH_8(sum, id, A, get_global_size(0));
-    FETCH_8(sum, id, A, get_global_size(0));
-
-    B[get_global_id(0)] = (sum.S0) + (sum.S1) + (sum.S2) + (sum.S3) + (sum.S4) + (sum.S5) + (sum.S6) + (sum.S7);
-}
-
-__kernel void global_bandwidth_v16_global_offset(__global float16 *A, __global float *B)
-{
-    int id = get_global_id(0);
-    float16 sum = 0;
-
-    FETCH_8(sum, id, A, get_global_size(0));
-    FETCH_8(sum, id, A, get_global_size(0));
-
-    float t = (sum.S0) + (sum.S1) + (sum.S2) + (sum.S3) + (sum.S4) + (sum.S5) + (sum.S6) + (sum.S7);
-    t += (sum.S8) + (sum.S9) + (sum.SA) + (sum.SB) + (sum.SC) + (sum.SD) + (sum.SE) + (sum.SF);
-    B[get_global_id(0)] = t;
-}
-
diff --git a/resources/kernels/ze_global_bw.spv b/resources/kernels/ze_global_bw.spv
deleted file mode 100644
index 604fc795f..000000000
Binary files a/resources/kernels/ze_global_bw.spv and /dev/null differ
diff --git a/resources/kernels/ze_int_compute.cl b/resources/kernels/ze_int_compute.cl
deleted file mode 100644
index 70f6d2070..000000000
--- a/resources/kernels/ze_int_compute.cl
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- * Copyright (C) 2019-2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#undef MAD_16
-#undef MAD_64
-
-#define MAD_4(x, y)     x = (y*x) + y;      y = (x*y) + x;      x = (y*x) + y;      y = (x*y) + x;
-#define MAD_16(x, y)    MAD_4(x, y);        MAD_4(x, y);        MAD_4(x, y);        MAD_4(x, y);
-#define MAD_64(x, y)    MAD_16(x, y);       MAD_16(x, y);       MAD_16(x, y);       MAD_16(x, y);
-
-__kernel void compute_int_v1(__global int *input_value, __global int *output)
-{
-    int x = input_value[0];
-    int y = (int)get_local_id(0);
-
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-
-    output[get_global_id(0)] = y;
-}
-
-
-__kernel void compute_int_v2(__global int *input_value, __global int *output)
-{
-    int2 x = (int2)(input_value[0], (input_value[0]+1));
-    int2 y = (int2)get_local_id(0);
-
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-    MAD_64(x, y);   MAD_64(x, y);
-
-    output[get_global_id(0)] = (y.S0) + (y.S1);
-}
-
-__kernel void compute_int_v4(__global int *input_value, __global int *output)
-{
-    int4 x = (int4)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3));
-    int4 y = (int4)get_local_id(0);
-
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-    MAD_64(x, y);
-
-    output[get_global_id(0)] = (y.S0) + (y.S1) + (y.S2) + (y.S3);
-}
-
-
-__kernel void compute_int_v8(__global int *input_value, __global int *output)
-{
-    int8 x = (int8)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3), (input_value[0]+4), (input_value[0]+5), (input_value[0]+6), (input_value[0]+7));
-    int8 y = (int8)get_local_id(0);
-
-    MAD_64(x, y);
-    MAD_64(x, y);
-
-    output[get_global_id(0)] = (y.S0) + (y.S1) + (y.S2) + (y.S3) + (y.S4) + (y.S5) + (y.S6) + (y.S7);
-}
-
-__kernel void compute_int_v16(__global int *input_value, __global int *output)
-{
-    int16 x = (int16)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3), (input_value[0]+4), (input_value[0]+5), (input_value[0]+6), (input_value[0]+7),
-                    (input_value[0]+8), (input_value[0]+9), (input_value[0]+10), (input_value[0]+11), (input_value[0]+12), (input_value[0]+13), (input_value[0]+14), (input_value[0]+15));
-    int16 y = (int16)get_local_id(0);
-
-    MAD_64(x, y);
-
-    int2 t = (y.S01) + (y.S23) + (y.S45) + (y.S67) + (y.S89) + (y.SAB) + (y.SCD) + (y.SEF);
-    output[get_global_id(0)] = t.S0 + t.S1;
-}
diff --git a/resources/kernels/ze_int_compute.spv b/resources/kernels/ze_int_compute.spv
deleted file mode 100644
index 1e644760b..000000000
Binary files a/resources/kernels/ze_int_compute.spv and /dev/null differ
diff --git a/resources/kernels/ze_sp_compute.cl b/resources/kernels/ze_sp_compute.cl
deleted file mode 100644
index c4a5e0b0f..000000000
--- a/resources/kernels/ze_sp_compute.cl
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- * Copyright (C) 2019-2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#undef MAD_4
-#undef MAD_16
-#undef MAD_64
-
-#define MAD_4(x, y)     x = mad(y, x, y);   y = mad(x, y, x);   x = mad(y, x, y);   y = mad(x, y, x);
-#define MAD_16(x, y)    MAD_4(x, y);        MAD_4(x, y);        MAD_4(x, y);        MAD_4(x, y);
-#define MAD_64(x, y)    MAD_16(x, y);       MAD_16(x, y);       MAD_16(x, y);       MAD_16(x, y);
-
-__kernel void compute_sp_v1(__global float *input_value, __global float *output)
-{
-    float x = input_value[0];
-    float y = (float)get_local_id(0);
-
-    for (int i = 0; i < 128; i++)
-    {
-        MAD_16(x, y);
-    }
-
-    output[get_global_id(0)] = y;
-}
-
-__kernel void compute_sp_v2(__global float *input_value, __global float *output)
-{
-    float2 x = (float2)(input_value[0], (input_value[0]+1));
-    float2 y = (float2)get_local_id(0);
-
-    for (int i = 0; i < 64; i++)
-    {
-        MAD_16(x, y);
-    }
-
-    output[get_global_id(0)] = (y.S0) + (y.S1);
-}
-
-__kernel void compute_sp_v4(__global float *input_value, __global float *output)
-{
-    float4 x = (float4)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3));
-    float4 y = (float4)get_local_id(0);
-
-    for(int i = 0; i < 32; i++)
-    {
-        MAD_16(x, y);
-    }
-
-    output[get_global_id(0)] = (y.S0) + (y.S1) + (y.S2) + (y.S3);
-}
-
-
-__kernel void compute_sp_v8(__global float *input_value, __global float *output)
-{
-    float8 x = (float8)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3), (input_value[0]+4), (input_value[0]+5), (input_value[0]+6), (input_value[0]+7));
-    float8 y = (float8)get_local_id(0);
-
-    for(int i = 0; i < 16; i++)
-    {
-        MAD_16(x, y);
-    }
-
-
-    output[get_global_id(0)] = (y.S0) + (y.S1) + (y.S2) + (y.S3) + (y.S4) + (y.S5) + (y.S6) + (y.S7);
-}
-
-__kernel void compute_sp_v16(__global float *input_value, __global float *output)
-{
-    float16 x = (float16)(input_value[0], (input_value[0]+1), (input_value[0]+2), (input_value[0]+3), (input_value[0]+4), (input_value[0]+5), (input_value[0]+6), (input_value[0]+7),
-                    (input_value[0]+8), (input_value[0]+9), (input_value[0]+10), (input_value[0]+11), (input_value[0]+12), (input_value[0]+13), (input_value[0]+14), (input_value[0]+15));
-    float16 y = (float16)get_local_id(0);
-
-    for(int i = 0; i < 8; i++)
-    {
-        MAD_16(x, y);
-    }
-
-    float2 t = (y.S01) + (y.S23) + (y.S45) + (y.S67) + (y.S89) + (y.SAB) + (y.SCD) + (y.SEF);
-    output[get_global_id(0)] = t.S0 + t.S1;
-}
diff --git a/resources/kernels/ze_sp_compute.spv b/resources/kernels/ze_sp_compute.spv
deleted file mode 100644
index 3af2e35b8..000000000
Binary files a/resources/kernels/ze_sp_compute.spv and /dev/null differ
diff --git a/resources/mediadata/test_stream.264 b/resources/mediadata/test_stream.264
deleted file mode 100644
index 235c3351f..000000000
Binary files a/resources/mediadata/test_stream.264 and /dev/null differ
diff --git a/resources/mediadata/test_stream_1080p.265 b/resources/mediadata/test_stream_1080p.265
deleted file mode 100644
index 443c792f3..000000000
Binary files a/resources/mediadata/test_stream_1080p.265 and /dev/null differ
diff --git a/resources/mediadata/test_stream_4K.265 b/resources/mediadata/test_stream_4K.265
deleted file mode 100644
index ce67e65af..000000000
Binary files a/resources/mediadata/test_stream_4K.265 and /dev/null differ
diff --git a/signfile/Certificates/06D3C8276753BD530CDDE7FCB620B9F97A368A6D.cer b/signfile/Certificates/06D3C8276753BD530CDDE7FCB620B9F97A368A6D.cer
deleted file mode 100644
index 06c856c33..000000000
--- a/signfile/Certificates/06D3C8276753BD530CDDE7FCB620B9F97A368A6D.cer
+++ /dev/null
@@ -1,35 +0,0 @@
-subject=CN=Intel Corporation, O=Intel Corporation, S=California, C=US
-issuer=CN=Sectigo Public Code Signing CA R36, O=Sectigo Limited, C=GB
------BEGIN CERTIFICATE-----
-MIIFxDCCBCygAwIBAgIRAN6u9KukaDn1ND+gI0/eIO0wDQYJKoZIhvcNAQEMBQAw
-VDELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDErMCkGA1UE
-AxMiU2VjdGlnbyBQdWJsaWMgQ29kZSBTaWduaW5nIENBIFIzNjAeFw0yNTA4MDQw
-MDAwMDBaFw0yNjA4MDQyMzU5NTlaMFoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApD
-YWxpZm9ybmlhMRowGAYDVQQKDBFJbnRlbCBDb3Jwb3JhdGlvbjEaMBgGA1UEAwwR
-SW50ZWwgQ29ycG9yYXRpb24wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIB
-gQDGDb77A+Uy51TlkgszsSrpqwAjm/pyPCaH34ROk5dAGzr38J/H7dIvsIFh2bmI
-CXMLcHMrK5eY4oLUyfMAs8ARkqxh1bakOn/FuVGzujeGN0OaCuRyXaOLFBQlbY4z
-IpF4KAqAs62IBfzqd3lVCaTk92cy0UqAky3Ct+MnjZILgLAtqpdhRfTUIjBMBV92
-LqcQWc4e3sYvoabM7vC/rHCtbkAVxmh1xzPn0Kdmjhh4aNB9Hnps+dzWsDS1VnOC
-OIVS2/oCK77bGVSnoBBiHMNL0KdnBg/DJ3XbdlwzB7ekU+qV5LlajOwAp3jE8rBd
-YUgdueM/a69M12rDiEosnr5/oYyxniZfVm1OOp6FHyou0uHWCVJY6twAvRQAAp+P
-ZR1bXuKsK+/rAFic4fkAK054LVGrU28KHq4yKKy6BuakxwRJVxbfoj/6AWSF+y19
-nZIO569Nn/9I1zzcmvappz3ZhrDWENcbVWcPeWBUjprFq8nTjKfUSiyLNkqfotcH
-wa8CAwEAAaOCAYkwggGFMB8GA1UdIwQYMBaAFA8qyyCHKLjsb0iuK1SmKaoXpM0M
-MB0GA1UdDgQWBBQG08gnZ1O9Uwzd5/y2ILn5ejaKbTAOBgNVHQ8BAf8EBAMCB4Aw
-DAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAzBKBgNVHSAEQzBBMDUG
-DCsGAQQBsjEBAgEDAjAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29t
-L0NQUzAIBgZngQwBBAEwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5zZWN0
-aWdvLmNvbS9TZWN0aWdvUHVibGljQ29kZVNpZ25pbmdDQVIzNi5jcmwweQYIKwYB
-BQUHAQEEbTBrMEQGCCsGAQUFBzAChjhodHRwOi8vY3J0LnNlY3RpZ28uY29tL1Nl
-Y3RpZ29QdWJsaWNDb2RlU2lnbmluZ0NBUjM2LmNydDAjBggrBgEFBQcwAYYXaHR0
-cDovL29jc3Auc2VjdGlnby5jb20wDQYJKoZIhvcNAQEMBQADggGBAFQe6aND0JfJ
-/1/rXFE55Znwa5LmQjVvlmE8dMnEs6wavAJkgFACuRtvPBC/ejQDtpreQMRfw7k5
-HWaPh93WqUw06dAoB7SXExl0cfwCX5Grho7pvqbFTyBlPGFnPNdzghd/Uo4R2r5r
-w7Rf6+ROb8neK9ObV5IHH/1K2sr9tUfccLfPC1IYEBViXokbHgW+4n7gi011A3hu
-GQpwINAhCccrytA2K5DYjKeUzpLN4kU8wRMfzAYsIxCBJaL+NRDKXLc8YsedOO3F
-jgIciAJAOEyWYUd/BZxPLabzxFivZZ8BiNGEvDgh5DTHAdV1DXaeQjqqPq4LS1gg
-DEl5j4040rS0KxCRnRTddMbWrkAVGB5umOjODIWxAgIpdkCNTTW7iG9DNZJgsfU+
-m6cru8i3mcZaYUUmui7ZeGREegxj6QMeX6psT9M5VH7cwmDdHFezQb26+t/WK7w1
-kRJLhjH+XCAD+e7P8FFzSynf1cplSS6EaHbTEXcLmxT2KLEb1SoQAg==
------END CERTIFICATE-----
diff --git a/signfile/Certificates/0F2ACB208728B8EC6F48AE2B54A629AA17A4CD0C.cer b/signfile/Certificates/0F2ACB208728B8EC6F48AE2B54A629AA17A4CD0C.cer
deleted file mode 100644
index 32cea4dd4..000000000
--- a/signfile/Certificates/0F2ACB208728B8EC6F48AE2B54A629AA17A4CD0C.cer
+++ /dev/null
@@ -1,37 +0,0 @@
-subject=CN=Sectigo Public Code Signing CA R36, O=Sectigo Limited, C=GB
-issuer=CN=Sectigo Public Code Signing Root R46, O=Sectigo Limited, C=GB
------BEGIN CERTIFICATE-----
-MIIGGjCCBAKgAwIBAgIQYh1tDFIBnjuQeRUgiSEcCjANBgkqhkiG9w0BAQwFADBW
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQD
-EyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBSNDYwHhcNMjEwMzIy
-MDAwMDAwWhcNMzYwMzIxMjM1OTU5WjBUMQswCQYDVQQGEwJHQjEYMBYGA1UEChMP
-U2VjdGlnbyBMaW1pdGVkMSswKQYDVQQDEyJTZWN0aWdvIFB1YmxpYyBDb2RlIFNp
-Z25pbmcgQ0EgUjM2MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAmyud
-U/o1P45gBkNqwM/1f/bIU1MYyM7TbH78WAeVF3llMwsRHgBGRmxDeEDIArCS2VCo
-Vk4Y/8j6stIkmYV5Gej4NgNjVQ4BYoDjGMwdjioXan1hlaGFt4Wk9vT0k2oWJMJj
-L9G//N523hAm4jF4UjrW2pvv9+hdPX8tbbAfI3v0VdJiJPFy/7XwiunD7mBxNtec
-M6ytIdUlh08T2z7mJEXZD9OWcJkZk5wDuf2q52PN43jc4T9OkoXZ0arWZVeffvMr
-/iiIROSCzKoDmWABDRzV/UiQ5vqsaeFaqQdzFf4ed8peNWh1OaZXnYvZQgWx/SXi
-JDRSAolRzZEZquE6cbcH747FHncs/Kzcn0Ccv2jrOW+LPmnOyB+tAfiWu01TPhCr
-9VrkxsHC5qFNxaThTG5j4/Kc+ODD2dX/fmBECELcvzUHf9shoFvrn35XGf2RPaNT
-O2uSZ6n9otv7jElspkfK9qEATHZcodp+R4q2OIypxR//YEb3fkDn3UayWW9bAgMB
-AAGjggFkMIIBYDAfBgNVHSMEGDAWgBQy65Ka/zWWSC8oQEJwIDaRXBeF5jAdBgNV
-HQ4EFgQUDyrLIIcouOxvSK4rVKYpqhekzQwwDgYDVR0PAQH/BAQDAgGGMBIGA1Ud
-EwEB/wQIMAYBAf8CAQAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwGwYDVR0gBBQwEjAG
-BgRVHSAAMAgGBmeBDAEEATBLBgNVHR8ERDBCMECgPqA8hjpodHRwOi8vY3JsLnNl
-Y3RpZ28uY29tL1NlY3RpZ29QdWJsaWNDb2RlU2lnbmluZ1Jvb3RSNDYuY3JsMHsG
-CCsGAQUFBwEBBG8wbTBGBggrBgEFBQcwAoY6aHR0cDovL2NydC5zZWN0aWdvLmNv
-bS9TZWN0aWdvUHVibGljQ29kZVNpZ25pbmdSb290UjQ2LnA3YzAjBggrBgEFBQcw
-AYYXaHR0cDovL29jc3Auc2VjdGlnby5jb20wDQYJKoZIhvcNAQEMBQADggIBAAb/
-guF3YzZue6EVIJsT/wT+mHVEYcNWlXHRkT+FoetAQLHI1uBy/YXKZDk8+Y1LoNqH
-rp22AKMGxQtgCivnDHFyAQ9GXTmlk7MjcgQbDCx6mn7yIawsppWkvfPkKaAQsiqa
-T9DnMWBHVNIabGqgQSGTrQWo43MOfsPynhbz2Hyxf5XWKZpRvr3dMapandPfYgoZ
-8iDL2OR3sYztgJrbG6VZ9DoTXFm1g0Rf97Aaen1l4c+w3DC+IkwFkvjFV3jS49ZS
-c4lShKK6BrPTJYs4NG1DGzmpToTnwoqZ8fAmi2XlZnuchC4NPSZaPATHvNIzt+z1
-PHo35D/f7j2pO1S8BCysQDHCbM5Mnomnq5aYcKCsdbh0czchOm8bkinLrYrKpii+
-Tk7pwL7TjRKLXkomm5D1Umds++pip8wH2cQpf93at3VDcOK4N7EwoIJB0kak6pSz
-Eu4I64U6gZs7tS/dGNSljf2OSSnRr7KWzq03zl8l75jy+hOds9TWSenLbjBQUGR9
-6cFr6lEUfAIEHVC1L68Y1GGxx4/eRI82ut83axHMViw1+sVpbPxg51Tbnio1lB93
-079WPFnYaOvfGAA0e0zcfF/M9gXr+korwQTh2Prqooq2bYNMvUoUKD85gnJ+t0sm
-rWrb8dee2CvYZXD5laGtaAxOfy/VKNmwuWuAh9kc
------END CERTIFICATE-----
diff --git a/signfile/Certificates/32EB929AFF3596482F284042702036915C1785E6.cer b/signfile/Certificates/32EB929AFF3596482F284042702036915C1785E6.cer
deleted file mode 100644
index 1b4784a7c..000000000
--- a/signfile/Certificates/32EB929AFF3596482F284042702036915C1785E6.cer
+++ /dev/null
@@ -1,34 +0,0 @@
-subject=CN=Sectigo Public Code Signing Root R46, O=Sectigo Limited, C=GB
-issuer=CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB
------BEGIN CERTIFICATE-----
-MIIFbzCCBFegAwIBAgIQSPyTtGBVlI02p8mKidaUFjANBgkqhkiG9w0BAQwFADB7
-MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
-VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
-AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTIxMDUyNTAwMDAwMFoXDTI4
-MTIzMTIzNTk1OVowVjELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1NlY3RpZ28gTGlt
-aXRlZDEtMCsGA1UEAxMkU2VjdGlnbyBQdWJsaWMgQ29kZSBTaWduaW5nIFJvb3Qg
-UjQ2MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjeeUEiIEJHQu/xYj
-ApKKtq42haxH1CORKz7cfeIxoFFvrISR41KKteKW3tCHYySJiv/vEpM7fbu2ir29
-BX8nm2tl06UMabG8STma8W1uquSggyfamg0rUOlLW7O4ZDakfko9qXGrYbNzszwL
-DO/bM1flvjQ345cbXf0fEj2CA3bm+z9m0pQxafptszSswXp43JJQ8mTHqi0Eq8Nq
-6uAvp6fcbtfo/9ohq0C/ue4NnsbZnpnvxt4fqQx2sycgoda6/YDnAdLv64IplXCN
-/7sVz/7RDzaiLk8ykHRGa0c1E3cFM09jLrgt4b9lpwRrGNhx+swI8m2JmRCxrds+
-LOSqGLDGBwF1Z95t6WNjHjZ/aYm+qkU+blpfj6Fby50whjDoA7NAxg0POM1nqFOI
-+rgwZfpvx+cdsYN0aT6sxGg7seZnM5q2COCABUhA7vaCZEao9XOwBpXybGWfv1Vb
-HJxXGsd4RnxwqpQbghesh+m2yQ6BHEDWFhcp/FycGCvqRfXvvdVnTyheBe6QTHrn
-xvTQ/PrNPjJGEyA2igTqt6oHRpwNkzoJZplYXCmjuQymMDg80EY2NXycuu7D1fkK
-dvp+BRtAypI16dV60bV/AK6pkKrFfwGcELEW/MxuGNxvYv6mUKe4e7idFT/+IAx1
-yCJaE5UZkADpGtXChvHjjuxf9OUCAwEAAaOCARIwggEOMB8GA1UdIwQYMBaAFKAR
-CiM+lvEH7OKvKe+CpX/QMKS0MB0GA1UdDgQWBBQy65Ka/zWWSC8oQEJwIDaRXBeF
-5jAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zATBgNVHSUEDDAKBggr
-BgEFBQcDAzAbBgNVHSAEFDASMAYGBFUdIAAwCAYGZ4EMAQQBMEMGA1UdHwQ8MDow
-OKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmljYXRlU2Vy
-dmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29j
-c3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUAA4IBAQASv6Hvi3SamES4aUa1
-qyQKDKSKZ7g6gb9Fin1SB6iNH04hhTmja14tIIa/ELiueTtTzbT72ES+BtlcY2fU
-QBaHRIZyKtYyFfUSg8L54V0RQGf2QidyxSPiAjgaTCDi2wH3zUZPJqJ8ZsBRNraJ
-AlTH/Fj7bADu/pimLpWhDFMpH2/YGaZPnvesCepdgsaLr4CnvYFIUoQx2jLsFeSm
-TD1sOXPUC4U5IOCFGmjhp0g4qdE2JXfBjRkWxYhMZn0vY86Y6GnfrDyoXZ3JHFuu
-2PMvdM+4fvbXg50RlmKarkUT2n/cR/vfw1Kf5gZV6Z2M8jpiUbzsJA8p1FiAhORF
-e1rY
------END CERTIFICATE-----
diff --git a/signfile/Certificates/A0110A233E96F107ECE2AF29EF82A57FD030A4B4.cer b/signfile/Certificates/A0110A233E96F107ECE2AF29EF82A57FD030A4B4.cer
deleted file mode 100644
index e71c0156b..000000000
--- a/signfile/Certificates/A0110A233E96F107ECE2AF29EF82A57FD030A4B4.cer
+++ /dev/null
@@ -1,27 +0,0 @@
-subject=CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB
-issuer=CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
diff --git a/signfile/Certificates/intel_xpum_windows_ext.cer b/signfile/Certificates/intel_xpum_windows_ext.cer
deleted file mode 100644
index 17cff6ced..000000000
--- a/signfile/Certificates/intel_xpum_windows_ext.cer
+++ /dev/null
@@ -1,133 +0,0 @@
-subject=CN=Intel Corporation, O=Intel Corporation, S=California, C=US
-issuer=CN=Sectigo Public Code Signing CA R36, O=Sectigo Limited, C=GB
------BEGIN CERTIFICATE-----
-MIIFxDCCBCygAwIBAgIRAN6u9KukaDn1ND+gI0/eIO0wDQYJKoZIhvcNAQEMBQAw
-VDELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDErMCkGA1UE
-AxMiU2VjdGlnbyBQdWJsaWMgQ29kZSBTaWduaW5nIENBIFIzNjAeFw0yNTA4MDQw
-MDAwMDBaFw0yNjA4MDQyMzU5NTlaMFoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApD
-YWxpZm9ybmlhMRowGAYDVQQKDBFJbnRlbCBDb3Jwb3JhdGlvbjEaMBgGA1UEAwwR
-SW50ZWwgQ29ycG9yYXRpb24wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIB
-gQDGDb77A+Uy51TlkgszsSrpqwAjm/pyPCaH34ROk5dAGzr38J/H7dIvsIFh2bmI
-CXMLcHMrK5eY4oLUyfMAs8ARkqxh1bakOn/FuVGzujeGN0OaCuRyXaOLFBQlbY4z
-IpF4KAqAs62IBfzqd3lVCaTk92cy0UqAky3Ct+MnjZILgLAtqpdhRfTUIjBMBV92
-LqcQWc4e3sYvoabM7vC/rHCtbkAVxmh1xzPn0Kdmjhh4aNB9Hnps+dzWsDS1VnOC
-OIVS2/oCK77bGVSnoBBiHMNL0KdnBg/DJ3XbdlwzB7ekU+qV5LlajOwAp3jE8rBd
-YUgdueM/a69M12rDiEosnr5/oYyxniZfVm1OOp6FHyou0uHWCVJY6twAvRQAAp+P
-ZR1bXuKsK+/rAFic4fkAK054LVGrU28KHq4yKKy6BuakxwRJVxbfoj/6AWSF+y19
-nZIO569Nn/9I1zzcmvappz3ZhrDWENcbVWcPeWBUjprFq8nTjKfUSiyLNkqfotcH
-wa8CAwEAAaOCAYkwggGFMB8GA1UdIwQYMBaAFA8qyyCHKLjsb0iuK1SmKaoXpM0M
-MB0GA1UdDgQWBBQG08gnZ1O9Uwzd5/y2ILn5ejaKbTAOBgNVHQ8BAf8EBAMCB4Aw
-DAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAzBKBgNVHSAEQzBBMDUG
-DCsGAQQBsjEBAgEDAjAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29t
-L0NQUzAIBgZngQwBBAEwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5zZWN0
-aWdvLmNvbS9TZWN0aWdvUHVibGljQ29kZVNpZ25pbmdDQVIzNi5jcmwweQYIKwYB
-BQUHAQEEbTBrMEQGCCsGAQUFBzAChjhodHRwOi8vY3J0LnNlY3RpZ28uY29tL1Nl
-Y3RpZ29QdWJsaWNDb2RlU2lnbmluZ0NBUjM2LmNydDAjBggrBgEFBQcwAYYXaHR0
-cDovL29jc3Auc2VjdGlnby5jb20wDQYJKoZIhvcNAQEMBQADggGBAFQe6aND0JfJ
-/1/rXFE55Znwa5LmQjVvlmE8dMnEs6wavAJkgFACuRtvPBC/ejQDtpreQMRfw7k5
-HWaPh93WqUw06dAoB7SXExl0cfwCX5Grho7pvqbFTyBlPGFnPNdzghd/Uo4R2r5r
-w7Rf6+ROb8neK9ObV5IHH/1K2sr9tUfccLfPC1IYEBViXokbHgW+4n7gi011A3hu
-GQpwINAhCccrytA2K5DYjKeUzpLN4kU8wRMfzAYsIxCBJaL+NRDKXLc8YsedOO3F
-jgIciAJAOEyWYUd/BZxPLabzxFivZZ8BiNGEvDgh5DTHAdV1DXaeQjqqPq4LS1gg
-DEl5j4040rS0KxCRnRTddMbWrkAVGB5umOjODIWxAgIpdkCNTTW7iG9DNZJgsfU+
-m6cru8i3mcZaYUUmui7ZeGREegxj6QMeX6psT9M5VH7cwmDdHFezQb26+t/WK7w1
-kRJLhjH+XCAD+e7P8FFzSynf1cplSS6EaHbTEXcLmxT2KLEb1SoQAg==
------END CERTIFICATE-----
-subject=CN=Sectigo Public Code Signing CA R36, O=Sectigo Limited, C=GB
-issuer=CN=Sectigo Public Code Signing Root R46, O=Sectigo Limited, C=GB
------BEGIN CERTIFICATE-----
-MIIGGjCCBAKgAwIBAgIQYh1tDFIBnjuQeRUgiSEcCjANBgkqhkiG9w0BAQwFADBW
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQD
-EyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBSNDYwHhcNMjEwMzIy
-MDAwMDAwWhcNMzYwMzIxMjM1OTU5WjBUMQswCQYDVQQGEwJHQjEYMBYGA1UEChMP
-U2VjdGlnbyBMaW1pdGVkMSswKQYDVQQDEyJTZWN0aWdvIFB1YmxpYyBDb2RlIFNp
-Z25pbmcgQ0EgUjM2MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAmyud
-U/o1P45gBkNqwM/1f/bIU1MYyM7TbH78WAeVF3llMwsRHgBGRmxDeEDIArCS2VCo
-Vk4Y/8j6stIkmYV5Gej4NgNjVQ4BYoDjGMwdjioXan1hlaGFt4Wk9vT0k2oWJMJj
-L9G//N523hAm4jF4UjrW2pvv9+hdPX8tbbAfI3v0VdJiJPFy/7XwiunD7mBxNtec
-M6ytIdUlh08T2z7mJEXZD9OWcJkZk5wDuf2q52PN43jc4T9OkoXZ0arWZVeffvMr
-/iiIROSCzKoDmWABDRzV/UiQ5vqsaeFaqQdzFf4ed8peNWh1OaZXnYvZQgWx/SXi
-JDRSAolRzZEZquE6cbcH747FHncs/Kzcn0Ccv2jrOW+LPmnOyB+tAfiWu01TPhCr
-9VrkxsHC5qFNxaThTG5j4/Kc+ODD2dX/fmBECELcvzUHf9shoFvrn35XGf2RPaNT
-O2uSZ6n9otv7jElspkfK9qEATHZcodp+R4q2OIypxR//YEb3fkDn3UayWW9bAgMB
-AAGjggFkMIIBYDAfBgNVHSMEGDAWgBQy65Ka/zWWSC8oQEJwIDaRXBeF5jAdBgNV
-HQ4EFgQUDyrLIIcouOxvSK4rVKYpqhekzQwwDgYDVR0PAQH/BAQDAgGGMBIGA1Ud
-EwEB/wQIMAYBAf8CAQAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwGwYDVR0gBBQwEjAG
-BgRVHSAAMAgGBmeBDAEEATBLBgNVHR8ERDBCMECgPqA8hjpodHRwOi8vY3JsLnNl
-Y3RpZ28uY29tL1NlY3RpZ29QdWJsaWNDb2RlU2lnbmluZ1Jvb3RSNDYuY3JsMHsG
-CCsGAQUFBwEBBG8wbTBGBggrBgEFBQcwAoY6aHR0cDovL2NydC5zZWN0aWdvLmNv
-bS9TZWN0aWdvUHVibGljQ29kZVNpZ25pbmdSb290UjQ2LnA3YzAjBggrBgEFBQcw
-AYYXaHR0cDovL29jc3Auc2VjdGlnby5jb20wDQYJKoZIhvcNAQEMBQADggIBAAb/
-guF3YzZue6EVIJsT/wT+mHVEYcNWlXHRkT+FoetAQLHI1uBy/YXKZDk8+Y1LoNqH
-rp22AKMGxQtgCivnDHFyAQ9GXTmlk7MjcgQbDCx6mn7yIawsppWkvfPkKaAQsiqa
-T9DnMWBHVNIabGqgQSGTrQWo43MOfsPynhbz2Hyxf5XWKZpRvr3dMapandPfYgoZ
-8iDL2OR3sYztgJrbG6VZ9DoTXFm1g0Rf97Aaen1l4c+w3DC+IkwFkvjFV3jS49ZS
-c4lShKK6BrPTJYs4NG1DGzmpToTnwoqZ8fAmi2XlZnuchC4NPSZaPATHvNIzt+z1
-PHo35D/f7j2pO1S8BCysQDHCbM5Mnomnq5aYcKCsdbh0czchOm8bkinLrYrKpii+
-Tk7pwL7TjRKLXkomm5D1Umds++pip8wH2cQpf93at3VDcOK4N7EwoIJB0kak6pSz
-Eu4I64U6gZs7tS/dGNSljf2OSSnRr7KWzq03zl8l75jy+hOds9TWSenLbjBQUGR9
-6cFr6lEUfAIEHVC1L68Y1GGxx4/eRI82ut83axHMViw1+sVpbPxg51Tbnio1lB93
-079WPFnYaOvfGAA0e0zcfF/M9gXr+korwQTh2Prqooq2bYNMvUoUKD85gnJ+t0sm
-rWrb8dee2CvYZXD5laGtaAxOfy/VKNmwuWuAh9kc
------END CERTIFICATE-----
-subject=CN=Sectigo Public Code Signing Root R46, O=Sectigo Limited, C=GB
-issuer=CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB
------BEGIN CERTIFICATE-----
-MIIFbzCCBFegAwIBAgIQSPyTtGBVlI02p8mKidaUFjANBgkqhkiG9w0BAQwFADB7
-MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
-VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
-AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTIxMDUyNTAwMDAwMFoXDTI4
-MTIzMTIzNTk1OVowVjELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1NlY3RpZ28gTGlt
-aXRlZDEtMCsGA1UEAxMkU2VjdGlnbyBQdWJsaWMgQ29kZSBTaWduaW5nIFJvb3Qg
-UjQ2MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjeeUEiIEJHQu/xYj
-ApKKtq42haxH1CORKz7cfeIxoFFvrISR41KKteKW3tCHYySJiv/vEpM7fbu2ir29
-BX8nm2tl06UMabG8STma8W1uquSggyfamg0rUOlLW7O4ZDakfko9qXGrYbNzszwL
-DO/bM1flvjQ345cbXf0fEj2CA3bm+z9m0pQxafptszSswXp43JJQ8mTHqi0Eq8Nq
-6uAvp6fcbtfo/9ohq0C/ue4NnsbZnpnvxt4fqQx2sycgoda6/YDnAdLv64IplXCN
-/7sVz/7RDzaiLk8ykHRGa0c1E3cFM09jLrgt4b9lpwRrGNhx+swI8m2JmRCxrds+
-LOSqGLDGBwF1Z95t6WNjHjZ/aYm+qkU+blpfj6Fby50whjDoA7NAxg0POM1nqFOI
-+rgwZfpvx+cdsYN0aT6sxGg7seZnM5q2COCABUhA7vaCZEao9XOwBpXybGWfv1Vb
-HJxXGsd4RnxwqpQbghesh+m2yQ6BHEDWFhcp/FycGCvqRfXvvdVnTyheBe6QTHrn
-xvTQ/PrNPjJGEyA2igTqt6oHRpwNkzoJZplYXCmjuQymMDg80EY2NXycuu7D1fkK
-dvp+BRtAypI16dV60bV/AK6pkKrFfwGcELEW/MxuGNxvYv6mUKe4e7idFT/+IAx1
-yCJaE5UZkADpGtXChvHjjuxf9OUCAwEAAaOCARIwggEOMB8GA1UdIwQYMBaAFKAR
-CiM+lvEH7OKvKe+CpX/QMKS0MB0GA1UdDgQWBBQy65Ka/zWWSC8oQEJwIDaRXBeF
-5jAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zATBgNVHSUEDDAKBggr
-BgEFBQcDAzAbBgNVHSAEFDASMAYGBFUdIAAwCAYGZ4EMAQQBMEMGA1UdHwQ8MDow
-OKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmljYXRlU2Vy
-dmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29j
-c3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUAA4IBAQASv6Hvi3SamES4aUa1
-qyQKDKSKZ7g6gb9Fin1SB6iNH04hhTmja14tIIa/ELiueTtTzbT72ES+BtlcY2fU
-QBaHRIZyKtYyFfUSg8L54V0RQGf2QidyxSPiAjgaTCDi2wH3zUZPJqJ8ZsBRNraJ
-AlTH/Fj7bADu/pimLpWhDFMpH2/YGaZPnvesCepdgsaLr4CnvYFIUoQx2jLsFeSm
-TD1sOXPUC4U5IOCFGmjhp0g4qdE2JXfBjRkWxYhMZn0vY86Y6GnfrDyoXZ3JHFuu
-2PMvdM+4fvbXg50RlmKarkUT2n/cR/vfw1Kf5gZV6Z2M8jpiUbzsJA8p1FiAhORF
-e1rY
------END CERTIFICATE-----
-subject=CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB
-issuer=CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
diff --git a/signfile/SignFile b/signfile/SignFile
index ff531aa74..5d5f37c46 100644
Binary files a/signfile/SignFile and b/signfile/SignFile differ
diff --git a/signfile/SignFile.config.xml b/signfile/SignFile.config.xml
index 6dcbb7203..46c323549 100644
--- a/signfile/SignFile.config.xml
+++ b/signfile/SignFile.config.xml
@@ -1,75 +1,84 @@
-<?xml version="1.0" standalone="no" ?>
-<configuration>
-	<appSettings>
-		<add key="VerboseMode" value="Moderate"/>
-		<!-- <add key="PgpPublicKeyFileName" value="intelswprod.public" /> -->
-		<add key="DefaultCertificateName" value="INTEL_GRAPHICS_LINUX_PGP"/>
-		<!-- Path to cross certificate for windows kernel mode driver signing (or if using the -a commandline option). The cross certificates for sha2 and sha1 certificates are available to download at the release location  
-		Use the sha2-cross.crt for sha2 certificates 
-		Use the sha1-cross.crt for sha1 certificates
-		--> 
-		<add key="CrossCertificateFile" value="" />
-		<!-- Directory where cached  directories + files should be stored. The user running the utility should have access to created directories and files at this location.
-		If left empty the directories + files will be stored in the working directory. --> 
-		<add key="CacheFilesLocation" value=""/>
-		<!-- If set to True will disable the caching of local certificate/template files. Note that this will hamper performance.--> 
-		<add key="DisableCache" value="False" />
-		<!-- If set to True will disable the sending of email notification in case a signing error occurs.--> 
-		<add key="DisableErrorEmail" value="False" />
-		
-		<add key="WebServiceURL" value="https://edss-api.intel.com;"/>
-		
-		<add key="AuthenticationServer" value="https://iamws-i.intel.com/api/v1"/>
-		<!--<add key="UserName" value="amr\swfactory"/>
-		<add key="Password" value=""/>-->
-		<add key="SoapRequestAttempts" value="5"/>
-		<add key="DelayBetweenRequestAttempts" value="60"/>
-		<add key="SoapRequestTimeout" value="180"/>
-		<add key="SkipSignedFiles" value="False"/>
-		<add key="WorkingThreads" value="Auto"/>
-		<add key="DisableTimestamping" value="False"/>
-		<!-- <add key="SupportBigEndian" value="True" /> -->
-		<!-- <add key="Description" value="" /> -->
-		<!-- <add key="DescriptionUrl" value="" /> -->
-		<!-- <add key="Identifier" value="" /> -->
-		<!-- <add key="OptionFlags" value="" /> -->
-		<!-- <add key="LocalBuffer" value="" /> -->
-		<!-- <add key="FileWithRequirements" value="" /> -->
-		<!-- <add key="Entitlements" value="" /> -->
-		<!-- <add key="PageSize" value="" /> -->
-		<!-- <add key="ApplicationRulesFileName" value="" /> -->
-		<add key="LogFileName" value="Log.txt"/>
-		<!-- <add key="UseAdditionalCertificate" value="True" /> -->
-		<add key="AlwaysSignKernelDriversWithAdditionalCertificate" value="True"/>
-		<add key="HashAlgorithm" value="SHA256"/>
-
-    <add key="SimpleWFAttempts" value="250"/>
-    <add key="DelayBetweenSimpleWFAttempts" value="15"/>
-    <!--
-    TimeStampServiceURL format multiple server entries separated by ;   
-    Each server entry has the following format :  URL|OS1,OS2|Standard|IsExternal
-    
-    eg.  
-    "http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|Authenticode|0;http://timestamp.intel.com/TSS/HttpTspServer|Windows,Linux|rfc_3161|0"
-    
-    Windows
-		Linux
-		CrossPlatform
-		FreeBSD
-    -->
-
-    <add key="TimeStampServiceURL" value="http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|AuthentiCode|0;http://timestamp.intel.com/TSS/HttpTspServer|Linux,Windows|rfc_3161|0;http://timestamp.verisign.com/scripts/timestamp.dll|Windows|Authenticode|1;http://timestamp.comodoca.com|Linux,Windows|rfc_3161|1"/>
-
-<!-- 
-			The Time Stamp Hash algorithm that should be used if timestamping is enabled. For Windows + SHA1 an Authenticode TimeStamp Authority should be configured in the TimeStampServiceURL above
-		-->
-	<add key="TimeStampHashAlgorithm" value="SHA256"/>
-    <add key="TimeStampRetries" value="15" />
-    <add key="TimeStampDelaySeconds" value="45" />
-	<!-- 
-	If an external timestamp server has to be used then this proxy setting will be used. The machine doing the signing should have access to the proxy server and its port (912) in order to get out to external time stamp servers
-	for e.g. http://timestamp.verisign.com/scripts/timestamp.dll
-	-->
-    <add key="HttpProxy" value="proxy-chain.intel.com:912" />
-	</appSettings>
-</configuration>
+<?xml version="1.0" standalone="no" ?>
+<configuration>
+	<appSettings>
+		<add key="VerboseMode" value="Moderate"/>
+		<!-- <add key="PgpPublicKeyFileName" value="intelswprod.public" /> -->
+		<add key="DefaultCertificateName" value="INTEL_GRAPHICS_LINUX_PGP"/>
+    <!-- Additional requirements (base64 encoded) for Mac OS signing 
+    The MacServerRequirements value below should only be specified when using the Apple Certificate for signing.
+    If you are using an Intel issued internal/external certificate then please do not specify this value 
+    instead use : 
+    <add key="MacServerRequirements" value=""/>
+    -->
+		<add key="MacServerRequirements" value="+t4MAQAAACQAAAABAAAAAwAAABT63gwAAAAAEAAAAAEAAAAP"/>
+		<!-- Path to cross certificate for windows kernel mode driver signing (or if using the -a commandline option). The cross certificates for sha2 and sha1 certificates are available to download at the release location  
+		Use the sha2-cross.crt for sha2 certificates 
+		Use the sha1-cross.crt for sha1 certificates
+		--> 
+		<add key="CrossCertificateFile" value="" />
+		<!-- Directory where cached  directories + files should be stored. The user running the utility should have access to created directories and files at this location.
+		If left empty the directories + files will be stored in the working directory. --> 
+		<add key="CacheFilesLocation" value=""/>
+		<!-- If set to True will disable the caching of local certificate/template files. Note that this will hamper performance.--> 
+		<add key="DisableCache" value="False" />
+		<!-- If set to True will disable the sending of email notification in case a signing error occurs.--> 
+		<add key="DisableErrorEmail" value="False" />
+		
+		<add key="WebServiceURL" value="https://edss-next-api.intel.com;"/>
+		
+		<add key="AuthenticationServer" value="https://iamws-i.intel.com/api/v1"/>
+		<!--<add key="UserName" value="amr\swfactory"/>
+		<add key="Password" value=""/>-->
+		<add key="SoapRequestAttempts" value="3"/>
+		<add key="DelayBetweenRequestAttempts" value="30"/>
+		<add key="SoapRequestTimeout" value="180"/>
+		<add key="SkipSignedFiles" value="False"/>
+		<add key="WorkingThreads" value="Auto"/>
+		<add key="DisableTimestamping" value="False"/>
+		<!-- <add key="SupportBigEndian" value="True" /> -->
+		<!-- <add key="Description" value="" /> -->
+		<!-- <add key="DescriptionUrl" value="" /> -->
+		<!-- <add key="Identifier" value="" /> -->
+		<!-- <add key="OptionFlags" value="" /> -->
+		<!-- <add key="LocalBuffer" value="" /> -->
+		<!-- <add key="FileWithRequirements" value="" /> -->
+		<!-- <add key="Entitlements" value="" /> -->
+		<!-- <add key="PageSize" value="" /> -->
+		<!-- <add key="ApplicationRulesFileName" value="" /> -->
+		<add key="LogFileName" value="Log.txt"/>
+		<!-- <add key="UseAdditionalCertificate" value="True" /> -->
+		<add key="AlwaysSignKernelDriversWithAdditionalCertificate" value="False"/>
+		<add key="HashAlgorithm" value="SHA256"/>
+
+    <add key="SimpleWFAttempts" value="250"/>
+    <add key="DelayBetweenSimpleWFAttempts" value="15"/>
+	<!-- <add key="NvmBigEndian" value="False" /> -->
+    <!--
+    TimeStampServiceURL format multiple server entries separated by ;   
+    Each server entry has the following format :  URL|OS1,OS2|Standard|IsExternal
+    
+    eg.  
+    "http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|Authenticode|0;http://timestamp.intel.com/TSS/HttpTspServer|Windows,Linux|rfc_3161|0"
+    
+    Windows
+		MacOS
+		Linux
+		CrossPlatform
+		FreeBSD
+    -->
+
+    <add key="TimeStampServiceURL" value="http://timestamp.apple.com/ts01|MacOS|rfc_3161|1;http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|AuthentiCode|0;http://timestamp.intel.com/TSS/HttpTspServer|Linux,Windows|rfc_3161|0;http://timestamp.verisign.com/scripts/timestamp.dll|Windows|Authenticode|1;http://timestamp.comodoca.com|Linux,Windows|rfc_3161|1"/>
+
+<!-- 
+			The Time Stamp Hash algorithm that should be used if timestamping is enabled. For Windows + SHA1 an Authenticode TimeStamp Authority should be configured in the TimeStampServiceURL above
+		-->
+	<add key="TimeStampHashAlgorithm" value="SHA256"/>
+    <add key="TimeStampRetries" value="15" />
+    <add key="TimeStampDelaySeconds" value="45" />
+	<!-- 
+	If an external timestamp server has to be used then this proxy setting will be used. The machine doing the signing should have access to the proxy server and its port (911) in order to get out to external time stamp servers 
+	for e.g. http://timestamp.apple.com/ts01  http://timestamp.verisign.com/scripts/timestamp.dll
+	-->
+    <add key="HttpProxy" value="proxy-chain.intel.com:911" />
+	</appSettings>
+</configuration>
diff --git a/signfile/SignFile.exe b/signfile/SignFile.exe
index adf2e3266..4b1e94603 100644
Binary files a/signfile/SignFile.exe and b/signfile/SignFile.exe differ
diff --git a/signfile/SignFile.info.xsl b/signfile/SignFile.info.xsl
index 106d49441..7df832306 100644
--- a/signfile/SignFile.info.xsl
+++ b/signfile/SignFile.info.xsl
@@ -1,196 +1,196 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml"
-              omit-xml-declaration="yes"/>
-  <xsl:template match="/">
-    <xsl:for-each select="Files/File">
-      <a>
-        <xsl:attribute name="href">
-          #<xsl:value-of select="position()"/>
-        </xsl:attribute>
-      </a>
-      <xsl:value-of select="File"/>
-      <br/>
-    </xsl:for-each>
-    <br/>
-    <hr size="4" color="#BEBEBE"/>
-    <br/>
-    <xsl:for-each select="Files/File">
-      <p>
-        <a>
-          <xsl:attribute name="name">
-            <xsl:value-of select="position()"/>
-          </xsl:attribute>
-        </a>
-      </p>
-      <br/>
-      File:
-      <xsl:value-of select="File" />
-      <br/>
-      File size:
-      <xsl:value-of select="FileSize" />
-      <br/>
-      Date modified:
-      <xsl:value-of select="DateModified" />
-      <br />
-      <br/>
-      Error message:
-      <xsl:value-of select="ErrorMessage" />
-      <br />
-      <br/>
-      <TABLE border="1" width="100%" cellspacing="0">
-        <tr align="center">
-          <td colspan="3">
-            Hashes
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <span>
-              HashAlgorithm
-            </span>
-          </td>
-          <td>
-            <span>
-              Value
-            </span>
-          </td>
-          <td>
-            <span>
-              Notes
-            </span>
-          </td>
-        </tr>
-        <xsl:apply-templates select="Hashes/Hash" />
-      </TABLE>
-      <br/>
-      <TABLE border="1" width="100%" cellspacing="0">
-        <tr align="center">
-          <td colspan="16">
-            Sessions
-          </td>
-        </tr>
-        <tr>
-          <td rowspan="2">
-            Id
-          </td>
-          <td rowspan="2">
-            Certificate name
-          </td>
-          <td colspan="3">
-            User
-          </td>
-          <td colspan="4">
-            Environment
-          </td>
-          <td colspan="3">
-            FileInfo
-          </td>
-          <td rowspan="2">
-            RequestTime
-          </td>
-          <td rowspan="2">
-            <p>
-            </p>
-            SignTime
-          </td>
-          <td rowspan="2">
-            SessionStart
-          </td>
-          <td rowspan="2">
-            Message
-          </td>
-        </tr>
-        <tr>
-          <td>UserIDSID</td>
-          <td>HostIp</td>
-          <td>HostName</td>
-          <td>ClientVersion</td>
-          <td>OS</td>
-          <td>OSArchitecture</td>
-          <td>OSVersion</td>
-          <td>FileName</td>
-          <td>FileTime</td>
-          <td>FileSize</td>
-        </tr>
-        <xsl:apply-templates select="Sessions/Session" />
-      </TABLE>
-      <br/>
-      <hr size="4" color="#BEBEBE"/>
-      <br/>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template match="Session">
-    <tr>
-      <td>
-        <xsl:value-of select="Id" />
-      </td>
-      <td>
-        <xsl:value-of select="CertificateName" />
-      </td>
-      <td>
-        <xsl:value-of select="User/UserIDSID" />
-      </td>
-      <td>
-        <xsl:value-of select="User/HostIp" />
-      </td>
-      <td>
-        <xsl:value-of select="User/HostName" />
-      </td>
-      <td>
-        <xsl:value-of select="Environment/ClientVersion" />
-      </td>
-      <td>
-        <xsl:value-of select="Environment/OS" />
-      </td>
-      <td>
-        <xsl:value-of select="Environment/OSArchitecture" />
-      </td>
-      <td>
-        <xsl:value-of select="Environment/OSVersion" />
-      </td>
-      <td>
-        <xsl:value-of select="FileInfo/FileName" />
-      </td>
-      <td>
-        <xsl:value-of select="FileInfo/FileTime" />
-      </td>
-      <td>
-        <xsl:value-of select="FileInfo/FileSize" />
-      </td>
-      <td>
-        <xsl:value-of select="RequestTime" />
-      </td>
-      <td>
-        <xsl:value-of select="SignTime" />
-      </td>
-      <td>
-        <xsl:value-of select="SessionStart" />
-      </td>
-      <td>
-        <xsl:value-of select="Message" />
-      </td>
-    </tr>
-  </xsl:template>
-  <xsl:template match="Hash">
-    <tr>
-      <td>
-        <SPAN>
-          <xsl:value-of select="HashAlgorithm" />
-        </SPAN>
-      </td>
-      <td>
-        <SPAN>
-          <code>
-            <xsl:value-of select="Value" />
-          </code>
-        </SPAN>
-      </td>
-      <td>
-        <SPAN>
-          <xsl:value-of select="Notes" />
-        </SPAN>
-      </td>
-    </tr>
-  </xsl:template>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml"
+              omit-xml-declaration="yes"/>
+  <xsl:template match="/">
+    <xsl:for-each select="Files/File">
+      <a>
+        <xsl:attribute name="href">
+          #<xsl:value-of select="position()"/>
+        </xsl:attribute>
+      </a>
+      <xsl:value-of select="File"/>
+      <br/>
+    </xsl:for-each>
+    <br/>
+    <hr size="4" color="#BEBEBE"/>
+    <br/>
+    <xsl:for-each select="Files/File">
+      <p>
+        <a>
+          <xsl:attribute name="name">
+            <xsl:value-of select="position()"/>
+          </xsl:attribute>
+        </a>
+      </p>
+      <br/>
+      File:
+      <xsl:value-of select="File" />
+      <br/>
+      File size:
+      <xsl:value-of select="FileSize" />
+      <br/>
+      Date modified:
+      <xsl:value-of select="DateModified" />
+      <br />
+      <br/>
+      Error message:
+      <xsl:value-of select="ErrorMessage" />
+      <br />
+      <br/>
+      <TABLE border="1" width="100%" cellspacing="0">
+        <tr align="center">
+          <td colspan="3">
+            Hashes
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <span>
+              HashAlgorithm
+            </span>
+          </td>
+          <td>
+            <span>
+              Value
+            </span>
+          </td>
+          <td>
+            <span>
+              Notes
+            </span>
+          </td>
+        </tr>
+        <xsl:apply-templates select="Hashes/Hash" />
+      </TABLE>
+      <br/>
+      <TABLE border="1" width="100%" cellspacing="0">
+        <tr align="center">
+          <td colspan="16">
+            Sessions
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="2">
+            Id
+          </td>
+          <td rowspan="2">
+            Certificate name
+          </td>
+          <td colspan="3">
+            User
+          </td>
+          <td colspan="4">
+            Environment
+          </td>
+          <td colspan="3">
+            FileInfo
+          </td>
+          <td rowspan="2">
+            RequestTime
+          </td>
+          <td rowspan="2">
+            <p>
+            </p>
+            SignTime
+          </td>
+          <td rowspan="2">
+            SessionStart
+          </td>
+          <td rowspan="2">
+            Message
+          </td>
+        </tr>
+        <tr>
+          <td>UserIDSID</td>
+          <td>HostIp</td>
+          <td>HostName</td>
+          <td>ClientVersion</td>
+          <td>OS</td>
+          <td>OSArchitecture</td>
+          <td>OSVersion</td>
+          <td>FileName</td>
+          <td>FileTime</td>
+          <td>FileSize</td>
+        </tr>
+        <xsl:apply-templates select="Sessions/Session" />
+      </TABLE>
+      <br/>
+      <hr size="4" color="#BEBEBE"/>
+      <br/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="Session">
+    <tr>
+      <td>
+        <xsl:value-of select="Id" />
+      </td>
+      <td>
+        <xsl:value-of select="CertificateName" />
+      </td>
+      <td>
+        <xsl:value-of select="User/UserIDSID" />
+      </td>
+      <td>
+        <xsl:value-of select="User/HostIp" />
+      </td>
+      <td>
+        <xsl:value-of select="User/HostName" />
+      </td>
+      <td>
+        <xsl:value-of select="Environment/ClientVersion" />
+      </td>
+      <td>
+        <xsl:value-of select="Environment/OS" />
+      </td>
+      <td>
+        <xsl:value-of select="Environment/OSArchitecture" />
+      </td>
+      <td>
+        <xsl:value-of select="Environment/OSVersion" />
+      </td>
+      <td>
+        <xsl:value-of select="FileInfo/FileName" />
+      </td>
+      <td>
+        <xsl:value-of select="FileInfo/FileTime" />
+      </td>
+      <td>
+        <xsl:value-of select="FileInfo/FileSize" />
+      </td>
+      <td>
+        <xsl:value-of select="RequestTime" />
+      </td>
+      <td>
+        <xsl:value-of select="SignTime" />
+      </td>
+      <td>
+        <xsl:value-of select="SessionStart" />
+      </td>
+      <td>
+        <xsl:value-of select="Message" />
+      </td>
+    </tr>
+  </xsl:template>
+  <xsl:template match="Hash">
+    <tr>
+      <td>
+        <SPAN>
+          <xsl:value-of select="HashAlgorithm" />
+        </SPAN>
+      </td>
+      <td>
+        <SPAN>
+          <code>
+            <xsl:value-of select="Value" />
+          </code>
+        </SPAN>
+      </td>
+      <td>
+        <SPAN>
+          <xsl:value-of select="Notes" />
+        </SPAN>
+      </td>
+    </tr>
+  </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/signfile/SignFile.sig b/signfile/SignFile.sig
index e1439f7e4..d800f6fd3 100644
Binary files a/signfile/SignFile.sig and b/signfile/SignFile.sig differ
diff --git a/signfile/SignFileWin.config.xml b/signfile/SignFileWin.config.xml
index 726d1c0e7..e916afe3a 100644
--- a/signfile/SignFileWin.config.xml
+++ b/signfile/SignFileWin.config.xml
@@ -1,75 +1,84 @@
-<?xml version="1.0" standalone="no" ?>
-<configuration>
-	<appSettings>
-		<add key="VerboseMode" value="Moderate"/>
-		<!-- <add key="PgpPublicKeyFileName" value="intelswprod.public" /> -->
-		<add key="DefaultCertificateName" value="intel_xpum_windows_ext"/>
-		<!-- Path to cross certificate for windows kernel mode driver signing (or if using the -a commandline option). The cross certificates for sha2 and sha1 certificates are available to download at the release location  
-		Use the sha2-cross.crt for sha2 certificates 
-		Use the sha1-cross.crt for sha1 certificates
-		--> 
-		<add key="CrossCertificateFile" value="" />
-		<!-- Directory where cached  directories + files should be stored. The user running the utility should have access to created directories and files at this location.
-		If left empty the directories + files will be stored in the working directory. --> 
-		<add key="CacheFilesLocation" value=""/>
-		<!-- If set to True will disable the caching of local certificate/template files. Note that this will hamper performance.--> 
-		<add key="DisableCache" value="False" />
-		<!-- If set to True will disable the sending of email notification in case a signing error occurs.--> 
-		<add key="DisableErrorEmail" value="False" />
-		
-		<add key="WebServiceURL" value="https://edss-api.intel.com;"/>
-		
-		<add key="AuthenticationServer" value="https://iamws-i.intel.com/api/v1"/>
-		<!--<add key="UserName" value="amr\swfactory"/>
-		<add key="Password" value=""/>-->
-		<add key="SoapRequestAttempts" value="3"/>
-		<add key="DelayBetweenRequestAttempts" value="30"/>
-		<add key="SoapRequestTimeout" value="180"/>
-		<add key="SkipSignedFiles" value="False"/>
-		<add key="WorkingThreads" value="Auto"/>
-		<add key="DisableTimestamping" value="False"/>
-		<!-- <add key="SupportBigEndian" value="True" /> -->
-		<!-- <add key="Description" value="" /> -->
-		<!-- <add key="DescriptionUrl" value="" /> -->
-		<!-- <add key="Identifier" value="" /> -->
-		<!-- <add key="OptionFlags" value="" /> -->
-		<!-- <add key="LocalBuffer" value="" /> -->
-		<!-- <add key="FileWithRequirements" value="" /> -->
-		<!-- <add key="Entitlements" value="" /> -->
-		<!-- <add key="PageSize" value="" /> -->
-		<!-- <add key="ApplicationRulesFileName" value="" /> -->
-		<add key="LogFileName" value="Log.txt"/>
-		<!-- <add key="UseAdditionalCertificate" value="True" /> -->
-		<add key="AlwaysSignKernelDriversWithAdditionalCertificate" value="True"/>
-		<add key="HashAlgorithm" value="SHA256"/>
-
-    <add key="SimpleWFAttempts" value="250"/>
-    <add key="DelayBetweenSimpleWFAttempts" value="15"/>
-    
-    <!--
-    TimeStampServiceURL format multiple server entries separated by ;   
-    Each server entry has the following format :  URL|OS1,OS2|Standard|IsExternal
-    
-    eg.  
-    "http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|Authenticode|0;http://timestamp.intel.com/TSS/HttpTspServer|Windows,Linux|rfc_3161|0"
-    
-    Windows
-		Linux
-		CrossPlatform
-		FreeBSD
-    -->
-
-    <add key="TimeStampServiceURL" value="http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|AuthentiCode|0;http://timestamp.intel.com/TSS/HttpTspServer|Linux,Windows|rfc_3161|0;http://timestamp.verisign.com/scripts/timestamp.dll|Windows|Authenticode|1;http://timestamp.comodoca.com|Linux,Windows|rfc_3161|1"/>
-	<!-- 
-			The Time Stamp Hash algorithm that should be used if timestamping is enabled. For Windows + SHA1 an Authenticode TimeStamp Authority should be configured in the TimeStampServiceURL above
-		-->
-	<add key="TimeStampHashAlgorithm" value="SHA256"/>
-    <add key="TimeStampRetries" value="15" />
-    <add key="TimeStampDelaySeconds" value="45" />
-	<!-- 
-	If an external timestamp server has to be used then this proxy setting will be used. The machine doing the signing should have access to the proxy server and its port (912) in order to get out to external time stamp servers 
-	for e.g. http://timestamp.verisign.com/scripts/timestamp.dll
-	-->
-    <add key="HttpProxy" value="proxy-chain.intel.com:912" />
-	</appSettings>
-</configuration>
+<?xml version="1.0" standalone="no" ?>
+<configuration>
+	<appSettings>
+		<add key="VerboseMode" value="Moderate"/>
+		<!-- <add key="PgpPublicKeyFileName" value="intelswprod.public" /> -->
+		<add key="DefaultCertificateName" value="intel_xpum_windows_ext_s1"/>
+    <!-- Additional requirements (base64 encoded) for Mac OS signing 
+    The MacServerRequirements value below should only be specified when using the Apple Certificate for signing.
+    If you are using an Intel issued internal/external certificate then please do not specify this value 
+    instead use : 
+    <add key="MacServerRequirements" value=""/>
+    -->
+		<add key="MacServerRequirements" value="+t4MAQAAACQAAAABAAAAAwAAABT63gwAAAAAEAAAAAEAAAAP"/>
+		<!-- Path to cross certificate for windows kernel mode driver signing (or if using the -a commandline option). The cross certificates for sha2 and sha1 certificates are available to download at the release location  
+		Use the sha2-cross.crt for sha2 certificates 
+		Use the sha1-cross.crt for sha1 certificates
+		--> 
+		<add key="CrossCertificateFile" value="" />
+		<!-- Directory where cached  directories + files should be stored. The user running the utility should have access to created directories and files at this location.
+		If left empty the directories + files will be stored in the working directory. --> 
+		<add key="CacheFilesLocation" value=""/>
+		<!-- If set to True will disable the caching of local certificate/template files. Note that this will hamper performance.--> 
+		<add key="DisableCache" value="False" />
+		<!-- If set to True will disable the sending of email notification in case a signing error occurs.--> 
+		<add key="DisableErrorEmail" value="False" />
+		
+		<add key="WebServiceURL" value="https://edss-next-api.intel.com;"/>
+		
+		<add key="AuthenticationServer" value="https://iamws-i.intel.com/api/v1"/>
+		<!--<add key="UserName" value="amr\swfactory"/>
+		<add key="Password" value=""/>-->
+		<add key="SoapRequestAttempts" value="3"/>
+		<add key="DelayBetweenRequestAttempts" value="30"/>
+		<add key="SoapRequestTimeout" value="180"/>
+		<add key="SkipSignedFiles" value="False"/>
+		<add key="WorkingThreads" value="Auto"/>
+		<add key="DisableTimestamping" value="False"/>
+		<!-- <add key="SupportBigEndian" value="True" /> -->
+		<!-- <add key="Description" value="" /> -->
+		<!-- <add key="DescriptionUrl" value="" /> -->
+		<!-- <add key="Identifier" value="" /> -->
+		<!-- <add key="OptionFlags" value="" /> -->
+		<!-- <add key="LocalBuffer" value="" /> -->
+		<!-- <add key="FileWithRequirements" value="" /> -->
+		<!-- <add key="Entitlements" value="" /> -->
+		<!-- <add key="PageSize" value="" /> -->
+		<!-- <add key="ApplicationRulesFileName" value="" /> -->
+		<add key="LogFileName" value="Log.txt"/>
+		<!-- <add key="UseAdditionalCertificate" value="True" /> -->
+		<add key="AlwaysSignKernelDriversWithAdditionalCertificate" value="False"/>
+		<add key="HashAlgorithm" value="SHA256"/>
+
+    <add key="SimpleWFAttempts" value="250"/>
+    <add key="DelayBetweenSimpleWFAttempts" value="15"/>
+	<!-- <add key="NvmBigEndian" value="False" /> -->
+    
+    <!--
+    TimeStampServiceURL format multiple server entries separated by ;   
+    Each server entry has the following format :  URL|OS1,OS2|Standard|IsExternal
+    
+    eg.  
+    "http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|Authenticode|0;http://timestamp.intel.com/TSS/HttpTspServer|Windows,Linux|rfc_3161|0"
+    
+    Windows
+		MacOS
+		Linux
+		CrossPlatform
+		FreeBSD
+    -->
+
+    <add key="TimeStampServiceURL" value="http://timestamp.apple.com/ts01|MacOS|rfc_3161|1;http://timestamp.intel.com/TSS/AuthenticodeTS|Windows|AuthentiCode|0;http://timestamp.intel.com/TSS/HttpTspServer|Linux,Windows|rfc_3161|0;http://timestamp.verisign.com/scripts/timestamp.dll|Windows|Authenticode|1;http://timestamp.comodoca.com|Linux,Windows|rfc_3161|1"/>
+	<!-- 
+			The Time Stamp Hash algorithm that should be used if timestamping is enabled. For Windows + SHA1 an Authenticode TimeStamp Authority should be configured in the TimeStampServiceURL above
+		-->
+	<add key="TimeStampHashAlgorithm" value="SHA256"/>
+    <add key="TimeStampRetries" value="15" />
+    <add key="TimeStampDelaySeconds" value="45" />
+	<!-- 
+	If an external timestamp server has to be used then this proxy setting will be used. The machine doing the signing should have access to the proxy server and its port (911) in order to get out to external time stamp servers 
+	for e.g. http://timestamp.apple.com/ts01  http://timestamp.verisign.com/scripts/timestamp.dll
+	-->
+    <add key="HttpProxy" value="proxy-chain.intel.com:911" />
+	</appSettings>
+</configuration>
diff --git a/signfile/edss.db b/signfile/edss.db
deleted file mode 100644
index 101b9444a..000000000
Binary files a/signfile/edss.db and /dev/null differ
diff --git a/signfile/intel-ca.crt b/signfile/intel-ca.crt
index 1289de331..8af9d5f79 100644
--- a/signfile/intel-ca.crt
+++ b/signfile/intel-ca.crt
@@ -1,31 +1,66 @@
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIQVjEnZqqj1qVKUoaZgBc18DANBgkqhkiG9w0BAQsFADBI
-MQswCQYDVQQGEwJVUzEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xHTAbBgNV
-BAMTFEludGVsIFNIQTI1NiBSb290IENBMB4XDTE1MDkxNjIwMDAwNVoXDTM1MDkx
-NjIwMDAwNVowSDELMAkGA1UEBhMCVVMxGjAYBgNVBAoTEUludGVsIENvcnBvcmF0
-aW9uMR0wGwYDVQQDExRJbnRlbCBTSEEyNTYgUm9vdCBDQTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBANEHLD4x7o4xKCDYTwXGMis1qob+uBlMR17Pr11i
-w/NERAx4nahGgzTZmX9i3viTtfn5uDX6IJMPdq7N4m+Flr8v4VuAznvnCBGqkUDe
-HAPbR6rXU4lMj7lNK7sAWbMuJ8+0a0Sc4wEyNOXYbNzS4pLcq0eL8AjFwSpFNYv1
-NoppB2tpnmTUu+KjymaXcXEubaWuonmHvjqEvzRjicqU1/QMYcoFOw3GP7gNwz2W
-nOKhnMSbs8CguBK9eIBdAYOsetdCOEm2s8yYrqeqtBWMVWq95qiRAdmz/rpWBlFl
-NwlXpEGSlGII374+E2/gPeOX3x6gUfpAiVeXni7puN4ixQWyCxEK0W+51xDltO1p
-0oFsl9Pt9UWpQqZoA8sFXsTf+IwoAzb9JcGoPlrzfMfuL+qgssF86J4i01drzRK8
-d+NhinCsjLpg+Qw1we/RRyv6CXvFYCVKqtECCYocY+NtJ3jDDtukyWLUfXMdFgTi
-Jx6IvEdinfV0RQz+8BZY3sNQQNC66/dPiZWER0TXxonjfrS1ze/6VngUla6L95LC
-UwlxpOd5cu3mpbtYvidOwufEQWw1IF+xgVjFx0i5VGg8jRsM3TSR/v3oPqY/Qv3K
-6QFZpspWAJcGsIuqyKfhcGLDNbdU/tiVNZfd2jt0rp40k12Kyig3S4heGMBvdM08
-UOYNAgMBAAGjUTBPMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
-DgQWBBSJn9Cy7SCppj5KZqryHoKw1iwJNjAQBgkrBgEEAYI3FQEEAwIBADANBgkq
-hkiG9w0BAQsFAAOCAgEAIUnVqslRWvl+TARbZHgPe+9XPUDK28BctvNBbCD+Aqxn
-6PwXkxyoCd/piLscVpAzkijTuyeIbH+k2JEkKuKCVabsf0OoRp5Y4jEwpXuPp4bj
-WpGnZTm3hwmxNZk3smFzsWgS7wiJRSpSKXiO3p9LEVsukR5RFpuy7uKOdS7ErL3A
-sSOqRTuNRGE7d6jk5mcA6LDO8g+YBI/PZQeR0B8iQGi3jrJdMf2GifRValzS0OWP
-TpEklh1uQVP9kG5uFg6HGqD+crc0Dp4Y6LapanZHWq7qjiL6oRw+/4TLUzONYwcm
-o8v4MtgYmlE7Io2S4WKlVwyyHEGc4ki3lgEPxFm1aVyRP5W+DkspX/+xlgLmMxje
-bGuIOgcieuTmixWaQJQgDZxjKBYMouI7knnHiCgT184Ed3qyNRwoOxRC8dVy/r4U
-6LmNf73o2yTPlhGhj9b/zEKrKSCrkWK5CMO8B1ihOh+f0nhF+UtoXkceUDmIVsYV
-k7xYdoqXXDbr5TmMX6lcsC8XHjOMFOzFczTwVr9nJw8ssOK8s3+t+K14qf33SibJ
-I26hieAkPXicvnGc+EVRLRCn5GZrdfrTBZ8KVak4E9lXmq+3OhZ326schF0ZNVTY
-geY4cbiNt4uaLKVzYlQu327psq5ZEbjjR/aurhbaJWA2YeMY2SB8I2chNHNhJp8=
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIQVjEnZqqj1qVKUoaZgBc18DANBgkqhkiG9w0BAQsFADBI
+MQswCQYDVQQGEwJVUzEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xHTAbBgNV
+BAMTFEludGVsIFNIQTI1NiBSb290IENBMB4XDTE1MDkxNjIwMDAwNVoXDTM1MDkx
+NjIwMDAwNVowSDELMAkGA1UEBhMCVVMxGjAYBgNVBAoTEUludGVsIENvcnBvcmF0
+aW9uMR0wGwYDVQQDExRJbnRlbCBTSEEyNTYgUm9vdCBDQTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBANEHLD4x7o4xKCDYTwXGMis1qob+uBlMR17Pr11i
+w/NERAx4nahGgzTZmX9i3viTtfn5uDX6IJMPdq7N4m+Flr8v4VuAznvnCBGqkUDe
+HAPbR6rXU4lMj7lNK7sAWbMuJ8+0a0Sc4wEyNOXYbNzS4pLcq0eL8AjFwSpFNYv1
+NoppB2tpnmTUu+KjymaXcXEubaWuonmHvjqEvzRjicqU1/QMYcoFOw3GP7gNwz2W
+nOKhnMSbs8CguBK9eIBdAYOsetdCOEm2s8yYrqeqtBWMVWq95qiRAdmz/rpWBlFl
+NwlXpEGSlGII374+E2/gPeOX3x6gUfpAiVeXni7puN4ixQWyCxEK0W+51xDltO1p
+0oFsl9Pt9UWpQqZoA8sFXsTf+IwoAzb9JcGoPlrzfMfuL+qgssF86J4i01drzRK8
+d+NhinCsjLpg+Qw1we/RRyv6CXvFYCVKqtECCYocY+NtJ3jDDtukyWLUfXMdFgTi
+Jx6IvEdinfV0RQz+8BZY3sNQQNC66/dPiZWER0TXxonjfrS1ze/6VngUla6L95LC
+UwlxpOd5cu3mpbtYvidOwufEQWw1IF+xgVjFx0i5VGg8jRsM3TSR/v3oPqY/Qv3K
+6QFZpspWAJcGsIuqyKfhcGLDNbdU/tiVNZfd2jt0rp40k12Kyig3S4heGMBvdM08
+UOYNAgMBAAGjUTBPMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBSJn9Cy7SCppj5KZqryHoKw1iwJNjAQBgkrBgEEAYI3FQEEAwIBADANBgkq
+hkiG9w0BAQsFAAOCAgEAIUnVqslRWvl+TARbZHgPe+9XPUDK28BctvNBbCD+Aqxn
+6PwXkxyoCd/piLscVpAzkijTuyeIbH+k2JEkKuKCVabsf0OoRp5Y4jEwpXuPp4bj
+WpGnZTm3hwmxNZk3smFzsWgS7wiJRSpSKXiO3p9LEVsukR5RFpuy7uKOdS7ErL3A
+sSOqRTuNRGE7d6jk5mcA6LDO8g+YBI/PZQeR0B8iQGi3jrJdMf2GifRValzS0OWP
+TpEklh1uQVP9kG5uFg6HGqD+crc0Dp4Y6LapanZHWq7qjiL6oRw+/4TLUzONYwcm
+o8v4MtgYmlE7Io2S4WKlVwyyHEGc4ki3lgEPxFm1aVyRP5W+DkspX/+xlgLmMxje
+bGuIOgcieuTmixWaQJQgDZxjKBYMouI7knnHiCgT184Ed3qyNRwoOxRC8dVy/r4U
+6LmNf73o2yTPlhGhj9b/zEKrKSCrkWK5CMO8B1ihOh+f0nhF+UtoXkceUDmIVsYV
+k7xYdoqXXDbr5TmMX6lcsC8XHjOMFOzFczTwVr9nJw8ssOK8s3+t+K14qf33SibJ
+I26hieAkPXicvnGc+EVRLRCn5GZrdfrTBZ8KVak4E9lXmq+3OhZ326schF0ZNVTY
+geY4cbiNt4uaLKVzYlQu327psq5ZEbjjR/aurhbaJWA2YeMY2SB8I2chNHNhJp8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGBTCCA+2gAwIBAgIUZaGaZtMW/DbJmSppGwFBCuZ06+EwDQYJKoZIhvcNAQEM
+BQAwgYkxHTAbBgNVBAMTFEludGVsIFNIQTM4NCBSb290IENBMQswCQYDVQQGEwJV
+UzEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0
+aW9uMQswCQYDVQQIEwJDQTEcMBoGCSqGSIb3DQEJARYNcGtpQGludGVsLmNvbTAe
+Fw0yMTExMjMxODQ0NTJaFw00MTExMjIxODQ0NTJaMIGJMR0wGwYDVQQDExRJbnRl
+bCBTSEEzODQgUm9vdCBDQTELMAkGA1UEBhMCVVMxFDASBgNVBAcTC1NhbnRhIENs
+YXJhMRowGAYDVQQKExFJbnRlbCBDb3Jwb3JhdGlvbjELMAkGA1UECBMCQ0ExHDAa
+BgkqhkiG9w0BCQEWDXBraUBpbnRlbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDLECLZdjgAjxCI2JazWPtESQnozd8CPiXZwmwMceslKrtSNgop
+23SDmg3XFdJy2kBO8AYq9YrfXHq0QvVaX3tms/iTuhW4HiM0uZKMPu880jy25v6Q
+yyQ3V+IGk7l3T/gGSsEB8s/ON9VmwwwoE5pyR/fJKtzE7s7WH6f3AMAz+ao6iL6X
+trXq48IHpc+dvSzwlZ01SYj25A7vSxpjMAzKwRs0LUJKI3SiWuaL+mmQyHm/TNbX
+vONAyi3WjjglbZX/zZBeBsI8Ytajp2cJHxdygiVQz+qaE+iHP5P3UBKy9Ko9oGd1
+leDyZXWTcPz3AEBvTi2w0sA+8v0eopqbNQNZv8JbDl5qtVvgVEQ5p4LlrxsgrvOM
+xiyE2WjRYr5jl75mEfneXp96rfXOydZ3Upj1rwcZ9h5AW1/H/JJ/8IWy/g22fimy
+x43XEsbJBKkr9eFX0XX+zN+c6Hzt4zA+BHtNMXqQmevMftEaddq0utTqs12DrZ/n
+N9XwO99j6O2i54KZAopHk9G18VcGiXNIBZCea7y1Ubi1wlh5wbf0IVp/3G3NB27z
+SnFcIwufXXsmWyP9LbBIoFl6BuofpHrSAcTk6i3A7w4DBtpHK1dac0yzSSUhvI1p
+MH5ns2ySx252rloRrcAeILjCRHSUdOROFuH53afJQ6bw+ulGE4mnyBTFSQIDAQAB
+o2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHV8EnxvqjgifcRlL6hNTv
+TJtoHTAfBgNVHSMEGDAWgBRHV8EnxvqjgifcRlL6hNTvTJtoHTAOBgNVHQ8BAf8E
+BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBAGLDj9I16SKGIZqIT61u1vYSq4POcXdu
+cA6U1rusbnffdiU4Vk6As60KlrwTVNrA9c8cqR51xi61Z+Gkuolavwjddb0JOG+6
+hIBGexi/MWcmEtRSyL/Frnbhk7X9vMLFauOq7vc76mzjdZBMSRWHtt/pwHkXiUNy
+eA3IniR7Q57O5wI0JyirJ5u8RSx1jOAXL6imdgb/+gueREKUZIR5WMRlceRhJNdy
++6K8rZTisiQRoMpt6gh5Dsbbx60XkurDDwn660ALTSVkTTcFM1Uy1pHa05McY2N4
+g9qGa8J6CkvRKlOSIq2kQdeOHkwEt4DC/hcpreYHUg7UJxYsly47OTFGVAkzxs/I
+j7wmV7BQXVWwbIdgiSAeAKI4IGKjhfwSQJGlJPnDoD5U1ogx6dXvMP+nvQJ8CSOt
+ZcToIoihOUbz/Ab29Sul1/0JyPb1O4QjdrRZah6PybDGnb2g0ZcSd7KmlNXterBi
+T3VBTvBoqa0tgAPVogeSsZYCEThYSYhztyDVjxUOEn53IDFyvttqCeGtimgzfRu4
+3EQHb1bpd66wsvzudLE2pDzA13RCsyutdFeAREuQfDi+1MNtqfN+MxmjBJXajQFk
+9+aOgx4Tq6VzySWFIbZX7r4yLEu5bKrg1Y6Q8CwfXNqbIbRA1uPbNAYZZEI6+JUl
+dytE3XyhQ85B
+-----END CERTIFICATE-----
diff --git a/utility/bdf/bdf.h b/utility/bdf/bdf.h
index 6f8c87c6b..4e688e729 100644
--- a/utility/bdf/bdf.h
+++ b/utility/bdf/bdf.h
@@ -7,8 +7,7 @@
 #ifndef XPUM_UTILITY_BDF_H
 #define XPUM_UTILITY_BDF_H
 
-#include <cctype>
-#include <string>
+#include <string_view>
 
 /**
  * @brief Validates that a string is a well-formed PCI BDF address
@@ -21,15 +20,22 @@
  * pure-string check.  Useful both for sysfs path-traversal protection on
  * Linux and for early CLI argument validation on either platform.
  *
+ * The hex digit check is locale-independent (explicit character ranges),
+ * making the function safe to call in any locale context.
+ *
+ * Evaluates at compile time when @p bdf is a compile-time constant.
+ *
  * @param bdf String to validate
  * @return true if @p bdf matches the canonical BDF format
  */
-inline bool isValidBdf(const std::string &bdf)
+[[nodiscard]] constexpr bool isValidBdf(std::string_view bdf) noexcept
 {
-	if (bdf.length() != 12) {
+	if (bdf.size() != 12) {
 		return false;
 	}
-	const auto isHex = [](unsigned char c) { return std::isxdigit(c) != 0; };
+	constexpr auto isHex = [](char c) constexpr noexcept {
+		return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+	};
 	return isHex(bdf[0]) && isHex(bdf[1]) && isHex(bdf[2]) && isHex(bdf[3]) && bdf[4] == ':' && isHex(bdf[5]) &&
 		   isHex(bdf[6]) && bdf[7] == ':' && isHex(bdf[8]) && isHex(bdf[9]) && bdf[10] == '.' && isHex(bdf[11]);
 }
diff --git a/utility/bdf/test/bdf_test.cpp b/utility/bdf/test/bdf_test.cpp
index ff44117c6..ea8b6d765 100644
--- a/utility/bdf/test/bdf_test.cpp
+++ b/utility/bdf/test/bdf_test.cpp
@@ -7,38 +7,72 @@
 #include <doctest/doctest.h>
 
 #include "bdf.h"
+#include <string>
+#include <string_view>
 
-TEST_CASE("Valid canonical BDF addresses") {
+// ── Compile-time checks ───────────────────────────────────────────────────────
+// isValidBdf is constexpr; these are verified at compile time with zero runtime
+// cost.  Any failure here is a hard build error, not a test failure.
+static_assert(isValidBdf("0000:4d:00.0"), "valid BDF must pass at compile time");
+static_assert(!isValidBdf(""),             "empty string must fail at compile time");
+static_assert(!isValidBdf("0000:4d:00."), "truncated BDF must fail at compile time");
+
+TEST_CASE("Valid canonical BDF addresses")
+{
+	// lowercase hex
 	CHECK(isValidBdf("0000:4d:00.0") == true);
 	CHECK(isValidBdf("0000:00:01.0") == true);
 	CHECK(isValidBdf("ffff:ff:ff.f") == true);
+	// uppercase hex
 	CHECK(isValidBdf("FFFF:FF:FF.F") == true);
+	// mixed case
 	CHECK(isValidBdf("AbCd:eF:01.a") == true);
 }
 
-TEST_CASE("Invalid BDF - wrong length") {
+TEST_CASE("Accepts std::string and std::string_view without a copy")
+{
+	// Implicit conversion from std::string to std::string_view
+	const std::string s = "0000:4d:00.0";
+	CHECK(isValidBdf(s) == true);
+
+	// Explicit std::string_view
+	const std::string_view sv = "0000:4d:00.0";
+	CHECK(isValidBdf(sv) == true);
+
+	// string_view of an invalid BDF
+	CHECK(isValidBdf(std::string_view{"bad"}) == false);
+}
+
+TEST_CASE("Invalid BDF - wrong length")
+{
 	CHECK(isValidBdf("") == false);
-	CHECK(isValidBdf("0000:4d:00.00") == false);
-	CHECK(isValidBdf("0000:4d:00.") == false);
-	CHECK(isValidBdf("000:4d:00.0") == false);
+	CHECK(isValidBdf("0000:4d:00.00") == false); // 13 chars
+	CHECK(isValidBdf("0000:4d:00.")  == false);  // 11 chars
+	CHECK(isValidBdf("000:4d:00.0")  == false);  // 11 chars
 }
 
-TEST_CASE("Invalid BDF - wrong separators") {
-	CHECK(isValidBdf("0000-4d:00.0") == false);
-	CHECK(isValidBdf("0000:4d-00.0") == false);
-	CHECK(isValidBdf("0000:4d:00:0") == false);
-	CHECK(isValidBdf("0000.4d.00:0") == false);
+TEST_CASE("Invalid BDF - wrong separator positions")
+{
+	CHECK(isValidBdf("0000-4d:00.0") == false); // '-' instead of first ':'
+	CHECK(isValidBdf("0000:4d-00.0") == false); // '-' instead of second ':'
+	CHECK(isValidBdf("0000:4d:00:0") == false); // ':' instead of '.'
+	CHECK(isValidBdf("0000.4d.00:0") == false); // '.' instead of ':'
 }
 
-TEST_CASE("Invalid BDF - non-hex characters") {
-	CHECK(isValidBdf("000g:4d:00.0") == false);
-	CHECK(isValidBdf("0000:4x:00.0") == false);
-	CHECK(isValidBdf("0000:4d:0z.0") == false);
-	CHECK(isValidBdf("0000:4d:00.g") == false);
+TEST_CASE("Invalid BDF - non-hex characters")
+{
+	CHECK(isValidBdf("000g:4d:00.0") == false); // 'g' in domain
+	CHECK(isValidBdf("0000:4x:00.0") == false); // 'x' in bus
+	CHECK(isValidBdf("0000:4d:0z.0") == false); // 'z' in device
+	CHECK(isValidBdf("0000:4d:00.g") == false); // 'g' in function
 }
 
-TEST_CASE("Invalid BDF - special / adversarial inputs") {
+TEST_CASE("Invalid BDF - adversarial / path-traversal inputs")
+{
 	CHECK(isValidBdf("../.:..:.0.0") == false);
 	CHECK(isValidBdf("000/../00.00") == false);
-	CHECK(isValidBdf("            ") == false);
+	CHECK(isValidBdf("            ") == false); // 12 spaces
+	// Construct a string_view that explicitly includes embedded NUL bytes so the
+	// view length is 12 but the content contains non-hex characters (\0).
+	CHECK(isValidBdf(std::string_view("\0\0\0\0:\0\0:\0\0.\0", 12)) == false); // embedded NUL bytes
 }
diff --git a/utility/table/table_builder.cpp b/utility/table/table_builder.cpp
index 0d914ef98..b7d7050de 100644
--- a/utility/table/table_builder.cpp
+++ b/utility/table/table_builder.cpp
@@ -962,6 +962,70 @@ std::string TableBuilder::asTable() const { return toTableString(); }
 
 std::string TableBuilder::asJson(bool compact) const { return toJsonString(compact); }
 
+TableBuilder TableBuilder::bordered()
+{
+	TableBuilder tb;
+	tb.config = TableConfig{.borderChar = '-', .cornerChar = '+', .verticalChar = '|', .emptyCellText = {}};
+	tb.suppressHeaderSep = false;
+	tb.suppressHeaderColSep = false;
+	tb.suppressDataColSep = false;
+	return tb;
+}
+
+TableBuilder &TableBuilder::lockWidths()
+{
+	calculateWidths();
+	widthsCalculated = true;
+	return *this;
+}
+
+std::string TableBuilder::headerLine(LineStyle style) const
+{
+	const bool pad = (style == LineStyle::Aligned);
+	const std::string_view sep = pad ? "  " : ", ";
+	calculateWidths();
+	if (columns.empty()) {
+		return {};
+	}
+	std::string result;
+	for (size_t i = 0; i < columns.size(); ++i) {
+		if (i > 0) {
+			result += sep;
+		}
+		if (pad) {
+			alignTextDirect(result, columns[i].header, columns[i].width, columns[i].alignment);
+		} else {
+			result += columns[i].header;
+		}
+	}
+	return result;
+}
+
+std::string TableBuilder::rowLine(const std::vector<std::string> &values, LineStyle style) const
+{
+	const bool pad = (style == LineStyle::Aligned);
+	const std::string_view sep = pad ? "  " : ", ";
+	calculateWidths();
+	if (columns.empty()) {
+		return {};
+	}
+	std::string result;
+	for (size_t i = 0; i < columns.size(); ++i) {
+		if (i > 0) {
+			result += sep;
+		}
+		const std::string_view cellContent = (i < values.size() && !values[i].empty())
+												 ? std::string_view{values[i]}
+												 : std::string_view{config.emptyCellText};
+		if (pad) {
+			alignTextDirect(result, cellContent, columns[i].width, columns[i].alignment);
+		} else {
+			result += cellContent;
+		}
+	}
+	return result;
+}
+
 TableBuilder &TableBuilder::clearRows() noexcept
 {
 	rows.clear();
diff --git a/utility/table/table_builder.h b/utility/table/table_builder.h
index f21c8f5d7..3e66ec13a 100644
--- a/utility/table/table_builder.h
+++ b/utility/table/table_builder.h
@@ -103,7 +103,7 @@ class TableBuilder
 		// GPU monitoring style features
 		std::vector<std::vector<std::string>> multiLineCells; // Multi-line cell content (overrides cells if non-empty)
 		std::optional<std::string> spanText;				  // Text spanning all columns
-		Align spanAlign = Align::Center;                      // Alignment for span text
+		Align spanAlign = Align::Center;					  // Alignment for span text
 		BorderStyle borderStyle = BorderStyle::Normal;		  // Custom border for this row
 		bool isSeparator = false;							  // Row is just a separator line
 
@@ -180,10 +180,11 @@ class TableBuilder
 
 	struct TableConfig
 	{
-		char borderChar = '-';
-		char cornerChar = '+';
-		char verticalChar = '|';
-		std::string emptyCellText;
+		char borderChar = ' ';
+		char cornerChar = ' ';
+		char verticalChar = ' ';
+		std::string emptyCellText{}; // NOLINT (readability-redundant-member-init) // Redundant default to empty in
+									 // order to use partial designated initializers
 		std::string noDataText = "No data";
 		bool showRowNumbers = false;
 		int maxCellWidth = 50; // Prevent extremely wide columns
@@ -211,10 +212,10 @@ class TableBuilder
 	std::vector<Column> columns;
 	std::vector<Row> rows;
 	std::vector<Row> preHeaderRows; // Rendered inside the table border, before column headers
-	bool autoSize = false;
-	bool suppressHeaderSep = false; // Suppress the border line drawn after column headers
-	bool suppressHeaderColSep = false; // Suppress inner | between column headers
-	bool suppressDataColSep = false; // Suppress inner | between data cells
+	bool autoSize = true;
+	bool suppressHeaderSep = true;    // Suppress the border line drawn after column headers
+	bool suppressHeaderColSep = true; // Suppress inner | between column headers
+	bool suppressDataColSep = true;   // Suppress inner | between data cells
 	mutable bool widthsCalculated = false;
 	OutputFormat outputFormat = OutputFormat::Table;
 	TableConfig config;
@@ -268,6 +269,15 @@ class TableBuilder
 	static int countLines(const std::string &str);
 
 public:
+	/**
+	 * @brief Create a TableBuilder pre-configured with visible borders and separators.
+	 *
+	 * Use this for tables that need the classic bordered style ('+'/'-'/'|' borders,
+	 * header separator, and column separators). The default constructor produces a
+	 * clean borderless layout suitable for inline help text and aligned output.
+	 */
+	[[nodiscard]] static TableBuilder bordered();
+
 	TableBuilder()
 	{
 		columns.reserve(8);
@@ -339,7 +349,8 @@ class TableBuilder
 	 * @param style   Border style for the separator that follows the span row
 	 * @return Reference to this TableBuilder for chaining
 	 */
-	TableBuilder &addPreHeaderSpanRow(std::string_view text, BorderStyle style = BorderStyle::Normal, Align align = Align::Center);
+	TableBuilder &addPreHeaderSpanRow(std::string_view text, BorderStyle style = BorderStyle::Normal,
+									  Align align = Align::Center);
 	TableBuilder &suppressHeaderSeparator() noexcept;
 	TableBuilder &suppressHeaderColumnSeparators() noexcept;
 	TableBuilder &suppressDataColumnSeparators() noexcept;
@@ -349,7 +360,7 @@ class TableBuilder
 	 * @param style Border style (Heavy for '=', Double for '═', etc.)
 	 * @return Reference to this TableBuilder for chaining
 	 */
-	TableBuilder &addSeparator(BorderStyle style = BorderStyle::Heavy);
+	TableBuilder &addSeparator(BorderStyle style = BorderStyle::Normal);
 
 	/**
 	 * @brief Get the last added row (for adding JSON metadata or modifying)
@@ -583,6 +594,44 @@ class TableBuilder
 	 */
 	[[nodiscard]] std::string asJson(bool compact = false) const;
 
+	/**
+	 * @brief Freeze column widths at their current values.
+	 *
+	 * Triggers auto-sizing if enabled. After this call, adding more rows will not
+	 * recalculate column widths, making the table safe for streaming append use.
+	 */
+	TableBuilder &lockWidths();
+
+	/**
+	 * @brief Controls whether @c headerLine() / @c rowLine() produce aligned or CSV output.
+	 */
+	enum class LineStyle
+	{
+		Aligned, ///< Pad each cell to its column width, separate with two spaces.
+		Csv,	 ///< Emit raw text with @c ", " separator (no padding).
+	};
+
+	/**
+	 * @brief Render only the header row as a plain string, without borders.
+	 *
+	 * @param style  @c LineStyle::Aligned (default) — padded/space-separated.
+	 *               @c LineStyle::Csv — raw text with @c ", " separator.
+	 * @return Formatted header string (no trailing newline).
+	 */
+	[[nodiscard]] std::string headerLine(LineStyle style = LineStyle::Aligned) const;
+
+	/**
+	 * @brief Render a single row of values as a plain string, without borders.
+	 *
+	 * @param values  Cell values in column order. Extra values are ignored;
+	 *                missing values use the configured @c emptyCellText.
+	 * @param style   @c LineStyle::Aligned (default) — padded/space-separated.
+	 *                @c LineStyle::Csv — raw text with @c ", " separator.
+	 * @return Formatted data row string (no trailing newline).
+	 */
+	[[nodiscard]] std::string rowLine(const std::vector<std::string> &values,
+									  LineStyle style = LineStyle::Aligned) const;
+
 	/**
 	 * @brief Get number of columns
 	 */
diff --git a/utility/table/test/table_builder_test.cpp b/utility/table/test/table_builder_test.cpp
index f85c49b97..f2b1c7203 100644
--- a/utility/table/test/table_builder_test.cpp
+++ b/utility/table/test/table_builder_test.cpp
@@ -337,7 +337,7 @@ TEST_CASE("TableBuilder print to stream") {
 }
 
 TEST_CASE("TableBuilder as_table vs as_json") {
-    TableBuilder table;
+    auto table = TableBuilder::bordered();
     table.addColumn("A").addRow("X");
 
     auto tableStr = table.asTable();
@@ -550,10 +550,10 @@ TEST_CASE("TableBuilder addPreHeaderSpanRow left alignment") {
 }
 
 TEST_CASE("TableBuilder addPreHeaderSpanRow BorderStyle::None omits inner separator") {
-    TableBuilder withSep;
+    auto withSep = TableBuilder::bordered();
     withSep.addColumn("A").addPreHeaderSpanRow("X", BorderStyle::Normal).addRow("v").enableAutoSizing();
 
-    TableBuilder noSep;
+    auto noSep = TableBuilder::bordered();
     noSep.addColumn("A").addPreHeaderSpanRow("X", BorderStyle::None).addRow("v").enableAutoSizing();
 
     auto countCorners = [](const std::string& s) {
@@ -564,10 +564,10 @@ TEST_CASE("TableBuilder addPreHeaderSpanRow BorderStyle::None omits inner separa
 }
 
 TEST_CASE("TableBuilder suppressHeaderSeparator removes border line after headers") {
-    TableBuilder normal;
+    auto normal = TableBuilder::bordered();
     normal.addColumn("A").addRow("X").enableAutoSizing();
 
-    TableBuilder suppressed;
+    auto suppressed = TableBuilder::bordered();
     suppressed.addColumn("A").addRow("X").suppressHeaderSeparator().enableAutoSizing();
 
     auto countLines = [](const std::string& s) {
@@ -578,10 +578,10 @@ TEST_CASE("TableBuilder suppressHeaderSeparator removes border line after header
 }
 
 TEST_CASE("TableBuilder suppressHeaderColumnSeparators reduces pipes on header line") {
-    TableBuilder normal;
+    auto normal = TableBuilder::bordered();
     normal.addColumn("Alpha").addColumn("Beta").addColumn("Gamma").addRow("1", "2", "3").enableAutoSizing();
 
-    TableBuilder suppressed;
+    auto suppressed = TableBuilder::bordered();
     suppressed.addColumn("Alpha").addColumn("Beta").addColumn("Gamma")
         .addRow("1", "2", "3").suppressHeaderColumnSeparators().enableAutoSizing();
 
@@ -592,10 +592,10 @@ TEST_CASE("TableBuilder suppressHeaderColumnSeparators reduces pipes on header l
 }
 
 TEST_CASE("TableBuilder suppressDataColumnSeparators reduces pipes on data line") {
-    TableBuilder normal;
+    auto normal = TableBuilder::bordered();
     normal.addColumn("A").addColumn("B").addColumn("C").addRow("foo", "bar", "baz").enableAutoSizing();
 
-    TableBuilder suppressed;
+    auto suppressed = TableBuilder::bordered();
     suppressed.addColumn("A").addColumn("B").addColumn("C")
         .addRow("foo", "bar", "baz").suppressDataColumnSeparators().enableAutoSizing();
 
@@ -606,7 +606,7 @@ TEST_CASE("TableBuilder suppressDataColumnSeparators reduces pipes on data line"
 }
 
 TEST_CASE("TableBuilder suppressDataColumnSeparators multiline row") {
-    TableBuilder suppressed;
+    auto suppressed = TableBuilder::bordered();
     suppressed.addColumn("A").addColumn("B")
         .addMultiLineRow({{"line1a", "line2a"}, {"line1b", "line2b"}})
         .suppressDataColumnSeparators()
diff --git a/validation/coverage_filters.py b/validation/coverage_filters.py
new file mode 100644
index 000000000..964e55f23
--- /dev/null
+++ b/validation/coverage_filters.py
@@ -0,0 +1,100 @@
+# Copyright (C) 2026 Intel Corporation
+# SPDX-License-Identifier: MIT
+
+"""gcovr filter / exclude patterns for the xpu-smi relevant-coverage report.
+
+Centralised so that ``run_coverage.py`` and any CI integrations import the
+same list.  Patterns are gcovr-style regexes matched against repo-relative
+source paths (gcovr is invoked with ``--root=<repo_root>``).
+
+Excluded categories
+-------------------
+- Tests themselves
+- Legacy / deprecated subcommands slated for removal
+  (agentset, group, policy, topdown, amc) and the C API shim (xpum_api).
+- AMC + firmware-update paths needing out-of-band MCTP/PLDM HW or real
+  FW images
+- Daemon-mode-only code (cmd_smi.cpp — only reachable via xpumd)
+- Dead / unwired code (metrics_registry)
+- Hardware-state-dependent HAL (diagnostic, fabric, fan, vf, ras, standby,
+  scheduler, performance, sysman, enginegroup, firmware, file_io, ecc,
+  pci.cpp, metric) — needs specific HW / real GPU workloads
+- OS-specific platform layer (Linux syscall / sysfs wrappers)
+- Infrastructure / template-instantiation artifacts in headers that gcov
+  counts per-instantiation but which do not represent real uncovered
+  logic paths
+"""
+
+# Source filter: only consider these top-level dirs.
+FILTERS = [
+    r"(ial|oal|hal|utility)/",
+]
+
+# Source excludes (applied after FILTERS).
+EXCLUDES = [
+    # ---- test sources themselves ----
+    r".*test.*",
+    r".*_test\.cpp",
+    # ---- legacy / deprecated subcommands ----
+    r"ial/cmn/cmd_agentset\.",
+    r"ial/cmn/cmd_group\.",
+    r"ial/cmn/cmd_policy\.",
+    r"ial/cmn/cmd_topdown\.",
+    r"ial/cmn/cmd_amc\.",
+    r"ial/api/xpum_api\.cpp",
+    # ---- daemon-only code (only reachable via xpumd) ----
+    r"ial/cmn/cmd_smi\.cpp",
+    # ---- dead / unwired code ----
+    r"ial/cmn/metrics_registry\.",
+    # ---- AMC + firmware-update paths needing real FW images ----
+    r"hal/amc/",
+    r"hal/fwupd/",
+    # ---- hardware-state-dependent HAL code (needs specific HW) ----
+    r"hal/core/diagnostic\.",
+    r"hal/core/fabric\.",
+    r"hal/core/fan\.",
+    r"hal/core/vf\.",
+    r"hal/core/ras\.",
+    r"hal/core/standby\.",
+    r"hal/core/scheduler\.",
+    r"hal/core/performance\.",
+    r"hal/core/sysman\.",
+    r"hal/core/enginegroup\.",
+    r"hal/core/firmware\.",
+    r"hal/core/file_io\.",
+    r"hal/core/ecc\.",
+    r"hal/core/pci\.cpp",
+    r"hal/core/metric\.",
+    # ---- OS-specific platform layer (Linux syscall wrappers) ----
+    r"oal/lin/lin\.cpp",
+    r"oal/lin/lin\.h",
+    r"oal/lin/linvf\.",
+    r"oal/lin/diag_lin\.",
+    r"oal/lin/i2c_interface\.",
+    r"oal/lin/topology\.",
+    r"oal/lin/fs_lock\.",
+    r"oal/lin/oslin\.h",
+    r"oal/lin/dmi_reader\.",
+    r"oal/lin/http_client\.",
+    r"oal/lin/pci_database\.",
+    r"oal/i2c_interface\.h",
+    r"oal/os\.h",
+    r"oal/osvf\.h",
+    # ---- infrastructure / template instantiation artifacts ----
+    # NOTE: logger.h, filestream_sink.h and table_builder.h are now
+    # exercised by the doctest unit-test phase (`meson test`) that
+    # run_coverage.py runs before the e2e phase, so they are no longer
+    # excluded.  Keep ``threading.`` excluded \u2014 it's a header-only
+    # template helper with no dedicated test.
+    r"hal/core/threading\.",
+]
+
+
+def gcovr_filter_args() -> list[str]:
+    """Return the ``--filter`` / ``--exclude`` argv slice for gcovr."""
+    args: list[str] = []
+    for pat in FILTERS:
+        args += ["--filter", pat]
+    for pat in EXCLUDES:
+        args += ["--exclude", pat]
+    return args
diff --git a/validation/lib/models.py b/validation/lib/models.py
index 44114415f..de266c259 100644
--- a/validation/lib/models.py
+++ b/validation/lib/models.py
@@ -69,6 +69,10 @@ class TestResult:
     duration: float = 0.0
     details: Dict[str, Any] = field(default_factory=dict)
     step_results: List[StepResult] = field(default_factory=list)
+    # Full command line executed (binary + args); populated by run_single_command_test
+    command: str = ""
+    # Snapshot of the expect: block from the test config; used by issue reporter
+    expect_config: Dict[str, Any] = field(default_factory=dict)
 
     def __str__(self) -> str:
         status = "PASS" if self.passed else "FAIL"
diff --git a/validation/lib/runner.py b/validation/lib/runner.py
index 523d592d6..f27592081 100644
--- a/validation/lib/runner.py
+++ b/validation/lib/runner.py
@@ -13,6 +13,7 @@
 import logging
 import os
 import platform
+import re
 import subprocess
 import sys
 import time
@@ -26,7 +27,10 @@
     TestResult, StepResult,
 )
 from .color import green, red, yellow, bold
-from .validators import validate_return_code, validate_plaintext, validate_json_output
+from .validators import (
+    validate_return_code, validate_plaintext, validate_json_output,
+    validate_combined_output, validate_stderr, validate_csv_output,
+)
 from .executor import execute_command, execute_with_script, execute_with_hooks, _full_binary
 from .resolver import DependencyResolver
 
@@ -36,7 +40,8 @@ class CLITestRunner:
 
     def __init__(self, binary_path: str = "xpu-smi", verbose: bool = False,
                  platform_type: str = "BMG", max_workers: int = 1,
-                 log_file: Optional[str] = None):
+                 log_file: Optional[str] = None,
+                 issues_dir: Optional[str] = None):
         self.binary_path = binary_path
         self.verbose = verbose
         self.is_windows = platform.system() == "Windows"
@@ -44,10 +49,14 @@ def __init__(self, binary_path: str = "xpu-smi", verbose: bool = False,
         self.platform_type = platform_type
         self.max_workers = max_workers
         self.log_file = log_file
+        self.issues_dir = Path(issues_dir) if issues_dir else None
         self.logger = self._setup_logger()
         self.results: List[TestResult] = []
         self.workflow_context: Dict[str, Any] = {}
 
+        if self.issues_dir:
+            self.issues_dir.mkdir(parents=True, exist_ok=True)
+
     # ------------------------------------------------------------------
     # Setup
     # ------------------------------------------------------------------
@@ -119,6 +128,58 @@ def validate_plaintext(self, output: str, expectations: Dict[str, Any]):
     def validate_json_output(self, output: str, expectations: Dict[str, Any]):
         return validate_json_output(output, expectations)
 
+    def _merge_suite_defaults(self, expectations: Dict[str, Any],
+                              global_settings: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        Merge suite-level default bad-output patterns into a test's expect block.
+
+        Keys merged (list-union, deduplicating):
+          default_combined_not_contains      → combined_not_contains
+          default_combined_not_matches_regex → combined_not_matches_regex
+          default_stdout_not_contains        → stdout_not_contains
+          default_stdout_not_matches_regex   → stdout_not_matches_regex
+
+        Use the ``default_stdout_*`` variants for patterns that target user-facing
+        output channel discipline (e.g. log lines or internal error constants
+        that should never appear on stdout but legitimately appear on stderr).
+        """
+        defaults_not_contains = global_settings.get('default_combined_not_contains', [])
+        defaults_not_regex = global_settings.get('default_combined_not_matches_regex', [])
+        defaults_stdout_not_contains = global_settings.get('default_stdout_not_contains', [])
+        defaults_stdout_not_regex = global_settings.get('default_stdout_not_matches_regex', [])
+
+        if not any([defaults_not_contains, defaults_not_regex,
+                    defaults_stdout_not_contains, defaults_stdout_not_regex]):
+            return expectations
+
+        merged = dict(expectations)
+
+        if defaults_not_contains:
+            existing = merged.get('combined_not_contains', [])
+            extra = [p for p in defaults_not_contains if p not in existing]
+            if extra:
+                merged['combined_not_contains'] = existing + extra
+
+        if defaults_not_regex:
+            existing = merged.get('combined_not_matches_regex', [])
+            extra = [p for p in defaults_not_regex if p not in existing]
+            if extra:
+                merged['combined_not_matches_regex'] = existing + extra
+
+        if defaults_stdout_not_contains:
+            existing = merged.get('stdout_not_contains', [])
+            extra = [p for p in defaults_stdout_not_contains if p not in existing]
+            if extra:
+                merged['stdout_not_contains'] = existing + extra
+
+        if defaults_stdout_not_regex:
+            existing = merged.get('stdout_not_matches_regex', [])
+            extra = [p for p in defaults_stdout_not_regex if p not in existing]
+            if extra:
+                merged['stdout_not_matches_regex'] = existing + extra
+
+        return merged
+
     def _execute_with_script(self, command: str, script: str, timeout: int,
                              variables: Dict[str, Any]) -> Dict[str, Any]:
         resolved = self.resolve_variables(script, variables)
@@ -321,7 +382,7 @@ def run_single_command_test(self, test_config: Dict[str, Any],
         description = test_config.get('description', '')
         command = test_config.get('command', '')
         output_format = test_config.get('output_format', 'plaintext')
-        expectations = test_config.get('expect', {})
+        expectations = self._merge_suite_defaults(test_config.get('expect', {}), global_settings)
         timeout = test_config.get('timeout', global_settings.get('timeout', 30))
         variables = test_config.get('variables', {})
 
@@ -370,19 +431,26 @@ def run_single_command_test(self, test_config: Dict[str, Any],
 
         duration = time.time() - start_time
 
+        full_command = f"{_full_binary(self.binary_path)} {command}"
+
         expected_rc = expectations.get('return_code', 0)
         if not validate_return_code(result['return_code'], expected_rc):
             msg = f"Return code mismatch: expected {expected_rc}, got {result['return_code']}"
             if result['stderr']:
                 msg += f"\nStderr: {result['stderr'][:200]}"
-            return TestResult(test_name, False, msg, duration, result)
+            tr = TestResult(test_name, False, msg, duration, result)
+            tr.command = full_command
+            tr.expect_config = expectations
+            return tr
 
         if output_format == 'json':
             success, message = validate_json_output(result['stdout'], expectations)
+        elif output_format == 'csv':
+            success, message = validate_csv_output(result['stdout'], expectations)
         else:
             success, message = validate_plaintext(result['stdout'], expectations)
 
-        if 'stdout_or_stderr_contains' in expectations:
+        if success and 'stdout_or_stderr_contains' in expectations:
             combined = result['stdout'] + result['stderr']
             for pattern in expectations['stdout_or_stderr_contains']:
                 if pattern not in combined:
@@ -390,7 +458,27 @@ def run_single_command_test(self, test_config: Dict[str, Any],
                     message = f"Expected pattern not in output: '{pattern}'"
                     break
 
-        return TestResult(test_name, success, message, duration, result)
+        # Stderr validations (independent of output_format)
+        if success and any(k in expectations for k in (
+            'stderr_contains', 'stderr_not_contains', 'stderr_matches_regex',
+            'stderr_not_matches_regex', 'stderr_equals', 'stderr_empty',
+        )):
+            ok, smsg = validate_stderr(result['stderr'], expectations)
+            if not ok:
+                success = False
+                message = smsg
+
+        # Combined (stdout+stderr) bad-output checks — always run even on success
+        if success:
+            ok, cmsg = validate_combined_output(result['stdout'], result['stderr'], expectations)
+            if not ok:
+                success = False
+                message = cmsg
+
+        tr = TestResult(test_name, success, message, duration, result)
+        tr.command = full_command
+        tr.expect_config = expectations
+        return tr
 
     def run_test(self, test_config: Dict[str, Any],
                  global_settings: Dict[str, Any]) -> TestResult:
@@ -493,6 +581,91 @@ def expand_parameterized_test(self, test_config: Dict[str, Any]) -> List[Dict[st
 
         return expanded
 
+    # ------------------------------------------------------------------
+    # Issue file generation
+    # ------------------------------------------------------------------
+
+    def _write_issue_file(self, result: TestResult) -> None:
+        """Write a per-issue report file for a failed test."""
+        if not self.issues_dir:
+            return
+
+        # Sanitize test name to a safe filename
+        safe_name = re.sub(r'[^\w\-\[\]=,.]', '_', result.test_name)
+        issue_path = self.issues_dir / f"{safe_name}.txt"
+
+        stdout = result.details.get('stdout', '')
+        stderr = result.details.get('stderr', '')
+        rc = result.details.get('return_code', 'N/A')
+
+        # Build human-readable expected description
+        ec = result.expect_config
+        expected_parts = []
+        if 'return_code' in ec:
+            expected_parts.append(f"  return_code: {ec['return_code']}")
+        if 'stdout_contains' in ec:
+            for p in ec['stdout_contains']:
+                expected_parts.append(f"  stdout contains: {p!r}")
+        if 'stdout_not_contains' in ec:
+            for p in ec['stdout_not_contains']:
+                expected_parts.append(f"  stdout NOT contains: {p!r}")
+        if 'stdout_or_stderr_contains' in ec:
+            for p in ec['stdout_or_stderr_contains']:
+                expected_parts.append(f"  stdout or stderr contains: {p!r}")
+        if 'json_schema' in ec:
+            expected_parts.append("  JSON schema validation (see YAML)")
+        if 'json_path_checks' in ec:
+            for chk in ec['json_path_checks']:
+                expected_parts.append(f"  JSONPath {chk.get('path')} {chk.get('expected')}"
+                                      + (f" {chk.get('value')!r}" if 'value' in chk else ""))
+        # New validator keys (stderr, csv, combined, regex)
+        # Note: "neither stdout nor stderr contains X" is expressed via
+        # combined_not_contains, so there is no separate
+        # stdout_or_stderr_not_contains key.
+        for key in ('stderr_contains', 'stderr_not_contains', 'stderr_matches_regex',
+                    'stderr_not_matches_regex', 'stderr_equals', 'stderr_empty',
+                    'stdout_equals', 'stdout_matches_regex', 'stdout_not_matches_regex',
+                    'combined_not_contains', 'combined_not_matches_regex',
+                    'csv_required_columns', 'csv_min_rows', 'csv_row_count',
+                    'csv_column_not_empty'):
+            val = ec.get(key)
+            if val is not None:
+                expected_parts.append(f"  {key}: {val!r}")
+        if not expected_parts:
+            expected_parts.append("  (see test YAML for full expectations)")
+
+        lines = [
+            f"Test:        {result.test_name}",
+            f"Command:     {result.command or '(not recorded — workflow test)'}",
+            "",
+            "Expected:",
+            *expected_parts,
+            "",
+            "Actual:",
+            f"  Exit code: {rc}",
+            "  Stdout:",
+        ]
+        for line in stdout.splitlines():
+            lines.append(f"    {line}")
+        if not stdout.strip():
+            lines.append("    (empty)")
+        lines.append("  Stderr:")
+        for line in stderr.splitlines():
+            lines.append(f"    {line}")
+        if not stderr.strip():
+            lines.append("    (empty)")
+        lines += [
+            "",
+            "Explanation:",
+            f"  {result.message}",
+        ]
+
+        try:
+            issue_path.write_text('\n'.join(lines) + '\n', encoding='utf-8')
+            self.logger.debug(f"  Issue file written: {issue_path}")
+        except OSError as e:
+            self.logger.warning(f"  Could not write issue file {issue_path}: {e}")
+
     # ------------------------------------------------------------------
     # Suite execution
     # ------------------------------------------------------------------
@@ -505,6 +678,19 @@ def run_test_suite(self, config: Dict[str, Any],
         global_settings = test_suite.get('settings', {})
         tests = test_suite.get('tests', [])
 
+        # Suite-level hooks (e.g. ensure daemon running, create/remove scratch dir).
+        # Teardown is paired with setup: if setup fails, teardown still runs so any
+        # partial side-effects (scratch dirs, daemons started before the failing
+        # step) get cleaned up.  Teardown is best-effort; its failure does not
+        # affect the suite result.
+        suite_setup = test_suite.get('setup')
+        suite_teardown = test_suite.get('teardown')
+        if suite_setup and not self._run_suite_hook(suite_setup, "suite-setup"):
+            self.logger.error(f"Suite setup failed for {suite_name}; skipping suite")
+            if suite_teardown:
+                self._run_suite_hook(suite_teardown, "suite-teardown")
+            return [TestResult(f"{suite_name}::setup", False, "Suite setup failed")]
+
         # Expand parameterized tests
         tests = [t for raw in tests for t in self.expand_parameterized_test(raw)]
 
@@ -569,6 +755,9 @@ def run_test_suite(self, config: Dict[str, Any],
                     group_results = self._run_tests_parallel(group_tests, global_settings, continue_on_failure)
                     self.max_workers = saved
                     results.extend(group_results)
+                    for r in group_results:
+                        if not r.passed:
+                            self._write_issue_file(r)
                     failed_tests.update(r.test_name for r in group_results if not r.passed)
             else:
                 test_config = item
@@ -587,6 +776,7 @@ def run_test_suite(self, config: Dict[str, Any],
                         self.logger.info(green("[PASS]") + f" {result.test_name}: {result.message}")
                     else:
                         self.logger.error(red("[FAIL]") + f" {result.test_name}: {result.message}")
+                        self._write_issue_file(result)
                         failed_tests.add(test_name)
                         if self.verbose and result.details:
                             self.logger.debug(f"  Stdout: {result.details.get('stdout', '')[:500]}")
@@ -595,6 +785,10 @@ def run_test_suite(self, config: Dict[str, Any],
                             self.logger.warning(yellow("Stopping test suite due to failure"))
                             break
 
+        # Suite-level teardown hook (always run, even after failures)
+        if suite_teardown:
+            self._run_suite_hook(suite_teardown, "suite-teardown")
+
         return results
 
     def _run_tests_parallel(self, tests: List[Dict[str, Any]],
@@ -661,3 +855,111 @@ def print_summary(self, results: List[TestResult]) -> None:
         self.logger.info(bold("=" * 60))
         if self.log_file:
             self.logger.info(f"Log file: {self.log_file}")
+
+    # ------------------------------------------------------------------
+    # Reports (JUnit XML, summary JSON)
+    # ------------------------------------------------------------------
+
+    def write_junit_xml(self, results: List[TestResult], path: str,
+                        suite_name: str = "xpu-smi e2e") -> None:
+        """Write a JUnit-style XML report for CI consumption."""
+        from xml.sax.saxutils import escape as _esc
+
+        # XML 1.0 forbids most ASCII control characters in character data.
+        # Strip them so CI parsers (Jenkins, GitLab, etc.) don't reject the
+        # report when the binary emits binary noise on stdout/stderr.
+        # Allowed control chars: \t (0x09), \n (0x0a), \r (0x0d).
+        _ILLEGAL_XML_RE = re.compile(
+            r'[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]'
+        )
+
+        def _xml_clean(s: str) -> str:
+            return _ILLEGAL_XML_RE.sub('?', s)
+
+        total = len(results)
+        skipped = sum(1 for r in results if r.message.startswith("Skipped"))
+        failed = sum(1 for r in results if not r.passed and not r.message.startswith("Skipped"))
+        total_time = sum(r.duration for r in results)
+
+        out = []
+        out.append('<?xml version="1.0" encoding="UTF-8"?>')
+        out.append(
+            f'<testsuite name="{_esc(suite_name)}" tests="{total}" '
+            f'failures="{failed}" skipped="{skipped}" time="{total_time:.3f}">'
+        )
+        for r in results:
+            classname = r.test_name.split('[')[0] if '[' in r.test_name else r.test_name
+            out.append(
+                f'  <testcase classname="{_esc(classname)}" '
+                f'name="{_esc(r.test_name)}" time="{r.duration:.3f}">'
+            )
+            if r.message.startswith("Skipped"):
+                out.append(f'    <skipped message="{_esc(_xml_clean(r.message))}"/>')
+            elif not r.passed:
+                stdout = _xml_clean((r.details or {}).get('stdout', ''))
+                stderr = _xml_clean((r.details or {}).get('stderr', ''))
+                msg = _xml_clean(r.message[:500])
+                body = (
+                    (r.command or "")
+                    + chr(10) + "STDOUT:" + chr(10) + stdout[:2000]
+                    + chr(10) + "STDERR:" + chr(10) + stderr[:2000]
+                )
+                out.append(
+                    f'    <failure message="{_esc(msg)}">'
+                    f'{_esc(body)}'
+                    f'</failure>'
+                )
+            out.append('  </testcase>')
+        out.append('</testsuite>')
+
+        Path(path).parent.mkdir(parents=True, exist_ok=True)
+        Path(path).write_text('\n'.join(out) + '\n', encoding='utf-8')
+        self.logger.info(f"JUnit XML written: {path}")
+
+    def write_summary_json(self, results: List[TestResult], path: str) -> None:
+        """Write a machine-readable summary of all results."""
+        data = {
+            "total":   len(results),
+            "passed":  sum(1 for r in results if r.passed),
+            "failed":  sum(1 for r in results if not r.passed),
+            "duration": round(sum(r.duration for r in results), 3),
+            "tests":   [
+                {
+                    "name":       r.test_name,
+                    "passed":     r.passed,
+                    "message":    r.message,
+                    "duration":   round(r.duration, 3),
+                    "command":    r.command,
+                    "return_code": (r.details or {}).get('return_code'),
+                }
+                for r in results
+            ],
+        }
+        Path(path).parent.mkdir(parents=True, exist_ok=True)
+        Path(path).write_text(json.dumps(data, indent=2), encoding='utf-8')
+        self.logger.info(f"Summary JSON written: {path}")
+
+    # ------------------------------------------------------------------
+    # Suite-level setup / teardown hooks
+    # ------------------------------------------------------------------
+
+    def _run_suite_hook(self, hook_cmd: str, label: str, timeout: int = 60) -> bool:
+        """Run a suite-level setup or teardown shell command. Returns True on success."""
+        if not hook_cmd:
+            return True
+        self.logger.info(f"[{label}] {hook_cmd}")
+        try:
+            r = subprocess.run(hook_cmd, shell=True, capture_output=True, text=True,
+                               timeout=timeout, env=os.environ.copy())
+            if r.returncode != 0:
+                self.logger.error(f"[{label}] failed (rc={r.returncode}): {r.stderr[:400]}")
+                return False
+            if r.stdout.strip():
+                self.logger.debug(f"[{label}] stdout: {r.stdout[:400]}")
+            return True
+        except subprocess.TimeoutExpired:
+            self.logger.error(f"[{label}] timed out after {timeout}s")
+            return False
+        except Exception as e:
+            self.logger.error(f"[{label}] error: {e}")
+            return False
diff --git a/validation/lib/validators.py b/validation/lib/validators.py
index 92fa33227..8f2c42c2b 100644
--- a/validation/lib/validators.py
+++ b/validation/lib/validators.py
@@ -8,6 +8,7 @@
 
 import json
 import logging
+import re
 from typing import Any, Dict, List, Tuple, Union
 
 import jsonschema
@@ -24,7 +25,15 @@ def validate_return_code(actual: int, expected: Union[int, List[int]]) -> bool:
 
 
 def validate_plaintext(output: str, expectations: Dict[str, Any]) -> Tuple[bool, str]:
-    """Validate plaintext output against stdout_contains / stdout_not_contains."""
+    """Validate plaintext stdout against literal and regex expectations.
+
+    Supported keys:
+      stdout_contains         list[str] — every literal must be present in stdout
+      stdout_not_contains     list[str] — every literal must NOT be present
+      stdout_matches_regex    list[str] — every regex must match (re.search, MULTILINE)
+      stdout_not_matches_regex list[str] — no regex may match
+      stdout_equals           str       — exact match (after rstrip of trailing newline)
+    """
     failures = []
 
     for pattern in expectations.get('stdout_contains', []):
@@ -35,11 +44,223 @@ def validate_plaintext(output: str, expectations: Dict[str, Any]) -> Tuple[bool,
         if pattern in output:
             failures.append(f"Unexpected pattern found: '{pattern}'")
 
+    for regex_str in expectations.get('stdout_matches_regex', []):
+        try:
+            if not re.search(regex_str, output, re.MULTILINE):
+                failures.append(f"Expected regex did not match stdout: {regex_str!r}")
+        except re.error as exc:
+            failures.append(f"Invalid regex {regex_str!r}: {exc}")
+
+    for regex_str in expectations.get('stdout_not_matches_regex', []):
+        try:
+            m = re.search(regex_str, output, re.MULTILINE)
+            if m:
+                failures.append(
+                    f"Forbidden regex {regex_str!r} matched stdout: {m.group(0)!r}"
+                )
+        except re.error as exc:
+            failures.append(f"Invalid regex {regex_str!r}: {exc}")
+
+    if 'stdout_equals' in expectations:
+        expected = expectations['stdout_equals']
+        if output.rstrip('\r\n') != expected.rstrip('\r\n'):
+            failures.append(
+                f"stdout exact-match failed:\n  expected: {expected!r}\n  actual:   {output!r}"
+            )
+
     if failures:
         return False, "; ".join(failures)
     return True, "All plaintext validations passed"
 
 
+def validate_stderr(stderr: str, expectations: Dict[str, Any]) -> Tuple[bool, str]:
+    """Validate stderr against literal/regex/exact-match expectations.
+
+    Supported keys:
+      stderr_contains         list[str]
+      stderr_not_contains     list[str]
+      stderr_matches_regex    list[str]
+      stderr_not_matches_regex list[str]
+      stderr_equals           str (rstrip-newline match)
+      stderr_empty            bool — when True, stderr must be empty (after strip)
+    """
+    failures = []
+
+    for pattern in expectations.get('stderr_contains', []):
+        if pattern not in stderr:
+            failures.append(f"Expected stderr pattern not found: '{pattern}'")
+
+    for pattern in expectations.get('stderr_not_contains', []):
+        if pattern in stderr:
+            failures.append(f"Unexpected stderr pattern found: '{pattern}'")
+
+    for regex_str in expectations.get('stderr_matches_regex', []):
+        try:
+            if not re.search(regex_str, stderr, re.MULTILINE):
+                failures.append(f"Expected regex did not match stderr: {regex_str!r}")
+        except re.error as exc:
+            failures.append(f"Invalid regex {regex_str!r}: {exc}")
+
+    for regex_str in expectations.get('stderr_not_matches_regex', []):
+        try:
+            m = re.search(regex_str, stderr, re.MULTILINE)
+            if m:
+                failures.append(
+                    f"Forbidden regex {regex_str!r} matched stderr: {m.group(0)!r}"
+                )
+        except re.error as exc:
+            failures.append(f"Invalid regex {regex_str!r}: {exc}")
+
+    if 'stderr_equals' in expectations:
+        expected = expectations['stderr_equals']
+        if stderr.rstrip('\r\n') != expected.rstrip('\r\n'):
+            failures.append(
+                f"stderr exact-match failed:\n  expected: {expected!r}\n  actual:   {stderr!r}"
+            )
+
+    if expectations.get('stderr_empty') is True:
+        if stderr.strip():
+            failures.append(f"stderr expected to be empty but had: {stderr.strip()[:200]!r}")
+
+    if failures:
+        return False, "; ".join(failures)
+    return True, "All stderr validations passed"
+
+
+def validate_csv_output(output: str, expectations: Dict[str, Any]) -> Tuple[bool, str]:
+    """Validate CSV output.
+
+    Supported keys:
+      csv_min_rows            int  — at least this many data rows (excluding header)
+      csv_required_columns    list[str] — header must contain each of these columns
+      csv_row_count           int  — exact data-row count
+      csv_column_not_empty    list[str] — every value in given columns must be non-empty
+    """
+    import csv as _csv
+    from io import StringIO
+
+    # Drop empty leading lines before the CSV header row
+    lines = output.splitlines()
+    while lines and not lines[0].strip():
+        lines.pop(0)
+
+    if not lines:
+        return False, "CSV output is empty"
+
+    try:
+        reader = _csv.DictReader(StringIO('\n'.join(lines)))
+        rows = list(reader)
+        header = reader.fieldnames or []
+    except Exception as e:
+        return False, f"CSV parse failed: {e}"
+
+    failures = []
+
+    required = expectations.get('csv_required_columns', [])
+    for col in required:
+        if col not in header:
+            failures.append(f"Missing CSV column: {col!r} (header: {header})")
+
+    if 'csv_min_rows' in expectations:
+        if len(rows) < expectations['csv_min_rows']:
+            failures.append(f"Expected at least {expectations['csv_min_rows']} rows, got {len(rows)}")
+
+    if 'csv_row_count' in expectations:
+        if len(rows) != expectations['csv_row_count']:
+            failures.append(f"Expected exactly {expectations['csv_row_count']} rows, got {len(rows)}")
+
+    for col in expectations.get('csv_column_not_empty', []):
+        if col not in header:
+            failures.append(f"csv_column_not_empty references unknown column: {col!r}")
+            continue
+        empties = [i for i, r in enumerate(rows) if not str(r.get(col, '')).strip()]
+        if empties:
+            failures.append(
+                f"CSV column {col!r} has empty values in rows {empties[:5]}"
+                f"{' (and more)' if len(empties) > 5 else ''}"
+            )
+
+    if failures:
+        return False, "; ".join(failures)
+    return True, f"CSV validations passed ({len(rows)} rows, {len(header)} columns)"
+
+
+def validate_combined_output(stdout: str, stderr: str,
+                              expectations: Dict[str, Any]) -> Tuple[bool, str]:
+    """
+    Validate that forbidden patterns appear in NEITHER stdout NOR stderr.
+
+    Checks:
+      combined_not_contains:       list of literal strings that must NOT appear
+      combined_not_matches_regex:  list of regex patterns that must NOT match
+
+    Each stream is examined independently rather than concatenated.  This
+    avoids two failure modes of the naive "stdout + stderr" approach:
+      (a) a forbidden literal/regex that straddles the stream boundary
+          (last partial line of stdout + first line of stderr) producing a
+          false positive that does not correspond to any real line, and
+      (b) the inserted separator suppressing a legitimate match when stdout
+          ends without a trailing newline.
+
+    Designed to catch internal debug output that leaks into user-facing output:
+      - Source file paths:   [Error] ../path/file.cpp:line:
+      - L0 constants:        ZE_RESULT_ERROR_UNSUPPORTED_FEATURE
+      - Unformatted strings: Error: %s
+    """
+    failures = []
+    streams = (('stdout', stdout), ('stderr', stderr))
+
+    for pattern in expectations.get('combined_not_contains', []):
+        # Aggregate stream names so a literal that appears in both stdout and
+        # stderr produces a single failure entry rather than two duplicates.
+        hits = []
+        sample_line = pattern
+        for stream_name, text in streams:
+            if pattern in text:
+                hits.append(stream_name)
+                if sample_line is pattern:
+                    sample_line = next(
+                        (ln for ln in text.splitlines() if pattern in ln),
+                        pattern,
+                    )
+        if hits:
+            where = " and ".join(hits)
+            failures.append(
+                f"Forbidden literal found in {where}: {pattern!r}  "
+                f"(line: {sample_line.strip()!r})"
+            )
+
+    for regex_str in expectations.get('combined_not_matches_regex', []):
+        try:
+            compiled = re.compile(regex_str, re.MULTILINE)
+        except re.error as exc:
+            failures.append(f"Invalid regex {regex_str!r}: {exc}")
+            continue
+        hits = []
+        offending = None
+        sample_line = None
+        for stream_name, text in streams:
+            m = compiled.search(text)
+            if m:
+                hits.append(stream_name)
+                if offending is None:
+                    offending = m.group(0)
+                    sample_line = next(
+                        (ln for ln in text.splitlines() if offending in ln),
+                        offending,
+                    )
+        if hits:
+            where = " and ".join(hits)
+            failures.append(
+                f"Forbidden regex {regex_str!r} matched in {where}: "
+                f"{offending!r}  (line: {sample_line.strip()!r})"
+            )
+
+    if failures:
+        return False, "; ".join(failures)
+    return True, "Combined output validation passed"
+
+
 def _parse_json(output: str) -> Tuple[Any, str]:
     """
     Parse JSON from command output.
diff --git a/validation/run_coverage.py b/validation/run_coverage.py
new file mode 100755
index 000000000..e71e6a859
--- /dev/null
+++ b/validation/run_coverage.py
@@ -0,0 +1,472 @@
+#!/usr/bin/env python3
+# Copyright (C) 2026 Intel Corporation
+# SPDX-License-Identifier: MIT
+"""run_coverage.py — Build, test and coverage orchestrator for xpu-smi.
+
+OS-agnostic replacement for run_validation.sh.  Performs:
+
+  1. ``meson setup -Db_coverage=true`` (if needed) + ``ninja``
+  2. Delete stale ``*.gcda`` files
+  3. Run ``meson test`` (doctest C++ unit tests) — populates .gcda
+  4. Invoke ``run_tests.py`` against the YAML e2e test suites
+  5. Print pass/fail summary
+  6. Run ``gcovr`` with the curated relevant-coverage filters
+     (see ``coverage_filters.py``) over the merged .gcda from both
+     phases to produce console / HTML / JSON / Cobertura XML reports
+
+Works on any platform where meson, ninja and gcovr are available.
+
+Usage:
+    python3 run_coverage.py [options]
+
+Options:
+    -b, --build-dir DIR    Meson build directory (default: builddir)
+    -c, --config PATH      YAML test directory or single config file
+                           (default: auto-detect tests/e2e or tests)
+    -o, --output-dir DIR   Output dir for reports
+                           (default: validation_results_<timestamp>)
+    -j, --parallel N       Parallel test workers (default: 1)
+    -t, --tags TAGS        Comma-separated tag filter
+    -s, --skip-build       Skip rebuild (binary must already be a coverage build)
+        --skip-tests       Run coverage report only (assumes .gcda already present)
+        --skip-unit-tests  Skip the doctest C++ unit-test phase
+        --skip-e2e-tests   Skip the YAML e2e validation phase
+    -v, --verbose          Verbose test output
+
+Exit codes:
+    0  All tests passed
+    1  One or more tests failed
+    2  Setup / build / coverage error
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import os
+import shutil
+import subprocess
+import sys
+import time
+from datetime import datetime
+from pathlib import Path
+
+from coverage_filters import gcovr_filter_args
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+REPO_ROOT = SCRIPT_DIR.parent
+
+
+# ---------------------------------------------------------------------------
+# helpers
+# ---------------------------------------------------------------------------
+def log(msg: str) -> None:
+    print(f"[run_coverage] {datetime.now().strftime('%H:%M:%S')} {msg}", flush=True)
+
+
+def die(msg: str, code: int = 2) -> None:
+    print(f"ERROR: {msg}", file=sys.stderr)
+    sys.exit(code)
+
+
+def require(cmd: str) -> str:
+    """Return absolute path to ``cmd`` or exit 2."""
+    found = shutil.which(cmd)
+    if not found:
+        die(f"{cmd} not found in PATH")
+    return found
+
+
+def run(cmd: list[str], **kw) -> subprocess.CompletedProcess:
+    """Echo + run; raise on non-zero unless ``check=False`` passed."""
+    log("$ " + " ".join(str(c) for c in cmd))
+    return subprocess.run(cmd, **kw)
+
+
+# ---------------------------------------------------------------------------
+# argv
+# ---------------------------------------------------------------------------
+def parse_args() -> argparse.Namespace:
+    p = argparse.ArgumentParser(
+        description="Run xpu-smi YAML tests + relevant-code coverage report",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    p.add_argument("-b", "--build-dir", default="builddir",
+                   help="Meson build directory (default: builddir)")
+    p.add_argument("-c", "--config",
+                   help="YAML test directory or single config file")
+    p.add_argument("-o", "--output-dir",
+                   help="Output directory for reports")
+    p.add_argument("-j", "--parallel", type=int, default=1,
+                   help="Parallel test workers (default: 1)")
+    p.add_argument("-t", "--tags",
+                   help="Comma-separated tag filter")
+    p.add_argument("-s", "--skip-build", action="store_true",
+                   help="Skip rebuild (binary must already be coverage-instrumented)")
+    p.add_argument("--skip-tests", action="store_true",
+                   help="Skip tests, only generate coverage report from existing .gcda")
+    p.add_argument("--skip-unit-tests", action="store_true",
+                   help="Skip the doctest C++ unit-test phase")
+    p.add_argument("--skip-e2e-tests", action="store_true",
+                   help="Skip the YAML e2e validation phase")
+    p.add_argument("-v", "--verbose", action="store_true",
+                   help="Verbose test output")
+    return p.parse_args()
+
+
+# ---------------------------------------------------------------------------
+# phases
+# ---------------------------------------------------------------------------
+def phase_build(build_dir: Path) -> None:
+    log("=== Phase 1: Building xpu-smi with coverage instrumentation ===")
+    require("meson")
+    require("ninja")
+
+    if not (build_dir / "meson-info").is_dir():
+        log("Build directory not configured. Running meson setup...")
+        run(["meson", "setup", str(build_dir), "-Db_coverage=true"],
+            cwd=REPO_ROOT, check=True)
+    else:
+        cfg = subprocess.run(["meson", "configure", str(build_dir)],
+                             capture_output=True, text=True)
+        opts = {}
+        for line in cfg.stdout.splitlines():
+            parts = line.split()
+            if len(parts) >= 2 and parts[0] in ("b_coverage", "with_tests"):
+                opts[parts[0]] = parts[1]
+        if opts.get("b_coverage") != "true":
+            log("Enabling -Db_coverage=true ...")
+            run(["meson", "configure", str(build_dir), "-Db_coverage=true"],
+                check=True)
+        if opts.get("with_tests") != "true":
+            log("Note: unit tests are not enabled (`with_tests=false`). "
+                "To include doctest coverage, reconfigure with:")
+            log("      conan install . --output-folder=.conan/ --build=missing "
+                "-c tools.build:skip_test=False")
+            log(f"      meson configure {build_dir} -Dwith_tests=true")
+
+    log("Compiling...")
+    if run(["ninja", "-C", str(build_dir)]).returncode != 0:
+        die("Build failed — see output above")
+    log("Build succeeded")
+
+
+def phase_clear_gcda(build_dir: Path) -> int:
+    log("=== Phase 2: Clearing previous coverage data ===")
+    removed = 0
+    for path in build_dir.rglob("*.gcda"):
+        try:
+            path.unlink()
+            removed += 1
+        except OSError:
+            pass
+    gcno = sum(1 for _ in build_dir.rglob("*.gcno"))
+    log(f"Removed {removed} stale .gcda; {gcno} .gcno instrumentation files present")
+    return gcno
+
+
+def resolve_test_dir(override: str | None) -> Path:
+    if override:
+        path = Path(override)
+        if not path.exists():
+            die(f"Config path not found: {override}")
+        return path
+    for cand in (SCRIPT_DIR / "tests" / "e2e", SCRIPT_DIR / "tests"):
+        if cand.is_dir():
+            return cand
+    die("Test directory not found. Use -c to specify an explicit path.")
+
+
+def phase_unit_tests(build_dir: Path, paths: dict[str, Path],
+                     verbose: bool) -> int:
+    """Run meson test (doctest C++ unit tests). .gcda lands in the same
+    build dir as the e2e run, so gcovr later sees the merged coverage."""
+    log("=== Phase 3a: Running C++ unit tests (doctest via meson test) ===")
+    require("meson")
+
+    # Detect whether unit tests are actually registered (with_tests=true).
+    listing = subprocess.run(["meson", "test", "-C", str(build_dir), "--list"],
+                             capture_output=True, text=True)
+    registered = [ln for ln in listing.stdout.splitlines()
+                  if ln.strip() and not ln.startswith("No tests")]
+    if not registered:
+        log("No unit tests registered in this build dir. "
+            "Reconfigure with `-Dwith_tests=true` (or rerun without `-s`) "
+            "to include doctest coverage.")
+        return 0
+    log(f"Unit-test targets registered: {len(registered)}")
+
+    cmd = ["meson", "test", "-C", str(build_dir), "--print-errorlogs"]
+    if verbose:
+        cmd.append("--verbose")
+
+    unit_log = paths["output"] / "unit_tests.log"
+    with unit_log.open("wb") as fh:
+        cp = subprocess.run(cmd, stdout=fh, stderr=subprocess.STDOUT)
+
+    # Parse meson's stdout for a quick summary (Ok:/Fail: line).
+    summary_line = ""
+    try:
+        for line in unit_log.read_text().splitlines():
+            if line.strip().startswith(("Ok:", "Fail:", "Expected Fail:")) or \
+               "tests passed" in line.lower() or "summary" in line.lower():
+                summary_line += line + "\n"
+    except OSError:
+        pass
+
+    # Copy meson's machine-readable test log if produced.
+    meson_log = build_dir / "meson-logs" / "testlog.txt"
+    if meson_log.is_file():
+        try:
+            shutil.copy2(meson_log, paths["output"] / "unit_tests_meson.txt")
+        except OSError:
+            pass
+
+    if cp.returncode == 0:
+        log("Unit tests: PASSED")
+    else:
+        log(f"Unit tests: FAILED (exit {cp.returncode}) — see {unit_log}")
+    if summary_line:
+        sys.stdout.write(summary_line)
+    return cp.returncode
+
+
+def phase_run_tests(args, binary: Path, paths: dict[str, Path]) -> int:
+    log("=== Phase 3b: Running YAML e2e validation tests ===")
+    test_dir = resolve_test_dir(args.config)
+    run_tests = SCRIPT_DIR / "run_tests.py"
+    if not run_tests.is_file():
+        die(f"run_tests.py not found: {run_tests}")
+
+    if test_dir.is_dir():
+        yaml_count = sum(1 for _ in test_dir.glob("*.yaml"))
+    else:
+        yaml_count = 1
+    log(f"Test suites found: {yaml_count}")
+    if yaml_count == 0:
+        die(f"No YAML test suites found in {test_dir}.")
+
+    cmd = [
+        sys.executable, str(run_tests),
+        "--config", str(test_dir),
+        "--binary", str(binary),
+        "--issues-dir", str(paths["issues"]),
+        "--log-file", str(paths["log"]),
+        "--junit-xml", str(paths["junit"]),
+        "--summary-json", str(paths["summary"]),
+        "--parallel", str(args.parallel),
+    ]
+    if args.tags:
+        cmd += ["--tags", *args.tags.split(",")]
+    if args.verbose:
+        cmd.append("--verbose")
+
+    return subprocess.run(cmd).returncode
+
+
+def phase_test_summary(summary_json: Path) -> None:
+    log("=== Phase 4: Test Results ===")
+    if not summary_json.is_file():
+        log(f"WARNING: summary JSON not found: {summary_json}")
+        return
+    with summary_json.open() as f:
+        s = json.load(f)
+    total = s["total"]
+    passed = s["passed"]
+    failed = s["failed"]
+    dur = s.get("duration", 0.0)
+    rate = (passed / total * 100) if total else 0.0
+
+    print("=" * 70)
+    print("  TEST RESULTS SUMMARY")
+    print("=" * 70)
+    print(f"  Total tests : {total}")
+    print(f"  Passed      : {passed:>4d}  ({rate:5.1f}%)")
+    print(f"  Failed      : {failed:>4d}  ({100 - rate:5.1f}%)")
+    print(f"  Duration    : {dur:.1f}s")
+    print("-" * 70)
+    if failed:
+        print("\n  FAILED TESTS:")
+        for t in s["tests"]:
+            if not t["passed"]:
+                rc = t.get("return_code", "?")
+                msg = (t.get("message") or "")[:120]
+                print(f"    [FAIL] {t['name']}")
+                print(f"           rc={rc}  {msg}")
+        print()
+    print("=" * 70)
+
+
+def phase_coverage(build_dir: Path, paths: dict[str, Path]) -> None:
+    log("=== Phase 5: Code Coverage Report ===")
+    gcda_count = sum(1 for _ in build_dir.rglob("*.gcda"))
+    log(f"Coverage data files (.gcda): {gcda_count}")
+    if gcda_count == 0:
+        log("WARNING: No coverage data found. "
+            "Was the binary built with -Db_coverage=true and exercised?")
+        log("         Skipping coverage report.")
+        return
+
+    require("gcovr")
+    require("gcov")
+
+    common = [
+        "gcovr",
+        "--root", str(REPO_ROOT),
+        "--gcov-executable", "gcov",
+        *gcovr_filter_args(),
+        "--gcov-ignore-parse-errors=negative_hits.warn_once_per_file",
+        "--gcov-ignore-errors=no_working_dir_found",
+        str(build_dir),
+    ]
+
+    # 1. Console summary (tee to file)
+    log("Generating console summary...")
+    cp = subprocess.run(common + ["--sort-percentage", "--print-summary"],
+                        capture_output=True, text=True)
+    paths["cov_summary"].write_text(cp.stdout)
+    sys.stdout.write(cp.stdout)
+    if cp.returncode != 0:
+        sys.stderr.write(cp.stderr)
+        die("gcovr (console summary) failed")
+
+    err_log = paths["output"] / "gcovr.err"
+
+    def gcovr_extra(label: str, extra: list[str]) -> None:
+        log(f"Generating {label} coverage report...")
+        with err_log.open("ab") as elog:
+            rc = subprocess.run(common + extra, stderr=elog).returncode
+        if rc != 0:
+            log(f"ERROR: gcovr ({label}) failed; see {err_log}")
+            try:
+                tail = err_log.read_text().splitlines()[-20:]
+                sys.stderr.write("\n".join(tail) + "\n")
+            except OSError:
+                pass
+            die(f"gcovr ({label}) failed")
+
+    gcovr_extra("HTML", ["--html", "--html-details",
+                         "--output", str(paths["cov_html"] / "index.html")])
+    log(f"HTML report: {paths['cov_html'] / 'index.html'}")
+
+    gcovr_extra("JSON", ["--json", "--output", str(paths["cov_json"])])
+    log(f"JSON report: {paths['cov_json']}")
+
+    cov_xml = paths["output"] / "coverage.xml"
+    gcovr_extra("XML", ["--xml", "--output", str(cov_xml)])
+    log(f"XML report: {cov_xml}")
+
+    # Per-file table
+    print()
+    print("=" * 74)
+    print("  CODE COVERAGE — PER-FILE BREAKDOWN (sorted by coverage %)")
+    print("=" * 74)
+    cp = subprocess.run(common + ["--sort-percentage"],
+                        capture_output=True, text=True)
+    sys.stdout.write("\n".join(cp.stdout.splitlines()[:120]) + "\n")
+    print("=" * 74)
+
+
+# ---------------------------------------------------------------------------
+# main
+# ---------------------------------------------------------------------------
+def main() -> int:
+    args = parse_args()
+
+    build_dir = (REPO_ROOT / args.build_dir).resolve()
+    binary = build_dir / "ial" / "cli" / "xpu-smi"
+    if os.name == "nt":
+        binary = binary.with_suffix(".exe")
+
+    timestamp = time.strftime("%Y%m%d_%H%M%S")
+    output_dir = Path(args.output_dir).resolve() if args.output_dir else \
+        (REPO_ROOT / f"validation_results_{timestamp}").resolve()
+
+    paths = {
+        "output":      output_dir,
+        "issues":      output_dir / "issues",
+        "log":         output_dir / "test_run.log",
+        "junit":       output_dir / "junit.xml",
+        "summary":     output_dir / "summary.json",
+        "cov_html":    output_dir / "coverage_html",
+        "cov_json":    output_dir / "coverage.json",
+        "cov_summary": output_dir / "coverage_summary.txt",
+    }
+    for d in (paths["output"], paths["issues"], paths["cov_html"]):
+        d.mkdir(parents=True, exist_ok=True)
+
+    log(f"Repository root  : {REPO_ROOT}")
+    log(f"Build directory  : {build_dir}")
+    log(f"Output directory : {output_dir}")
+    print()
+
+    # Build
+    if args.skip_build or args.skip_tests:
+        log("=== Phase 1: SKIPPED (using existing binary) ===")
+    else:
+        phase_build(build_dir)
+
+    if not binary.is_file() or not os.access(binary, os.X_OK):
+        die(f"xpu-smi binary not found or not executable: {binary}")
+    log(f"Binary: {binary}")
+    print()
+
+    # Clear stale coverage
+    if not args.skip_tests:
+        phase_clear_gcda(build_dir)
+        print()
+
+    # Tests
+    test_exit = 0
+    unit_exit = 0
+    if not args.skip_tests:
+        if not args.skip_unit_tests:
+            unit_exit = phase_unit_tests(build_dir, paths, args.verbose)
+            print()
+        if not args.skip_e2e_tests:
+            test_exit = phase_run_tests(args, binary, paths)
+            print()
+            phase_test_summary(paths["summary"])
+            log(f"Full log     : {paths['log']}")
+            log(f"JUnit XML    : {paths['junit']}")
+            log(f"Summary JSON : {paths['summary']}")
+            if paths["issues"].is_dir():
+                n = sum(1 for _ in paths["issues"].glob("*.txt"))
+                log(f"Issue files  : {n} (in {paths['issues']}/)")
+            print()
+
+    # Coverage
+    phase_coverage(build_dir, paths)
+    print()
+
+    # Final summary
+    log("=== Final Summary ===")
+    print()
+    print(f"  Reports written to: {output_dir}/")
+    print()
+    if not args.skip_unit_tests and not args.skip_tests:
+        print("  Unit test reports:")
+        print(f"    - meson testlog   : {paths['output'] / 'unit_tests.log'}")
+        print()
+    if not args.skip_e2e_tests and not args.skip_tests:
+        print("  E2E test reports:")
+        print(f"    - Console log     : {paths['log']}")
+        print(f"    - JUnit XML       : {paths['junit']}")
+        print(f"    - Summary JSON    : {paths['summary']}")
+        print(f"    - Issue files     : {paths['issues']}/")
+        print()
+    print("  Coverage reports:")
+    print(f"    - Console summary : {paths['cov_summary']}")
+    print(f"    - HTML report     : {paths['cov_html'] / 'index.html'}")
+    print(f"    - JSON report     : {paths['cov_json']}")
+    print()
+    overall = test_exit or unit_exit
+    if overall == 0:
+        log("RESULT: ALL TESTS PASSED (unit + e2e)")
+    else:
+        log(f"RESULT: SOME TESTS FAILED (unit={unit_exit} e2e={test_exit})")
+    return overall
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/validation/run_tests.py b/validation/run_tests.py
index 6ab559f7b..dc7d2656b 100755
--- a/validation/run_tests.py
+++ b/validation/run_tests.py
@@ -223,6 +223,30 @@ def main():
              'Parent directories are created automatically if they do not exist.'
     )
     
+    parser.add_argument(
+        '--issues-dir',
+        default=None,
+        metavar='PATH',
+        help='Write a per-issue report file for every failed test into this directory. '
+             'Each file is named after the test and contains the command, expected result, '
+             'actual output, and explanation. The directory is created if it does not exist.'
+    )
+
+    parser.add_argument(
+        '--junit-xml',
+        default=None,
+        metavar='PATH',
+        help='Write a JUnit-style XML report for CI consumption to this path. '
+             'Each test becomes a <testcase>; failures embed stdout/stderr.'
+    )
+
+    parser.add_argument(
+        '--summary-json',
+        default=None,
+        metavar='PATH',
+        help='Write a machine-readable JSON summary of all results to this path.'
+    )
+    
     args = parser.parse_args()
     
     # Expand config paths (handles multiple args, comma-separated, globs, and directories)
@@ -260,7 +284,8 @@ def main():
     # Initialize test runner
     runner = CLITestRunner(binary_path=binary_path, verbose=args.verbose,
                           platform_type=args.platform, max_workers=args.parallel,
-                          log_file=args.log_file)
+                          log_file=args.log_file,
+                          issues_dir=args.issues_dir)
     
     # Show parallel mode if enabled
     if args.parallel > 1:
@@ -334,6 +359,15 @@ def main():
         print(f"\nFailed to load/run {len(failed_configs)} configuration(s):")
         for path in failed_configs:
             print(f"  - {path}")
+
+    if args.issues_dir and any(not r.passed for r in all_results):
+        print(f"\nIssue files written to: {args.issues_dir}")
+
+    if args.junit_xml:
+        runner.write_junit_xml(all_results, args.junit_xml)
+
+    if args.summary_json:
+        runner.write_summary_json(all_results, args.summary_json)
     
     # Return non-zero exit code if any test failed or configs couldn't be loaded
     if any(not r.passed for r in all_results) or failed_configs:
diff --git a/xpumd/.gitignore b/xpumd/.gitignore
index 617868adc..62f481c5b 100644
--- a/xpumd/.gitignore
+++ b/xpumd/.gitignore
@@ -1,5 +1,4 @@
 /dist/
-/level-zero-go
 /tools/bin
 /tools/include
 /builder-config.yaml
diff --git a/xpumd/Dockerfile b/xpumd/Dockerfile
index 92a1e79fd..84b51084b 100644
--- a/xpumd/Dockerfile
+++ b/xpumd/Dockerfile
@@ -8,13 +8,21 @@ ARG BASE_IMAGE=scratch
 # The build stage
 FROM golang:1.26-trixie AS builder
 
-ARG IGC_CORE_VERSION=2.32.7+21184
-ARG COMPUTE_RUNTIME_RELEASE=26.14.37833.4
-ARG LIBIGDGMM12_VERSION=22.9.0
-ARG LEVEL_ZERO_VERSION=1.28.2
-ARG IGSC_VERSION=0.9.6
+# driver stack DEB package versions
+ARG IGC_CORE_VERSION=2.34.4+21428
+ARG COMPUTE_RUNTIME_RELEASE=26.18.38308.1
+ARG LIBIGDGMM12_VERSION=22.10.0
+ARG LEVEL_ZERO_VERSION=1.28.6
 
-WORKDIR /go/src/work
+# SHA256 checksums for those
+ARG CHECKSUMS_LOADER=checksums-loader.txt
+ARG CHECKSUMS_BACKEND=checksums-backend.txt
+
+# Git repo tags & commit hashes to match against them
+ARG IGSC_VERSION=V0.9.6
+ARG IGSC_COMMIT=6abae21408bc36561baaade9fca9ae4a5173d2f0
+ARG METEE_VERSION=6.2.3
+ARG METEE_COMMIT=67ff323aead437557d9a7309803aae79cd5b2d56
 
 # Enable source packages and install IGSC build dependencies
 RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources && \
@@ -26,80 +34,103 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
     libudev-dev \
     pkg-config
 
+WORKDIR /debs/
+COPY level-zero-go/level-zero/$CHECKSUMS_LOADER level-zero-go/level-zero/$CHECKSUMS_BACKEND .
+
 # Download and install Level-Zero and its dependencies
-RUN mkdir /debs /out && \
-    IGC_CORE_RELEASE=${IGC_CORE_VERSION%%+*} && \
-    curl -fS --fail-early --output-dir /debs/ \
+RUN IGC_CORE_RELEASE=${IGC_CORE_VERSION%%+*} && \
+    curl -fS --fail-early \
          -LO https://github.com/intel/intel-graphics-compiler/releases/download/v${IGC_CORE_RELEASE}/intel-igc-core-2_${IGC_CORE_VERSION}_amd64.deb \
          -LO https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_RELEASE}/libigdgmm12_${LIBIGDGMM12_VERSION}_amd64.deb \
          -LO https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_RELEASE}/libze-intel-gpu1_${COMPUTE_RUNTIME_RELEASE}-0_amd64.deb \
-         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/level-zero_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb \
-         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/level-zero-devel_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
-    dpkg -i /debs/*.deb
+         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/libze1_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb \
+         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/libze-dev_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
+    if ! sha256sum --check $CHECKSUMS_LOADER $CHECKSUMS_BACKEND ; then \
+	echo "--- Expected ($CHECKSUMS_LOADER / $CHECKSUMS_BACKEND): ---"; \
+	cat $CHECKSUMS_LOADER $CHECKSUMS_BACKEND; \
+	echo "--- Got: ---"; \
+	sha256sum *.deb; \
+	echo "=> ERROR"; \
+	exit 1; \
+    fi; \
+    dpkg -i *.deb
 
-# Build IGSC
+WORKDIR /go/src/work
+
+# Build IGSC + its MeTee dependency
+# (with --depth 1, clone $TAG + checkout $COMMIT verifies that tags & hashes match)
 RUN mkdir /src && \
-    git clone --branch V${IGSC_VERSION} --depth 1 https://github.com/intel/igsc.git /src/igsc && \
-    cd /src/igsc && \
+    git clone --branch ${METEE_VERSION} --depth 1 https://github.com/intel/metee.git /src/metee && \
+    cd /src/metee && git checkout ${METEE_COMMIT} && \
+    cmake -G Ninja -S . -B build -LH -DCMAKE_INSTALL_PREFIX=/usr/ && \
+    ninja -v -C build && \
+    ninja -C build install && \
+    git clone --branch ${IGSC_VERSION} --depth 1 https://github.com/intel/igsc.git /src/igsc && \
+    cd /src/igsc && git checkout ${IGSC_COMMIT} && \
     cmake -G Ninja -S . -B build -LH -DCMAKE_INSTALL_PREFIX=/usr/ && \
     ninja -v -C build && \
     ninja -C build install && \
     ldconfig
 
-# Build xpumd
+# Build xpumd / xpuinfo-cli + stub driver & install them
 RUN --mount=type=cache,target=/go/pkg/mod/ \
     --mount=type=cache,target=/root/.cache/go-build \
     --mount=src=.,target=.,rw \
+    mkdir /out && \
     make build && \
-    make -C receiver/internal/level-zero-go/level-zero-stub clean test && \
+    make -C level-zero-go/level-zero-stub clean test && \
     install -D dist/xpumd /out/usr/local/bin/xpumd && \
     install -D dist/xpuinfo-cli /out/usr/local/bin/xpuinfo-cli && \
     install -D config-example.yaml /out/etc/xpumd/config-example.yaml && \
-    install -D receiver/internal/level-zero-go/level-zero-stub/libze_stub.so \
+    install -D level-zero-go/level-zero-stub/libze_stub.so \
                /out/usr/local/lib/xpumd/level-zero-stub/libze_loader.so.1 && \
-    install -D receiver/internal/level-zero-go/level-zero-stub/example-config.yaml \
+    install -D level-zero-go/level-zero-stub/example-config.yaml \
                /out/etc/xpumd/level-zero-stub/example-config.yaml && \
     go -C dist tool -modfile $(pwd)/tools/go.mod \
         go-licenses save . \
                 --ignore github.com/intel/xpumanager/xpumd \
                 --save_path /out/usr/share/doc/xpumd/licenses
 
-# (L)GPL compliance: store source packages stored in /sources
-# Copy licences for all installed packages
-RUN mkdir /out/sources && \
-    cd /out/sources && \
-    gpl_pkgs="libc6 libcap2 libudev1 libstdc++6 libgcc-s1" && \
-    apt-get source --download-only $gpl_pkgs && \
-    other_pkgs="libigdgmm12 libze-intel-gpu1 libcyaml1 libyaml-0-2" && \
-    for pkg in $gpl_pkgs $other_pkgs; do \
-        install -Dt /out/usr/share/doc/$pkg \
-                /usr/share/doc/$pkg/copyright; \
-    done && \
-    install -Dt /out/usr/share/doc/libigc-core-2 \
-            /usr/local/lib/igc2/NOTICES.txt && \
-    install -Dt /out/usr/share/common-licenses/ \
-            /usr/share/common-licenses/*
-
-# Copy dependencies for the final image
-RUN install -Dt /out/lib64 \
-            /lib64/ld-linux-x86-64.so.2 && \
-    install -Dt /out/lib/x86_64-linux-gnu \
-            /lib/x86_64-linux-gnu/libc.so.6 \
-            /lib/x86_64-linux-gnu/libcap.so.2 \
-            /lib/x86_64-linux-gnu/libcyaml.so.1 \
-            /lib/x86_64-linux-gnu/libyaml-0.so.2 && \
-    install -Dt /out/usr/lib/x86_64-linux-gnu \
-            /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 \
-            /usr/lib/x86_64-linux-gnu/libm.so.6 \
-            /usr/lib/x86_64-linux-gnu/libresolv.so.2 \
-            /usr/lib/x86_64-linux-gnu/libstdc++.so.6 \
-            /usr/lib/x86_64-linux-gnu/libudev.so.1 \
-            /usr/lib/x86_64-linux-gnu/libigdgmm.so.12 \
-            /usr/lib/x86_64-linux-gnu/libze_intel_gpu.so.1 \
-            /usr/lib/x86_64-linux-gnu/libze_loader.so.1 \
-            /usr/lib/x86_64-linux-gnu/libigsc.so.0 && \
-    install -Dt /out/usr/local/lib \
-            /usr/local/lib/libigc.so.2
+# Endpoints cannot be limited to localhost in a container,
+# as then accessing them would require using host networking
+RUN sed -i 's/127.0.0.1:/0.0.0.0:/' /out/etc/xpumd/config-example.yaml
+
+# Copy runtime libraries and their package info.
+COPY scripts/copy-files-and-package-info.sh .
+RUN ./copy-files-and-package-info.sh /out \
+        /lib64/ld-linux-x86-64.so.2 \
+        /usr/lib/x86_64-linux-gnu/libc.so.6 \
+        /usr/lib/x86_64-linux-gnu/libcap.so.2 \
+        /usr/lib/x86_64-linux-gnu/libcyaml.so.1 \
+        /usr/lib/x86_64-linux-gnu/libyaml-0.so.2 \
+        /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 \
+        /usr/lib/x86_64-linux-gnu/libm.so.6 \
+        /usr/lib/x86_64-linux-gnu/libresolv.so.2 \
+        /usr/lib/x86_64-linux-gnu/libstdc++.so.6 \
+        /usr/lib/x86_64-linux-gnu/libudev.so.1 \
+        /usr/lib/x86_64-linux-gnu/libigdgmm.so.12 \
+        /usr/lib/x86_64-linux-gnu/libze_intel_gpu.so.1 \
+        /usr/lib/x86_64-linux-gnu/libze_loader.so.1 \
+        /usr/local/lib/libigc.so.2
+
+# libigsc and libmetee are source-built (not DEB packages): copy manually and add synthetic dpkg status entries for scanners
+RUN install -D /usr/lib/x86_64-linux-gnu/libigsc.so.0 \
+               /out/usr/lib/x86_64-linux-gnu/libigsc.so.0 && \
+    /usr/bin/echo -e "\
+Package: libigsc0\n\
+Status: install ok installed\n\
+Architecture: amd64\n\
+Version: ${IGSC_VERSION#V}\n\
+Homepage: https://github.com/intel/igsc\n\
+Description: Intel(R) Graphics System Controller Firmware Update Library\n\
+\n\
+Package: libmetee0\n\
+Status: install ok installed\n\
+Architecture: amd64\n\
+Version: ${METEE_VERSION}\n\
+Homepage: https://github.com/intel/metee\n\
+Description: Intel(R) ME TEE Library (statically linked to libigsc)\n\
+\n" >> /out/var/lib/dpkg/status
 
 # The final image
 FROM ${BASE_IMAGE} AS final
@@ -108,4 +139,7 @@ COPY --from=builder /out/ /
 
 USER 65534:65534
 
+# default "intelxpuinfo" socket dir
+ENV XDG_RUNTIME_DIR=/run/xpumd
+
 ENTRYPOINT ["/usr/local/bin/xpumd"]
diff --git a/xpumd/Makefile b/xpumd/Makefile
index ac8128406..4f72bb8f5 100644
--- a/xpumd/Makefile
+++ b/xpumd/Makefile
@@ -6,9 +6,10 @@
 # --- Helper targets ---
 
 # Skip the main module at the repo root as it's currently empty and makes some checks to fail.
-GO_MODULES := $(shell (git ls-files '*/go.mod' 2> /dev/null || find -mindepth 2 -name go.mod) | xargs dirname)
+GO_MODULES := $(shell (git ls-files '*/go.mod' 2> /dev/null || find -mindepth 2 -name go.mod -printf '%P\n') | xargs dirname)
 LEVEL_ZERO_GO_MODULES := $(foreach m,$(GO_MODULES),$(if $(findstring level-zero-go,$(m)),$(m)))
-XPUMD_GO_MODULES := $(filter-out $(LEVEL_ZERO_GO_MODULES),$(GO_MODULES))
+# Filter out level-zero-go and test/
+XPUMD_GO_MODULES := $(filter-out $(LEVEL_ZERO_GO_MODULES) $(filter test/%,$(GO_MODULES)),$(GO_MODULES))
 
 .PHONY: help
 help:
@@ -25,14 +26,24 @@ stats:
 
 # --- Build targets ---
 
-OTEL_VERSION ?= 0.151.0
+OTEL_VERSION ?= 0.153.0
+IMAGE_REPOSITORY ?= registry.local/xpumd
+IMAGE_TAG ?= latest
+IMAGE_PULL_POLICY ?= IfNotPresent
+
+# PIE + full RELRO, drop all symbols
+GO_FLAGS := -buildmode=pie -bindnow -s -w
 
 .PHONY: build
 # Build xpumd + xpuinfo-cli
 build:
 	sed 's/@OTEL_VERSION@/$(OTEL_VERSION)/g' builder-config.yaml.in > builder-config.yaml
-	go tool -modfile tools/go.mod builder --config=builder-config.yaml
-	go -C dist build github.com/intel/xpumanager/xpumd/exporter/xpuinfo-cli
+	go tool -modfile tools/go.mod builder --ldflags "$(GO_FLAGS)" --config=builder-config.yaml
+	go -C dist build --ldflags "$(GO_FLAGS)" github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/xpuinfo-cli
+
+.PHONY: docker-build
+docker-build:
+	docker build -t $(IMAGE_REPOSITORY):$(IMAGE_TAG) .
 
 .PHONY: generate
 generate: generate-bindings generate-mods generate-proto
@@ -40,7 +51,7 @@ generate: generate-bindings generate-mods generate-proto
 .PHONY: generate-bindings
 # Generate Go bindings for Level-Zero
 generate-bindings:
-	make -C receiver/internal/level-zero-go generate
+	make -C level-zero-go generate
 
 .PHONY: generate-mods
 # Generate indicated Go modules code + Helm docs / validation schema
@@ -52,7 +63,7 @@ generate-mods:
 generate-proto: install-protoc
 	PATH=tools/bin/ protoc --go_out=. --go_opt=paths=source_relative \
 	                       --go-grpc_out=. --go-grpc_opt=paths=source_relative \
-	                       exporter/api/deviceinfo/v1alpha1/deviceinfo.proto
+	                       exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto
 
 .PHONY: install-protoc
 install-protoc:
@@ -75,10 +86,26 @@ test-daemon:
 	fi; \
 	echo "✓ All tests passed"
 
+
 .PHONY: test-bindings
 test-bindings:
 	@echo "Running Level-Zero Go bindings tests..."
-	make -C receiver/internal/level-zero-go test
+	make -C level-zero-go test
+
+.PHONY: test-integration-kind
+test-integration-kind: docker-build
+	scripts/run-integration-tests.sh \
+		--image-repository=$(IMAGE_REPOSITORY) \
+		--image-tag=$(IMAGE_TAG) \
+		--kind-load-image
+
+.PHONY: test-integration-existing-cluster
+test-integration-existing-cluster:
+	scripts/run-integration-tests.sh \
+		--image-repository=$(IMAGE_REPOSITORY) \
+		--image-tag=$(IMAGE_TAG) \
+		--use-existing-cluster \
+		--image-pull-policy=$(IMAGE_PULL_POLICY)
 
 .PHONY: golint
 golint:
diff --git a/xpumd/README.md b/xpumd/README.md
index 20f0d610a..c4d994961 100644
--- a/xpumd/README.md
+++ b/xpumd/README.md
@@ -21,7 +21,7 @@ provides:
 * Intel GPU metric exporters
 * GPU status information for Kubernetes Intel GPU resource drivers
 
-[Changes](CHANGES.md) lists differences in corresponding functionality compared to XPUM v1.x.
+[Changes](docs/CHANGES.md) lists differences in corresponding functionality compared to XPUM v1.x.
 
 
 ## Architecture
@@ -39,6 +39,7 @@ graph TB
         subgraph XPUMD["XPUM Daemon - xpumd"]
             subgraph RECV["Receivers"]
                 RECV_XPU["Intel XPU Receiver<br/>(intelxpu)"]
+                RECV_LOG["Intel Crashlog<br/>(intel_crashlog)"]
             end
 
             subgraph PROC["Processor pipeline"]
@@ -46,6 +47,7 @@ graph TB
                 %% PROC_OTHERS["Standard Processors"] %%
             end
 
+            RECV -->|metrics| PROC_XPU
             %% PROC_XPU --> PROC_OTHERS %%
 
             subgraph EXP["Exporters"]
@@ -54,9 +56,10 @@ graph TB
                 EXP_OTEL["OpenTelemetry Exporter"]
             end
             %% change PROC_XPU => PROC_OTHERS if other processors added %%
-            PROC_XPU -->|processed metrics| EXP_INFO
             PROC_XPU -->|processed metrics| EXP_PROM
-            PROC_XPU -->|processed metrics| EXP_OTEL
+            PROC_XPU -->|GPU capabilities / status| EXP_INFO
+            PROC_XPU -->|processed metrics / events| EXP_OTEL
+            RECV_LOG -->|crash logs| EXP_OTEL
         end
     end
 
@@ -72,7 +75,6 @@ graph TB
     end
 
     SYSTEM_LIBRARIES --> RECV_XPU
-    RECV -->|metrics| PROC_XPU
 
     EXP_PROM -->|"HTTP(S)"| PROM
     EXP_OTEL -->|"OTLP<br/>gRPC/HTTP(S)"| OTEL_COL
@@ -112,10 +114,10 @@ docker run -it --rm --user 0 --cap-drop ALL --cap-add SYS_ADMIN \
 
 For integration-style runs without a real Level Zero userspace driver, the
 image also ships a stub driver. See
-[`DEVELOPMENT.md`](DEVELOPMENT.md#testing-container-image-with-stub-driver)
+[`DEVELOPMENT.md`](docs/DEVELOPMENT.md#testing-container-image-with-stub-driver)
 for detailed instructions.
 
-See also [Testing container image](#testing-container-image).
+See also [Testing container image](docs/DEVELOPMENT.md#testing-container-image).
 
 ### Kubernetes
 
@@ -123,22 +125,22 @@ See the [Helm chart](charts/xpumd/README.md) for deployment instructions.
 
 For an example of a more complete telemetry stack, see either:
 
-* [MONITORING.md](MONITORING.md) for using XPUM daemon with Prometheus + Grafana, or
-* [OTEL_STACK.md](OTEL_STACK.md) for deploying XPUM daemon with an OpenTelemetry collector backend
+* [MONITORING.md](docs/MONITORING.md) for using XPUM daemon with Prometheus + Grafana, or
+* [OTEL_STACK.md](docs/OTEL_STACK.md) for deploying XPUM daemon with an OpenTelemetry collector backend
 
 ### Grafana dashboard
 
 Helm chart installs Grafana dashboard, but one can also load manually
 [dashboard JSON version](charts/xpumd/json/) to Grafana.
 
-![GPU metrics dashboard](xpumd-dashboard.png)
+![GPU metrics dashboard](docs/xpumd-dashboard.png)
 
 
 ## Features
 
 ### Metrics
 
-See the [`intelxpu` receiver documentation](receiver/sysman/documentation.md)
+See the [`intelxpu` receiver documentation](receiver/intelxpu/sysman/documentation.md)
 for the list of supported GPU metrics and attributes.
 
 Metrics availability depends on the underlying host hardware,
@@ -167,9 +169,8 @@ metrics:
 
 ### Device info exporter
 
-The XPUM daemon implements a custom exporter that exposes GPU health
-information. It serves a custom gRPC API at local Unix socket
-(`/run/xpumd/intelxpuinfo.sock` by default).
+The XPUM daemon implements a custom exporter that exposes GPU capability and health information.
+It serves a custom gRPC API at local Unix socket (`/run/xpumd/intelxpuinfo.sock` by default).
 
 The device info exporter is enabled by the default configuration file
 ([`config-example.yaml`](config-example.yaml)) and the [Helm chart](charts/xpumd/README.md).
@@ -177,4 +178,4 @@ The device info exporter is enabled by the default configuration file
 
 ## Development
 
-See [DEVELOPMENT.md](DEVELOPMENT.md) for instructions on how to build, run and test the XPUM daemon.
+See [DEVELOPMENT.md](docs/DEVELOPMENT.md) for instructions on how to build, run and test the XPUM daemon.
diff --git a/xpumd/builder-config.yaml.in b/xpumd/builder-config.yaml.in
index fed9ed996..526abadba 100644
--- a/xpumd/builder-config.yaml.in
+++ b/xpumd/builder-config.yaml.in
@@ -10,7 +10,7 @@ dist:
   cgo_enabled: true
 
 replaces:
-  - github.com/intel/level-zero-go => ../receiver/internal/level-zero-go
+  - github.com/intel/level-zero-go => ../level-zero-go
   - github.com/intel/xpumanager/xpumd => ../
   - github.com/intel/xpumanager/xpumd/common => ../common
 
@@ -18,18 +18,22 @@ exporters:
   - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v@OTEL_VERSION@
   - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v@OTEL_VERSION@
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v@OTEL_VERSION@
-  - gomod: github.com/intel/xpumanager/xpumd/exporter v0.0.0
-    path: ./exporter
+  - gomod: github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo v0.0.0
+    path: ./exporter/intelxpuinfo
     name: intelxpuinfoexporter
 
 receivers:
-  - gomod: github.com/intel/xpumanager/xpumd/receiver v0.0.0
-    path: ./receiver
+  - gomod: github.com/intel/xpumanager/xpumd/receiver/intelxpu v0.0.0
+    path: ./receiver/intelxpu
     name: intelxpureceiver
+  - gomod: github.com/intel/xpumanager/xpumd/receiver/intelcrashlog v0.0.0
+    path: ./receiver/intelcrashlog
+    name: intelcrashlogreceiver
 
 processors:
-  - gomod: github.com/intel/xpumanager/xpumd/processor v0.0.0
-    path: ./processor
+  - gomod: github.com/intel/xpumanager/xpumd/processor/intelxpustatus v0.0.0
+    path: ./processor/intelxpustatus
     name: intelxpustatus
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v@OTEL_VERSION@
 
 extensions:
diff --git a/xpumd/charts/xpumd/README.md b/xpumd/charts/xpumd/README.md
index d6c359188..3fad34afc 100644
--- a/xpumd/charts/xpumd/README.md
+++ b/xpumd/charts/xpumd/README.md
@@ -12,6 +12,9 @@ NOTE: Enable NFD ([Node Feature Discovery](https://kubernetes-sigs.github.io/nod
 / GPU node labeling when installing either GPU plugin or DRA driver, to avoid `Pending` daemon
 pods on cluster nodes that do not have Intel GPUs.
 
+For stub-driver or other non-GPU test deployments, the chart can also run with
+`gpuAccess=none`, which skips GPU resource requests entirely.
+
 [^1]: [Intel GPU plugin](https://intel.github.io/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/README.html)
 [^2]: [Intel GPU resource driver](https://github.com/intel/intel-resource-drivers-for-kubernetes/tree/main/doc/gpu#readme)
 
@@ -19,9 +22,11 @@ pods on cluster nodes that do not have Intel GPUs.
 
 Specify which type of Intel [GPU monitoring access](#other-values) is used in the cluster:
 
-* `i915`: Intel GPU plugin[^1] resource for monitoring Intel GPUs supported by the `i915` kernel driver
-* `xe`: Intel GPU plugin[^1] resource for monitoring Intel GPUs supported by the `xe` kernel driver
-* `dra`: Intel GPU (DRA) resource driver[^2] claim for monitoring (both `xe` and `i915`) Intel GPUs
+* `dra`: Intel GPU (DRA) resource driver[^2] claim for monitoring Intel GPUs
+* `plugin`: Intel GPU plugin[^1] (v0.36.0 or newer) resource for monitoring Intel GPUs
+* `i915`: Intel GPU plugin (legacy) resource for monitoring Intel GPUs supported by the `i915` kernel driver
+* `xe`: Intel GPU plugin (legacy) resource for monitoring Intel GPUs supported by the `xe` kernel driver
+* `none`: Do not request GPU resources. Useful for stub-driver testing on generic clusters.
 
 For example:
 
@@ -74,7 +79,7 @@ and Grafana dashboard for the collected metrics, add options:
 ```
 
 NOTE: above requires Prometheus to be installed to the cluster beforehand, otherwise install fails.
-See [monitoring](../../MONITORING.md) and [Prometheus exporter README](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter#readme).
+See [monitoring](../../docs/MONITORING.md) and [Prometheus exporter README](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter#readme).
 
 To enable (only) OTLP gRPC exporter i.e. data pushing to specified OTel collector service, add options:
 
@@ -83,7 +88,7 @@ To enable (only) OTLP gRPC exporter i.e. data pushing to specified OTel collecto
   --set config.service.pipelines.metrics.exporters="{otlp}"
 ```
 
-See [OTEL_STACK](../../OTEL_STACK.md) on how to setup OTel collector, and
+See [OTEL_STACK](../../docs/OTEL_STACK.md) on how to setup OTel collector, and
 [OTLP gRPC exporter README](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter#readme) or
 [OTLP HTTP exporter README](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter#readme)
 on how to configure OTel exporter for gRPC or HTTP transport.
@@ -124,28 +129,33 @@ And add following option to chart install:
 | config.processors | object | `{"intelxpustatus":{}}` | [Configuration for processors](https://opentelemetry.io/docs/collector/configuration/#processors) |
 | config.processors.intelxpustatus | object | `{}` | Override configuration for the Intel XPU processor. Should only be used for advanced use cases. See `intelxpustatus` README for details. |
 | config.receivers | object |   | [Configuration for receivers](https://opentelemetry.io/docs/collector/configuration/#receivers) |
+| config.receivers.intel_crashlog | object | `{}` | Override configuration for the Intel Crashlog receiver. Should only be used for advanced use cases. See `intel_crashlog` README for details. |
 | config.receivers.intelxpu | object |   | Configuration for the Intel XPU receiver. |
 | config.receivers.intelxpu.collection_interval | string | `"5s"` | Metrics data collection interval. Must be at least twice the sampling_interval. |
 | config.receivers.intelxpu.initial_delay | string | `"1s"` | Initial start delay for metrics collection, any non positive value is assumed to be immediately. |
-| config.receivers.intelxpu.log_level | string | `"info"` | Log level (debug, info, warn, error) |
 | config.receivers.intelxpu.metrics | object | `{}` | Configuration for enabling/disabling individual metrics. |
 | config.receivers.intelxpu.sampling_interval | string | `"1s"` | Sampling interval for the high-frequency metrics. |
 | config.receivers.intelxpu.timeout | int | `0` | Metrics collection timeout. |
-| config.service | object | `{"pipelines":{"logs":{"exporters":["intelxpuinfo"],"receivers":["intelxpu"]},"metrics":{"exporters":["intelxpuinfo"],"processors":["intelxpustatus"],"receivers":["intelxpu"]}},"telemetry":{"logs":{"level":"info"}}}` | [Configuration for service](https://opentelemetry.io/docs/collector/configuration/#service) |
+| config.service | object | `{"pipelines":{"logs":{"exporters":["intelxpuinfo"],"receivers":["intelxpu","intel_crashlog"]},"metrics":{"exporters":["intelxpuinfo"],"processors":["intelxpustatus"],"receivers":["intelxpu"]}},"telemetry":{"logs":{"level":"info"}}}` | [Configuration for service](https://opentelemetry.io/docs/collector/configuration/#service) |
 
 ### Other Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) for the pods |
+| crashlog.directory | string | `"/var/log/crashlog"` | Host directory to watch for collecting GPU crash logs. Use `*` to match all files. |
+| extraEnv | list | `[]` | Extra environment variables for the xpumd container |
+| extraVolumeMounts | list | `[]` | Additional volume mounts for the xpumd container |
+| extraVolumes | list | `[]` | Additional volumes for the xpumd pod |
 | fullnameOverride | string | `""` | Override the fully qualified app name |
-| gpuAccess | string | `"xe"` | method for requesting monitoring access to Intel GPUs: `dra` (K8s DRA GPU driver) `i915` / `xe` (K8s GPU plugin) |
+| gpuAccess | string | `"dra"` | method for requesting monitoring access to Intel GPUs: `dra` (K8s DRA GPU driver), `plugin` (K8s GPU plugin), `i915` / `xe` (old K8s GPU plugin KMD-based resource names), `none` (no GPU resource request, useful for stub-driver testing) |
 | grafana.dashboards | bool | `false` | Install XPUMD dashboard(s) for Grafana |
 | grafana.namespace | string | `"monitoring"` | Namespace for Grafana install. Needed when Grafana dashboard auto-loader sidecar `searchNamespace: ALL` option is not used |
 | image.pullPolicy | string | `"Always"` | Image pull policy |
 | image.repository | string | `"ghcr.io/intel/xpumanager/xpumd"` | Image repository |
 | image.tag | string | `""` | Image tag, defaults to Chart.AppVersion |
 | imagePullSecrets | list | `[]` | [Image pull secrets](https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod) |
+| initContainers | list | `[]` | Init containers to run |
 | nameOverride | string | `""` | Override the chart name |
 | nodeSelector | object | `{}` | Node selector for pod placement |
 | podAnnotations | object | `{}` | Annotations to add to the pod |
diff --git a/xpumd/charts/xpumd/README.md.gotmpl b/xpumd/charts/xpumd/README.md.gotmpl
index db599c811..264e2d11e 100644
--- a/xpumd/charts/xpumd/README.md.gotmpl
+++ b/xpumd/charts/xpumd/README.md.gotmpl
@@ -14,6 +14,9 @@ NOTE: Enable NFD ([Node Feature Discovery](https://kubernetes-sigs.github.io/nod
 / GPU node labeling when installing either GPU plugin or DRA driver, to avoid `Pending` daemon
 pods on cluster nodes that do not have Intel GPUs.
 
+For stub-driver or other non-GPU test deployments, the chart can also run with
+`gpuAccess=none`, which skips GPU resource requests entirely.
+
 [^1]: [Intel GPU plugin](https://intel.github.io/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/README.html)
 [^2]: [Intel GPU resource driver](https://github.com/intel/intel-resource-drivers-for-kubernetes/tree/main/doc/gpu#readme)
 
@@ -22,9 +25,11 @@ pods on cluster nodes that do not have Intel GPUs.
 
 Specify which type of Intel [GPU monitoring access](#other-values) is used in the cluster:
 
-* `i915`: Intel GPU plugin[^1] resource for monitoring Intel GPUs supported by the `i915` kernel driver
-* `xe`: Intel GPU plugin[^1] resource for monitoring Intel GPUs supported by the `xe` kernel driver
-* `dra`: Intel GPU (DRA) resource driver[^2] claim for monitoring (both `xe` and `i915`) Intel GPUs
+* `dra`: Intel GPU (DRA) resource driver[^2] claim for monitoring Intel GPUs
+* `plugin`: Intel GPU plugin[^1] (v0.36.0 or newer) resource for monitoring Intel GPUs
+* `i915`: Intel GPU plugin (legacy) resource for monitoring Intel GPUs supported by the `i915` kernel driver
+* `xe`: Intel GPU plugin (legacy) resource for monitoring Intel GPUs supported by the `xe` kernel driver
+* `none`: Do not request GPU resources. Useful for stub-driver testing on generic clusters.
 
 For example:
 
@@ -77,7 +82,7 @@ and Grafana dashboard for the collected metrics, add options:
 ```
 
 NOTE: above requires Prometheus to be installed to the cluster beforehand, otherwise install fails.
-See [monitoring](../../MONITORING.md) and [Prometheus exporter README](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter#readme).
+See [monitoring](../../docs/MONITORING.md) and [Prometheus exporter README](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter#readme).
 
 To enable (only) OTLP gRPC exporter i.e. data pushing to specified OTel collector service, add options:
 
@@ -86,7 +91,7 @@ To enable (only) OTLP gRPC exporter i.e. data pushing to specified OTel collecto
   --set config.service.pipelines.metrics.exporters="{otlp}"
 ```
 
-See [OTEL_STACK](../../OTEL_STACK.md) on how to setup OTel collector, and
+See [OTEL_STACK](../../docs/OTEL_STACK.md) on how to setup OTel collector, and
 [OTLP gRPC exporter README](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter#readme) or
 [OTLP HTTP exporter README](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter#readme)
 on how to configure OTel exporter for gRPC or HTTP transport.
diff --git a/xpumd/charts/xpumd/templates/configmap.yaml b/xpumd/charts/xpumd/templates/configmap.yaml
index aa1e3192f..53d297cf7 100644
--- a/xpumd/charts/xpumd/templates/configmap.yaml
+++ b/xpumd/charts/xpumd/templates/configmap.yaml
@@ -5,6 +5,14 @@ metadata:
   labels:
     {{- include "xpumd.labels" . | nindent 4 }}
 data:
+  # Default configuration for the Intel Crashlog receiver. Can be overridden
+  # in config.yaml (via .Values.config).
+  config-receiver-crashlog.yaml: |-
+    receivers:
+      intel_crashlog:
+        directory: /var/log/crashlog
+        glob: "*.bin"
+        ignore_older_than: 0s
   # Default configuration for the Intel XPU status processor. Can be overridden
   # in config.yaml (via .Values.config).
   config-processor-xpustatus.yaml: |-
diff --git a/xpumd/charts/xpumd/templates/daemonset.yaml b/xpumd/charts/xpumd/templates/daemonset.yaml
index d0653e2ac..5be2b71f6 100644
--- a/xpumd/charts/xpumd/templates/daemonset.yaml
+++ b/xpumd/charts/xpumd/templates/daemonset.yaml
@@ -35,14 +35,23 @@ spec:
         seccompProfile:
           type: RuntimeDefault
         {{- end }}
+      {{- with .Values.initContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args:
+        - "--config=/etc/xpumd/config-receiver-crashlog.yaml"
         - "--config=/etc/xpumd/config-processor-xpustatus.yaml"
         - "--config=/etc/xpumd/config-exporter-xpuinfo.yaml"
         - "--config=/etc/xpumd/config.yaml"
+        {{- with .Values.extraEnv }}
+        env:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         securityContext:
           {{- if .Values.securityContextOverride }}
           {{- toYaml .Values.securityContextOverride | nindent 10 }}
@@ -82,6 +91,8 @@ spec:
             gpu.intel.com/i915_monitoring: 1
             {{- else if eq .Values.gpuAccess "xe" }}
             gpu.intel.com/xe_monitoring: 1
+            {{- else if eq .Values.gpuAccess "plugin" }}
+            gpu.intel.com/monitoring: 1
             {{- end }}
             memory: 2Gi
           {{- end }}
@@ -91,6 +102,12 @@ spec:
           readOnly: true
         - name: rundir
           mountPath: /run/xpumd
+        - name: crashlog
+          mountPath: /var/log/crashlog
+          readOnly: true
+        {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -111,3 +128,14 @@ spec:
         hostPath:
           path: /run/xpumd
           type: DirectoryOrCreate
+      - name: crashlog
+      {{- if .Values.crashlog.directory }}
+        hostPath:
+          path: {{ .Values.crashlog.directory }}
+          type: DirectoryOrCreate
+      {{- else }}
+        emptyDir: {}
+      {{- end }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
diff --git a/xpumd/charts/xpumd/values.schema.json b/xpumd/charts/xpumd/values.schema.json
index 686b71ffd..cea7acebf 100644
--- a/xpumd/charts/xpumd/values.schema.json
+++ b/xpumd/charts/xpumd/values.schema.json
@@ -40,6 +40,10 @@
                     "description": "[Configuration for receivers](https://opentelemetry.io/docs/collector/configuration/#receivers)",
                     "type": "object",
                     "properties": {
+                        "intel_crashlog": {
+                            "description": "Override configuration for the Intel Crashlog receiver. Should only be used for advanced use cases. See `intel_crashlog` README for details.",
+                            "type": "object"
+                        },
                         "intelxpu": {
                             "description": "Configuration for the Intel XPU receiver.",
                             "type": "object",
@@ -52,16 +56,6 @@
                                     "description": "Initial start delay for metrics collection, any non positive value is assumed to be immediately.",
                                     "type": "string"
                                 },
-                                "log_level": {
-                                    "description": "Log level (debug, info, warn, error)",
-                                    "type": "string",
-                                    "enum": [
-                                        "debug",
-                                        "info",
-                                        "warn",
-                                        "error"
-                                    ]
-                                },
                                 "metrics": {
                                     "description": "Configuration for enabling/disabling individual metrics.",
                                     "type": "object"
@@ -86,6 +80,31 @@
             },
             "additionalProperties": false
         },
+        "crashlog": {
+            "type": "object",
+            "properties": {
+                "directory": {
+                    "description": "Host directory to watch for collecting GPU crash logs. Use `*` to match all files.",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false
+        },
+        "extraEnv": {
+            "description": "Extra environment variables for the xpumd container",
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.34.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/env",
+            "type": "array"
+        },
+        "extraVolumeMounts": {
+            "description": "Additional volume mounts for the xpumd container",
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.34.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/volumeMounts",
+            "type": "array"
+        },
+        "extraVolumes": {
+            "description": "Additional volumes for the xpumd pod",
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.34.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/volumes",
+            "type": "array"
+        },
         "fullnameOverride": {
             "description": "Override the fully qualified app name",
             "type": "string"
@@ -99,12 +118,14 @@
             ]
         },
         "gpuAccess": {
-            "description": "method for requesting monitoring access to Intel GPUs: `dra` (K8s DRA GPU driver) `i915` / `xe` (K8s GPU plugin)",
+            "description": "method for requesting monitoring access to Intel GPUs: `dra` (K8s DRA GPU driver), `plugin` (K8s GPU plugin), `i915` / `xe` (old K8s GPU plugin KMD-based resource names), `none` (no GPU resource request, useful for stub-driver testing)",
             "type": "string",
             "enum": [
                 "dra",
+                "plugin",
                 "i915",
-                "xe"
+                "xe",
+                "none"
             ]
         },
         "grafana": {
@@ -149,6 +170,11 @@
             "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.34.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/imagePullSecrets",
             "type": "array"
         },
+        "initContainers": {
+            "description": "Init containers to run",
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.34.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers",
+            "type": "array"
+        },
         "nameOverride": {
             "description": "Override the chart name",
             "type": "string"
diff --git a/xpumd/charts/xpumd/values.yaml b/xpumd/charts/xpumd/values.yaml
index 1e9ad10dd..9511b80af 100644
--- a/xpumd/charts/xpumd/values.yaml
+++ b/xpumd/charts/xpumd/values.yaml
@@ -31,6 +31,18 @@ serviceAccount:
 # -- Annotations to add to the pod
 podAnnotations: {}
 
+# @schema $ref: $k8s/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/env
+# -- Extra environment variables for the xpumd container
+extraEnv: []
+
+# @schema $ref: $k8s/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/volumeMounts
+# -- Additional volume mounts for the xpumd container
+extraVolumeMounts: []
+
+# @schema $ref: $k8s/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/volumes
+# -- Additional volumes for the xpumd pod
+extraVolumes: []
+
 # @schema $ref: $k8s/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext
 # -- [Pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod).
 # NOTE: security settings control to what GPU metrics container has access to
@@ -41,6 +53,10 @@ podSecurityContextOverride: {}
 # NOTE: security settings control to what GPU metrics container has access to
 securityContextOverride: {}
 
+# @schema $ref: $k8s/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers
+# -- Init containers to run
+initContainers: []
+
 # @schema additionalProperties:false
 service:
   # -- Create service
@@ -51,9 +67,10 @@ service:
   # -- Service port
   port: 8080
 
-# @schema enum: [dra, i915, xe]
-# -- method for requesting monitoring access to Intel GPUs: `dra` (K8s DRA GPU driver) `i915` / `xe` (K8s GPU plugin)
-gpuAccess: xe
+# @schema enum: [dra, plugin, i915, xe, none]
+# -- method for requesting monitoring access to Intel GPUs: `dra` (K8s DRA GPU driver), `plugin` (K8s GPU plugin),
+# `i915` / `xe` (old K8s GPU plugin KMD-based resource names), `none` (no GPU resource request, useful for stub-driver testing)
+gpuAccess: dra
 
 # @schema additionalProperties:false
 prometheus:
@@ -89,6 +106,14 @@ tolerations: []
 # -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) for the pods
 affinity: {}
 
+
+# @schema additionalProperties:false
+crashlog:
+  # -- Host directory to watch for collecting GPU crash logs.
+  # Use `*` to match all files.
+  directory: /var/log/crashlog
+
+
 # @schema additionalProperties:false
 config:
   # -- [Configuration for receivers](https://opentelemetry.io/docs/collector/configuration/#receivers)
@@ -100,10 +125,6 @@ config:
     # @default --  
     # @section -- XPUM Daemon Configuration
     intelxpu:
-      # @schema enum: [debug, info, warn, error]
-      # -- Log level (debug, info, warn, error)
-      # @section -- XPUM Daemon Configuration
-      log_level: info
       # -- Metrics data collection interval. Must be at least twice the sampling_interval.
       # @section -- XPUM Daemon Configuration
       collection_interval: 5s
@@ -119,6 +140,10 @@ config:
       # -- Configuration for enabling/disabling individual metrics.
       # @section -- XPUM Daemon Configuration
       metrics: {}
+    # -- Override configuration for the Intel Crashlog receiver. Should only be used for advanced use cases.
+    # See `intel_crashlog` README for details.
+    # @section -- XPUM Daemon Configuration
+    intel_crashlog: {}
 
   # -- [Configuration for processors](https://opentelemetry.io/docs/collector/configuration/#processors)
   # @section -- XPUM Daemon Configuration
@@ -149,7 +174,6 @@ config:
     telemetry:
       logs:
         level: info
-        # TODO: enable before release
         #disable_stacktrace: true
     # @schema hidden
     pipelines:
@@ -158,5 +182,5 @@ config:
         processors: [intelxpustatus]
         exporters: [intelxpuinfo]
       logs:
-        receivers: [intelxpu]
+        receivers: [intelxpu, intel_crashlog]
         exporters: [intelxpuinfo]
diff --git a/xpumd/config-example.yaml b/xpumd/config-example.yaml
index 3002c61a1..e08162982 100644
--- a/xpumd/config-example.yaml
+++ b/xpumd/config-example.yaml
@@ -1,8 +1,6 @@
 receivers:
   # The Intel XPU receiver.
   intelxpu:
-    # Log level (debug, info, warn, error)
-    log_level: info
     # Metrics data collection interval.
     # Must be at least twice the sampling_interval.
     collection_interval: 5s
@@ -13,11 +11,23 @@ receivers:
     # Sampling interval for the high-frequency metrics.
     sampling_interval: 1s
     # Configuration for enabling/disabling individual metrics.
-    # See receiver/intelxpu/documentation.md for list of available metrics.
+    # See receiver/intelxpu/sysman/documentation.md for list of available metrics.
     metrics:
 #      hw.memory.size:
 #        enabled: false
 
+  intel_crashlog:
+    # Directory to watch for new crashlog files (must exist!).
+    directory: /var/log/crashlog
+    # Filename glob pattern (matched against the base name of each file).
+    glob: "*.bin"
+    # Ignore files whose modification time is older than this duration before
+    # startup. Zero means only files created after startup are processed.
+    ignore_older_than: 0s
+    # Static attributes added to every emitted log record (optional).
+    # add_attributes:
+    #   hw.vendor: "ACME"
+
 processors:
   intelxpustatus:
     rules:
@@ -73,6 +83,14 @@ processors:
             conditions:
               - value: 85.0
 
+  # An example config for filter processor: drop hw.status{hw.state="ok"} data points to reduce metric cardinality.
+  # NOTE: If enabled in the default pipeline, this also affects the
+  # intelxpuinfo exporter: healthy components will have no active status entry.
+  filter/ok_status:
+    metrics:
+      datapoint:
+        - 'metric.name == "hw.status" and attributes["hw.state"] == "ok"'
+
 exporters:
   intelxpuinfo:
     # Only unix domain socket is allowed.
@@ -113,7 +131,7 @@ exporters:
           "*":
             severity: warning
   prometheus:
-    endpoint: "0.0.0.0:8080"
+    endpoint: "127.0.0.1:8080"
 
 extensions:
 
@@ -121,7 +139,6 @@ service:
   telemetry:
     logs:
       level: info
-      # TODO: enable before release
       #disable_stacktrace: true
   pipelines:
     metrics:
@@ -129,5 +146,6 @@ service:
       processors: [intelxpustatus]
       exporters: [intelxpuinfo,prometheus]
     logs:
+      # "intel_crashlog" receiver can be added when its dir is present
       receivers: [intelxpu]
       exporters: [intelxpuinfo]
diff --git a/xpumd/docs/ALERTS.md b/xpumd/docs/ALERTS.md
new file mode 100644
index 000000000..8fbe13c26
--- /dev/null
+++ b/xpumd/docs/ALERTS.md
@@ -0,0 +1,82 @@
+# GPU state / metric alerts
+
+Contents:
+
+* [Description](#description)
+* [Alert rules](#alert-rules)
+  - [Alert resolving on rule changes](#alert-resolving-on-rule-changes)
+* [Setup](#setup)
+
+
+## Description
+
+When health management is enabled for the Kubernetes Intel GPU DRA
+driver, it automatically sets health state and device taints for the
+GPUs, based on the information provided by the XPUM daemon.
+
+It does not inform cluster admin about these detected HW state changes though,
+but one could use e.g. [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/overview/)
+for that.
+
+Alerts are specified in `PrometheusRule` CRD, handled by the
+Prometheus operator. Each alert rule has a name, a Prometheus metric
+query triggering the alert, and some extra annotations & labels for
+their severity and description. Alertmanager then handles sending
+notifications for alerts in "firing" state.
+
+> [!NOTE]
+> `PrometheusRule` CRDs are understood also e.g. by Grafana Mimir,
+> Thanos and VictoriaMetrics services, and natively supported by AWS AMP
+> and Google GCP platforms.
+
+
+## Alert rules
+
+Alert rule file provides examples for potentially relevant GPU
+health related metrics currently supported by the XPUM daemon:
+
+* [xpum-alert-rules.yaml](xpum-alert-rules.yaml)
+
+All GPUs do not provide all the metrics, and they can have different
+maximum values.  Alerts are also intended for continuing conditions
+and their Prometheus metric rules specify a period "FOR" over which
+that condition is evaluated.
+
+Thus, prior to deploying the alert rules:
+
+- **Review evaluation periods**: audit how long the conditions should exist before sending notifications
+- **Evaluate relevance**: remove rules that are not relevant for given cluster use-cases
+
+> [!NOTE]
+> Depending on Prometheus Operator / `kube-prometheus` Helm chart
+> settings, rule file `metadata.labels` may need to be updated to match
+> Prometheus `ruleSelector`.
+
+
+### Alert resolving on rule changes
+
+As long as only the rule conditions for an alert are changed (not
+other alert details, nor Alertmanager configuration), Alertmanager
+will resolve that alert if its new rule conditions do not trigger any
+more with metric values.  E.g. after power limit for an alert is
+increased.
+
+
+## Setup
+
+See [MONITORING](MONITORING.md) for setting up Prometheus operator /
+Alertmanager with `kube-prometheus`.
+
+After reading [Alert rules](#alert-rules) section and updating rules
+appropriately, apply GPU metric alert rules to the Prometheus /
+Alertmanager namespace:
+
+```
+kubectl apply -n <namespace> -f xpum-alert-rules.yaml
+```
+
+One could start with lowered thresholds, to verify that alerts work
+e.g. by viewing the resulting alerts (if any) from Grafana.
+
+Once everything works, one can revert to more suitable thresholds, and
+configure Alertmanager to automatically send alert notifications.
diff --git a/xpumd/CHANGES.md b/xpumd/docs/CHANGES.md
similarity index 76%
rename from xpumd/CHANGES.md
rename to xpumd/docs/CHANGES.md
index 519752612..c192731f8 100644
--- a/xpumd/CHANGES.md
+++ b/xpumd/docs/CHANGES.md
@@ -23,20 +23,23 @@ for their daemon / exporter / remote API functionality.
 
 * Daemon and exporter in the same process
   * Implemented in Go on top of OpenTelemetry (OTel) packages and Level-Zero Go bindings
-* Provides OpenTelemetry and Prometheus metrics endpoints
+* Provides OpenTelemetry and Prometheus metrics exporting endpoints
   * Prometheus metric names (`hw_*`) and attributes follow OTel conventions
   * No "destructive" GPU operations supported, only GPU metric / status queries
+  * OpenTelemetry endpoint also provides events and logs in addition to metrics
 * Separate endpoint to provide GPU state information for Kubernetes DRA Intel GPU driver
 * Extensive configuration support through YAML configuration file
 
 
 #### Missing metrics
 
-Compared to XPUM 1.x, XPUM 2.x lacks support for the following GPU metrics:
+Compared to XPUM 1.x, XPUM 2.0 lacks support for the following GPU metrics:
 
-* EU active/stall/idle metrics - were disabled by default in 1.x
+* EU active/stall/idle metrics
+  * OA HW counter config is GPU-wide, and processing them can have noticeable
+    performance impact, so these were not enabled by default even in v1.x
+  * Use instead e.g. VTune for debugging performance issues
 * Fabric (XeLink) metrics - not relevant for BMG
-* RAS (error) counters - not relevant for BMG
 
 
 ### Summary
diff --git a/xpumd/DEVELOPMENT.md b/xpumd/docs/DEVELOPMENT.md
similarity index 73%
rename from xpumd/DEVELOPMENT.md
rename to xpumd/docs/DEVELOPMENT.md
index dc264be91..02dacaf67 100644
--- a/xpumd/DEVELOPMENT.md
+++ b/xpumd/docs/DEVELOPMENT.md
@@ -14,11 +14,12 @@
     - [Kind cluster](#kind-cluster)
     - [Containerd-based cluster](#containerd-based-cluster)
   - [Deploy with Helm](#deploy-with-helm)
+- [Driver stack updates](#driver-stack-updates)
 
 ## Building
 
 See the build requirements in Level-Zero Go Bindings
-[README](receiver/internal/level-zero-go/README.md#requirements).
+[README](../level-zero-go/README.md#requirements).
 
 Clone the repository:
 
@@ -44,8 +45,15 @@ make build
 sudo ./dist/xpumd --config config-example.yaml
 ```
 
-(Extra privileges are required to get all the metrics, but some of them
-are available also without `sudo`, see [Metrics](README.md#metrics).)
+> [!NOTE]
+> Extra privileges are required to get all the metrics, but some metrics
+> are available also without `sudo`, see [Metrics](../README.md#metrics).
+
+> [!NOTE]
+> If not running this through normal user session, one may need to specify
+> `intelxpuinfo` exporter socket directory with e.g. `XDG_RUNTIME_DIR=$PWD`
+> environment variable (or full socket path with the
+> `exporters.intelxpuinfo.endpoint` config option).
 
 ## Testing Prometheus exporter
 
@@ -55,6 +63,11 @@ In another terminal:
 curl --no-progress-meter http://localhost:8080/metrics
 ```
 
+> [!NOTE]
+> Example config restricts access to localhost for security reasons.
+> If this is run on another host, `xpumd` needs to be started with
+> `--set exporters.prometheus.endpoint=0.0.0.0:8080` option.
+
 ## Testing device info exporter
 
 In another terminal, run the test client to receive device health information and changes:
@@ -144,7 +157,7 @@ and point `SYSMAN_STUB_CONFIG` at that path:
 docker run -it --rm --user 0 \
   -e LD_LIBRARY_PATH=/usr/local/lib/xpumd/level-zero-stub \
   -e SYSMAN_STUB_CONFIG=/etc/xpumd/level-zero-stub/example-config.yaml \
-  --volume $PWD/receiver/internal/level-zero-go/level-zero-stub:/etc/xpumd/level-zero-stub:ro \
+  --volume $PWD/level-zero-go/level-zero-stub:/etc/xpumd/level-zero-stub:ro \
   --publish 8080:8080 registry.local/xpumd:latest \
   --config /etc/xpumd/config-example.yaml
 ```
@@ -222,9 +235,46 @@ devices without Kubernetes resource drivers:
 
 ```bash
 helm install xpumd charts/xpumd --set image.repository=registry.local/xpumd --set image.pullPolicy=Never \
-        --set gpuAccess=null \
+        --set gpuAccess=none \
         --set securityContextOverride.runAsUser=0 --set securityContextOverride.privileged=true
 ```
 
-See [Helm chart README](charts/xpumd/README.md) for other deployment scenarios
+See [Helm chart README](../charts/xpumd/README.md) for other deployment scenarios
 and detailed configuration options.
+
+## Integration tests
+
+The project includes a suite of Kubernetes integration tests that verify the
+deployment and basic functionality using the
+[stub Level-Zero driver](../level-zero-go/level-zero-stub).
+
+### Kind cluster
+
+Run with:
+
+```bash
+make test-integration-kind
+```
+
+This runs everything locally: builds the container image, creates a disposable
+Kind cluster, deploys xpumd via the Helm chart (with stub driver enabled), and
+runs the tests.
+
+### Existing cluster
+
+To run the integration tests against an existing cluster:
+
+```bash
+make test-integration-existing-cluster IMAGE_REPOSITORY=ghcr.io/intel/xpumanager/xpumd IMAGE_TAG=latest
+```
+
+> [!IMPORTANT]
+> Ensure that the container image is present in/reachable by the cluster.
+
+## Driver stack updates
+
+XPUMD [helper scripts](../scripts/README.md) and Docker files validate
+directly downloaded (driver) DEB and ZIP files against hard-coded
+checksums.  If DEB / ZIP file versions are changed, build will error
+out after outputting the new checksums (so they can be updated after
+validation).
diff --git a/xpumd/MONITORING.md b/xpumd/docs/MONITORING.md
similarity index 91%
rename from xpumd/MONITORING.md
rename to xpumd/docs/MONITORING.md
index 6542d41e4..296ee3f9b 100644
--- a/xpumd/MONITORING.md
+++ b/xpumd/docs/MONITORING.md
@@ -5,6 +5,7 @@
 - [Prometheus + Grafana install](#prometheus--grafana-install)
 - [XPUMD Helm options](#xpumd-helm-options)
 - [View metrics](#view-metrics)
+- [GPU metric alerts](#gpu-metric-alerts)
 - [Manual metrics verification](#manual-metrics-verification)
 - [Dashboard install workarounds](#dashboard-install-workarounds)
 
@@ -45,7 +46,7 @@ helm repo update
 3. Verify that Grafana options for dashboard auto-loading:
 
 ```bash
-helm -n monitoring show values prometheus-community/kube-prometheus-stack | grep -B1 -A3 dashboards:
+helm -n $prom_ns show values prometheus-community/kube-prometheus-stack | grep -B1 -A3 dashboards:
 ```
 
 Are enabled (as they should by default):
@@ -107,6 +108,14 @@ of being generated on Grafana install and stored into a K8s Secret.)
 ![GPU metrics dashboard](xpumd-dashboard.png)
 
 
+## GPU metric alerts
+
+K8s DRA driver (listening on XPUMD local gRPC socket) can taint
+unhealthy cluster devices, but those do not produce alerts for the
+admin. [ALERTS.md](ALERTS.md) provides some examples on setting up
+GPU metric based alerts.
+
+
 ## Manual metrics verification
 
 If Grafana dashboard does not show any metrics, one can check whether Prometheus actually gets them.
@@ -157,4 +166,4 @@ As explained in the [Grafana Helm chart documentation](https://github.com/grafan
 
 But if auto-loading does not work, restarting Grafana (by deleting Grafana pod from `$prom_ns` namespace) should load all the available dashboard configMaps.
 
-If even that fails, one can also load the [dashboard JSON version](charts/xpumd/json/) directly from Grafana.
+If even that fails, one can also load the [dashboard JSON version](../charts/xpumd/json/) directly from Grafana.
diff --git a/xpumd/OTEL_STACK.md b/xpumd/docs/OTEL_STACK.md
similarity index 65%
rename from xpumd/OTEL_STACK.md
rename to xpumd/docs/OTEL_STACK.md
index 10fb925cb..c5448c0fa 100644
--- a/xpumd/OTEL_STACK.md
+++ b/xpumd/docs/OTEL_STACK.md
@@ -7,7 +7,7 @@ OpenTelemetry Collector to build a more complete observability stack. In this
 example setup:
 
 - [**Upstream OpenTelemetry Collector**](#step-1-deploy-upstream-opentelemetry-collector)
-  receives metrics from xpumd and provides Prometheus-compatible endpoints
+  receives metrics from `xpumd` and provides Prometheus-compatible endpoints
 - [**xpumd**](#step-2-deploy-xpumd)
   collects Intel GPU telemetry and exports metrics via OTLP (OpenTelemetry Protocol)
 - [**Prometheus/Grafana**](#visualization-with-grafana)
@@ -91,7 +91,7 @@ helm install xpumd oci://ghcr.io/intel/xpumanager/charts/xpumd \
 Alternatively, use the OTLP gRPC exporter (port 4317) instead of HTTP.
 
 > [!IMPORTANT]
-> See the [Chart README](charts/xpumd/README.md) for details on how to
+> See the [Chart README](../charts/xpumd/README.md) for details on how to
 > configure `xpumd` for the target cluster setup.
 
 ### Step 3: Validate the Setup
@@ -126,10 +126,42 @@ Look for Intel GPU metrics, e.g.:
 - `hw_memory_usage_bytes`
 
 > [!NOTE]
-> See the [`intelxpu` receiver documentation](receiver/sysman/documentation.md)
+> See the [`intelxpu` receiver documentation](../receiver/intelxpu/sysman/documentation.md)
 > for all available metrics.
 
 ## Visualization with Grafana
 
-TODO: add instructions on using Prometheus with OTel collector, instead
-of [monitoring XPUM daemon directly](MONITORING.md).
+Visualization requires metrics to be stored in a timeseries database, and Prometheus is a popular choice for that.
+
+The [MONITORING.md](MONITORING.md) document has instructions on installing Prometheus / Grafana, and
+the [Helm chart documentation](../charts/xpumd/README.md) explains how to enable `xpumd` dashboard for Grafana
+(`xpumd` Prometheus integration should not be enabled for this setup, only the Grafana dashboard).
+
+If a larger amount of data is collected, configuring OpenTelemetry Collector with
+the `prometheusremotewrite` instead of the `prometheus` exporter one may be preferred:
+https://grafana.com/blog/a-practical-guide-to-data-collection-with-opentelemetry-and-prometheus/#6-use-prometheus-remote-write-exporter
+
+```mermaid
+graph BT
+    grafana["Grafana<br/>(Visualization)"]
+    prometheus["Prometheus<br/>(Timeseries database)"]
+    other["Other viewers: OpenObserve, OpenSearch, VictoriaMetrics..."]
+    collector["OpenTelemetry Collector<br/>(data gateway)"]
+
+    subgraph node1["GPU node 1"]
+        xpumd1["XPUM Daemon<br/>(GPU info exporter)"]
+    end
+    subgraph node2["GPU node 2"]
+        xpumd2["XPUM Daemon<br/>(GPU info exporter)"]
+    end
+    subgraph node3["GPU node ..."]
+        xpumd3["XPUM Daemon<br/>(GPU info exporter)"]
+    end
+
+    xpumd1 -->|"metrics/logs/events"| collector
+    xpumd2 -->|"metrics/logs/events"| collector
+    xpumd3 -->|"metrics/logs/events"| collector
+    collector -->|"logs/events/traces"| other
+    collector -->|"metrics"| prometheus
+    prometheus -->|"metrics"| grafana
+```
diff --git a/xpumd/docs/xpum-alert-rules.yaml b/xpumd/docs/xpum-alert-rules.yaml
new file mode 100644
index 000000000..7dbce6420
--- /dev/null
+++ b/xpumd/docs/xpum-alert-rules.yaml
@@ -0,0 +1,67 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app.kubernetes.io/name: xpumd
+    app.kubernetes.io/part-of: xpumd
+    prometheus: k8s
+    role: alert-rules
+  name: xpum-alert-rules
+# relevant specs:
+# - https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/
+# - https://prometheus.io/docs/prometheus/latest/configuration/template_reference/
+spec:
+  # NOTE:
+  # - "hw_sensor_location" attribute values may differ between HW and driver versions, use
+  #   one relevant for the cluster HW (gpu, memory, package, card...)
+  # - use suitable intervals [1] in "for" fields, and update summary/description accordingly
+  #
+  # [1] the time taken to generate an alarm varies between:
+  # - minimum time = [time set in the 'FOR' clause]
+  # - maximum time = [scrape_interval + evaluation_interval + 'FOR' clause time]
+  # where (scrape and) rule evaluation intervals are 1 min by default:
+  #   https://prometheus.io/docs/prometheus/latest/configuration/configuration/
+  groups:
+  - name: xpum-alerts
+    rules:
+    - alert: GpuPowerUsageHigh
+      # TODO: set limit to a value suitable for GPU type(s) used in the cluster
+      # (or if GPU stack provides power ratio metrics, use those instead)
+      expr: hw_power_watts{pci_bdf!="",hw_sensor_location="gpu"} > 99
+      for: 20s
+      annotations:
+        description: "Over 99W ({{ $value }}W) {{ $labels.hw_sensor_location }} power usage over 20s on '{{ $labels.node }}' node '{{ $labels.pci_bdf }}' GPU"
+        summary: "99+W GPU power usage 20+s on {{ $labels.node }}/{{ $labels.pci_bdf }}"
+      labels:
+        severity: warning
+    - alert: GpuTemperatureHigh
+      expr: hw_temperature_celsius{pci_bdf!="",hw_sensor_location="gpu",statistic="max"} > 85
+      for: 20s
+      annotations:
+        description: "Over 85C ({{ $value }}C) max temperature across all sensors over 20s on '{{ $labels.node }}' node '{{ $labels.pci_bdf }}' GPU"
+        summary: "85+C GPU max temperature 20+s on {{ $labels.node }}/{{ $labels.pci_bdf }}"
+      labels:
+        severity: warning
+    - alert: GpuMemoryUsageHigh
+      expr: hw_memory_utilization_ratio{pci_bdf!="",hw_memory_location="device"} > 0.95
+      for: 20s
+      annotations:
+        description: "Over 95% ({{ humanizePercentage $value }}) device ({{ $labels.hw_memory_type }}) memory usage over 20s on '{{ $labels.node }}' node '{{ $labels.pci_bdf }}' GPU"
+        summary: "95+% GPU device memory usage 20+s on {{ $labels.node }}/{{ $labels.pci_bdf }}"
+      labels:
+        severity: warning
+    - alert: GpuStateIssue
+      # HW (component) moved to non-OK state (or to unknown state from a known one)
+      expr: sum by (hw_type, hw_state, node, pci_bdf)(hw_status{pci_bdf!="",hw_state!="ok"}) > 0
+      annotations:
+        description: "{{ $labels.hw_type }} {{ $labels.hw_state }} issue on '{{ $labels.node }}' node '{{ $labels.pci_bdf }}' GPU"
+        summary: "GPU issue(s) on {{ $labels.node }}/{{ $labels.pci_bdf }}"
+      labels:
+        severity: warning
+    - alert: GpuErrors
+      expr: sum by (hw_type, error_type, error_category, node, pci_bdf)(hw_errors_total{hw_type="gpu",pci_bdf!="",error_type="uncorrectable"}) > 0
+      annotations:
+        description: "{{ $value }} uncorrectable '{{ $labels.error_category }}' errors on '{{ $labels.node }}' node '{{ $labels.pci_bdf }}' GPU"
+        summary: "Uncorrectable GPU error(s) on {{ $labels.node }}/{{ $labels.pci_bdf }}"
+      labels:
+        severity: warning
diff --git a/xpumd/xpumd-dashboard.png b/xpumd/docs/xpumd-dashboard.png
similarity index 100%
rename from xpumd/xpumd-dashboard.png
rename to xpumd/docs/xpumd-dashboard.png
diff --git a/xpumd/exporter/doc.go b/xpumd/exporter/doc.go
deleted file mode 100644
index 75701e08d..000000000
--- a/xpumd/exporter/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright (C) 2026 Intel Corporation
-//
-// SPDX-License-Identifier: MIT
-
-package exporter
-
-//go:generate go tool -modfile ../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/exporter/go.mod b/xpumd/exporter/go.mod
deleted file mode 100644
index 6c60f0a74..000000000
--- a/xpumd/exporter/go.mod
+++ /dev/null
@@ -1,97 +0,0 @@
-module github.com/intel/xpumanager/xpumd/exporter
-
-go 1.26
-
-replace github.com/intel/xpumanager/xpumd => ..
-
-replace github.com/intel/xpumanager/xpumd/common => ../common
-
-require (
-	github.com/google/go-cmp v0.7.0
-	github.com/stretchr/testify v1.11.1
-	go.opentelemetry.io/collector/component v1.57.0
-	go.opentelemetry.io/collector/component/componenttest v0.151.0
-	go.opentelemetry.io/collector/config/configgrpc v0.151.0
-	go.opentelemetry.io/collector/config/confignet v1.57.0
-	go.opentelemetry.io/collector/confmap v1.57.0
-	go.opentelemetry.io/collector/exporter v1.57.0
-	go.opentelemetry.io/collector/exporter/exporterhelper v0.151.0
-	go.opentelemetry.io/collector/exporter/exportertest v0.151.0
-	go.opentelemetry.io/collector/pdata v1.57.0
-	go.opentelemetry.io/otel/metric v1.43.0
-	go.opentelemetry.io/otel/sdk/metric v1.43.0
-	go.opentelemetry.io/otel/trace v1.43.0
-	go.uber.org/goleak v1.3.0
-	go.uber.org/zap v1.28.0
-	google.golang.org/grpc v1.81.0
-	google.golang.org/protobuf v1.36.11
-	gopkg.in/yaml.v3 v3.0.1
-)
-
-require (
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/golang/snappy v1.0.0 // indirect
-	github.com/google/go-tpm v0.9.8 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/hashicorp/go-version v1.9.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/intel/xpumanager/xpumd/common v0.0.0
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.18.5 // indirect
-	github.com/knadh/koanf/maps v0.1.2 // indirect
-	github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
-	github.com/knadh/koanf/v2 v2.3.4 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/collector v0.151.0 // indirect
-	go.opentelemetry.io/collector/client v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configauth v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configcompression v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configmiddleware v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configopaque v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configoptional v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configretry v1.57.0 // indirect
-	go.opentelemetry.io/collector/config/configtls v1.57.0 // indirect
-	go.opentelemetry.io/collector/confmap/xconfmap v0.151.0 // indirect
-	go.opentelemetry.io/collector/consumer v1.57.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror v0.151.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumertest v0.151.0 // indirect
-	go.opentelemetry.io/collector/consumer/xconsumer v0.151.0 // indirect
-	go.opentelemetry.io/collector/exporter/xexporter v0.151.0 // indirect
-	go.opentelemetry.io/collector/extension v1.57.0 // indirect
-	go.opentelemetry.io/collector/extension/extensionauth v1.57.0 // indirect
-	go.opentelemetry.io/collector/extension/extensionmiddleware v0.151.0 // indirect
-	go.opentelemetry.io/collector/extension/xextension v0.151.0 // indirect
-	go.opentelemetry.io/collector/featuregate v1.57.0 // indirect
-	go.opentelemetry.io/collector/internal/componentalias v0.151.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.151.0 // indirect
-	go.opentelemetry.io/collector/pdata/xpdata v0.151.0 // indirect
-	go.opentelemetry.io/collector/pipeline v1.57.0 // indirect
-	go.opentelemetry.io/collector/pipeline/xpipeline v0.151.0 // indirect
-	go.opentelemetry.io/collector/receiver v1.57.0 // indirect
-	go.opentelemetry.io/collector/receiver/receivertest v0.151.0 // indirect
-	go.opentelemetry.io/collector/receiver/xreceiver v0.151.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
-	go.opentelemetry.io/otel v1.43.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
-)
diff --git a/xpumd/exporter/README.md b/xpumd/exporter/intelxpuinfo/README.md
similarity index 93%
rename from xpumd/exporter/README.md
rename to xpumd/exporter/intelxpuinfo/README.md
index f1003a55a..4dd9a0744 100644
--- a/xpumd/exporter/README.md
+++ b/xpumd/exporter/intelxpuinfo/README.md
@@ -21,7 +21,7 @@ information for all known XPU devices.
 ### Logs pipeline
 
 The exporter also consumes events (log records) produced by the
-[intelxpu](../receiver/README.md) receiver. Events with the `hw.id`
+[intelxpu](../../receiver/intelxpu/) receiver. Events with the `hw.id`
 attribute are translated into device events.
 
 ## Configuration
@@ -86,6 +86,7 @@ documentation for details.
 | `filters` | []AttributeFilter | [] | Attribute filters that must all match for this mapping to apply (AND semantics). An empty list matches unconditionally and acts as a catch-all |
 | `health_domain` | string | *required* | [Go template](https://pkg.go.dev/text/template) for the health domain name. Attribute keys are available as template variables with dots replaced by underscores (e.g. `hw.type` -> `.hw_type`) |
 | `state_mapping` | map[string]HwStateMapping | {} | Maps `hw.state` attribute values to health status output. The special key `"*"` is a a catch-all for any state not matched by an exact key. Leaving this empty can be used to filter out certain metrics (not be picked by a catch-all mapping) |
+| `show_all_states` | bool | `false` | When `true`, all active `hw.state` values are reported as separate health status entries instead of only the one with the highest severity for each health domain. Useful when multiple concurrent issues should all be visible |
 
 #### AttributeFilter
 
diff --git a/xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo.pb.go b/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.pb.go
similarity index 80%
rename from xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo.pb.go
rename to xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.pb.go
index 018baed9a..8c8c1250f 100644
--- a/xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo.pb.go
+++ b/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.pb.go
@@ -6,8 +6,8 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.36.11
-// 	protoc        v6.33.4
-// source: exporter/api/deviceinfo/v1alpha1/deviceinfo.proto
+// 	protoc        v7.35.0
+// source: exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto
 
 package v1alpha1
 
@@ -66,11 +66,11 @@ func (x SeverityLevel) String() string {
 }
 
 func (SeverityLevel) Descriptor() protoreflect.EnumDescriptor {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[0].Descriptor()
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[0].Descriptor()
 }
 
 func (SeverityLevel) Type() protoreflect.EnumType {
-	return &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[0]
+	return &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[0]
 }
 
 func (x SeverityLevel) Number() protoreflect.EnumNumber {
@@ -79,7 +79,7 @@ func (x SeverityLevel) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use SeverityLevel.Descriptor instead.
 func (SeverityLevel) EnumDescriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{0}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{0}
 }
 
 // Severity level for device events, aligned with OpenTelemetry log severity.
@@ -128,11 +128,11 @@ func (x EventSeverityLevel) String() string {
 }
 
 func (EventSeverityLevel) Descriptor() protoreflect.EnumDescriptor {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[1].Descriptor()
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[1].Descriptor()
 }
 
 func (EventSeverityLevel) Type() protoreflect.EnumType {
-	return &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[1]
+	return &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes[1]
 }
 
 func (x EventSeverityLevel) Number() protoreflect.EnumNumber {
@@ -141,7 +141,7 @@ func (x EventSeverityLevel) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use EventSeverityLevel.Descriptor instead.
 func (EventSeverityLevel) EnumDescriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{1}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{1}
 }
 
 // Request message for WatchDeviceHealth.
@@ -153,7 +153,7 @@ type WatchDeviceHealthRequest struct {
 
 func (x *WatchDeviceHealthRequest) Reset() {
 	*x = WatchDeviceHealthRequest{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[0]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -165,7 +165,7 @@ func (x *WatchDeviceHealthRequest) String() string {
 func (*WatchDeviceHealthRequest) ProtoMessage() {}
 
 func (x *WatchDeviceHealthRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[0]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -178,7 +178,7 @@ func (x *WatchDeviceHealthRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WatchDeviceHealthRequest.ProtoReflect.Descriptor instead.
 func (*WatchDeviceHealthRequest) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{0}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{0}
 }
 
 // Request message for WatchDeviceEvents.
@@ -190,7 +190,7 @@ type WatchDeviceEventsRequest struct {
 
 func (x *WatchDeviceEventsRequest) Reset() {
 	*x = WatchDeviceEventsRequest{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[1]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -202,7 +202,7 @@ func (x *WatchDeviceEventsRequest) String() string {
 func (*WatchDeviceEventsRequest) ProtoMessage() {}
 
 func (x *WatchDeviceEventsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[1]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -215,7 +215,7 @@ func (x *WatchDeviceEventsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WatchDeviceEventsRequest.ProtoReflect.Descriptor instead.
 func (*WatchDeviceEventsRequest) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{1}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{1}
 }
 
 // Response message containing health metrics for all devices.
@@ -228,7 +228,7 @@ type DeviceHealthResponse struct {
 
 func (x *DeviceHealthResponse) Reset() {
 	*x = DeviceHealthResponse{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[2]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -240,7 +240,7 @@ func (x *DeviceHealthResponse) String() string {
 func (*DeviceHealthResponse) ProtoMessage() {}
 
 func (x *DeviceHealthResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[2]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -253,7 +253,7 @@ func (x *DeviceHealthResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceHealthResponse.ProtoReflect.Descriptor instead.
 func (*DeviceHealthResponse) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{2}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DeviceHealthResponse) GetDevices() []*DeviceHealth {
@@ -281,7 +281,7 @@ type DeviceEventResponse struct {
 
 func (x *DeviceEventResponse) Reset() {
 	*x = DeviceEventResponse{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[3]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -293,7 +293,7 @@ func (x *DeviceEventResponse) String() string {
 func (*DeviceEventResponse) ProtoMessage() {}
 
 func (x *DeviceEventResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[3]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -306,7 +306,7 @@ func (x *DeviceEventResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceEventResponse.ProtoReflect.Descriptor instead.
 func (*DeviceEventResponse) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{3}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *DeviceEventResponse) GetDevice() *DeviceIdentification {
@@ -348,7 +348,7 @@ type DeviceHealth struct {
 
 func (x *DeviceHealth) Reset() {
 	*x = DeviceHealth{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[4]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -360,7 +360,7 @@ func (x *DeviceHealth) String() string {
 func (*DeviceHealth) ProtoMessage() {}
 
 func (x *DeviceHealth) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[4]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -373,7 +373,7 @@ func (x *DeviceHealth) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceHealth.ProtoReflect.Descriptor instead.
 func (*DeviceHealth) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{4}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *DeviceHealth) GetInfo() *DeviceInformation {
@@ -404,7 +404,7 @@ type DeviceInformation struct {
 
 func (x *DeviceInformation) Reset() {
 	*x = DeviceInformation{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[5]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -416,7 +416,7 @@ func (x *DeviceInformation) String() string {
 func (*DeviceInformation) ProtoMessage() {}
 
 func (x *DeviceInformation) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[5]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -429,7 +429,7 @@ func (x *DeviceInformation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceInformation.ProtoReflect.Descriptor instead.
 func (*DeviceInformation) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{5}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *DeviceInformation) GetUuid() string {
@@ -479,7 +479,7 @@ type DeviceIdentification struct {
 
 func (x *DeviceIdentification) Reset() {
 	*x = DeviceIdentification{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[6]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -491,7 +491,7 @@ func (x *DeviceIdentification) String() string {
 func (*DeviceIdentification) ProtoMessage() {}
 
 func (x *DeviceIdentification) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[6]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -504,7 +504,7 @@ func (x *DeviceIdentification) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceIdentification.ProtoReflect.Descriptor instead.
 func (*DeviceIdentification) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{6}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *DeviceIdentification) GetUuid() string {
@@ -540,7 +540,7 @@ type PciInfo struct {
 
 func (x *PciInfo) Reset() {
 	*x = PciInfo{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[7]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -552,7 +552,7 @@ func (x *PciInfo) String() string {
 func (*PciInfo) ProtoMessage() {}
 
 func (x *PciInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[7]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -565,7 +565,7 @@ func (x *PciInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PciInfo.ProtoReflect.Descriptor instead.
 func (*PciInfo) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{7}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *PciInfo) GetBdf() string {
@@ -600,7 +600,7 @@ type FirmwareInfo struct {
 
 func (x *FirmwareInfo) Reset() {
 	*x = FirmwareInfo{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[8]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -612,7 +612,7 @@ func (x *FirmwareInfo) String() string {
 func (*FirmwareInfo) ProtoMessage() {}
 
 func (x *FirmwareInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[8]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -625,7 +625,7 @@ func (x *FirmwareInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FirmwareInfo.ProtoReflect.Descriptor instead.
 func (*FirmwareInfo) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{8}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *FirmwareInfo) GetName() string {
@@ -665,7 +665,7 @@ type MemoryInfo struct {
 
 func (x *MemoryInfo) Reset() {
 	*x = MemoryInfo{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[9]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -677,7 +677,7 @@ func (x *MemoryInfo) String() string {
 func (*MemoryInfo) ProtoMessage() {}
 
 func (x *MemoryInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[9]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -690,7 +690,7 @@ func (x *MemoryInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MemoryInfo.ProtoReflect.Descriptor instead.
 func (*MemoryInfo) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{9}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *MemoryInfo) GetType() string {
@@ -731,7 +731,7 @@ type HealthStatus struct {
 
 func (x *HealthStatus) Reset() {
 	*x = HealthStatus{}
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[10]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -743,7 +743,7 @@ func (x *HealthStatus) String() string {
 func (*HealthStatus) ProtoMessage() {}
 
 func (x *HealthStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[10]
+	mi := &file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -756,7 +756,7 @@ func (x *HealthStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HealthStatus.ProtoReflect.Descriptor instead.
 func (*HealthStatus) Descriptor() ([]byte, []int) {
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{10}
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *HealthStatus) GetName() string {
@@ -787,11 +787,11 @@ func (x *HealthStatus) GetMessage() string {
 	return ""
 }
 
-var File_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto protoreflect.FileDescriptor
+var File_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto protoreflect.FileDescriptor
 
-const file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc = "" +
+const file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc = "" +
 	"\n" +
-	"1exporter/api/deviceinfo/v1alpha1/deviceinfo.proto\x12\n" +
+	">exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto\x12\n" +
 	"deviceinfo\"\x1a\n" +
 	"\x18WatchDeviceHealthRequest\"\x1a\n" +
 	"\x18WatchDeviceEventsRequest\"J\n" +
@@ -853,20 +853,20 @@ const file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc = "" +
 	"\x11WatchDeviceEvents\x12$.deviceinfo.WatchDeviceEventsRequest\x1a\x1f.deviceinfo.DeviceEventResponse0\x01BDZBgithub.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1b\x06proto3"
 
 var (
-	file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescOnce sync.Once
-	file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescData []byte
+	file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescOnce sync.Once
+	file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescData []byte
 )
 
-func file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP() []byte {
-	file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescOnce.Do(func() {
-		file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc), len(file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc)))
+func file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescGZIP() []byte {
+	file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescOnce.Do(func() {
+		file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc), len(file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc)))
 	})
-	return file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescData
+	return file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDescData
 }
 
-var file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes = []any{
+var file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
+var file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes = []any{
 	(SeverityLevel)(0),               // 0: deviceinfo.SeverityLevel
 	(EventSeverityLevel)(0),          // 1: deviceinfo.EventSeverityLevel
 	(*WatchDeviceHealthRequest)(nil), // 2: deviceinfo.WatchDeviceHealthRequest
@@ -881,7 +881,7 @@ var file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes = []any{
 	(*MemoryInfo)(nil),               // 11: deviceinfo.MemoryInfo
 	(*HealthStatus)(nil),             // 12: deviceinfo.HealthStatus
 }
-var file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs = []int32{
+var file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs = []int32{
 	6,  // 0: deviceinfo.DeviceHealthResponse.devices:type_name -> deviceinfo.DeviceHealth
 	8,  // 1: deviceinfo.DeviceEventResponse.device:type_name -> deviceinfo.DeviceIdentification
 	1,  // 2: deviceinfo.DeviceEventResponse.severity:type_name -> deviceinfo.EventSeverityLevel
@@ -903,27 +903,27 @@ var file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs = []int32{
 	0,  // [0:10] is the sub-list for field type_name
 }
 
-func init() { file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_init() }
-func file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_init() {
-	if File_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto != nil {
+func init() { file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_init() }
+func file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_init() {
+	if File_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto != nil {
 		return
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc), len(file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc), len(file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_rawDesc)),
 			NumEnums:      2,
 			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes,
-		DependencyIndexes: file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs,
-		EnumInfos:         file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes,
-		MessageInfos:      file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes,
+		GoTypes:           file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes,
+		DependencyIndexes: file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs,
+		EnumInfos:         file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_enumTypes,
+		MessageInfos:      file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_msgTypes,
 	}.Build()
-	File_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto = out.File
-	file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes = nil
-	file_exporter_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs = nil
+	File_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto = out.File
+	file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_goTypes = nil
+	file_exporter_intelxpuinfo_api_deviceinfo_v1alpha1_deviceinfo_proto_depIdxs = nil
 }
diff --git a/xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo.proto b/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto
similarity index 100%
rename from xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo.proto
rename to xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto
diff --git a/xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo_grpc.pb.go b/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo_grpc.pb.go
similarity index 97%
rename from xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo_grpc.pb.go
rename to xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo_grpc.pb.go
index 0b25b839d..591864059 100644
--- a/xpumd/exporter/api/deviceinfo/v1alpha1/deviceinfo_grpc.pb.go
+++ b/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo_grpc.pb.go
@@ -5,9 +5,9 @@
 
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.6.0
-// - protoc             v6.33.4
-// source: exporter/api/deviceinfo/v1alpha1/deviceinfo.proto
+// - protoc-gen-go-grpc v1.6.2
+// - protoc             v7.35.0
+// source: exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto
 
 package v1alpha1
 
@@ -176,5 +176,5 @@ var DeviceInfo_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "exporter/api/deviceinfo/v1alpha1/deviceinfo.proto",
+	Metadata: "exporter/intelxpuinfo/api/deviceinfo/v1alpha1/deviceinfo.proto",
 }
diff --git a/xpumd/exporter/config.go b/xpumd/exporter/intelxpuinfo/config.go
similarity index 94%
rename from xpumd/exporter/config.go
rename to xpumd/exporter/intelxpuinfo/config.go
index 3f5e29f9f..c089a9e6e 100644
--- a/xpumd/exporter/config.go
+++ b/xpumd/exporter/intelxpuinfo/config.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"bytes"
@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 
 	"github.com/intel/xpumanager/xpumd/common"
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
 )
 
 // severityNames maps configuration severity name strings to pb.SeverityLevel
@@ -69,6 +69,9 @@ type HwStatusMapping struct {
 	// "*" acts as a default catch-all for any state not matched by an
 	// exact key.
 	StateMapping map[string]HwStateMapping `mapstructure:"state_mapping"`
+	// ShowAllStates, if true, includes all active hw.state values in the
+	// output, not just the one with the highest severity for each health domain.
+	ShowAllStates bool `mapstructure:"show_all_states"`
 
 	// healthDomainTmpl is compiled from HealthDomain during Validate.
 	healthDomainTmpl *template.Template
@@ -97,6 +100,7 @@ func (m *HwStatusMapping) healthDomainFor(attrs pcommon.Map) (string, error) {
 
 // Config defines configuration for the exporter.
 type Config struct {
+	// https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/configgrpc/configgrpc.go
 	configgrpc.ServerConfig `mapstructure:",squash"`
 
 	// HwStatusMappings specifies hw.status to health status mappings.
diff --git a/xpumd/exporter/config_test.go b/xpumd/exporter/intelxpuinfo/config_test.go
similarity index 99%
rename from xpumd/exporter/config_test.go
rename to xpumd/exporter/intelxpuinfo/config_test.go
index 7dc6f7c49..9653b223b 100644
--- a/xpumd/exporter/config_test.go
+++ b/xpumd/exporter/intelxpuinfo/config_test.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"testing"
diff --git a/xpumd/exporter/deviceinfo.go b/xpumd/exporter/intelxpuinfo/deviceinfo.go
similarity index 95%
rename from xpumd/exporter/deviceinfo.go
rename to xpumd/exporter/intelxpuinfo/deviceinfo.go
index 6ada45ae9..b9f095d47 100644
--- a/xpumd/exporter/deviceinfo.go
+++ b/xpumd/exporter/intelxpuinfo/deviceinfo.go
@@ -3,14 +3,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"context"
 	"sync"
 
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
-	"github.com/intel/xpumanager/xpumd/exporter/internal/metadata"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
+	"github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/internal/metadata"
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/zap"
diff --git a/xpumd/exporter/intelxpuinfo/doc.go b/xpumd/exporter/intelxpuinfo/doc.go
new file mode 100644
index 000000000..2298c825f
--- /dev/null
+++ b/xpumd/exporter/intelxpuinfo/doc.go
@@ -0,0 +1,8 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelxpuinfo
+
+//go:generate go tool -modfile ../../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/exporter/documentation.md b/xpumd/exporter/intelxpuinfo/documentation.md
similarity index 100%
rename from xpumd/exporter/documentation.md
rename to xpumd/exporter/intelxpuinfo/documentation.md
diff --git a/xpumd/exporter/events_translator.go b/xpumd/exporter/intelxpuinfo/events_translator.go
similarity index 96%
rename from xpumd/exporter/events_translator.go
rename to xpumd/exporter/intelxpuinfo/events_translator.go
index c3efd64a7..338b7058e 100644
--- a/xpumd/exporter/events_translator.go
+++ b/xpumd/exporter/intelxpuinfo/events_translator.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"strings"
@@ -12,7 +12,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/intel/xpumanager/xpumd/common"
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
 )
 
 // translateEvents converts OTel log records emitted by the sysman events
diff --git a/xpumd/exporter/exporter.go b/xpumd/exporter/intelxpuinfo/exporter.go
similarity index 52%
rename from xpumd/exporter/exporter.go
rename to xpumd/exporter/intelxpuinfo/exporter.go
index c559ce742..da36693df 100644
--- a/xpumd/exporter/exporter.go
+++ b/xpumd/exporter/intelxpuinfo/exporter.go
@@ -3,14 +3,18 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"sync"
+	"syscall"
+	"time"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confignet"
@@ -20,19 +24,19 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
-	"github.com/intel/xpumanager/xpumd/exporter/internal/metadata"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
+	"github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/internal/metadata"
 )
 
 type xpuInfoExporter struct {
 	sync.Mutex
 
-	cfg          *Config
-	logger       *zap.SugaredLogger
-	telemetry    *metadata.TelemetryBuilder
-	settings     exporter.Settings
-	grpcServer   *grpc.Server
-	healthServer *deviceInfoServer
+	cfg        *Config
+	logger     *zap.SugaredLogger
+	telemetry  *metadata.TelemetryBuilder
+	settings   exporter.Settings
+	grpcServer *grpc.Server
+	infoServer *deviceInfoServer
 
 	started bool
 }
@@ -70,6 +74,8 @@ func (e *xpuInfoExporter) start(ctx context.Context, host component.Host) error
 }
 
 func (e *xpuInfoExporter) shutdown(ctx context.Context) error {
+	const shutdownTimeout = 5 * time.Second
+
 	e.Lock()
 	defer e.Unlock()
 
@@ -80,10 +86,13 @@ func (e *xpuInfoExporter) shutdown(ctx context.Context) error {
 
 	e.logger.Info("Shutting down XPU Info exporter")
 
+	ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
+	defer cancel()
+
 	done := make(chan struct{})
 	go func() {
-		if e.healthServer != nil {
-			e.healthServer.stop()
+		if e.infoServer != nil {
+			e.infoServer.stop()
 		}
 		if e.grpcServer != nil {
 			e.grpcServer.GracefulStop()
@@ -95,6 +104,10 @@ func (e *xpuInfoExporter) shutdown(ctx context.Context) error {
 	case <-done:
 		e.logger.Info("gRPC server stopped gracefully")
 	case <-ctx.Done():
+		// Force stop
+		if e.grpcServer != nil {
+			e.grpcServer.Stop()
+		}
 		return fmt.Errorf("gRPC server shutdown timed out: %v", ctx.Err())
 	}
 	return nil
@@ -105,64 +118,79 @@ func (e *xpuInfoExporter) pushMetrics(_ context.Context, md pmetric.Metrics) err
 
 	// NOTE: No batching is in place. We rely on the property that md contains
 	// all metrics for a particular device.
-	e.healthServer.updateHealthData(md)
+	e.infoServer.updateHealthData(md)
 
 	return nil
 }
 
 func (e *xpuInfoExporter) pushLogs(_ context.Context, ld plog.Logs) error {
 	e.logger.Debugw("Pushing logs", "logRecords", ld.LogRecordCount())
-	e.healthServer.broadcastEvents(ld)
+	e.infoServer.broadcastEvents(ld)
 	return nil
 }
 
 func (e *xpuInfoExporter) startGrpcServer(ctx context.Context) error {
-	s, err := e.cfg.ToServer(ctx, nil, e.settings.TelemetrySettings)
+	grpcServer, err := e.cfg.ToServer(ctx, nil, e.settings.TelemetrySettings)
 	if err != nil {
 		return fmt.Errorf("failed to create gRPC server: %v", err)
 	}
-	e.grpcServer = s
 
-	h := newDeviceInfoServer(e.logger, e.telemetry, e.cfg)
-	pb.RegisterDeviceInfoServer(s, h)
-	e.healthServer = h
+	infoServer := newDeviceInfoServer(e.logger, e.telemetry, e.cfg)
+	pb.RegisterDeviceInfoServer(grpcServer, infoServer)
 
 	if e.cfg.NetAddr.Transport == confignet.TransportTypeUnix {
-		if e.cfg.NetAddr.Endpoint != "" {
-			dir := filepath.Dir(e.cfg.NetAddr.Endpoint)
-			if _, err := os.Stat(dir); err != nil {
-				// does not exist, can it be created?
-				if err := os.MkdirAll(dir, 0o755); err != nil {
-					return fmt.Errorf("failed to create directory for unix socket: %w", err)
-				}
-			}
-		} else {
-			// use runtime dir specified for the user?
+		endpoint := e.cfg.NetAddr.Endpoint
+		if endpoint == "" {
+			// Use runtime dir specified for the user?
 			name := metadata.Type.String() + ".sock"
 			if dir := os.Getenv("XDG_RUNTIME_DIR"); dir != "" {
-				e.cfg.NetAddr.Endpoint = filepath.Join(dir, name)
+				endpoint = filepath.Join(dir, name)
 			} else {
-				e.cfg.NetAddr.Endpoint = name
+				return fmt.Errorf("neither XDG_RUNTIME_DIR set, nor intelxpuinfo.endpoint configured")
 			}
 		}
 
+		dir := filepath.Dir(endpoint)
+		if stat, err := os.Stat(dir); errors.Is(err, os.ErrNotExist) {
+			// Create dir if it does not exist
+			if err := os.MkdirAll(dir, 0o750); err != nil {
+				return fmt.Errorf("failed to create directory for unix socket: %w", err)
+			}
+		} else if err != nil {
+			return fmt.Errorf("failed to stat unix socket directory: %w", err)
+		} else if !stat.IsDir() {
+			return fmt.Errorf("configured unix socket dir is not a directory: %s", dir)
+		}
+
 		// Remove the socket file if it already exists
-		if _, err := os.Stat(e.cfg.NetAddr.Endpoint); err == nil {
-			if err := os.Remove(e.cfg.NetAddr.Endpoint); err != nil {
-				return fmt.Errorf("failed to remove existing unix socket file: %w", err)
+		if stat, err := os.Lstat(endpoint); err == nil {
+			if stat.Mode()&fs.ModeSocket == 0 {
+				// This is privileged process, remove only files of correct type
+				return fmt.Errorf("refusing to remove existing/stale endpoint, it's not a socket: %s", endpoint)
+			}
+			if err = os.Remove(endpoint); err != nil && !errors.Is(err, os.ErrNotExist) {
+				return fmt.Errorf("failed to remove existing/stale unix socket file: %w", err)
 			}
+		} else if !errors.Is(err, os.ErrNotExist) {
+			return fmt.Errorf("failed to stat existing unix socket endpoint: %w", err)
 		}
+		e.cfg.NetAddr.Endpoint = endpoint
 	}
 
+	// Socket writable by the same user or group ID (0o117 mask => 0o660 access)
+	umask := syscall.Umask(0o117)
 	lis, err := e.cfg.NetAddr.Listen(ctx)
+	syscall.Umask(umask)
 	if err != nil {
-		return fmt.Errorf("failed to listen on endpoint: %v", err)
+		return fmt.Errorf("failed to listen on endpoint: %w", err)
 	}
 
 	e.logger.Infow("gRPC server listening", "endpoint", e.cfg.NetAddr.Endpoint)
+	e.grpcServer = grpcServer
+	e.infoServer = infoServer
 
 	go func() {
-		if err := s.Serve(lis); err != nil {
+		if err := grpcServer.Serve(lis); err != nil {
 			e.logger.Errorw("gRPC server failed", "error", err)
 		}
 	}()
diff --git a/xpumd/exporter/factory.go b/xpumd/exporter/intelxpuinfo/factory.go
similarity index 94%
rename from xpumd/exporter/factory.go
rename to xpumd/exporter/intelxpuinfo/factory.go
index 49a068007..7fb431766 100644
--- a/xpumd/exporter/factory.go
+++ b/xpumd/exporter/intelxpuinfo/factory.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
 
-	"github.com/intel/xpumanager/xpumd/exporter/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/internal/metadata"
 )
 
 // NewFactory creates a factory for the exporter.
diff --git a/xpumd/exporter/generated_component_test.go b/xpumd/exporter/intelxpuinfo/generated_component_test.go
similarity index 99%
rename from xpumd/exporter/generated_component_test.go
rename to xpumd/exporter/intelxpuinfo/generated_component_test.go
index eb7b3f7a3..b73277aae 100644
--- a/xpumd/exporter/generated_component_test.go
+++ b/xpumd/exporter/intelxpuinfo/generated_component_test.go
@@ -1,6 +1,6 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
-package exporter
+package intelxpuinfo
 
 import (
 	"context"
diff --git a/xpumd/exporter/generated_package_test.go b/xpumd/exporter/intelxpuinfo/generated_package_test.go
similarity index 87%
rename from xpumd/exporter/generated_package_test.go
rename to xpumd/exporter/intelxpuinfo/generated_package_test.go
index e786b89e7..ea5323183 100644
--- a/xpumd/exporter/generated_package_test.go
+++ b/xpumd/exporter/intelxpuinfo/generated_package_test.go
@@ -1,6 +1,6 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
-package exporter
+package intelxpuinfo
 
 import (
 	"go.uber.org/goleak"
diff --git a/xpumd/exporter/intelxpuinfo/go.mod b/xpumd/exporter/intelxpuinfo/go.mod
new file mode 100644
index 000000000..a36eae559
--- /dev/null
+++ b/xpumd/exporter/intelxpuinfo/go.mod
@@ -0,0 +1,95 @@
+module github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo
+
+go 1.26.0
+
+replace github.com/intel/xpumanager/xpumd/common => ../../common
+
+require (
+	github.com/google/go-cmp v0.7.0
+	github.com/stretchr/testify v1.11.1
+	go.opentelemetry.io/collector/component v1.59.0
+	go.opentelemetry.io/collector/component/componenttest v0.153.0
+	go.opentelemetry.io/collector/config/configgrpc v0.153.0
+	go.opentelemetry.io/collector/config/confignet v1.59.0
+	go.opentelemetry.io/collector/confmap v1.59.0
+	go.opentelemetry.io/collector/exporter v1.59.0
+	go.opentelemetry.io/collector/exporter/exporterhelper v0.153.0
+	go.opentelemetry.io/collector/exporter/exportertest v0.153.0
+	go.opentelemetry.io/collector/pdata v1.59.0
+	go.opentelemetry.io/otel/metric v1.43.0
+	go.opentelemetry.io/otel/sdk/metric v1.43.0
+	go.opentelemetry.io/otel/trace v1.43.0
+	go.uber.org/goleak v1.3.0
+	go.uber.org/zap v1.28.0
+	google.golang.org/grpc v1.81.1
+	google.golang.org/protobuf v1.36.11
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f // indirect
+	github.com/fsnotify/fsnotify v1.10.1 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/golang/snappy v1.0.0 // indirect
+	github.com/google/go-tpm v0.9.8 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/hashicorp/go-version v1.9.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/intel/xpumanager/xpumd/common v0.0.0
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.18.6 // indirect
+	github.com/knadh/koanf/maps v0.1.2 // indirect
+	github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
+	github.com/knadh/koanf/v2 v2.3.4 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/collector v0.153.0 // indirect
+	go.opentelemetry.io/collector/client v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configauth v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configcompression v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configmiddleware v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configopaque v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configoptional v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configretry v1.59.0 // indirect
+	go.opentelemetry.io/collector/config/configtls v1.59.0 // indirect
+	go.opentelemetry.io/collector/confmap/xconfmap v0.153.0 // indirect
+	go.opentelemetry.io/collector/consumer v1.59.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror v0.153.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumertest v0.153.0 // indirect
+	go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 // indirect
+	go.opentelemetry.io/collector/exporter/xexporter v0.153.0 // indirect
+	go.opentelemetry.io/collector/extension v1.59.0 // indirect
+	go.opentelemetry.io/collector/extension/extensionauth v1.59.0 // indirect
+	go.opentelemetry.io/collector/extension/extensionmiddleware v0.153.0 // indirect
+	go.opentelemetry.io/collector/extension/xextension v0.153.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.59.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata/xpdata v0.153.0 // indirect
+	go.opentelemetry.io/collector/pipeline v1.59.0 // indirect
+	go.opentelemetry.io/collector/pipeline/xpipeline v0.153.0 // indirect
+	go.opentelemetry.io/collector/receiver v1.59.0 // indirect
+	go.opentelemetry.io/collector/receiver/receivertest v0.153.0 // indirect
+	go.opentelemetry.io/collector/receiver/xreceiver v0.153.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
+	go.opentelemetry.io/otel v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.52.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
+)
diff --git a/xpumd/exporter/go.sum b/xpumd/exporter/intelxpuinfo/go.sum
similarity index 52%
rename from xpumd/exporter/go.sum
rename to xpumd/exporter/intelxpuinfo/go.sum
index 08c969679..6755c3bbd 100644
--- a/xpumd/exporter/go.sum
+++ b/xpumd/exporter/intelxpuinfo/go.sum
@@ -9,8 +9,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f h1:RJ+BDPLSHQO7cSjKBqjPJSbi1qfk9WcsjQDtZiw3dZw=
 github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f/go.mod h1:VHbbch/X4roIY22jL1s3qRbZhCiRIgUAF/PdSUcx2io=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
+github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -39,8 +39,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
-github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
 github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
 github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
 github.com/knadh/koanf/providers/confmap v1.0.0 h1:mHKLJTE7iXEys6deO5p6olAiZdG5zwp8Aebir+/EaRE=
@@ -71,90 +71,90 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/collector v0.151.0 h1:oLpn/4nHer84QumNauqg2W8UxdoeZaqgk2JHKnbR4nM=
-go.opentelemetry.io/collector v0.151.0/go.mod h1:fD3zKqBj4tCYr4620ZnAEHUkb1Ihr8hyCqwl3v2qRfk=
-go.opentelemetry.io/collector/client v1.57.0 h1:B6yTRsjQcFa1mqR9EA4sEvcKY5x0QtUFrf8/senhUR8=
-go.opentelemetry.io/collector/client v1.57.0/go.mod h1:gdJxZb5MnsJ3WrV6Oy72keeLLeAchv3Wl1gxUDu1WUE=
-go.opentelemetry.io/collector/component v1.57.0 h1:WKIqx2Bs0JaAZxDEhsLradXpYxnwAxVFzWhQUmu2q3w=
-go.opentelemetry.io/collector/component v1.57.0/go.mod h1:rXLy5mV78e7Gqp/dzFB+nbAFSEuJCipJfp8LbkrvOMg=
-go.opentelemetry.io/collector/component/componenttest v0.151.0 h1:0rYcx913VAfD1VyVA9MKPjTrdinUaJGEaOhom8MX5zY=
-go.opentelemetry.io/collector/component/componenttest v0.151.0/go.mod h1:vmhG58+J9QHOHaNu8LUD5d13LqldvkzI2jil4+lk+x0=
-go.opentelemetry.io/collector/config/configauth v1.57.0 h1:wNm4CYIo3n8zFfk8mW3lppI5CtRqg7SGwfO+k20iaiY=
-go.opentelemetry.io/collector/config/configauth v1.57.0/go.mod h1:Tzoa6JoVmQ6mhgSeYf0mqQk8GGC77Ilj7ahPko8JNZQ=
-go.opentelemetry.io/collector/config/configcompression v1.57.0 h1:i8GgiuhJ2EdBfcwjx3RaScQEyIN0NFZPdqrxx6zRstY=
-go.opentelemetry.io/collector/config/configcompression v1.57.0/go.mod h1:SEcE2uFLHHPc/Vi8WCkW5MhOMUwaT321HBdZ3P8x8D0=
-go.opentelemetry.io/collector/config/configgrpc v0.151.0 h1:pz1wB+mbRLqXWEV9eiQGR8cuLcRq3rQEu9eQ1BpHC/M=
-go.opentelemetry.io/collector/config/configgrpc v0.151.0/go.mod h1:w++RXGBmNDgh7VjRNNhxG2RyVMPj/HCPGtMEXH3YmSM=
-go.opentelemetry.io/collector/config/configmiddleware v1.57.0 h1:7RVS4DHAbMHDlsLDlNDDbaDolYxQOPOYwqJovbBAfog=
-go.opentelemetry.io/collector/config/configmiddleware v1.57.0/go.mod h1:ia49Ny/3Ew6SeQc+ZYMewjyGr8IPg9y8XVSgbmVqpQE=
-go.opentelemetry.io/collector/config/confignet v1.57.0 h1:X2tVVQiKo4/V/A1/4GzKPipZsdvrQdgZCfCOHIW6jo8=
-go.opentelemetry.io/collector/config/confignet v1.57.0/go.mod h1:Op+r1B/DtzXgIuKEL7/JkTqtJdL9veu2uEXvSxH3lks=
-go.opentelemetry.io/collector/config/configopaque v1.57.0 h1:cV56mFftZyU3vaLus77/mHboRzJ2GqzOHIsyO0zvCuw=
-go.opentelemetry.io/collector/config/configopaque v1.57.0/go.mod h1:6/DgOtshwnuiTehze+czXeN4GgKgR3ZD+wxBumlgUWM=
-go.opentelemetry.io/collector/config/configoptional v1.57.0 h1:eN/MCyDJINsMR3KSOJ+3q4rOdEm4lzb04sRD1iG4pUE=
-go.opentelemetry.io/collector/config/configoptional v1.57.0/go.mod h1:jVagnW+2jTO9WQiD17wK7VqbZ+nMzvfoNlHUi0WdhpI=
-go.opentelemetry.io/collector/config/configretry v1.57.0 h1:S/XCZQbmLe0TnwSWiO+WJAkbF02LTnVCYPUyVwNpVFc=
-go.opentelemetry.io/collector/config/configretry v1.57.0/go.mod h1:1BoQ5SvJT751bqP/5g0VTPLkNgMtvifAr2QqMCVOv2o=
-go.opentelemetry.io/collector/config/configtls v1.57.0 h1:/xyZxadD/Kn9X0V1JFQzaEisuA8DXmWTbsb7BOvE+eE=
-go.opentelemetry.io/collector/config/configtls v1.57.0/go.mod h1:PVY1IqNQIpxRmON1Uw0P1n+IjhWOAGPamN/VVQtatMY=
-go.opentelemetry.io/collector/confmap v1.57.0 h1:5AuK920dJmV8zxQAiODi2JHPl2r1HmEHHMaBSC+qF5I=
-go.opentelemetry.io/collector/confmap v1.57.0/go.mod h1:ifmog4kqEMM037qX04qEbom5CcxhmkadLUqhi2Vkuec=
-go.opentelemetry.io/collector/confmap/xconfmap v0.151.0 h1:txpp8lH/J2sKsQXEmV0TXTIrDS7n0Bo2bPJR+mhcP3M=
-go.opentelemetry.io/collector/confmap/xconfmap v0.151.0/go.mod h1:3R0Ru3Gsz6HKzjMecZPlTFDzFxaxAOl23ptm+xlsAA0=
-go.opentelemetry.io/collector/consumer v1.57.0 h1:jyDh4GkYPuIXNB0UJIh33NAzZoTCVNkwS+XWdlI08P8=
-go.opentelemetry.io/collector/consumer v1.57.0/go.mod h1:tJKbog9Xw/8y66aWd/C+21BMuQkOWn/lF4bzJDRC9OM=
-go.opentelemetry.io/collector/consumer/consumererror v0.151.0 h1:tspiI5WE/xwYNAzR61I1XhmNYhSXdsR0Yf1Dk2MZIfQ=
-go.opentelemetry.io/collector/consumer/consumererror v0.151.0/go.mod h1:dxnhPRnw3kjyweDy9pGWUNVueem15kxlvqRp0qY5k6U=
-go.opentelemetry.io/collector/consumer/consumertest v0.151.0 h1:qByIVlFh9RAR/newAk/sN5i1zoIXKa2K1hRNVfye8LU=
-go.opentelemetry.io/collector/consumer/consumertest v0.151.0/go.mod h1:eAGCGxkq+aABLmlr3PvMOqz3ZJbmn/lUqCbbffabSi4=
-go.opentelemetry.io/collector/consumer/xconsumer v0.151.0 h1:eKIYxuPBEIrjZMAkyKBUWrlpHAE9OgxXBjq7PMSeXkE=
-go.opentelemetry.io/collector/consumer/xconsumer v0.151.0/go.mod h1:9K97TkCN7XYfwKzPzktozrWc3Qw/4A1T4XgMn9TnG0c=
-go.opentelemetry.io/collector/exporter v1.57.0 h1:eDiWLiZZV2u+ihNSdWtrACOZI600TnUk0W4SKraJ0w0=
-go.opentelemetry.io/collector/exporter v1.57.0/go.mod h1:xfJPcn0EJMIFP8g5nheLSWLzPZgdu9/p14b9+D5RXjM=
-go.opentelemetry.io/collector/exporter/exporterhelper v0.151.0 h1:s+OiaQZBHkhaxJj5zkSY3jVsO0HZUW6hHDZ9Rc/qULA=
-go.opentelemetry.io/collector/exporter/exporterhelper v0.151.0/go.mod h1:IdqxjEDvwDcuhHOw83krWDjxj4NFrWRzTUc6q8enTh0=
-go.opentelemetry.io/collector/exporter/exportertest v0.151.0 h1:w1XKgIuozEGE/I68M2DRkNbOPOQZ3NsE9QDSgr4S6to=
-go.opentelemetry.io/collector/exporter/exportertest v0.151.0/go.mod h1:huqcu/9iu+EOs01VUpMEmjIuOoHoT+rWNvZwdPgAQ1Q=
-go.opentelemetry.io/collector/exporter/xexporter v0.151.0 h1:2uiLSWF6CtnfNesRj/L+f6n5eLnggg71evvhTp9w254=
-go.opentelemetry.io/collector/exporter/xexporter v0.151.0/go.mod h1:zCGNIgAg7os4xNiDB0DVelNMtIK5gGILdmu4nktNSfw=
-go.opentelemetry.io/collector/extension v1.57.0 h1:xrKqf2CK8AjEJFtxky84l7PkzbDrFv5jomfsRDgeW80=
-go.opentelemetry.io/collector/extension v1.57.0/go.mod h1:jwIanPruVtNwWbkXOi8ikfWj0mIl4m7vZdGQPDvUJcE=
-go.opentelemetry.io/collector/extension/extensionauth v1.57.0 h1:SUTbKc3sVFrCOQcU8NoNsVySKvmIOosn4z3H5tyg9FQ=
-go.opentelemetry.io/collector/extension/extensionauth v1.57.0/go.mod h1:iXhR9e5eC2XbdDf/Z17QJIV+wQx1E5DTth2oE3MmVMA=
-go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.151.0 h1:hBlyGreyBrKQLXrSCoClkgeryyNe388LuZXrBHjwmc4=
-go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.151.0/go.mod h1:jn1J+XxwNrsdEarKB3CpCLezuTLQipzLozFTeFQvFuk=
-go.opentelemetry.io/collector/extension/extensionmiddleware v0.151.0 h1:UxqZPlF345Xnrl8fJWWpJEDNkKbiuu37r0XlfOPkxzc=
-go.opentelemetry.io/collector/extension/extensionmiddleware v0.151.0/go.mod h1:IzeOB7CZmf/92KGu4Sm6mODu5tejgupcs1tW2eAkXmY=
-go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.151.0 h1:N8btWjsACekA8mqD+B+So3aqHF2X7X/MWIBJS0PpYXM=
-go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.151.0/go.mod h1:HYRwLtjSJDeCsJg8ifXjFeAnOb1CnB8il6Z2Cilrc9k=
-go.opentelemetry.io/collector/extension/extensiontest v0.151.0 h1:O2ZIj7KSSxJ9WNJsEOjFeKd85EiX5cciz+Z1pIVHcJs=
-go.opentelemetry.io/collector/extension/extensiontest v0.151.0/go.mod h1:PjpMpUN3CW1xEI+eSCPcg/G8QXap6eBr52gBZDxpMTQ=
-go.opentelemetry.io/collector/extension/xextension v0.151.0 h1:N8Bs5cPUpnpQDKVBkCGLRHuLmLubkI1BANl/tGp93Qc=
-go.opentelemetry.io/collector/extension/xextension v0.151.0/go.mod h1:DXK1pzPdH5zQpKfTYW7eFBUf3ES/RkLxJUnSxco/ZrA=
-go.opentelemetry.io/collector/featuregate v1.57.0 h1:KPDSUKYn6MHwgyGRSGPPcW/G96HH93pxuvvPwM+R8nY=
-go.opentelemetry.io/collector/featuregate v1.57.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
-go.opentelemetry.io/collector/internal/componentalias v0.151.0 h1:5IJn4XXRbjGrJCuIByHzxgHqwC0Hcl99tM+PoyYzjJY=
-go.opentelemetry.io/collector/internal/componentalias v0.151.0/go.mod h1:c70sQuXHQZWSYCyc0y/VynqJdmEeBunSmEy3xfLQPWE=
-go.opentelemetry.io/collector/internal/testutil v0.151.0 h1:CFjDItLuqzblItOsnK6IPSdrsOaZCaDjYpB8qWG+XHI=
-go.opentelemetry.io/collector/internal/testutil v0.151.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
-go.opentelemetry.io/collector/pdata v1.57.0 h1:oDWBMjEIqyJO3GJEB+iwqxj47rxDK19OKzwaFEaE4sg=
-go.opentelemetry.io/collector/pdata v1.57.0/go.mod h1:wZojinP6mNhLXudH8QXx/bjWzOsKMxi/FXwnk+12G/w=
-go.opentelemetry.io/collector/pdata/pprofile v0.151.0 h1:hsU0+DpkvhJh3xL1Y8CX2vAPdLMoJLiw+C+rAMsaxZc=
-go.opentelemetry.io/collector/pdata/pprofile v0.151.0/go.mod h1:5zfGTQqRuaKyh2SRaZi4SV4nSD8TzY1kYoOjniOD3uk=
-go.opentelemetry.io/collector/pdata/testdata v0.151.0 h1:ye09e8UMADdVrQjLgCznZxmM8ra7ciAuOCteHDzgHjc=
-go.opentelemetry.io/collector/pdata/testdata v0.151.0/go.mod h1:h5+Ys9F+pf64cGt5cZCDtRsrkOnvjgpcONr8pFA3KBc=
-go.opentelemetry.io/collector/pdata/xpdata v0.151.0 h1:trsLPS6jCkwVwJyKxbPqQerAiMpKkQrQLEGIEcyC6yM=
-go.opentelemetry.io/collector/pdata/xpdata v0.151.0/go.mod h1:0vID3D52DGVoypLa8S7izv41ElTBEgtAbc0HmB4KF60=
-go.opentelemetry.io/collector/pipeline v1.57.0 h1:nlevGN75Vt/Fp0HTaDjZpUHQf5QFA6o2asSmzSoBVkA=
-go.opentelemetry.io/collector/pipeline v1.57.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
-go.opentelemetry.io/collector/pipeline/xpipeline v0.151.0 h1:IywvWUfCS2cGOoNFowmq7CAeeyyZzp4MKUGB8gDlk9E=
-go.opentelemetry.io/collector/pipeline/xpipeline v0.151.0/go.mod h1:hwkQnowliexFbNCUL/UawKdJvk2zGEegdoycPbAYIYE=
-go.opentelemetry.io/collector/receiver v1.57.0 h1:Aq8hcLByUOOrouekGPsxvaAHbUMxa4NM2Ok84KHjdcE=
-go.opentelemetry.io/collector/receiver v1.57.0/go.mod h1:6y2UO4pmiT85z9JApUmRiP/7yX7zY5cmxbMgXvvMOA0=
-go.opentelemetry.io/collector/receiver/receivertest v0.151.0 h1:U1iALsnbrAM3QdT4977y/S+Tbe68iS42qoeY5zgGXfE=
-go.opentelemetry.io/collector/receiver/receivertest v0.151.0/go.mod h1:MBAEOfep8HMpdOcD5j1LOpP/GTjqz5hmZijGyYGxkGE=
-go.opentelemetry.io/collector/receiver/xreceiver v0.151.0 h1:Ib86H9rBBD76wmpKQFRlwYqugvxbDtq8Lg6bVROBw4k=
-go.opentelemetry.io/collector/receiver/xreceiver v0.151.0/go.mod h1:9Jqb3YKmgkZeLmHx5QBLBgdoLiu2T9q4B+o6LGTR/8U=
+go.opentelemetry.io/collector v0.153.0 h1:hXKZdQtwHdUfNwMHfzhg4dANlfv+kgg3RIUYMoXReiA=
+go.opentelemetry.io/collector v0.153.0/go.mod h1:OooJNOc1KV5TbAqXoOs5yld2qQQrvcHGHiX4ORjhzFY=
+go.opentelemetry.io/collector/client v1.59.0 h1:OzT7FdIiFVWKGU/UPgVDuCQtaI/GwTjLqWVz14IPGTI=
+go.opentelemetry.io/collector/client v1.59.0/go.mod h1:1V5wVLhMZIMxeVoRK5AVHXnK2Ozyn6WNtmzMAjIMwY0=
+go.opentelemetry.io/collector/component v1.59.0 h1:WtulkwzsdAOM/LE0cH/IiudUgiyb2ueVDDeEh5HsXzo=
+go.opentelemetry.io/collector/component v1.59.0/go.mod h1:5eQCM0tS6qbG2XJ6Bt67kgCxuhCbg4csVv6SywyHZ6w=
+go.opentelemetry.io/collector/component/componenttest v0.153.0 h1:u6O1l+9PUNnI22k8q4sF9wgLAUyt+y2Ov7xi1yZ+wE4=
+go.opentelemetry.io/collector/component/componenttest v0.153.0/go.mod h1:Ym/d5UxnoHmrCI5LsVANBicikNiqtwjk8uWBM+Z4jDM=
+go.opentelemetry.io/collector/config/configauth v1.59.0 h1:JxmyiCv9xxyVEmBJQFcVTB0ymtSzOV90g+bChC1sSek=
+go.opentelemetry.io/collector/config/configauth v1.59.0/go.mod h1:FMcL9Mr7KoPyGC4rbMm1qLn/8MiEy/sTQHigFQpge84=
+go.opentelemetry.io/collector/config/configcompression v1.59.0 h1:uXDvWhm8zKZIFI6bS0wtMb8HwuNLywnO1MLpPPQBcGI=
+go.opentelemetry.io/collector/config/configcompression v1.59.0/go.mod h1:SEcE2uFLHHPc/Vi8WCkW5MhOMUwaT321HBdZ3P8x8D0=
+go.opentelemetry.io/collector/config/configgrpc v0.153.0 h1:VCwlpFbe1BZqo1xzkJetQvGL1hMeZIFRKRBaN1TtJ/M=
+go.opentelemetry.io/collector/config/configgrpc v0.153.0/go.mod h1:ZYx9+38ytDJzIOXxt90Zv4wJNIzY1sTrIy2jjXqG6B0=
+go.opentelemetry.io/collector/config/configmiddleware v1.59.0 h1:v1RKvzh8KZfSCwU1e5ESARg/Yj3TXDAN/viLxE4UVg4=
+go.opentelemetry.io/collector/config/configmiddleware v1.59.0/go.mod h1:5Ic7T0GPx03YoCGy/Dn6uYK8QGQL9pJXW+OXrjVXDg8=
+go.opentelemetry.io/collector/config/confignet v1.59.0 h1:vcV5YJj6L+vnF7GiGjBynt5xcxteV6RyIeycLEHkNi8=
+go.opentelemetry.io/collector/config/confignet v1.59.0/go.mod h1:Op+r1B/DtzXgIuKEL7/JkTqtJdL9veu2uEXvSxH3lks=
+go.opentelemetry.io/collector/config/configopaque v1.59.0 h1:32PvJXf3V4P1iUcAmN5E/mIa3+EqLx8/4mOzFU/9CjQ=
+go.opentelemetry.io/collector/config/configopaque v1.59.0/go.mod h1:75nru6ahPcZsCOnVqsSomiBKk8n+iCZgUZXlwSdT8Ik=
+go.opentelemetry.io/collector/config/configoptional v1.59.0 h1:kP751PU6KMxpw64DTPLD6vNDPjxqNJqFo7fPemu65Lc=
+go.opentelemetry.io/collector/config/configoptional v1.59.0/go.mod h1:+TnLr1EMcsR4jJGoBHOCbifgunBjV3rHWNlDWPgBJcE=
+go.opentelemetry.io/collector/config/configretry v1.59.0 h1:Y/V2GjMtfU4daUM1ZcjxI1woorK8nop8VBVagJ5HmLc=
+go.opentelemetry.io/collector/config/configretry v1.59.0/go.mod h1:1BoQ5SvJT751bqP/5g0VTPLkNgMtvifAr2QqMCVOv2o=
+go.opentelemetry.io/collector/config/configtls v1.59.0 h1:ob9OpwDkXgQIKqZ0ITk17D+oLusBK5wXRsOR+/ghmyw=
+go.opentelemetry.io/collector/config/configtls v1.59.0/go.mod h1:oAZwCfp651SpN/5aZkHnTcj+ratuvUOHUS4DjmRSxBE=
+go.opentelemetry.io/collector/confmap v1.59.0 h1:asxEEiWwNuGfmTVSctYArOTF8jcxYpS4NmPtvvFhNNI=
+go.opentelemetry.io/collector/confmap v1.59.0/go.mod h1:X5SjFINrF0cb0hcM8PwnW2z+0L/pHA1H1yPPtm2j0tY=
+go.opentelemetry.io/collector/confmap/xconfmap v0.153.0 h1:RSn7C87eBp1iuWip3hX8v9AR8adMze1usJxwumefkq4=
+go.opentelemetry.io/collector/confmap/xconfmap v0.153.0/go.mod h1:4SuPyutUiirRqQoPeY+13lLYkOQ2opMQgKvKACnXh1k=
+go.opentelemetry.io/collector/consumer v1.59.0 h1:EFDQ8ZTWwHEratWusKgW26W20LeAWdXj235iD9MxpuA=
+go.opentelemetry.io/collector/consumer v1.59.0/go.mod h1:wrOSfXkKjzEeHYxhKGukuB9+NFV/CboWwEH1oEXhMtw=
+go.opentelemetry.io/collector/consumer/consumererror v0.153.0 h1:x64J2xnSOoOp3yZRWioZ03vNAF19aBioUsRlZ4eC6x8=
+go.opentelemetry.io/collector/consumer/consumererror v0.153.0/go.mod h1:5zJ8TYQisuMjWJNaW6S86cHY1rf3DzXOVvsN8pA3Cc8=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0 h1:fCqkOWNVK/qipg4SX60zICs3jhKDjcrtF1oxJR6msCk=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0/go.mod h1:YfVqyCrvEfvsbbrpfiH97fITh4vmIBzZT112tUluqx0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 h1:Jt1Aiiq9zDILzppRTEdZXaA830KBjjP1i2kWL+h5br0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0/go.mod h1:IzJ/dTOtEUMjY0DYu6kO946u5jbiDDUG8+sLaLhJ+HY=
+go.opentelemetry.io/collector/exporter v1.59.0 h1:euVTD79AVw8eSKi/OhX3iLBV/EnY9KFY10z7yCTN7xQ=
+go.opentelemetry.io/collector/exporter v1.59.0/go.mod h1:VVpK5byUW0r/ncXT9RltZGlzMp41sZj0i3F8pq9ESCQ=
+go.opentelemetry.io/collector/exporter/exporterhelper v0.153.0 h1:PdRWHJIJguacgkMd3EDMDYGeNYAJS9dsTQflj7cCi1Q=
+go.opentelemetry.io/collector/exporter/exporterhelper v0.153.0/go.mod h1:T+Pd0Zzlih2g/b2Yl70tA8XRENKv3ssJc/3hNvNuPoo=
+go.opentelemetry.io/collector/exporter/exportertest v0.153.0 h1:kXrli6XWylPE7TjkgEhnv3ZnyW5tX8YzPxlsCH3alF0=
+go.opentelemetry.io/collector/exporter/exportertest v0.153.0/go.mod h1:nMQIX7zf0eUA3o66WEdFaRouIcVKPJye6NG5FeNBbKs=
+go.opentelemetry.io/collector/exporter/xexporter v0.153.0 h1:u2HeNDQdILoC1mtd76d4pbBTU6WjU2d8g3SKR+iWN4A=
+go.opentelemetry.io/collector/exporter/xexporter v0.153.0/go.mod h1:3k51y+RlA8nMm0Y2NXkWtmYBs48ZhYbxHqiecobVUU4=
+go.opentelemetry.io/collector/extension v1.59.0 h1:fewl/jU67OT2LePe3xNbYdMog4KruN4TZbvr0haoNFE=
+go.opentelemetry.io/collector/extension v1.59.0/go.mod h1:OPhsUCwdQ6Z8k8KXnmxTt6gmsWTBxrkIvL+/SoHiX8Y=
+go.opentelemetry.io/collector/extension/extensionauth v1.59.0 h1:Z4VQSf8p3zNJBZtdr3KUzJrFl6ArMQCgbHEc2qiHZXQ=
+go.opentelemetry.io/collector/extension/extensionauth v1.59.0/go.mod h1:pn6TIMsbQDDI73ysgqQor6pZLPW3GgKlueJFWIloENI=
+go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.153.0 h1:OA/ox3Cnv06imwywfQDZP9vERSrWogtFQniJNsKfJts=
+go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.153.0/go.mod h1:bGwGZ2Kh9c3CJK2QbUzAMIH0AzIbI3M1MA5FNuYcbX8=
+go.opentelemetry.io/collector/extension/extensionmiddleware v0.153.0 h1:dfRy58RhuypZHy/KPhYOKqIRysdAreJLDDlkfr0TC5I=
+go.opentelemetry.io/collector/extension/extensionmiddleware v0.153.0/go.mod h1:1m1+iz6cYOvXty9iHZwo8whRxUYw8F+1JsRQoqCf9r4=
+go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.153.0 h1:5tzIbYqlPPlftEKaWettihciNTRbrzReaWzLSb523L4=
+go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.153.0/go.mod h1:TtauDSMVGFxZ2su5Usw/qJqLXJdO3qUX9C0MRlE72nc=
+go.opentelemetry.io/collector/extension/extensiontest v0.153.0 h1:BNE/Bm1lTkJV7ix3T8EXmdjuU5BTCbHMO+L3+fY8B6A=
+go.opentelemetry.io/collector/extension/extensiontest v0.153.0/go.mod h1:dPZ2vhJg08/zVwl7BmhzLOaH0vQMkXgvc5rVGJg22IE=
+go.opentelemetry.io/collector/extension/xextension v0.153.0 h1:X81P0kRlWc2gXXxb4/XHzSuDTzs0DGOwjUk4trFa8gw=
+go.opentelemetry.io/collector/extension/xextension v0.153.0/go.mod h1:4V5uGnqdaUcXQV6HXjs9VF89dq+y7Icex96JCANVur0=
+go.opentelemetry.io/collector/featuregate v1.59.0 h1:pu70/9eWRjAjzGnr3VmqwY+k6fmU3esLp15AqxfBBz0=
+go.opentelemetry.io/collector/featuregate v1.59.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0 h1:tr5I5hsJPJBbVPGjvOVVPPK4dLR5ZLqVEckuOfnzzMs=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0/go.mod h1:tFSKiuWKJJgfxANyVnbKPVZkOF7N0bFXvCxCEgqMKuo=
+go.opentelemetry.io/collector/internal/testutil v0.153.0 h1:GJEaPLohao+7wtm08yGf73RGi1rpIHvqzxOb7Xn8sP0=
+go.opentelemetry.io/collector/internal/testutil v0.153.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
+go.opentelemetry.io/collector/pdata v1.59.0 h1:lO1IcaO9+HUVdFh+RATCUG3oTP+uCZzsE7HJ0MjmzRc=
+go.opentelemetry.io/collector/pdata v1.59.0/go.mod h1:AH6M14C6qhesnUpcvigkvFMiX9KtdSWQENMBNyNhe7I=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0 h1:IurcS9g28cVrtIvc1oUVN8vSm5j0t79Pd8GZgd1PV28=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0/go.mod h1:nX33dLKrwdoz/FQeIs6JKPeZcS1KbU2VIOwH7K0F05c=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0 h1:pO/+b8Rz5PG0G+TskdYdQEjhXnNG2bQoiRRMwic6X0I=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0/go.mod h1:JVjUfJv9YFL3JUhisxMdLe2DX7we227Ry9JiTgwlEro=
+go.opentelemetry.io/collector/pdata/xpdata v0.153.0 h1:aN+kNiUUMOzmgrMSn/jwUQFSkrCKDc6wzSA3ZYv5+V0=
+go.opentelemetry.io/collector/pdata/xpdata v0.153.0/go.mod h1:o3qYgdBimJtEPHefjOrB3WPIHtNenT2lHuHrYBRAPE4=
+go.opentelemetry.io/collector/pipeline v1.59.0 h1:AyEcAPy5ZuUFpqis9i97WEIAcFh/mEEo90+1wr4urNU=
+go.opentelemetry.io/collector/pipeline v1.59.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
+go.opentelemetry.io/collector/pipeline/xpipeline v0.153.0 h1:b2GvTGxFqcRFHARtU95/pOh9uhdY8TDTcrA5TOy3mhs=
+go.opentelemetry.io/collector/pipeline/xpipeline v0.153.0/go.mod h1:EPU4bxOCNAI6Jny7ijUzRNATGNkcTMMBazY+NK2Ifng=
+go.opentelemetry.io/collector/receiver v1.59.0 h1:2jf2guECLyWno3OqNaefjfo+Tt3MSm6uz1WsbIXv5Ao=
+go.opentelemetry.io/collector/receiver v1.59.0/go.mod h1:rklWFy0kaMMghuGlrTxqYP96V810HwDVwIgKpP6kn2o=
+go.opentelemetry.io/collector/receiver/receivertest v0.153.0 h1:YHvywYcyV1G0I5r/J0OxgOJZPLLyrMAMA0Q7VdBYFxc=
+go.opentelemetry.io/collector/receiver/receivertest v0.153.0/go.mod h1:Zkf5hQ9qk9ACx/WBMZIaSri6LIJzFgfRxmScigP05tg=
+go.opentelemetry.io/collector/receiver/xreceiver v0.153.0 h1:yz6By4iJzOsvl9GxVOXTn0GoSr5ZxOuvk9+24obhqDQ=
+go.opentelemetry.io/collector/receiver/xreceiver v0.153.0/go.mod h1:4cM85JHe5weHwUAc60P/vPKU1uLtrhI46lzDOsSpqz4=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 h1:0Qx7VGBacMm9ZENQ7TnNObTYI4ShC+lHI16seduaxZo=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0/go.mod h1:Sje3i3MjSPKTSPvVWCaL8ugBzJwik3u4smCjUeuupqg=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
@@ -181,20 +181,20 @@ go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
 go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
+golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d h1:wT2n40TBqFY6wiwazVK9/iTWbsQrgk5ZfCSVFLO9LQA=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw=
-google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
+google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
+google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/xpumd/exporter/internal/metadata/generated_status.go b/xpumd/exporter/intelxpuinfo/internal/metadata/generated_status.go
similarity index 60%
rename from xpumd/exporter/internal/metadata/generated_status.go
rename to xpumd/exporter/intelxpuinfo/internal/metadata/generated_status.go
index c0b97fb68..c2fca3805 100644
--- a/xpumd/exporter/internal/metadata/generated_status.go
+++ b/xpumd/exporter/intelxpuinfo/internal/metadata/generated_status.go
@@ -1,5 +1,7 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
+// Package metadata contains the autogenerated telemetry and
+// build information for the exporter/intelxpuinfo component.
 package metadata
 
 import (
@@ -8,7 +10,7 @@ import (
 
 var (
 	Type      = component.MustNewType("intelxpuinfo")
-	ScopeName = "github.com/intel/xpumanager/xpumd/exporter"
+	ScopeName = "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo"
 )
 
 const (
diff --git a/xpumd/exporter/internal/metadata/generated_telemetry.go b/xpumd/exporter/intelxpuinfo/internal/metadata/generated_telemetry.go
similarity index 97%
rename from xpumd/exporter/internal/metadata/generated_telemetry.go
rename to xpumd/exporter/intelxpuinfo/internal/metadata/generated_telemetry.go
index ab497f4e6..487ec9ff1 100644
--- a/xpumd/exporter/internal/metadata/generated_telemetry.go
+++ b/xpumd/exporter/intelxpuinfo/internal/metadata/generated_telemetry.go
@@ -13,11 +13,11 @@ import (
 )
 
 func Meter(settings component.TelemetrySettings) metric.Meter {
-	return settings.MeterProvider.Meter("github.com/intel/xpumanager/xpumd/exporter")
+	return settings.MeterProvider.Meter("github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo")
 }
 
 func Tracer(settings component.TelemetrySettings) trace.Tracer {
-	return settings.TracerProvider.Tracer("github.com/intel/xpumanager/xpumd/exporter")
+	return settings.TracerProvider.Tracer("github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo")
 }
 
 // TelemetryBuilder provides an interface for components to report telemetry
diff --git a/xpumd/exporter/internal/metadata/generated_telemetry_test.go b/xpumd/exporter/intelxpuinfo/internal/metadata/generated_telemetry_test.go
similarity index 90%
rename from xpumd/exporter/internal/metadata/generated_telemetry_test.go
rename to xpumd/exporter/intelxpuinfo/internal/metadata/generated_telemetry_test.go
index 83fe6df6f..111f8bbc0 100644
--- a/xpumd/exporter/internal/metadata/generated_telemetry_test.go
+++ b/xpumd/exporter/intelxpuinfo/internal/metadata/generated_telemetry_test.go
@@ -50,14 +50,14 @@ func TestProviders(t *testing.T) {
 
 	meter := Meter(set)
 	if m, ok := meter.(mockMeter); ok {
-		require.Equal(t, "github.com/intel/xpumanager/xpumd/exporter", m.name)
+		require.Equal(t, "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo", m.name)
 	} else {
 		require.Fail(t, "returned Meter not mockMeter")
 	}
 
 	tracer := Tracer(set)
 	if m, ok := tracer.(mockTracer); ok {
-		require.Equal(t, "github.com/intel/xpumanager/xpumd/exporter", m.name)
+		require.Equal(t, "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo", m.name)
 	} else {
 		require.Fail(t, "returned Meter not mockTracer")
 	}
diff --git a/xpumd/exporter/internal/metadatatest/generated_telemetrytest.go b/xpumd/exporter/intelxpuinfo/internal/metadatatest/generated_telemetrytest.go
similarity index 100%
rename from xpumd/exporter/internal/metadatatest/generated_telemetrytest.go
rename to xpumd/exporter/intelxpuinfo/internal/metadatatest/generated_telemetrytest.go
diff --git a/xpumd/exporter/internal/metadatatest/generated_telemetrytest_test.go b/xpumd/exporter/intelxpuinfo/internal/metadatatest/generated_telemetrytest_test.go
similarity index 92%
rename from xpumd/exporter/internal/metadatatest/generated_telemetrytest_test.go
rename to xpumd/exporter/intelxpuinfo/internal/metadatatest/generated_telemetrytest_test.go
index ccf262ce0..32f952e8c 100644
--- a/xpumd/exporter/internal/metadatatest/generated_telemetrytest_test.go
+++ b/xpumd/exporter/intelxpuinfo/internal/metadatatest/generated_telemetrytest_test.go
@@ -10,7 +10,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
 
-	"github.com/intel/xpumanager/xpumd/exporter/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/internal/metadata"
 	"go.opentelemetry.io/collector/component/componenttest"
 )
 
diff --git a/xpumd/exporter/metadata.yaml b/xpumd/exporter/intelxpuinfo/metadata.yaml
similarity index 100%
rename from xpumd/exporter/metadata.yaml
rename to xpumd/exporter/intelxpuinfo/metadata.yaml
diff --git a/xpumd/exporter/translator.go b/xpumd/exporter/intelxpuinfo/translator.go
similarity index 87%
rename from xpumd/exporter/translator.go
rename to xpumd/exporter/intelxpuinfo/translator.go
index ad5f92d5f..79d3aaeef 100644
--- a/xpumd/exporter/translator.go
+++ b/xpumd/exporter/intelxpuinfo/translator.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"cmp"
@@ -15,7 +15,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/zap"
 
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
 )
 
 // metricsTranslator translates OpenTelemetry metrics into the gRPC API format.
@@ -24,12 +24,18 @@ type metricsTranslator struct {
 	resp   map[string]*pb.DeviceHealth
 
 	// helpers for quick'n'easy lookups
-	health   map[string]domainHealth
+	health   map[string]healthStatuses
 	memory   map[string][]*pb.MemoryInfo
 	mappings []HwStatusMapping
 }
 
-type domainHealth map[string]*pb.HealthStatus
+type healthStatusKey struct {
+	domain string
+	state  string
+}
+
+// healthStatuses contains health status entries for a specific device
+type healthStatuses map[healthStatusKey]*pb.HealthStatus
 
 func newMetricsTranslator(logger *zap.SugaredLogger, cfg *Config) *metricsTranslator {
 	var mappings []HwStatusMapping
@@ -39,7 +45,7 @@ func newMetricsTranslator(logger *zap.SugaredLogger, cfg *Config) *metricsTransl
 	return &metricsTranslator{
 		logger:   logger,
 		resp:     make(map[string]*pb.DeviceHealth),
-		health:   make(map[string]domainHealth),
+		health:   make(map[string]healthStatuses),
 		memory:   make(map[string][]*pb.MemoryInfo),
 		mappings: mappings,
 	}
@@ -80,8 +86,10 @@ func (t *metricsTranslator) fillHealthData() {
 		}
 
 		// Sort for reproducibility
-		for _, domain := range slices.Sorted(maps.Keys(health)) {
-			resp.Health = append(resp.Health, health[domain])
+		for _, k := range slices.SortedFunc(maps.Keys(health), func(a, b healthStatusKey) int {
+			return cmp.Or(cmp.Compare(a.domain, b.domain), cmp.Compare(a.state, b.state))
+		}) {
+			resp.Health = append(resp.Health, health[k])
 		}
 	}
 }
@@ -226,15 +234,15 @@ func (t *metricsTranslator) updateHealthStatus(metricName string, dps pmetric.Nu
 
 		health := t.health[id]
 		if health == nil {
-			health = make(domainHealth)
+			health = make(healthStatuses)
 			t.health[id] = health
 		}
 
-		t.updateHealthDomainStatus(health, metricName, attrs, t.mappings)
+		t.updateDeviceHealthStatus(health, metricName, attrs, t.mappings)
 	}
 }
 
-func (t *metricsTranslator) updateHealthDomainStatus(domain domainHealth, metricName string, attrs pcommon.Map, mappings []HwStatusMapping) {
+func (t *metricsTranslator) updateDeviceHealthStatus(statuses healthStatuses, metricName string, attrs pcommon.Map, mappings []HwStatusMapping) {
 	m, ok := matchHwStatusMapping(mappings, attrs)
 	if !ok {
 		return
@@ -260,8 +268,13 @@ func (t *metricsTranslator) updateHealthDomainStatus(domain domainHealth, metric
 		reason = hwState
 	}
 
-	if status, exists := domain[healthDomain]; !exists {
-		domain[healthDomain] = &pb.HealthStatus{
+	key := healthStatusKey{domain: healthDomain}
+	if m.ShowAllStates {
+		key.state = hwState
+	}
+
+	if status, exists := statuses[key]; !exists {
+		statuses[key] = &pb.HealthStatus{
 			Name:     healthDomain,
 			Severity: sm.severityLevel,
 			Reason:   reason,
@@ -270,9 +283,9 @@ func (t *metricsTranslator) updateHealthDomainStatus(domain domainHealth, metric
 	} else if sm.severityLevel != pb.SeverityLevel_SEVERITY_LEVEL_OK {
 		// Pick the worst severity level if multiple statuses exist for the same domain
 		if sm.severityLevel > status.Severity {
-			domain[healthDomain].Severity = sm.severityLevel
-			domain[healthDomain].Reason = reason
-			domain[healthDomain].Message = sm.Message
+			statuses[key].Severity = sm.severityLevel
+			statuses[key].Reason = reason
+			statuses[key].Message = sm.Message
 		}
 	}
 }
diff --git a/xpumd/exporter/translator_test.go b/xpumd/exporter/intelxpuinfo/translator_test.go
similarity index 55%
rename from xpumd/exporter/translator_test.go
rename to xpumd/exporter/intelxpuinfo/translator_test.go
index 729aeea59..204a23a51 100644
--- a/xpumd/exporter/translator_test.go
+++ b/xpumd/exporter/intelxpuinfo/translator_test.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package exporter
+package intelxpuinfo
 
 import (
 	"testing"
@@ -15,7 +15,7 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/testing/protocmp"
 
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
 )
 
 func TestParseFirmwares(t *testing.T) {
@@ -83,6 +83,180 @@ func TestParseFirmwares(t *testing.T) {
 	}
 }
 
+func TestUpdateHealthStatus(t *testing.T) {
+	addStatusDP := func(dps pmetric.NumberDataPointSlice, hwParent, hwState string, active bool) {
+		dp := dps.AppendEmpty()
+		if active {
+			dp.SetIntValue(1)
+		} else {
+			dp.SetIntValue(0)
+		}
+		dp.Attributes().PutStr("hw.parent", hwParent)
+		dp.Attributes().PutStr("hw.state", hwState)
+	}
+
+	makeStateMapping := func(state, severity string) HwStateMapping {
+		return HwStateMapping{
+			Severity:      severity,
+			severityLevel: severityNames[severity],
+		}
+	}
+
+	makeStatusMapping := func(domain string, showAllStates bool, stateMapping map[string]HwStateMapping) HwStatusMapping {
+		return HwStatusMapping{
+			HealthDomain:     domain,
+			healthDomainTmpl: mustParseTemplate(domain),
+			ShowAllStates:    showAllStates,
+			StateMapping:     stateMapping,
+		}
+	}
+
+	tests := []struct {
+		name           string
+		statusMappings []HwStatusMapping
+		setup          func(pmetric.NumberDataPointSlice)
+		wantStatuses   map[string]healthStatuses
+	}{
+		{
+			name: "zero data points",
+			statusMappings: []HwStatusMapping{
+				makeStatusMapping("gpu.health", false, map[string]HwStateMapping{
+					"degraded": makeStateMapping("degraded", "warning"),
+				}),
+			},
+			setup:        func(dps pmetric.NumberDataPointSlice) {},
+			wantStatuses: nil,
+		},
+		{
+			name: "no mapping matches hw.state",
+			statusMappings: []HwStatusMapping{
+				makeStatusMapping("gpu.health", false, map[string]HwStateMapping{
+					"degraded": makeStateMapping("degraded", "warning"),
+				}),
+			},
+			setup: func(dps pmetric.NumberDataPointSlice) {
+				addStatusDP(dps, "gpu0", "unknown_state", true)
+			},
+			wantStatuses: map[string]healthStatuses{
+				"gpu0": {},
+			},
+		},
+		{
+			name: "multiple active states collapsed to worst severity",
+			statusMappings: []HwStatusMapping{
+				makeStatusMapping("gpu.health", false, map[string]HwStateMapping{
+					"degraded": makeStateMapping("degraded", "warning"),
+					"failed":   makeStateMapping("failed", "critical"),
+				}),
+			},
+			setup: func(dps pmetric.NumberDataPointSlice) {
+				addStatusDP(dps, "gpu0", "degraded", true)
+				addStatusDP(dps, "gpu0", "failed", true)
+				addStatusDP(dps, "gpu0", "degraded", false) // inactive, should be skipped
+			},
+			wantStatuses: map[string]healthStatuses{
+				"gpu0": {
+					{domain: "gpu.health"}: {
+						Name:     "gpu.health",
+						Severity: pb.SeverityLevel_SEVERITY_LEVEL_CRITICAL,
+						Reason:   "failed"},
+				},
+			},
+		},
+		{
+			name: "inactive states are ignored",
+			statusMappings: []HwStatusMapping{
+				makeStatusMapping("gpu.health", false, map[string]HwStateMapping{
+					"degraded": makeStateMapping("degraded", "warning"),
+					"failed":   makeStateMapping("failed", "critical"),
+				}),
+			},
+			setup: func(dps pmetric.NumberDataPointSlice) {
+				addStatusDP(dps, "gpu0", "degraded", true)
+				addStatusDP(dps, "gpu0", "failed", false) // inactive, should be skipped
+			},
+			wantStatuses: map[string]healthStatuses{
+				"gpu0": {
+					{domain: "gpu.health"}: {
+						Name:     "gpu.health",
+						Severity: pb.SeverityLevel_SEVERITY_LEVEL_WARNING,
+						Reason:   "degraded"},
+				},
+			},
+		},
+		{
+			name: "show_all_states: multiple active states",
+			statusMappings: []HwStatusMapping{
+				makeStatusMapping("gpu.health", true, map[string]HwStateMapping{
+					"degraded": makeStateMapping("degraded", "warning"),
+					"failed":   makeStateMapping("failed", "critical"),
+				}),
+			},
+			setup: func(dps pmetric.NumberDataPointSlice) {
+				addStatusDP(dps, "gpu0", "degraded", true)
+				addStatusDP(dps, "gpu0", "failed", true)
+			},
+			wantStatuses: map[string]healthStatuses{
+				"gpu0": {
+					{domain: "gpu.health", state: "degraded"}: {
+						Name:     "gpu.health",
+						Severity: pb.SeverityLevel_SEVERITY_LEVEL_WARNING,
+						Reason:   "degraded"},
+					{domain: "gpu.health", state: "failed"}: {
+						Name:     "gpu.health",
+						Severity: pb.SeverityLevel_SEVERITY_LEVEL_CRITICAL,
+						Reason:   "failed"},
+				},
+			},
+		},
+		{
+			name: "show_all_states: single active state",
+			statusMappings: []HwStatusMapping{
+				makeStatusMapping("gpu.health", true, map[string]HwStateMapping{
+					"degraded": makeStateMapping("degraded", "warning"),
+					"failed":   makeStateMapping("failed", "critical"),
+				}),
+			},
+			setup: func(dps pmetric.NumberDataPointSlice) {
+				addStatusDP(dps, "gpu0", "failed", true)
+			},
+			wantStatuses: map[string]healthStatuses{
+				"gpu0": {
+					{domain: "gpu.health", state: "failed"}: {
+						Name:     "gpu.health",
+						Severity: pb.SeverityLevel_SEVERITY_LEVEL_CRITICAL,
+						Reason:   "failed"},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			translator := newMetricsTranslator(zap.NewNop().Sugar(), nil)
+			translator.mappings = tt.statusMappings
+
+			dps := pmetric.NewNumberDataPointSlice()
+			tt.setup(dps)
+
+			translator.updateHealthStatus("hw.status", dps)
+
+			require.Len(t, translator.health, len(tt.wantStatuses))
+			for devID, wantDevStatuses := range tt.wantStatuses {
+				gotDevStatuses := translator.health[devID]
+				require.Len(t, gotDevStatuses, len(wantDevStatuses), "unexpected number of health entries for device %q", devID)
+				for key, wantStatus := range wantDevStatuses {
+					gotStatus := gotDevStatuses[key]
+					require.NotNil(t, gotStatus, "expected health status for key %q not found", key)
+					if diff := cmp.Diff(wantStatus, gotStatus, protocmp.Transform()); diff != "" {
+						t.Errorf("unexpected health status for %q (-want +got):\n%s", key, diff)
+					}
+				}
+			}
+		})
+	}
+}
+
 func TestUpdateMemoryInfo(t *testing.T) {
 	addDataPoint := func(dps pmetric.NumberDataPointSlice, hwParent, memType, memLocation, subdeviceID string, size int64) {
 		dp := dps.AppendEmpty()
diff --git a/xpumd/exporter/xpuinfo-cli/main.go b/xpumd/exporter/intelxpuinfo/xpuinfo-cli/main.go
similarity index 94%
rename from xpumd/exporter/xpuinfo-cli/main.go
rename to xpumd/exporter/intelxpuinfo/xpuinfo-cli/main.go
index 1a8242d49..97dabfaee 100644
--- a/xpumd/exporter/xpuinfo-cli/main.go
+++ b/xpumd/exporter/intelxpuinfo/xpuinfo-cli/main.go
@@ -21,8 +21,8 @@ import (
 	"google.golang.org/grpc/status"
 	"gopkg.in/yaml.v3"
 
-	pb "github.com/intel/xpumanager/xpumd/exporter/api/deviceinfo/v1alpha1"
-	"github.com/intel/xpumanager/xpumd/exporter/internal/metadata"
+	pb "github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/api/deviceinfo/v1alpha1"
+	"github.com/intel/xpumanager/xpumd/exporter/intelxpuinfo/internal/metadata"
 )
 
 var (
diff --git a/xpumd/go.mod b/xpumd/go.mod
index c80bfe4aa..1e8316e78 100644
--- a/xpumd/go.mod
+++ b/xpumd/go.mod
@@ -1,3 +1,3 @@
 module github.com/intel/xpumanager/xpumd
 
-go 1.26
+go 1.26.0
diff --git a/xpumd/receiver/internal/level-zero-go/.gitignore b/xpumd/level-zero-go/.gitignore
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/.gitignore
rename to xpumd/level-zero-go/.gitignore
diff --git a/xpumd/receiver/internal/level-zero-go/.golangci.yml b/xpumd/level-zero-go/.golangci.yml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/.golangci.yml
rename to xpumd/level-zero-go/.golangci.yml
diff --git a/xpumd/receiver/internal/level-zero-go/LICENSE b/xpumd/level-zero-go/LICENSE
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/LICENSE
rename to xpumd/level-zero-go/LICENSE
diff --git a/xpumd/receiver/internal/level-zero-go/Makefile b/xpumd/level-zero-go/Makefile
similarity index 95%
rename from xpumd/receiver/internal/level-zero-go/Makefile
rename to xpumd/level-zero-go/Makefile
index 24b410980..57d6991b9 100644
--- a/xpumd/receiver/internal/level-zero-go/Makefile
+++ b/xpumd/level-zero-go/Makefile
@@ -24,12 +24,16 @@ stats:
 # --- Build targets ---
 
 .PHONY: generate
-generate: clean
+generate: clean generate-stub
 	go mod download
 	$(Q)for pkg in $(PACKAGES); do \
 	    hack/generate.sh $$pkg || exit 1; \
 	done
 
+.PHONY: generate-stub
+generate-stub:
+	$(MAKE) -C level-zero-stub generate
+
 .PHONY: generate-dockerized
 generate-dockerized: clean
 	$(Q)docker build --target artifacts \
diff --git a/xpumd/receiver/internal/level-zero-go/README.md b/xpumd/level-zero-go/README.md
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/README.md
rename to xpumd/level-zero-go/README.md
diff --git a/xpumd/receiver/internal/level-zero-go/SECURITY.md b/xpumd/level-zero-go/SECURITY.md
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/SECURITY.md
rename to xpumd/level-zero-go/SECURITY.md
diff --git a/xpumd/receiver/internal/level-zero-go/core.yml b/xpumd/level-zero-go/core.yml
similarity index 91%
rename from xpumd/receiver/internal/level-zero-go/core.yml
rename to xpumd/level-zero-go/core.yml
index ccb1a75d2..4aed7f3f4 100644
--- a/xpumd/receiver/internal/level-zero-go/core.yml
+++ b/xpumd/level-zero-go/core.yml
@@ -24,6 +24,9 @@ TRANSLATOR:
       - {action: accept, from: "^ZE_DEVICE_TYPE_"}
       - {action: replace, from: "^ZE_"}
       - {transform: export}
+      # Ignore experimental
+      - {action: ignore, from: "_EXP[2]?_"}
+      - {action: ignore, from: "_EXP[2]?$"}
     function:
     type:
       - {action: accept, from: "^ze_api_version_t$"}
diff --git a/xpumd/receiver/internal/level-zero-go/core/Doxyfile b/xpumd/level-zero-go/core/Doxyfile
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/Doxyfile
rename to xpumd/level-zero-go/core/Doxyfile
diff --git a/xpumd/receiver/internal/level-zero-go/core/cgo_helpers.h b/xpumd/level-zero-go/core/cgo_helpers.h
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/cgo_helpers.h
rename to xpumd/level-zero-go/core/cgo_helpers.h
diff --git a/xpumd/receiver/internal/level-zero-go/core/const.go b/xpumd/level-zero-go/core/const.go
similarity index 90%
rename from xpumd/receiver/internal/level-zero-go/core/const.go
rename to xpumd/level-zero-go/core/const.go
index 1a9ff11ab..accd9a809 100644
--- a/xpumd/receiver/internal/level-zero-go/core/const.go
+++ b/xpumd/level-zero-go/core/const.go
@@ -42,21 +42,6 @@ const (
 	RESULT_ERROR_DEVICE_REQUIRES_RESET Result = 1879048198
 	// [Core] device currently in low power state
 	RESULT_ERROR_DEVICE_IN_LOW_POWER_STATE Result = 1879048199
-	// [Core, Experimental] device is not represented by a fabric vertex
-	RESULT_EXP_ERROR_DEVICE_IS_NOT_VERTEX Result = 2146435073
-	// [Core, Experimental] fabric vertex does not represent a device
-	RESULT_EXP_ERROR_VERTEX_IS_NOT_DEVICE Result = 2146435074
-	// [Core, Experimental] fabric vertex represents a remote device or subdevice
-	RESULT_EXP_ERROR_REMOTE_DEVICE Result = 2146435075
-	// [Core, Experimental] operands of comparison are not compatible
-	RESULT_EXP_ERROR_OPERANDS_INCOMPATIBLE Result = 2146435076
-	// [Core, Experimental] ray tracing acceleration structure build operation failed
-	// due to insufficient resources, retry with a larger acceleration structure buffer
-	// allocation
-	RESULT_EXP_RTAS_BUILD_RETRY Result = 2146435077
-	// [Core, Experimental] ray tracing acceleration structure build operation deferred
-	// to parallel operation join
-	RESULT_EXP_RTAS_BUILD_DEFERRED Result = 2146435078
 	// [Sysman] access denied due to permission level
 	RESULT_ERROR_INSUFFICIENT_PERMISSIONS Result = 1879113728
 	// [Sysman] resource already in use and simultaneous access not allowed or resource
diff --git a/xpumd/receiver/internal/level-zero-go/core/core.go b/xpumd/level-zero-go/core/core.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/core.go
rename to xpumd/level-zero-go/core/core.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/core_static.go b/xpumd/level-zero-go/core/core_static.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/core_static.go
rename to xpumd/level-zero-go/core/core_static.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/doc.go b/xpumd/level-zero-go/core/doc.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/doc.go
rename to xpumd/level-zero-go/core/doc.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/types-mangle-const.yaml b/xpumd/level-zero-go/core/types-mangle-const.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/types-mangle-const.yaml
rename to xpumd/level-zero-go/core/types-mangle-const.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/core/types-mangle.yaml b/xpumd/level-zero-go/core/types-mangle.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/types-mangle.yaml
rename to xpumd/level-zero-go/core/types-mangle.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/core/types.go b/xpumd/level-zero-go/core/types.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/types.go
rename to xpumd/level-zero-go/core/types.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/types_static.go b/xpumd/level-zero-go/core/types_static.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/types_static.go
rename to xpumd/level-zero-go/core/types_static.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/zz_ApiVersion_string.go b/xpumd/level-zero-go/core/zz_ApiVersion_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/zz_ApiVersion_string.go
rename to xpumd/level-zero-go/core/zz_ApiVersion_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/zz_DevicePropertyFlag_string.go b/xpumd/level-zero-go/core/zz_DevicePropertyFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/zz_DevicePropertyFlag_string.go
rename to xpumd/level-zero-go/core/zz_DevicePropertyFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/zz_DeviceType_string.go b/xpumd/level-zero-go/core/zz_DeviceType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/core/zz_DeviceType_string.go
rename to xpumd/level-zero-go/core/zz_DeviceType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/core/zz_Result_string.go b/xpumd/level-zero-go/core/zz_Result_string.go
similarity index 87%
rename from xpumd/receiver/internal/level-zero-go/core/zz_Result_string.go
rename to xpumd/level-zero-go/core/zz_Result_string.go
index 2253464dd..05142bedc 100644
--- a/xpumd/receiver/internal/level-zero-go/core/zz_Result_string.go
+++ b/xpumd/level-zero-go/core/zz_Result_string.go
@@ -17,12 +17,6 @@ func _() {
 	_ = x[RESULT_ERROR_MODULE_LINK_FAILURE-1879048197]
 	_ = x[RESULT_ERROR_DEVICE_REQUIRES_RESET-1879048198]
 	_ = x[RESULT_ERROR_DEVICE_IN_LOW_POWER_STATE-1879048199]
-	_ = x[RESULT_EXP_ERROR_DEVICE_IS_NOT_VERTEX-2146435073]
-	_ = x[RESULT_EXP_ERROR_VERTEX_IS_NOT_DEVICE-2146435074]
-	_ = x[RESULT_EXP_ERROR_REMOTE_DEVICE-2146435075]
-	_ = x[RESULT_EXP_ERROR_OPERANDS_INCOMPATIBLE-2146435076]
-	_ = x[RESULT_EXP_RTAS_BUILD_RETRY-2146435077]
-	_ = x[RESULT_EXP_RTAS_BUILD_DEFERRED-2146435078]
 	_ = x[RESULT_ERROR_INSUFFICIENT_PERMISSIONS-1879113728]
 	_ = x[RESULT_ERROR_NOT_AVAILABLE-1879113729]
 	_ = x[RESULT_ERROR_DEPENDENCY_UNAVAILABLE-1879179264]
@@ -70,8 +64,7 @@ const (
 	_Result_name_2 = "ERROR_INSUFFICIENT_PERMISSIONSERROR_NOT_AVAILABLE"
 	_Result_name_3 = "ERROR_DEPENDENCY_UNAVAILABLEWARNING_DROPPED_DATA"
 	_Result_name_4 = "ERROR_UNINITIALIZEDERROR_UNSUPPORTED_VERSIONERROR_UNSUPPORTED_FEATUREERROR_INVALID_ARGUMENTERROR_INVALID_NULL_HANDLEERROR_HANDLE_OBJECT_IN_USEERROR_INVALID_NULL_POINTERERROR_INVALID_SIZEERROR_UNSUPPORTED_SIZEERROR_UNSUPPORTED_ALIGNMENTERROR_INVALID_SYNCHRONIZATION_OBJECTERROR_INVALID_ENUMERATIONERROR_UNSUPPORTED_ENUMERATIONERROR_UNSUPPORTED_IMAGE_FORMATERROR_INVALID_NATIVE_BINARYERROR_INVALID_GLOBAL_NAMEERROR_INVALID_KERNEL_NAMEERROR_INVALID_FUNCTION_NAMEERROR_INVALID_GROUP_SIZE_DIMENSIONERROR_INVALID_GLOBAL_WIDTH_DIMENSIONERROR_INVALID_KERNEL_ARGUMENT_INDEXERROR_INVALID_KERNEL_ARGUMENT_SIZEERROR_INVALID_KERNEL_ATTRIBUTE_VALUEERROR_INVALID_MODULE_UNLINKEDERROR_INVALID_COMMAND_LIST_TYPEERROR_OVERLAPPING_REGIONSWARNING_ACTION_REQUIREDERROR_INVALID_KERNEL_HANDLEEXT_RTAS_BUILD_RETRYEXT_RTAS_BUILD_DEFERREDEXT_ERROR_OPERANDS_INCOMPATIBLEERROR_SURVIVABILITY_MODE_DETECTEDERROR_ADDRESS_NOT_FOUND"
-	_Result_name_5 = "EXP_ERROR_DEVICE_IS_NOT_VERTEXEXP_ERROR_VERTEX_IS_NOT_DEVICEEXP_ERROR_REMOTE_DEVICEEXP_ERROR_OPERANDS_INCOMPATIBLEEXP_RTAS_BUILD_RETRYEXP_RTAS_BUILD_DEFERRED"
-	_Result_name_6 = "ERROR_UNKNOWNFORCE_UINT32"
+	_Result_name_5 = "ERROR_UNKNOWNFORCE_UINT32"
 )
 
 var (
@@ -80,8 +73,7 @@ var (
 	_Result_index_2 = [...]uint8{0, 30, 49}
 	_Result_index_3 = [...]uint8{0, 28, 48}
 	_Result_index_4 = [...]uint16{0, 19, 44, 69, 91, 116, 142, 168, 186, 208, 235, 271, 296, 325, 355, 382, 407, 432, 459, 493, 529, 564, 598, 634, 663, 694, 719, 742, 769, 789, 812, 843, 876, 899}
-	_Result_index_5 = [...]uint8{0, 30, 60, 83, 114, 134, 157}
-	_Result_index_6 = [...]uint8{0, 13, 25}
+	_Result_index_5 = [...]uint8{0, 13, 25}
 )
 
 func (i Result) String() string {
@@ -100,12 +92,9 @@ func (i Result) String() string {
 	case 2013265921 <= i && i <= 2013265953:
 		i -= 2013265921
 		return _Result_name_4[_Result_index_4[i]:_Result_index_4[i+1]]
-	case 2146435073 <= i && i <= 2146435078:
-		i -= 2146435073
-		return _Result_name_5[_Result_index_5[i]:_Result_index_5[i+1]]
 	case 2147483646 <= i && i <= 2147483647:
 		i -= 2147483646
-		return _Result_name_6[_Result_index_6[i]:_Result_index_6[i+1]]
+		return _Result_name_5[_Result_index_5[i]:_Result_index_5[i+1]]
 	default:
 		return "Result(" + strconv.FormatInt(int64(i), 10) + ")"
 	}
diff --git a/xpumd/receiver/internal/level-zero-go/examples/Dockerfile b/xpumd/level-zero-go/examples/Dockerfile
similarity index 52%
rename from xpumd/receiver/internal/level-zero-go/examples/Dockerfile
rename to xpumd/level-zero-go/examples/Dockerfile
index 5d2ff0acd..f5817dbf6 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/Dockerfile
+++ b/xpumd/level-zero-go/examples/Dockerfile
@@ -6,27 +6,46 @@
 FROM golang:1.26-trixie AS builder
 
 ARG APP=list-sysman
-ARG IGC_CORE_VERSION=2.32.7+21184
-ARG COMPUTE_RUNTIME_RELEASE=26.14.37833.4
-ARG LIBIGDGMM12_VERSION=22.9.0
-ARG LEVEL_ZERO_VERSION=1.28.2
-ARG IGSC_VERSION=0.9.6
 
-WORKDIR /go/src/work
+# driver stack DEB package versions
+ARG IGC_CORE_VERSION=2.34.4+21428
+ARG COMPUTE_RUNTIME_RELEASE=26.18.38308.1
+ARG LIBIGDGMM12_VERSION=22.10.0
+ARG LEVEL_ZERO_VERSION=1.28.6
+
+# SHA256 checksums for those
+ARG CHECKSUMS_LOADER=checksums-loader.txt
+ARG CHECKSUMS_BACKEND=checksums-backend.txt
+
+# Git repo tags & commit hashes to match against them
+ARG IGSC_VERSION=V0.9.6
+ARG IGSC_COMMIT=6abae21408bc36561baaade9fca9ae4a5173d2f0
+ARG METEE_VERSION=6.2.3
+ARG METEE_COMMIT=67ff323aead437557d9a7309803aae79cd5b2d56
+
+WORKDIR /debs/
+COPY level-zero/$CHECKSUMS_LOADER level-zero/$CHECKSUMS_BACKEND .
 
-RUN mkdir /debs && \
-    IGC_CORE_RELEASE=${IGC_CORE_VERSION%%+*} && \
+RUN IGC_CORE_RELEASE=${IGC_CORE_VERSION%%+*} && \
     curl -fS --fail-early --output-dir /debs/ \
          -LO https://github.com/intel/intel-graphics-compiler/releases/download/v${IGC_CORE_RELEASE}/intel-igc-core-2_${IGC_CORE_VERSION}_amd64.deb \
          -LO https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_RELEASE}/libigdgmm12_${LIBIGDGMM12_VERSION}_amd64.deb \
          -LO https://github.com/intel/compute-runtime/releases/download/${COMPUTE_RUNTIME_RELEASE}/libze-intel-gpu1_${COMPUTE_RUNTIME_RELEASE}-0_amd64.deb \
-         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/level-zero_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
+         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/libze1_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
     for deb in /debs/*.deb; do \
         dpkg-deb -x "$deb" /out; \
     done
 
 RUN curl -fS --output-dir /debs/ \
-         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/level-zero-devel_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
+         -LO https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/libze-dev_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
+    if ! sha256sum --check $CHECKSUMS_LOADER $CHECKSUMS_BACKEND ; then \
+	echo "--- Expected ($CHECKSUMS_LOADER / $CHECKSUMS_BACKEND): ---"; \
+	cat $CHECKSUMS_LOADER $CHECKSUMS_BACKEND; \
+	echo "--- Got: ---"; \
+	sha256sum *.deb; \
+	echo "=> ERROR"; \
+	exit 1; \
+    fi; \
     dpkg -i /debs/*.deb
 
 # Install IGSC build dependencies
@@ -35,10 +54,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ninja-build \
     libudev-dev
 
-# Build IGSC
+WORKDIR /go/src/work
+
+# Build IGSC + its MeTee dependency
+# (with --depth 1, clone $TAG + checkout $COMMIT verifies that tags & hashes match)
 RUN mkdir /src && \
-    git clone --branch V${IGSC_VERSION} --depth 1 https://github.com/intel/igsc.git /src/igsc && \
-    cd /src/igsc && \
+    git clone --branch ${METEE_VERSION} --depth 1 https://github.com/intel/metee.git /src/metee && \
+    cd /src/metee && git checkout ${METEE_COMMIT} && \
+    cmake -G Ninja -S . -B build -LH -DCMAKE_INSTALL_PREFIX=/usr/ && \
+    ninja -v -C build && \
+    ninja -C build install && \
+    git clone --branch ${IGSC_VERSION} --depth 1 https://github.com/intel/igsc.git /src/igsc && \
+    cd /src/igsc && git checkout ${IGSC_COMMIT} && \
     cmake -G Ninja -S . -B build -LH -DCMAKE_INSTALL_PREFIX=/usr/local && \
     ninja -v -C build && \
     DESTDIR=/igsc-install ninja -C build install
diff --git a/xpumd/receiver/internal/level-zero-go/examples/Makefile b/xpumd/level-zero-go/examples/Makefile
similarity index 77%
rename from xpumd/receiver/internal/level-zero-go/examples/Makefile
rename to xpumd/level-zero-go/examples/Makefile
index 6973e880a..64ca2c49d 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/Makefile
+++ b/xpumd/level-zero-go/examples/Makefile
@@ -9,6 +9,9 @@ IMAGE_REPO_BASE ?= registry.local/level-zero-go
 IMAGE_TAG ?= latest
 EXAMPLE_APPS := list-sysman events-sysman
 
+# PIE + full RELRO, drop all symbols
+GO_FLAGS := -buildmode=pie --ldflags="-bindnow -s -w"
+
 # --- Helper targets ---
 
 .PHONY: help
@@ -19,8 +22,8 @@ help:
 
 .PHONY: build
 build:
-	$(Q)go build -o bin/list-sysman ./list-sysman/.
-	$(Q)go build -o bin/events-sysman ./events-sysman/.
+	$(Q)go build $(GO_FLAGS) -o bin/list-sysman ./list-sysman/.
+	$(Q)go build $(GO_FLAGS) -o bin/events-sysman ./events-sysman/.
 
 .PHONY: images
 # "label=disable" is needed for Dockerfile "RUN --mount" on hosts using Podman + SELinux
diff --git a/xpumd/receiver/internal/level-zero-go/examples/common/dump.go b/xpumd/level-zero-go/examples/common/dump.go
similarity index 99%
rename from xpumd/receiver/internal/level-zero-go/examples/common/dump.go
rename to xpumd/level-zero-go/examples/common/dump.go
index c564b812d..3f3eed3bc 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/common/dump.go
+++ b/xpumd/level-zero-go/examples/common/dump.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"reflect"
 
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // DumpJSON prints an object in JSON format with with human-readable string
diff --git a/xpumd/receiver/internal/level-zero-go/examples/events-sysman/main.go b/xpumd/level-zero-go/examples/events-sysman/main.go
similarity index 90%
rename from xpumd/receiver/internal/level-zero-go/examples/events-sysman/main.go
rename to xpumd/level-zero-go/examples/events-sysman/main.go
index e771cc2ee..1bb79c93d 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/events-sysman/main.go
+++ b/xpumd/level-zero-go/examples/events-sysman/main.go
@@ -29,8 +29,8 @@ const allEventFlags = sysman.EventTypeFlags(
 		sysman.EVENT_TYPE_FLAG_PCI_LINK_HEALTH |
 		sysman.EVENT_TYPE_FLAG_RAS_CORRECTABLE_ERRORS |
 		sysman.EVENT_TYPE_FLAG_RAS_UNCORRECTABLE_ERRORS |
-		sysman.EVENT_TYPE_FLAG_DEVICE_RESET_REQUIRED,
-	// NOTE: sysman.EVENT_TYPE_FLAG_SURVIVABILITY_MODE_DETECTED disabled, causes ERROR_INVALID_ENUMERATION error
+		sysman.EVENT_TYPE_FLAG_DEVICE_RESET_REQUIRED |
+		sysman.EVENT_TYPE_FLAG_SURVIVABILITY_MODE_DETECTED,
 )
 
 const (
@@ -78,7 +78,8 @@ func pollDriver(idx int, driver *sysman.Driver) {
 	var deviceIdentifiers []string
 
 	for i, device := range sysDevices {
-		if err := device.EventRegister(allEventFlags); err != nil {
+		eventsMask, err := device.EventRegister(allEventFlags)
+		if err != nil {
 			log.Printf("Error: driver %d device %d: EventRegister: %v", idx, i, err)
 			continue
 		}
@@ -98,7 +99,7 @@ func pollDriver(idx int, driver *sysman.Driver) {
 		if props, err := device.GetProperties(); err == nil {
 			modelName = props.ModelName.String()
 		}
-		log.Printf("Registered for events on driver %d device %d: [%s] (%s)", idx, i, pciBDF, modelName)
+		log.Printf("Registered for events on driver %d device %d ([%s] %s): %s", idx, i, pciBDF, modelName, eventsMask)
 	}
 
 	if len(devices) == 0 {
diff --git a/xpumd/receiver/internal/level-zero-go/examples/go.mod b/xpumd/level-zero-go/examples/go.mod
similarity index 84%
rename from xpumd/receiver/internal/level-zero-go/examples/go.mod
rename to xpumd/level-zero-go/examples/go.mod
index b9ba47579..d793575f4 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/go.mod
+++ b/xpumd/level-zero-go/examples/go.mod
@@ -1,12 +1,12 @@
 module github.com/intel/level-zero-go/examples
 
-go 1.26
+go 1.26.0
 
 replace github.com/intel/level-zero-go => ../
 
 require (
 	github.com/intel/level-zero-go v0.0.0-00010101000000-000000000000
-	gopkg.in/yaml.v3 v3.0.1
+	go.yaml.in/yaml/v4 v4.0.0-rc.4
 )
 
 require github.com/google/uuid v1.6.0 // indirect
diff --git a/xpumd/receiver/internal/level-zero-go/go.sum b/xpumd/level-zero-go/examples/go.sum
similarity index 80%
rename from xpumd/receiver/internal/level-zero-go/go.sum
rename to xpumd/level-zero-go/examples/go.sum
index 42976e030..570bee1d8 100644
--- a/xpumd/receiver/internal/level-zero-go/go.sum
+++ b/xpumd/level-zero-go/examples/go.sum
@@ -6,7 +6,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=
+go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/xpumd/receiver/internal/level-zero-go/examples/list-sysman/collect.go b/xpumd/level-zero-go/examples/list-sysman/collect.go
similarity index 99%
rename from xpumd/receiver/internal/level-zero-go/examples/list-sysman/collect.go
rename to xpumd/level-zero-go/examples/list-sysman/collect.go
index 150e9c634..f412de8a9 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/list-sysman/collect.go
+++ b/xpumd/level-zero-go/examples/list-sysman/collect.go
@@ -595,6 +595,11 @@ func (d *DeviceInfo) collectRasInfo(device *sysman.Device) {
 		} else {
 			result[i].State = &state
 		}
+		if states, err := ras.GetStateExp(); err != nil {
+			d.recordError("RasErrorSet.GetStateExp", err)
+		} else {
+			result[i].StateExp = states
+		}
 	}
 
 	d.RasErrorSets = result
diff --git a/xpumd/receiver/internal/level-zero-go/examples/list-sysman/main.go b/xpumd/level-zero-go/examples/list-sysman/main.go
similarity index 97%
rename from xpumd/receiver/internal/level-zero-go/examples/list-sysman/main.go
rename to xpumd/level-zero-go/examples/list-sysman/main.go
index df19eb323..f9d53e9e3 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/list-sysman/main.go
+++ b/xpumd/level-zero-go/examples/list-sysman/main.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/intel/level-zero-go/examples/common"
 	"github.com/intel/level-zero-go/sysman"
-	yaml "gopkg.in/yaml.v3"
+	yaml "go.yaml.in/yaml/v4"
 )
 
 func main() {
diff --git a/xpumd/receiver/internal/level-zero-go/examples/list-sysman/types.go b/xpumd/level-zero-go/examples/list-sysman/types.go
similarity index 99%
rename from xpumd/receiver/internal/level-zero-go/examples/list-sysman/types.go
rename to xpumd/level-zero-go/examples/list-sysman/types.go
index 27dccdc44..56ac92d3c 100644
--- a/xpumd/receiver/internal/level-zero-go/examples/list-sysman/types.go
+++ b/xpumd/level-zero-go/examples/list-sysman/types.go
@@ -160,6 +160,7 @@ type RasInfo struct {
 	Properties *sysman.RasProperties
 	Config     *sysman.RasConfig
 	State      *sysman.RasState
+	StateExp   []sysman.RasStateExp
 }
 
 type SchedulerInfo struct {
diff --git a/xpumd/receiver/internal/level-zero-go/go.mod b/xpumd/level-zero-go/go.mod
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/go.mod
rename to xpumd/level-zero-go/go.mod
diff --git a/xpumd/receiver/internal/level-zero-go/examples/go.sum b/xpumd/level-zero-go/go.sum
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/examples/go.sum
rename to xpumd/level-zero-go/go.sum
diff --git a/xpumd/receiver/internal/level-zero-go/hack/Dockerfile.generate b/xpumd/level-zero-go/hack/Dockerfile.generate
similarity index 89%
rename from xpumd/receiver/internal/level-zero-go/hack/Dockerfile.generate
rename to xpumd/level-zero-go/hack/Dockerfile.generate
index 132dfe350..e312b691c 100644
--- a/xpumd/receiver/internal/level-zero-go/hack/Dockerfile.generate
+++ b/xpumd/level-zero-go/hack/Dockerfile.generate
@@ -10,7 +10,7 @@ FROM golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO} AS builder
 
 ARG PACKAGES="core sysman"
 
-RUN apt-get update && apt-get install -y doxygen
+RUN apt-get update && apt-get install -y doxygen clang-format
 
 WORKDIR /go/src
 
diff --git a/xpumd/level-zero-go/hack/generate-cyaml.py b/xpumd/level-zero-go/hack/generate-cyaml.py
new file mode 100644
index 000000000..c2377e74d
--- /dev/null
+++ b/xpumd/level-zero-go/hack/generate-cyaml.py
@@ -0,0 +1,647 @@
+#!/usr/bin/env python3
+"""
+Generate CYAML schemas for structs.
+
+Annotations supported in header comments (// gen: <directive>):
+  flatten    - flatten this inline struct member's sub-members with dot-path prefix
+  count=NAME - for fixed arrays: use field NAME as the runtime element count
+  ignore     - skip this field entirely (no CYAML schema entry generated)
+  key=NAME   - on a struct field: use NAME as the YAML key instead of the auto-generated CamelCase name
+               on an enum value: use NAME as the YAML string for that value instead of the C enumerator name
+  enum       - emit a CYAML_VALUE_ENUM string table for this enum type
+
+Usage:
+    python3 hack/generate-cyaml.py [options]
+"""
+
+import argparse
+import re
+import sys
+from dataclasses import dataclass, field
+from pathlib import Path
+
+@dataclass
+class Annotations:
+    """Parsed // gen: directives for a struct field."""
+    ignore: bool = False
+    flatten: bool = False
+    count: str = ""
+    key: str = ""
+
+
+# Hardcoded annotations for upstream headers we cannot modify
+# TODO: consider moving these into a separate config file
+FIELD_ANNOTATIONS_OVERRIDE = {
+    ("zes_fan_speed_table_t", "table"): Annotations(count="numPoints"),
+    # UUID fields in upstream structs are handled via sysman_uuid_t wrapper fields;
+    # skip them here to avoid generating a CYAML schema for the raw byte-array struct.
+    ("ze_device_properties_t", "uuid"): Annotations(ignore=True),
+    ("zes_device_ext_properties_t", "uuid"): Annotations(ignore=True),
+    # zes_device_properties_t.core is handled by the sysman_device_core_properties_t
+    # helper field in sysman_device_properties_info_t, which adds a Uuid string parser.
+    # Skipping it here avoids a duplicate "Core" YAML key when zes_device_properties_t
+    # is flattened, which would shadow the helper mapping and break UUID parsing.
+    ("zes_device_properties_t", "core"): Annotations(ignore=True),
+}
+
+# ---------------------------------------------------------------------------
+# Parsing helpers
+# ---------------------------------------------------------------------------
+
+def read_file(path):
+    return Path(path).read_text(encoding="utf-8")
+
+
+def extract_struct_bodies(text):
+    """Return {typedef_name: body_str} for all typedef struct blocks."""
+    result = {}
+    pat = re.compile(r"typedef\s+struct(?:\s+_?\w+)?\s*\{")
+    pos = 0
+    while True:
+        m = pat.search(text, pos)
+        if not m:
+            break
+        start = m.end()
+        depth = 1
+        i = start
+        while i < len(text) and depth:
+            c = text[i]
+            if c == "{":
+                depth += 1
+            elif c == "}":
+                depth -= 1
+            i += 1
+        body = text[start : i - 1]
+        rest = text[i:].lstrip()
+        nm = re.match(r"(\w+)\s*;", rest)
+        if nm:
+            result[nm.group(1)] = body
+        pos = m.start() + 1
+    return result
+
+
+def parse_gen_annotations(raw_line):
+    """Parse //gen: directives from a source line."""
+    m = re.search(r"//\s*gen:\s*(.+)", raw_line)
+    if not m:
+        return Annotations()
+    ann = Annotations()
+    for d in m.group(1).split(","):
+        stripped = d.strip()
+        parts = stripped.split("=", 1)
+        key, value = (parts[0], parts[1]) if len(parts) == 2 else (parts[0], None)
+        if key == "ignore" and value is None:
+            ann.ignore = True
+        elif key == "flatten" and value is None:
+            ann.flatten = True
+        elif key == "count" and value is not None:
+            ann.count = value
+        elif key == "key" and value is not None:
+            ann.key = value
+        else:
+            raise ValueError(f"Unknown gen annotation: {stripped!r} in line: {raw_line.strip()!r}")
+    return ann
+
+
+def parse_members(struct_name, body):
+    """Parse struct body into Member tuples.
+
+    Member = (type, name, is_ptr, array_size (or None), annotations)
+    """
+    members = []
+    for raw_line in body.splitlines():
+        stripped = raw_line.strip()
+        if not stripped:
+            continue
+        # Skip pure comment lines (not gen annotations)
+        if stripped.startswith("//") and not re.search(r"//\s*gen:", stripped):
+            continue
+        if stripped.startswith("/*") or stripped.startswith("*"):
+            continue
+        # Strip all inline comments (//, ///, //gen:) to get bare code
+        code_only = re.split(r"\s*//", stripped)[0].strip()
+        if not code_only or not code_only.endswith(";"):
+            continue
+        # Skip bitfield members
+        if re.search(r":\s*\d+\s*;", code_only):
+            continue
+        if not code_only:
+            continue
+
+        # Match "[const] type [**] name [array];"
+        m = re.match(
+            r"((?:const\s+)?[\w][\w\s]*?)\s+(\*{0,2})\s*(\w+)\s*(\[\w+\])?\s*;",
+            code_only,
+        )
+        if not m:
+            continue
+        type_str = m.group(1).strip()
+        is_ptr = bool(m.group(2).strip())
+        name = m.group(3)
+        array_size = m.group(4)  # e.g. '[ZES_FAN_TEMP_SPEED_PAIR_COUNT]' or None
+
+        annotations = parse_gen_annotations(raw_line)
+        annotations = FIELD_ANNOTATIONS_OVERRIDE.get((struct_name, name), annotations)
+
+        members.append((type_str, name, is_ptr, array_size, annotations))
+    return members
+
+
+def collect_enums(text):
+    """Return all typedef enum type names found in text."""
+    enums = set()
+    for m in re.finditer(r"typedef\s+enum\b[^}]*\}\s+(\w+)\s*;", text, re.DOTALL):
+        enums.add(m.group(1))
+    return enums
+
+
+def collect_enum_string_tables(text):
+    """Return {type_name: [(str_val, c_name), ...]} for enums
+
+    Only typedef enums enabled with a // gen: enum annotation are included.
+    """
+    result = {}
+    pat = re.compile(r"typedef\s+enum\b[^{]*\{([^}]*)\}\s+(\w+)\s*;([^\n]*)", re.DOTALL)
+    for m in pat.finditer(text):
+        trailing = m.group(3)
+        if not re.search(r"//\s*gen:\s*enum\b", trailing):
+            continue
+        body = m.group(1)
+        type_name = m.group(2)
+        pairs = []
+        ok = True
+        for raw_line in body.splitlines():
+            stripped = raw_line.strip()
+            if not stripped or stripped.startswith("//") or stripped.startswith("*"):
+                continue
+            mm = re.match(r"(\w+)", stripped)
+            if not mm:
+                ok = False
+                break
+            gk = re.search(r"//\s*gen:\s*key=(\S+)", stripped)
+            pairs.append((gk.group(1) if gk else mm.group(1), mm.group(1)))
+        if ok and pairs:
+            result[type_name] = pairs
+    return result
+
+
+def collect_aliases(text):
+    """Return {alias: base_type} for all simple (non-pointer, non-function) typedef aliases."""
+    aliases = {}
+    for m in re.finditer(
+        r"^typedef\s+([\w]+(?:\s*\*)?)\s+(\w+)\s*;", text, re.MULTILINE
+    ):
+        base = m.group(1).strip()
+        alias = m.group(2)
+        if alias != base and "(" not in base and "*" not in base:
+            aliases[alias] = base
+    return aliases
+
+
+@dataclass
+class HeaderParser:
+    """Parsed data from one or more C header files."""
+
+    all_structs: dict
+    aliases: dict
+    enums: set
+    enum_str_tables: dict
+
+    @classmethod
+    def from_files(cls, paths):
+        """Parse all given header files and return a populated HeaderParser."""
+        all_structs_raw = {}
+        all_text = ""
+        for path in paths:
+            text = read_file(path)
+            all_structs_raw.update(extract_struct_bodies(text))
+            all_text += text
+        return cls(
+            all_structs={name: parse_members(name, body) for name, body in all_structs_raw.items()},
+            aliases=collect_aliases(all_text),
+            enums=collect_enums(all_text),
+            enum_str_tables=collect_enum_string_tables(all_text),
+        )
+
+    def resolve_kind(self, name, _seen=None):
+        """Return 'bool' | 'float' | 'int' | 'uint' | 'struct' | 'char'."""
+        if _seen is None:
+            _seen = frozenset()
+        if name in _seen:
+            return "uint"
+        if name == "char":
+            return "char"
+        if name == "ze_bool_t":
+            return "bool"
+        if name in {"float", "double"}:
+            return "float"
+        if name in {"int8_t", "int16_t", "int32_t", "int64_t"}:
+            return "int"
+        if name in {"uint8_t", "uint16_t", "uint32_t", "uint64_t", "size_t", "uintptr_t"}:
+            return "uint"
+        if name in self.enums:
+            return "uint"
+        if name in self.all_structs:
+            return "struct"
+        if name in self.aliases:
+            return self.resolve_kind(self.aliases[name], _seen | {name})
+        return "uint"  # unknown: assume flags/enum
+
+
+# ---------------------------------------------------------------------------
+# Code generation helpers
+# ---------------------------------------------------------------------------
+
+SKIP_FIELDS = {"stype", "pNext"}
+
+def var_name(struct_name, suffix):
+    return re.sub(r"_t$", "", struct_name) + suffix
+
+
+def fields_var(struct_name):
+    return var_name(struct_name, "_fields")
+
+
+def schema_var(struct_name):
+    return var_name(struct_name, "_schema")
+
+
+def to_yaml_key(name):
+    """Convert a C field name to a YAML key string."""
+    if "_" in name or name.islower():
+        # snake_case -> CamelCase
+        return "".join(w.capitalize() for w in name.split("_"))
+    # Already CamelCase/mixed: capitalize first letter only
+    return name[0].upper() + name[1:]
+
+
+def detect_count_pairs(members):
+    """Return (pairs_dict, count_names_set).
+
+    pairs_dict maps ptr_field_name -> count_field_name for adjacent pairs.
+    """
+    pairs = {}
+    count_names = set()
+    for i, (_type_str, name, is_ptr, arr, _ann) in enumerate(members):
+        if is_ptr and not arr and i > 0:
+            prev_name = members[i - 1][1]
+            prev_is_ptr = members[i - 1][2]
+            if prev_name == name + "_count" and not prev_is_ptr:
+                pairs[name] = prev_name
+                count_names.add(prev_name)
+    return pairs, count_names
+
+
+def traverse_from_root(p, root_struct):
+    """Depth-first search from root.
+
+    Returns (emit_order, rv_set) where emit_order lists struct names in
+    topological order (dependencies before dependents) and rv_set lists "return
+    value" structs that need separate RV field arrays.
+    NOTE: flattened types are visited for their dependencies but not added to emit_order.
+    """
+    emit_order = []
+    rv_set = set()
+    in_order = set()
+
+    def visit_deps(name, flatten_seen):
+        """Recurse into members of 'name', scheduling dependencies via visit()."""
+        members = p.all_structs.get(name, [])
+        _, count_names = detect_count_pairs(members)
+        for type_str, field_name, _is_ptr, arr, annotations in members:
+            if field_name in SKIP_FIELDS:
+                continue
+            if field_name in count_names:
+                continue
+            if annotations.ignore:
+                continue
+            is_rv = type_str.endswith("_rv_t")
+            if arr and not annotations.count:
+                continue
+            if is_rv:
+                rv_set.add(type_str)
+            elif annotations.flatten:
+                if type_str not in flatten_seen:
+                    visit_deps(type_str, flatten_seen | {type_str})
+            else:
+                visit(type_str)
+
+    def visit(name):
+        if name in in_order:
+            return
+        in_order.add(name)
+        visit_deps(name, set())
+        emit_order.append(name)  # post-order: after all dependencies
+
+    if root_struct not in p.all_structs:
+        sys.exit(f"ERROR: root struct {root_struct!r} not found")
+
+    visit(root_struct)
+    return emit_order, rv_set
+
+
+@dataclass
+class SchemaEmitter:
+    """Helper for emitting CYAML schema code for a struct and its members."""
+
+    @dataclass
+    class FieldCtx:
+        """Common context for all member emit methods."""
+
+        yaml_key: str
+        type_str: str
+        member_path: str
+        container: str
+        annotations: Annotations = field(default_factory=Annotations)
+
+    parser: HeaderParser
+    out: list = field(default_factory=list)
+
+    def _manual_seq(self, ctx, elem_type_str, schema_var, count_path):
+        """Emit a manual struct-literal SEQUENCE entry."""
+        self.out.append(f'\t{{.key = "{ctx.yaml_key}",')
+        self.out.append("\t .value = {.type = CYAML_SEQUENCE,")
+        self.out.append("\t           .flags = SYSMAN_NULLABLE_PTR_FLAGS,")
+        self.out.append(f"\t           .data_size = sizeof({elem_type_str}),")
+        self.out.append(
+            f"\t           .sequence = {{.entry = &{schema_var}, .min = 0, .max = CYAML_UNLIMITED}}}},"
+        )
+        self.out.append(f"\t .data_offset = offsetof({ctx.container}, {ctx.member_path}),")
+        self.out.append(f"\t .count_offset = offsetof({ctx.container}, {count_path}),")
+        self.out.append("\t .count_size = sizeof(uint32_t)},")
+
+    def _emit_fixed_array(self, ctx, size_expr):
+        """Emit a fixed-size array field."""
+        if ctx.type_str == "char":
+            self.out.append(
+                f'\tCYAML_FIELD_STRING("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path}, 0),'
+            )
+        elif ctx.annotations.count:
+            sv = schema_var(ctx.type_str) if ctx.type_str in self.parser.all_structs else "uint64_schema"
+            self.out.append(
+                f'\tCYAML_FIELD_SEQUENCE_COUNT("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path},'
+                f" {ctx.annotations.count}, &{sv}, 0, {size_expr}),"
+            )
+        else:
+            kind = self.parser.resolve_kind(ctx.type_str)
+            if kind == "struct" and ctx.type_str in self.parser.all_structs:
+                sv = schema_var(ctx.type_str)
+                self.out.append(
+                    f'\tCYAML_FIELD_SEQUENCE_FIXED("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path},'
+                    f" &{sv}, {size_expr}),"
+                )
+            else:
+                self.out.append(
+                    f'\tCYAML_FIELD_SEQUENCE_FIXED("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path},'
+                    f" &uint64_schema, {size_expr}),"
+                )
+
+    def _emit_count_seq(self, ctx, count_name, count_path, prefix):
+        """Emit a count+pointer sequence field pair."""
+        kind = self.parser.resolve_kind(ctx.type_str)
+        if kind == "struct" and ctx.type_str in self.parser.all_structs:
+            sv = schema_var(ctx.type_str)
+            if prefix:
+                # Dotted paths (e.g. base.entries_count) are non-standard in macros; use manual form.
+                self._manual_seq(ctx, ctx.type_str, sv, count_path)
+            else:
+                self.out.append(
+                    f'\tCYAML_FIELD_SEQUENCE_COUNT("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container},'
+                    f" {ctx.member_path}, {count_name}, &{sv}, 0, CYAML_UNLIMITED),"
+                )
+        elif ctx.type_str in self.parser.enum_str_tables:
+            sv = schema_var(ctx.type_str)
+            if prefix:
+                self._manual_seq(ctx, ctx.type_str, sv, count_path)
+            else:
+                self.out.append(
+                    f'\tCYAML_FIELD_SEQUENCE_COUNT("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container},'
+                    f" {ctx.member_path}, {count_name}, &{sv}, 0, CYAML_UNLIMITED),"
+                )
+        elif ctx.type_str == "double":
+            self._manual_seq(ctx, "double", "double_schema", count_path)
+        else:
+            if prefix:
+                self._manual_seq(ctx, "uint64_t", "uint64_schema", count_path)
+            else:
+                self.out.append(
+                    f'\tCYAML_FIELD_SEQUENCE_COUNT("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container},'
+                    f" {ctx.member_path}, {count_name}, &uint64_schema, 0, CYAML_UNLIMITED),"
+                )
+
+    def _emit_ptr_field(self, ctx):
+        """Emit a non-array pointer field."""
+        kind = self.parser.resolve_kind(ctx.type_str)
+        if kind == "struct" and ctx.type_str in self.parser.all_structs:
+            fv = fields_var(ctx.type_str)
+            self.out.append(
+                f'\tCYAML_FIELD_MAPPING_PTR("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container}, {ctx.member_path}, {fv}),'
+            )
+        elif kind == "float":
+            self.out.append(
+                f'\tCYAML_FIELD_FLOAT_PTR("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container}, {ctx.member_path}),'
+            )
+        elif kind == "int":
+            self.out.append(
+                f'\tCYAML_FIELD_INT_PTR("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container}, {ctx.member_path}),'
+            )
+        else:
+            self.out.append(
+                f'\tCYAML_FIELD_UINT_PTR("{ctx.yaml_key}", SYSMAN_NULLABLE_PTR_FLAGS, {ctx.container}, {ctx.member_path}),'
+            )
+
+    def _emit_inline_field(self, ctx, depth):
+        """Emit an inline (non-pointer, non-array) field."""
+        kind = self.parser.resolve_kind(ctx.type_str)
+        if kind == "bool":
+            self.out.append(
+                f'\tCYAML_FIELD_BOOL("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path}),'
+            )
+        elif kind == "float":
+            self.out.append(
+                f'\tCYAML_FIELD_FLOAT("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path}),'
+            )
+        elif kind == "int":
+            self.out.append(
+                f'\tCYAML_FIELD_INT("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path}),'
+            )
+        elif kind == "struct" and ctx.type_str in self.parser.all_structs:
+            if ctx.type_str.endswith("_rv_t") or not ctx.annotations.flatten or depth >= 5:
+                fv = fields_var(ctx.type_str)
+                self.out.append(
+                    f'\tCYAML_FIELD_MAPPING("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path}, {fv}),'
+                )
+            else:
+                # Flatten: recurse with extended dot-path prefix
+                self.emit_members(ctx.container, self.parser.all_structs[ctx.type_str], prefix=f"{ctx.member_path}.", depth=depth + 1)
+        else:
+            self.out.append(
+                f'\tCYAML_FIELD_UINT("{ctx.yaml_key}", CYAML_FLAG_OPTIONAL, {ctx.container}, {ctx.member_path}),'
+            )
+
+    def emit_members(self, container, members, prefix="", depth=0):
+        """Emit CYAML_FIELD_* entries for all non-skipped members."""
+        pairs, count_names = detect_count_pairs(members)
+
+        for type_str, name, is_ptr, arr, annotations in members:
+            member_path = f"{prefix}{name}" if prefix else name
+            yaml_key = annotations.key if annotations.key else to_yaml_key(name)
+            if name in SKIP_FIELDS or name in count_names or annotations.ignore:
+                continue
+
+            ctx = SchemaEmitter.FieldCtx(
+                yaml_key=yaml_key,
+                type_str=type_str,
+                member_path=member_path,
+                container=container,
+                annotations=annotations,
+            )
+
+            if arr:
+                self._emit_fixed_array(ctx, arr[1:-1])
+            elif name in pairs:
+                count_name = pairs[name]
+                count_path = f"{prefix}{count_name}" if prefix else count_name
+                self._emit_count_seq(ctx, count_name, count_path, prefix)
+            else:
+                if is_ptr:
+                    self._emit_ptr_field(ctx)
+                else:
+                    self._emit_inline_field(ctx, depth)
+
+
+
+def emit(out, text):
+    """Append lines of a static text block to out, trimming the leading newline."""
+    out.extend(text.lstrip("\n").splitlines())
+
+
+_CYAML_FILE_HEADER = """
+/*
+ * Copyright (C) 2026 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ *
+ * Code generated by hack/generate-cyaml.py. DO NOT EDIT.
+ */
+
+#ifndef SYSMAN_STATE_CYAML_H
+#define SYSMAN_STATE_CYAML_H
+
+#include "sysman_state.h"
+
+#include <cyaml/cyaml.h>
+
+"""
+
+_CYAML_FILE_RV_MACRO_BEGIN = """
+// Return value schemas (per hierarchy level).
+#define RV(T, n) CYAML_FIELD_UINT(#n, CYAML_FLAG_OPTIONAL, T, n)
+"""
+
+_CYAML_FILE_SCALAR_SCHEMAS = """
+#undef RV
+
+#define SYSMAN_NULLABLE_PTR_FLAGS (CYAML_FLAG_OPTIONAL | CYAML_FLAG_POINTER_NULL_STR)
+
+static const cyaml_schema_value_t double_schema = {CYAML_VALUE_FLOAT(CYAML_FLAG_DEFAULT, double)};
+static const cyaml_schema_value_t uint64_schema = {CYAML_VALUE_UINT(CYAML_FLAG_DEFAULT, uint64_t)};
+"""
+
+_CYAML_FILE_FOOTER = """
+#undef SYSMAN_NULLABLE_PTR_FLAGS
+
+#endif /* SYSMAN_STATE_CYAML_H */
+"""
+
+
+def generate(p, rv_set, emit_order, root_struct):
+    out = []
+    emitter = SchemaEmitter(parser=p, out=out)
+
+    emit(out, _CYAML_FILE_HEADER)
+
+    # RV field arrays
+    emit(out, _CYAML_FILE_RV_MACRO_BEGIN)
+
+    for rv_struct in sorted(rv_set):
+        fv = fields_var(rv_struct)
+        members = p.all_structs.get(rv_struct, [])
+        out.append(f"static const cyaml_schema_field_t {fv}[] = {{")
+        for _type_str, name, _is_ptr, _arr, _ann in members:
+            out.append(f"\tRV({rv_struct}, {name}),")
+        out.append("\tCYAML_FIELD_END};")
+        out.append("")
+
+    emit(out, _CYAML_FILE_SCALAR_SCHEMAS)
+
+    # Emit enum schemas
+    referenced_enum_str = {
+        type_str
+        for struct_name in emit_order
+        for type_str, _n, is_ptr, _a, _ann in p.all_structs.get(struct_name, [])
+        if is_ptr and type_str in p.enum_str_tables
+    }
+    for enum_name in sorted(referenced_enum_str):
+        strvals_var = re.sub(r"_t$", "", enum_name) + "_strvals"
+        sv = schema_var(enum_name)
+        out.append(f"static const cyaml_strval_t {strvals_var}[] = {{")
+        for str_val, c_name in p.enum_str_tables[enum_name]:
+            out.append(f'\t{{"{str_val}", {c_name}}},')
+        out.append("};")
+        out.append(
+            f"static const cyaml_schema_value_t {sv} = "
+            f"{{CYAML_VALUE_ENUM(CYAML_FLAG_DEFAULT, {enum_name},"
+            f" {strvals_var}, CYAML_ARRAY_LEN({strvals_var}))}};"
+        )
+        out.append("")
+
+    # Emit each schema in topological order
+    for struct_name in emit_order:
+        members = p.all_structs.get(struct_name, [])
+        if not members:
+            continue
+
+        fv = fields_var(struct_name)
+        sv = schema_var(struct_name)
+
+        out.append(f"static const cyaml_schema_field_t {fv}[] = {{")
+        emitter.emit_members(struct_name, members)
+        out.append("\tCYAML_FIELD_END};")
+
+        flag = "CYAML_FLAG_POINTER" if struct_name == root_struct else "CYAML_FLAG_DEFAULT"
+        out.append(f"static const cyaml_schema_value_t {sv} = {{CYAML_VALUE_MAPPING({flag}, {struct_name}, {fv})}};")
+        out.append("")
+
+    emit(out, _CYAML_FILE_FOOTER)
+
+    return "\n".join(out)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument("--header-file", action="append", dest="header_files", required=True, metavar="FILE",
+                        help="Header file to parse (may be specified multiple times; later files override earlier)")
+    parser.add_argument("--output-file", default=None, metavar="FILE",
+                        help="Output header file (default: stdout)")
+    parser.add_argument("--root-struct", required=True, metavar="TYPE",
+                        help="Root struct type name")
+    args = parser.parse_args()
+
+    # Parse all header files
+    p = HeaderParser.from_files(args.header_files)
+
+    # Discover structs (and their ordering)
+    emit_order, rv_set = traverse_from_root(p, args.root_struct)
+
+    code = generate(p, rv_set, emit_order, args.root_struct)
+
+    if args.output_file:
+        Path(args.output_file).write_text(code, encoding="utf-8")
+        print(f"Written: {args.output_file}", file=sys.stderr)
+    else:
+        sys.stdout.write(code)
+    print(f"Schemas: {len(emit_order)}, RV arrays: {len(rv_set)}", file=sys.stderr)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/xpumd/receiver/internal/level-zero-go/hack/generate-stringer.sh b/xpumd/level-zero-go/hack/generate-stringer.sh
similarity index 89%
rename from xpumd/receiver/internal/level-zero-go/hack/generate-stringer.sh
rename to xpumd/level-zero-go/hack/generate-stringer.sh
index 5babee396..16cde670a 100755
--- a/xpumd/receiver/internal/level-zero-go/hack/generate-stringer.sh
+++ b/xpumd/level-zero-go/hack/generate-stringer.sh
@@ -6,7 +6,7 @@
 
 
 project_root_dir=$(dirname "$(go env GOMOD)")
-types=$(grep '^type [A-Z]' const.go | awk '{print $2;}')
+types=$(awk '/^type [A-Z]/{print $2}' const.go)
 
 camel_to_snake() {
     echo "$1" | sed 's/\([A-Z]\)/_\1/g;s/^_//;s/.*/\U&/'
diff --git a/xpumd/receiver/internal/level-zero-go/hack/generate.sh b/xpumd/level-zero-go/hack/generate.sh
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/hack/generate.sh
rename to xpumd/level-zero-go/hack/generate.sh
diff --git a/xpumd/receiver/internal/level-zero-go/hack/go.mod b/xpumd/level-zero-go/hack/go.mod
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/hack/go.mod
rename to xpumd/level-zero-go/hack/go.mod
diff --git a/xpumd/receiver/internal/level-zero-go/hack/go.sum b/xpumd/level-zero-go/hack/go.sum
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/hack/go.sum
rename to xpumd/level-zero-go/hack/go.sum
diff --git a/xpumd/receiver/internal/level-zero-go/hack/types-mangle/doxygen.go b/xpumd/level-zero-go/hack/types-mangle/doxygen.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/hack/types-mangle/doxygen.go
rename to xpumd/level-zero-go/hack/types-mangle/doxygen.go
diff --git a/xpumd/receiver/internal/level-zero-go/hack/types-mangle/main.go b/xpumd/level-zero-go/hack/types-mangle/main.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/hack/types-mangle/main.go
rename to xpumd/level-zero-go/hack/types-mangle/main.go
diff --git a/xpumd/receiver/internal/level-zero-go/internal/helpers.go b/xpumd/level-zero-go/internal/helpers.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/internal/helpers.go
rename to xpumd/level-zero-go/internal/helpers.go
diff --git a/xpumd/receiver/internal/level-zero-go/internal/helpers_test.go b/xpumd/level-zero-go/internal/helpers_test.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/internal/helpers_test.go
rename to xpumd/level-zero-go/internal/helpers_test.go
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/Makefile b/xpumd/level-zero-go/level-zero-stub/Makefile
similarity index 67%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/Makefile
rename to xpumd/level-zero-go/level-zero-stub/Makefile
index 79e065c5b..55e4cd2b9 100644
--- a/xpumd/receiver/internal/level-zero-go/level-zero-stub/Makefile
+++ b/xpumd/level-zero-go/level-zero-stub/Makefile
@@ -2,11 +2,11 @@
 # Copyright (C) 2026 Intel Corporation
 
 CC      = gcc
-CFLAGS  = -std=c11 -Wall -Wextra -fPIC -D_POSIX_C_SOURCE=200809L -I.. $(shell pkg-config --cflags libcyaml)
+CFLAGS  = -std=c11 -O2 -Wall -Wextra -fPIC -D_POSIX_C_SOURCE=200809L -I.. $(shell pkg-config --cflags libcyaml)
 LDFLAGS = -shared
 LDLIBS  = -lpthread $(shell pkg-config --libs libcyaml)
 
-TEST_CFLAGS  = -std=c11 -Wall -Wextra -D_POSIX_C_SOURCE=200809L -I.. $(shell pkg-config --cflags libcyaml)
+TEST_CFLAGS  = -std=c11 -O2 -Wall -Wextra -D_POSIX_C_SOURCE=200809L -I.. $(shell pkg-config --cflags libcyaml)
 TEST_LDFLAGS = -Wl,-rpath,.
 TEST_LDLIBS  = -L. -lze_stub $(shell pkg-config --libs libcyaml)
 
@@ -16,6 +16,10 @@ SRCS  = zes_stub.c sysman_state.c
 OBJS  = $(SRCS:.c=.o)
 TESTS = test_sysman
 
+.PHONY: help
+help:
+	@echo -e "\nTargets:\n$$(grep '^[^#:. ]*:' Makefile | sed -e 's/^/- /' -e 's/:$$//')\n"
+
 .PHONY: all
 all: $(LIB)
 
@@ -44,6 +48,16 @@ valgrind: $(TESTS)
 		valgrind --tool=drd --error-exitcode=1 ./$$t || exit 1; \
 	done
 
+.PHONY: generate
+generate:
+	python3 ../hack/generate-cyaml.py \
+		--header-file ../level-zero/ze_api.h \
+		--header-file ../level-zero/zes_api.h \
+		--header-file sysman_state.h \
+		--root-struct sysman_state_t \
+		--output-file sysman_state_cyaml.h
+	clang-format -i sysman_state_cyaml.h
+
 .PHONY: format
 format:
 	@clang-format -i *.c *.h
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/README.md b/xpumd/level-zero-go/level-zero-stub/README.md
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/README.md
rename to xpumd/level-zero-go/level-zero-stub/README.md
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/example-config.yaml b/xpumd/level-zero-go/level-zero-stub/example-config.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/example-config.yaml
rename to xpumd/level-zero-go/level-zero-stub/example-config.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/level-zero.pc b/xpumd/level-zero-go/level-zero-stub/level-zero.pc
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/level-zero.pc
rename to xpumd/level-zero-go/level-zero-stub/level-zero.pc
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state.c b/xpumd/level-zero-go/level-zero-stub/sysman_state.c
similarity index 71%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state.c
rename to xpumd/level-zero-go/level-zero-stub/sysman_state.c
index 5311436c4..9065f4776 100644
--- a/xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state.c
+++ b/xpumd/level-zero-go/level-zero-stub/sysman_state.c
@@ -238,99 +238,92 @@ static int sysman_watch_start_locked(void)
 
 static void free_engine_groups(sysman_device_state_t *dev)
 {
-	if (dev->engine_groups.entries) {
-		for (uint32_t j = 0; j < dev->engine_groups.count; j++) {
-			free(dev->engine_groups.entries[j].activity_ext);
-			memset(&dev->engine_groups.entries[j], 0, sizeof(dev->engine_groups.entries[j]));
+	if (dev->engine_groups) {
+		for (uint32_t j = 0; j < dev->engine_groups_count; j++) {
+			free(dev->engine_groups[j].activity_ext);
+			memset(&dev->engine_groups[j], 0, sizeof(dev->engine_groups[j]));
 		}
-		free(dev->engine_groups.entries);
+		free(dev->engine_groups);
 	}
-	memset(&dev->engine_groups, 0, sizeof(dev->engine_groups));
 }
 
 static void free_fabric_ports(sysman_device_state_t *dev)
 {
-	if (dev->fabric_ports.entries) {
-		for (uint32_t j = 0; j < dev->fabric_ports.count; j++) {
-			free(dev->fabric_ports.entries[j].properties);
-			free(dev->fabric_ports.entries[j].link_type);
-			free(dev->fabric_ports.entries[j].config);
-			free(dev->fabric_ports.entries[j].state);
-			free(dev->fabric_ports.entries[j].throughput);
-			free(dev->fabric_ports.entries[j].error_counters);
-			memset(&dev->fabric_ports.entries[j], 0, sizeof(dev->fabric_ports.entries[j]));
+	if (dev->fabric_ports) {
+		for (uint32_t j = 0; j < dev->fabric_ports_count; j++) {
+			free(dev->fabric_ports[j].properties);
+			free(dev->fabric_ports[j].link_type);
+			free(dev->fabric_ports[j].config);
+			free(dev->fabric_ports[j].state);
+			free(dev->fabric_ports[j].throughput);
+			free(dev->fabric_ports[j].error_counters);
+			memset(&dev->fabric_ports[j], 0, sizeof(dev->fabric_ports[j]));
 		}
-		free(dev->fabric_ports.entries);
+		free(dev->fabric_ports);
 	}
-	memset(&dev->fabric_ports, 0, sizeof(dev->fabric_ports));
 }
 
 static void free_fans(sysman_device_state_t *dev)
 {
-	if (dev->fans.entries) {
-		for (uint32_t j = 0; j < dev->fans.count; j++) {
-			free(dev->fans.entries[j].properties);
-			free(dev->fans.entries[j].config);
-			memset(&dev->fans.entries[j], 0, sizeof(dev->fans.entries[j]));
+	if (dev->fans) {
+		for (uint32_t j = 0; j < dev->fans_count; j++) {
+			free(dev->fans[j].properties);
+			free(dev->fans[j].config);
+			memset(&dev->fans[j], 0, sizeof(dev->fans[j]));
 		}
-		free(dev->fans.entries);
+		free(dev->fans);
 	}
-	memset(&dev->fans, 0, sizeof(dev->fans));
 }
 
 static void free_firmwares(sysman_device_state_t *dev)
 {
-	if (dev->firmwares.entries) {
-		for (uint32_t j = 0; j < dev->firmwares.count; j++) {
-			free(dev->firmwares.entries[j].properties);
-			memset(&dev->firmwares.entries[j], 0, sizeof(dev->firmwares.entries[j]));
+	if (dev->firmwares) {
+		for (uint32_t j = 0; j < dev->firmwares_count; j++) {
+			free(dev->firmwares[j].properties);
+			memset(&dev->firmwares[j], 0, sizeof(dev->firmwares[j]));
 		}
-		free(dev->firmwares.entries);
+		free(dev->firmwares);
 	}
-	memset(&dev->firmwares, 0, sizeof(dev->firmwares));
 }
 
 static void free_frequency_domains(sysman_device_state_t *dev)
 {
-	if (dev->frequency_domains.entries) {
-		for (uint32_t j = 0; j < dev->frequency_domains.count; j++) {
-			free(dev->frequency_domains.entries[j].properties);
-			free(dev->frequency_domains.entries[j].range);
-			free(dev->frequency_domains.entries[j].available_clocks);
-			free(dev->frequency_domains.entries[j].state);
-			free(dev->frequency_domains.entries[j].throttle_time);
-			memset(&dev->frequency_domains.entries[j], 0, sizeof(dev->frequency_domains.entries[j]));
+	if (dev->frequency_domains) {
+		for (uint32_t j = 0; j < dev->frequency_domains_count; j++) {
+			free(dev->frequency_domains[j].properties);
+			free(dev->frequency_domains[j].range);
+			free(dev->frequency_domains[j].available_clocks);
+			free(dev->frequency_domains[j].state);
+			free(dev->frequency_domains[j].throttle_time);
+			memset(&dev->frequency_domains[j], 0, sizeof(dev->frequency_domains[j]));
 		}
-		free(dev->frequency_domains.entries);
+		free(dev->frequency_domains);
 	}
-	memset(&dev->frequency_domains, 0, sizeof(dev->frequency_domains));
 }
 
 static void free_leds(sysman_device_state_t *dev)
 {
-	if (dev->leds.entries) {
-		for (uint32_t j = 0; j < dev->leds.count; j++) {
-			free(dev->leds.entries[j].properties);
-			free(dev->leds.entries[j].state);
-			memset(&dev->leds.entries[j], 0, sizeof(dev->leds.entries[j]));
+	if (dev->leds) {
+		for (uint32_t j = 0; j < dev->leds_count; j++) {
+			free(dev->leds[j].properties);
+			free(dev->leds[j].state);
+			memset(&dev->leds[j], 0, sizeof(dev->leds[j]));
 		}
-		free(dev->leds.entries);
+		free(dev->leds);
 	}
-	memset(&dev->leds, 0, sizeof(dev->leds));
 }
 
 static void free_memory_modules(sysman_device_state_t *dev)
 {
-	if (dev->memory_modules.entries) {
-		for (uint32_t j = 0; j < dev->memory_modules.count; j++) {
-			free(dev->memory_modules.entries[j].properties);
-			free(dev->memory_modules.entries[j].state);
-			free(dev->memory_modules.entries[j].bandwidth);
-			memset(&dev->memory_modules.entries[j], 0, sizeof(dev->memory_modules.entries[j]));
+	if (dev->memory_modules) {
+		for (uint32_t j = 0; j < dev->memory_modules_count; j++) {
+			free(dev->memory_modules[j].properties);
+			free(dev->memory_modules[j].state);
+			free(dev->memory_modules[j].bandwidth);
+			memset(&dev->memory_modules[j], 0, sizeof(dev->memory_modules[j]));
 		}
-		free(dev->memory_modules.entries);
+		free(dev->memory_modules);
 	}
-	memset(&dev->memory_modules, 0, sizeof(dev->memory_modules));
 }
 
 static void free_overclock(sysman_device_state_t *dev)
@@ -339,7 +332,7 @@ static void free_overclock(sysman_device_state_t *dev)
 		return;
 	if (dev->overclock->domains) {
 		for (uint32_t j = 0; j < dev->overclock->domains_count; j++) {
-			sysman_oc_entry_t *e = &dev->overclock->domains[j];
+			sysman_oc_t *e = &dev->overclock->domains[j];
 			free(e->properties);
 			free(e->vf_properties);
 			if (e->control_infos) {
@@ -374,108 +367,101 @@ static void free_ecc(sysman_device_state_t *dev)
 
 static void free_performance_domains(sysman_device_state_t *dev)
 {
-	if (dev->performance_domains.entries) {
-		for (uint32_t j = 0; j < dev->performance_domains.count; j++) {
-			free(dev->performance_domains.entries[j].properties);
-			memset(&dev->performance_domains.entries[j], 0, sizeof(dev->performance_domains.entries[j]));
+	if (dev->performance_domains) {
+		for (uint32_t j = 0; j < dev->performance_domains_count; j++) {
+			free(dev->performance_domains[j].properties);
+			memset(&dev->performance_domains[j], 0, sizeof(dev->performance_domains[j]));
 		}
-		free(dev->performance_domains.entries);
+		free(dev->performance_domains);
 	}
-	memset(&dev->performance_domains, 0, sizeof(dev->performance_domains));
 }
 
 static void free_power_domains(sysman_device_state_t *dev)
 {
-	if (dev->power_domains.entries) {
-		for (uint32_t j = 0; j < dev->power_domains.count; j++) {
-			free(dev->power_domains.entries[j].properties);
-			free(dev->power_domains.entries[j].energy_counter);
-			free(dev->power_domains.entries[j].limits);
-			free(dev->power_domains.entries[j].energy_threshold);
-			memset(&dev->power_domains.entries[j], 0, sizeof(dev->power_domains.entries[j]));
+	if (dev->power_domains) {
+		for (uint32_t j = 0; j < dev->power_domains_count; j++) {
+			free(dev->power_domains[j].properties);
+			free(dev->power_domains[j].energy_counter);
+			free(dev->power_domains[j].limits);
+			free(dev->power_domains[j].energy_threshold);
+			memset(&dev->power_domains[j], 0, sizeof(dev->power_domains[j]));
 		}
-		free(dev->power_domains.entries);
+		free(dev->power_domains);
 	}
-	memset(&dev->power_domains, 0, sizeof(dev->power_domains));
 }
 
 static void free_psus(sysman_device_state_t *dev)
 {
-	if (dev->psus.entries) {
-		for (uint32_t j = 0; j < dev->psus.count; j++) {
-			free(dev->psus.entries[j].properties);
-			free(dev->psus.entries[j].state);
-			memset(&dev->psus.entries[j], 0, sizeof(dev->psus.entries[j]));
+	if (dev->psus) {
+		for (uint32_t j = 0; j < dev->psus_count; j++) {
+			free(dev->psus[j].properties);
+			free(dev->psus[j].state);
+			memset(&dev->psus[j], 0, sizeof(dev->psus[j]));
 		}
-		free(dev->psus.entries);
+		free(dev->psus);
 	}
-	memset(&dev->psus, 0, sizeof(dev->psus));
 }
 
 static void free_ras_error_sets(sysman_device_state_t *dev)
 {
-	if (dev->ras_error_sets.entries) {
-		for (uint32_t j = 0; j < dev->ras_error_sets.count; j++) {
-			free(dev->ras_error_sets.entries[j].properties);
-			free(dev->ras_error_sets.entries[j].config);
-			free(dev->ras_error_sets.entries[j].state);
-			memset(&dev->ras_error_sets.entries[j], 0, sizeof(dev->ras_error_sets.entries[j]));
+	if (dev->ras_error_sets) {
+		for (uint32_t j = 0; j < dev->ras_error_sets_count; j++) {
+			free(dev->ras_error_sets[j].properties);
+			free(dev->ras_error_sets[j].config);
+			free(dev->ras_error_sets[j].state);
+			free(dev->ras_error_sets[j].state_exp);
+			memset(&dev->ras_error_sets[j], 0, sizeof(dev->ras_error_sets[j]));
 		}
-		free(dev->ras_error_sets.entries);
+		free(dev->ras_error_sets);
 	}
-	memset(&dev->ras_error_sets, 0, sizeof(dev->ras_error_sets));
 }
 
 static void free_schedulers(sysman_device_state_t *dev)
 {
-	if (dev->schedulers.entries) {
-		for (uint32_t j = 0; j < dev->schedulers.count; j++) {
-			free(dev->schedulers.entries[j].properties);
-			free(dev->schedulers.entries[j].timeout_mode_properties);
-			free(dev->schedulers.entries[j].timeslice_mode_properties);
-			memset(&dev->schedulers.entries[j], 0, sizeof(dev->schedulers.entries[j]));
+	if (dev->schedulers) {
+		for (uint32_t j = 0; j < dev->schedulers_count; j++) {
+			free(dev->schedulers[j].properties);
+			free(dev->schedulers[j].timeout_mode_properties);
+			free(dev->schedulers[j].timeslice_mode_properties);
+			memset(&dev->schedulers[j], 0, sizeof(dev->schedulers[j]));
 		}
-		free(dev->schedulers.entries);
+		free(dev->schedulers);
 	}
-	memset(&dev->schedulers, 0, sizeof(dev->schedulers));
 }
 
 static void free_standby_domains(sysman_device_state_t *dev)
 {
-	if (dev->standby_domains.entries) {
-		for (uint32_t j = 0; j < dev->standby_domains.count; j++) {
-			free(dev->standby_domains.entries[j].properties);
-			memset(&dev->standby_domains.entries[j], 0, sizeof(dev->standby_domains.entries[j]));
+	if (dev->standby_domains) {
+		for (uint32_t j = 0; j < dev->standby_domains_count; j++) {
+			free(dev->standby_domains[j].properties);
+			memset(&dev->standby_domains[j], 0, sizeof(dev->standby_domains[j]));
 		}
-		free(dev->standby_domains.entries);
+		free(dev->standby_domains);
 	}
-	memset(&dev->standby_domains, 0, sizeof(dev->standby_domains));
 }
 
 static void free_temperature_sensors(sysman_device_state_t *dev)
 {
-	if (dev->temperature_sensors.entries) {
-		for (uint32_t j = 0; j < dev->temperature_sensors.count; j++) {
-			free(dev->temperature_sensors.entries[j].properties);
-			free(dev->temperature_sensors.entries[j].config);
-			memset(&dev->temperature_sensors.entries[j], 0, sizeof(dev->temperature_sensors.entries[j]));
+	if (dev->temperature_sensors) {
+		for (uint32_t j = 0; j < dev->temperature_sensors_count; j++) {
+			free(dev->temperature_sensors[j].properties);
+			free(dev->temperature_sensors[j].config);
+			memset(&dev->temperature_sensors[j], 0, sizeof(dev->temperature_sensors[j]));
 		}
-		free(dev->temperature_sensors.entries);
+		free(dev->temperature_sensors);
 	}
-	memset(&dev->temperature_sensors, 0, sizeof(dev->temperature_sensors));
 }
 
 static void free_diagnostics(sysman_device_state_t *dev)
 {
-	if (dev->diagnostics.entries) {
-		for (uint32_t j = 0; j < dev->diagnostics.count; j++) {
-			free(dev->diagnostics.entries[j].properties);
-			free(dev->diagnostics.entries[j].tests);
-			memset(&dev->diagnostics.entries[j], 0, sizeof(dev->diagnostics.entries[j]));
+	if (dev->diagnostics) {
+		for (uint32_t j = 0; j < dev->diagnostics_count; j++) {
+			free(dev->diagnostics[j].properties);
+			free(dev->diagnostics[j].tests);
+			memset(&dev->diagnostics[j], 0, sizeof(dev->diagnostics[j]));
 		}
-		free(dev->diagnostics.entries);
+		free(dev->diagnostics);
 	}
-	memset(&dev->diagnostics, 0, sizeof(dev->diagnostics));
 }
 
 static void free_device(sysman_device_state_t *dev)
@@ -605,7 +591,7 @@ static int sysman_state_load_locked(const char *path)
 	}
 
 	sysman_state_t *parsed = NULL;
-	cyaml_err_t err = cyaml_load_file(resolved, &cyaml_cfg, &state_schema, (cyaml_data_t **)&parsed, NULL);
+	cyaml_err_t err = cyaml_load_file(resolved, &cyaml_cfg, &sysman_state_schema, (cyaml_data_t **)&parsed, NULL);
 	if (err != CYAML_OK) {
 		fprintf(stderr, "stub: YAML parse error in '%s': %s\n", resolved, cyaml_strerror(err));
 		return -1;
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state.h b/xpumd/level-zero-go/level-zero-stub/sysman_state.h
similarity index 55%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state.h
rename to xpumd/level-zero-go/level-zero-stub/sysman_state.h
index cf1db7bf4..4454988a0 100644
--- a/xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state.h
+++ b/xpumd/level-zero-go/level-zero-stub/sysman_state.h
@@ -180,6 +180,8 @@ typedef struct
 	ze_result_t zesRasGetConfig;
 	ze_result_t zesRasSetConfig;
 	ze_result_t zesRasGetState;
+	ze_result_t zesRasGetStateExp;
+	ze_result_t zesRasClearStateExp;
 } sysman_ras_rv_t;
 
 typedef struct
@@ -271,121 +273,123 @@ typedef struct
 
 typedef enum
 {
-	UNSUPPORTED_FEATURE_GET_PROPERTIES = 0,				  // Device.GetProperties
-	UNSUPPORTED_FEATURE_GET_STATE,						  // Device.GetState
-	UNSUPPORTED_FEATURE_PROCESSES_GET_STATE,			  // Device.ProcessesGetState
-	UNSUPPORTED_FEATURE_PCI_GET_PROPERTIES,				  // PCI.GetProperties
-	UNSUPPORTED_FEATURE_PCI_GET_STATE,					  // PCI.GetState
-	UNSUPPORTED_FEATURE_PCI_GET_BARS,					  // PCI.GetBars
-	UNSUPPORTED_FEATURE_PCI_GET_STATS,					  // PCI.GetStats
-	UNSUPPORTED_FEATURE_OVERCLOCK_DOMAINS,				  // OverclockDomains
-	UNSUPPORTED_FEATURE_GET_OVERCLOCK_CONTROLS,			  // Device.GetOverclockControls
-	UNSUPPORTED_FEATURE_OVERCLOCK_READ_STATE,			  // Overclock.ReadState
-	UNSUPPORTED_FEATURE_OVERCLOCK_ENUM_DOMAINS,			  // Overclock.EnumDomains
-	UNSUPPORTED_FEATURE_ECC,							  // ECC
-	UNSUPPORTED_FEATURE_ECC_CONFIGURABLE,				  // ECC.Configurable
-	UNSUPPORTED_FEATURE_ECC_GET_STATE,					  // ECC.GetState
-	UNSUPPORTED_FEATURE_ENGINE_GROUPS,					  // EngineGroups
-	UNSUPPORTED_FEATURE_FABRIC_PORTS,					  // FabricPorts
-	UNSUPPORTED_FEATURE_FANS,							  // Fans
-	UNSUPPORTED_FEATURE_FIRMWARES,						  // Firmwares
-	UNSUPPORTED_FEATURE_FREQUENCY_DOMAINS,				  // FrequencyDomains
-	UNSUPPORTED_FEATURE_LEDS,							  // Leds
-	UNSUPPORTED_FEATURE_MEMORY_MODULES,					  // MemoryModules
-	UNSUPPORTED_FEATURE_PERFORMANCE_DOMAINS,			  // PerformanceDomains
-	UNSUPPORTED_FEATURE_POWER_DOMAINS,					  // PowerDomains
-	UNSUPPORTED_FEATURE_PSUS,							  // Psus
-	UNSUPPORTED_FEATURE_RAS_ERROR_SETS,					  // RasErrorSets
-	UNSUPPORTED_FEATURE_SCHEDULERS,						  // Schedulers
-	UNSUPPORTED_FEATURE_STANDBY_DOMAINS,				  // StandbyDomains
-	UNSUPPORTED_FEATURE_TEMPERATURE_SENSORS,			  // TemperatureSensors
-	UNSUPPORTED_FEATURE_DIAGNOSTICS_TEST_SUITES,		  // DiagnosticsTestSuites
-	UNSUPPORTED_FEATURE_GET_EXT_PROPERTIES,				  // GetExtensionProperties
-	UNSUPPORTED_FEATURE_DRIVER_DEVICE_GET,				  // Driver.DeviceGet
-	UNSUPPORTED_FEATURE_DEVICE_RESET,					  // Device.Reset
-	UNSUPPORTED_FEATURE_DEVICE_RESET_EXT,				  // Device.ResetExt
-	UNSUPPORTED_FEATURE_SET_OVERCLOCK_WAIVER,			  // Device.SetOverclockWaiver
-	UNSUPPORTED_FEATURE_OVERCLOCK_RESET_SETTINGS,		  // Overclock.ResetSettings
-	UNSUPPORTED_FEATURE_ECC_SET_STATE,					  // ECC.SetState
-	UNSUPPORTED_FEATURE_EVENT_REGISTER,					  // Device.EventRegister
-	UNSUPPORTED_FEATURE_EVENT_LISTEN,					  // Driver.EventListen
-	UNSUPPORTED_FEATURE_EVENT_LISTEN_EX,				  // Driver.EventListenEx
-	UNSUPPORTED_FEATURE_FABRIC_PORT_MULTI_THROUGHPUT,	  // FabricPort.GetMultiPortThroughput
-	UNSUPPORTED_FEATURE_OC_GET_DOMAIN_PROPERTIES,		  // OverclockDomain.GetProperties
-	UNSUPPORTED_FEATURE_OC_GET_DOMAIN_VF_PROPERTIES,	  // OverclockDomain.GetVFProperties
-	UNSUPPORTED_FEATURE_OC_GET_DOMAIN_CONTROL_PROPERTIES, // OverclockDomain.GetDomainControlProperties
-	UNSUPPORTED_FEATURE_OC_GET_CONTROL_CURRENT_VALUE,	  // OverclockDomain.GetControlCurrentValue
-	UNSUPPORTED_FEATURE_OC_GET_CONTROL_PENDING_VALUE,	  // OverclockDomain.GetControlPendingValue
-	UNSUPPORTED_FEATURE_OC_SET_CONTROL_USER_VALUE,		  // OverclockDomain.SetControlUserValue
-	UNSUPPORTED_FEATURE_OC_GET_CONTROL_STATE,			  // OverclockDomain.GetControlState
-	UNSUPPORTED_FEATURE_OC_GET_VF_POINT_VALUES,			  // OverclockDomain.GetVFPointValues
-	UNSUPPORTED_FEATURE_OC_SET_VF_POINT_VALUES,			  // OverclockDomain.SetVFPointValues
-	UNSUPPORTED_FEATURE_DIAG_GET_PROPERTIES,			  // Diagnostic.GetProperties
-	UNSUPPORTED_FEATURE_DIAG_GET_TESTS,					  // Diagnostic.GetTests
-	UNSUPPORTED_FEATURE_DIAG_RUN_TESTS,					  // Diagnostic.RunTests
-	UNSUPPORTED_FEATURE_ENGINE_GET_PROPERTIES,			  // EngineGroup.GetProperties
-	UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY,			  // EngineGroup.GetActivity
-	UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY_EXT,		  // EngineGroup.GetActivityExt
-	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_PROPERTIES,		  // FabricPort.GetProperties
-	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_LINK_TYPE,		  // FabricPort.GetLinkType
-	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_CONFIG,			  // FabricPort.GetConfig
-	UNSUPPORTED_FEATURE_FABRIC_PORT_SET_CONFIG,			  // FabricPort.SetConfig
-	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_STATE,			  // FabricPort.GetState
-	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_THROUGHPUT,		  // FabricPort.GetThroughput
-	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_ERROR_COUNTERS,	  // FabricPort.GetErrorCounters
-	UNSUPPORTED_FEATURE_FAN_GET_PROPERTIES,				  // Fan.GetProperties
-	UNSUPPORTED_FEATURE_FAN_GET_CONFIG,					  // Fan.GetConfig
-	UNSUPPORTED_FEATURE_FAN_SET_DEFAULT_MODE,			  // Fan.SetDefaultMode
-	UNSUPPORTED_FEATURE_FAN_SET_FIXED_SPEED_MODE,		  // Fan.SetFixedSpeedMode
-	UNSUPPORTED_FEATURE_FAN_SET_SPEED_TABLE_MODE,		  // Fan.SetSpeedTableMode
-	UNSUPPORTED_FEATURE_FAN_GET_STATE,					  // Fan.GetState
-	UNSUPPORTED_FEATURE_FW_GET_PROPERTIES,				  // Firmware.GetProperties
-	UNSUPPORTED_FEATURE_FW_FLASH,						  // Firmware.Flash
-	UNSUPPORTED_FEATURE_FW_GET_FLASH_PROGRESS,			  // Firmware.GetFlashProgress
-	UNSUPPORTED_FEATURE_FW_GET_CONSOLE_LOGS,			  // Firmware.GetConsoleLogs
-	UNSUPPORTED_FEATURE_FREQ_GET_PROPERTIES,			  // FrequencyDomain.GetProperties
-	UNSUPPORTED_FEATURE_FREQ_GET_AVAILABLE_CLOCKS,		  // FrequencyDomain.GetAvailableClocks
-	UNSUPPORTED_FEATURE_FREQ_GET_RANGE,					  // FrequencyDomain.GetRange
-	UNSUPPORTED_FEATURE_FREQ_SET_RANGE,					  // FrequencyDomain.SetRange
-	UNSUPPORTED_FEATURE_FREQ_GET_STATE,					  // FrequencyDomain.GetState
-	UNSUPPORTED_FEATURE_FREQ_GET_THROTTLE_TIME,			  // FrequencyDomain.GetThrottleTime
-	UNSUPPORTED_FEATURE_LED_GET_PROPERTIES,				  // Led.GetProperties
-	UNSUPPORTED_FEATURE_LED_GET_STATE,					  // Led.GetState
-	UNSUPPORTED_FEATURE_LED_SET_STATE,					  // Led.SetState
-	UNSUPPORTED_FEATURE_LED_SET_COLOR,					  // Led.SetColor
-	UNSUPPORTED_FEATURE_MEM_GET_PROPERTIES,				  // MemoryModule.GetProperties
-	UNSUPPORTED_FEATURE_MEM_GET_STATE,					  // MemoryModule.GetState
-	UNSUPPORTED_FEATURE_MEM_GET_BANDWIDTH,				  // MemoryModule.GetBandwidth
-	UNSUPPORTED_FEATURE_PERF_GET_PROPERTIES,			  // PerformanceDomain.GetProperties
-	UNSUPPORTED_FEATURE_PERF_GET_CONFIG,				  // PerformanceDomain.GetConfig
-	UNSUPPORTED_FEATURE_PERF_SET_CONFIG,				  // PerformanceDomain.SetConfig
-	UNSUPPORTED_FEATURE_POWER_GET_PROPERTIES,			  // PowerDomain.GetProperties
-	UNSUPPORTED_FEATURE_POWER_GET_ENERGY_COUNTER,		  // PowerDomain.GetEnergyCounter
-	UNSUPPORTED_FEATURE_POWER_GET_LIMITS_EXT,			  // PowerDomain.GetLimitsExt
-	UNSUPPORTED_FEATURE_POWER_SET_LIMITS_EXT,			  // PowerDomain.SetLimitsExt
-	UNSUPPORTED_FEATURE_POWER_GET_ENERGY_THRESHOLD,		  // PowerDomain.GetEnergyThreshold
-	UNSUPPORTED_FEATURE_POWER_SET_ENERGY_THRESHOLD,		  // PowerDomain.SetEnergyThreshold
-	UNSUPPORTED_FEATURE_PSU_GET_PROPERTIES,				  // Psu.GetProperties
-	UNSUPPORTED_FEATURE_PSU_GET_STATE,					  // Psu.GetState
-	UNSUPPORTED_FEATURE_RAS_GET_PROPERTIES,				  // RasErrorSet.GetProperties
-	UNSUPPORTED_FEATURE_RAS_GET_CONFIG,					  // RasErrorSet.GetConfig
-	UNSUPPORTED_FEATURE_RAS_SET_CONFIG,					  // RasErrorSet.SetConfig
-	UNSUPPORTED_FEATURE_RAS_GET_STATE,					  // RasErrorSet.GetState
-	UNSUPPORTED_FEATURE_SCHED_GET_PROPERTIES,			  // Scheduler.GetProperties
-	UNSUPPORTED_FEATURE_SCHED_GET_CURRENT_MODE,			  // Scheduler.GetCurrentMode
-	UNSUPPORTED_FEATURE_SCHED_GET_TIMEOUT_MODE_PROPS,	  // Scheduler.GetTimeoutModeProperties
-	UNSUPPORTED_FEATURE_SCHED_GET_TIMESLICE_MODE_PROPS,	  // Scheduler.GetTimesliceModeProperties
-	UNSUPPORTED_FEATURE_SCHED_SET_TIMEOUT_MODE,			  // Scheduler.SetTimeoutMode
-	UNSUPPORTED_FEATURE_SCHED_SET_TIMESLICE_MODE,		  // Scheduler.SetTimesliceMode
-	UNSUPPORTED_FEATURE_SCHED_SET_EXCLUSIVE_MODE,		  // Scheduler.SetExclusiveMode
-	UNSUPPORTED_FEATURE_STANDBY_GET_PROPERTIES,			  // StandbyDomain.GetProperties
-	UNSUPPORTED_FEATURE_STANDBY_GET_MODE,				  // StandbyDomain.GetMode
-	UNSUPPORTED_FEATURE_STANDBY_SET_MODE,				  // StandbyDomain.SetMode
-	UNSUPPORTED_FEATURE_TEMP_GET_PROPERTIES,			  // TemperatureSensor.GetProperties
-	UNSUPPORTED_FEATURE_TEMP_GET_CONFIG,				  // TemperatureSensor.GetConfig
-	UNSUPPORTED_FEATURE_TEMP_SET_CONFIG,				  // TemperatureSensor.SetConfig
-	UNSUPPORTED_FEATURE_TEMP_GET_STATE,					  // TemperatureSensor.GetState
-} sysman_unsupported_feature_t;
+	UNSUPPORTED_FEATURE_GET_PROPERTIES = 0,				  // gen: key=Device.GetProperties
+	UNSUPPORTED_FEATURE_GET_STATE,						  // gen: key=Device.GetState
+	UNSUPPORTED_FEATURE_PROCESSES_GET_STATE,			  // gen: key=Device.ProcessesGetState
+	UNSUPPORTED_FEATURE_PCI_GET_PROPERTIES,				  // gen: key=PCI.GetProperties
+	UNSUPPORTED_FEATURE_PCI_GET_STATE,					  // gen: key=PCI.GetState
+	UNSUPPORTED_FEATURE_PCI_GET_BARS,					  // gen: key=PCI.GetBars
+	UNSUPPORTED_FEATURE_PCI_GET_STATS,					  // gen: key=PCI.GetStats
+	UNSUPPORTED_FEATURE_OVERCLOCK_DOMAINS,				  // gen: key=OverclockDomains
+	UNSUPPORTED_FEATURE_GET_OVERCLOCK_CONTROLS,			  // gen: key=Device.GetOverclockControls
+	UNSUPPORTED_FEATURE_OVERCLOCK_READ_STATE,			  // gen: key=Overclock.ReadState
+	UNSUPPORTED_FEATURE_OVERCLOCK_ENUM_DOMAINS,			  // gen: key=Overclock.EnumDomains
+	UNSUPPORTED_FEATURE_ECC,							  // gen: key=ECC
+	UNSUPPORTED_FEATURE_ECC_CONFIGURABLE,				  // gen: key=ECC.Configurable
+	UNSUPPORTED_FEATURE_ECC_GET_STATE,					  // gen: key=ECC.GetState
+	UNSUPPORTED_FEATURE_ENGINE_GROUPS,					  // gen: key=EngineGroups
+	UNSUPPORTED_FEATURE_FABRIC_PORTS,					  // gen: key=FabricPorts
+	UNSUPPORTED_FEATURE_FANS,							  // gen: key=Fans
+	UNSUPPORTED_FEATURE_FIRMWARES,						  // gen: key=Firmwares
+	UNSUPPORTED_FEATURE_FREQUENCY_DOMAINS,				  // gen: key=FrequencyDomains
+	UNSUPPORTED_FEATURE_LEDS,							  // gen: key=Leds
+	UNSUPPORTED_FEATURE_MEMORY_MODULES,					  // gen: key=MemoryModules
+	UNSUPPORTED_FEATURE_PERFORMANCE_DOMAINS,			  // gen: key=PerformanceDomains
+	UNSUPPORTED_FEATURE_POWER_DOMAINS,					  // gen: key=PowerDomains
+	UNSUPPORTED_FEATURE_PSUS,							  // gen: key=Psus
+	UNSUPPORTED_FEATURE_RAS_ERROR_SETS,					  // gen: key=RasErrorSets
+	UNSUPPORTED_FEATURE_SCHEDULERS,						  // gen: key=Schedulers
+	UNSUPPORTED_FEATURE_STANDBY_DOMAINS,				  // gen: key=StandbyDomains
+	UNSUPPORTED_FEATURE_TEMPERATURE_SENSORS,			  // gen: key=TemperatureSensors
+	UNSUPPORTED_FEATURE_DIAGNOSTICS_TEST_SUITES,		  // gen: key=DiagnosticsTestSuites
+	UNSUPPORTED_FEATURE_GET_EXT_PROPERTIES,				  // gen: key=GetExtensionProperties
+	UNSUPPORTED_FEATURE_DRIVER_DEVICE_GET,				  // gen: key=Driver.DeviceGet
+	UNSUPPORTED_FEATURE_DEVICE_RESET,					  // gen: key=Device.Reset
+	UNSUPPORTED_FEATURE_DEVICE_RESET_EXT,				  // gen: key=Device.ResetExt
+	UNSUPPORTED_FEATURE_SET_OVERCLOCK_WAIVER,			  // gen: key=Device.SetOverclockWaiver
+	UNSUPPORTED_FEATURE_OVERCLOCK_RESET_SETTINGS,		  // gen: key=Overclock.ResetSettings
+	UNSUPPORTED_FEATURE_ECC_SET_STATE,					  // gen: key=ECC.SetState
+	UNSUPPORTED_FEATURE_EVENT_REGISTER,					  // gen: key=Device.EventRegister
+	UNSUPPORTED_FEATURE_EVENT_LISTEN,					  // gen: key=Driver.EventListen
+	UNSUPPORTED_FEATURE_EVENT_LISTEN_EX,				  // gen: key=Driver.EventListenEx
+	UNSUPPORTED_FEATURE_FABRIC_PORT_MULTI_THROUGHPUT,	  // gen: key=FabricPort.GetMultiPortThroughput
+	UNSUPPORTED_FEATURE_OC_GET_DOMAIN_PROPERTIES,		  // gen: key=OverclockDomain.GetProperties
+	UNSUPPORTED_FEATURE_OC_GET_DOMAIN_VF_PROPERTIES,	  // gen: key=OverclockDomain.GetVFProperties
+	UNSUPPORTED_FEATURE_OC_GET_DOMAIN_CONTROL_PROPERTIES, // gen: key=OverclockDomain.GetDomainControlProperties
+	UNSUPPORTED_FEATURE_OC_GET_CONTROL_CURRENT_VALUE,	  // gen: key=OverclockDomain.GetControlCurrentValue
+	UNSUPPORTED_FEATURE_OC_GET_CONTROL_PENDING_VALUE,	  // gen: key=OverclockDomain.GetControlPendingValue
+	UNSUPPORTED_FEATURE_OC_SET_CONTROL_USER_VALUE,		  // gen: key=OverclockDomain.SetControlUserValue
+	UNSUPPORTED_FEATURE_OC_GET_CONTROL_STATE,			  // gen: key=OverclockDomain.GetControlState
+	UNSUPPORTED_FEATURE_OC_GET_VF_POINT_VALUES,			  // gen: key=OverclockDomain.GetVFPointValues
+	UNSUPPORTED_FEATURE_OC_SET_VF_POINT_VALUES,			  // gen: key=OverclockDomain.SetVFPointValues
+	UNSUPPORTED_FEATURE_DIAG_GET_PROPERTIES,			  // gen: key=Diagnostic.GetProperties
+	UNSUPPORTED_FEATURE_DIAG_GET_TESTS,					  // gen: key=Diagnostic.GetTests
+	UNSUPPORTED_FEATURE_DIAG_RUN_TESTS,					  // gen: key=Diagnostic.RunTests
+	UNSUPPORTED_FEATURE_ENGINE_GET_PROPERTIES,			  // gen: key=EngineGroup.GetProperties
+	UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY,			  // gen: key=EngineGroup.GetActivity
+	UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY_EXT,		  // gen: key=EngineGroup.GetActivityExt
+	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_PROPERTIES,		  // gen: key=FabricPort.GetProperties
+	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_LINK_TYPE,		  // gen: key=FabricPort.GetLinkType
+	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_CONFIG,			  // gen: key=FabricPort.GetConfig
+	UNSUPPORTED_FEATURE_FABRIC_PORT_SET_CONFIG,			  // gen: key=FabricPort.SetConfig
+	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_STATE,			  // gen: key=FabricPort.GetState
+	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_THROUGHPUT,		  // gen: key=FabricPort.GetThroughput
+	UNSUPPORTED_FEATURE_FABRIC_PORT_GET_ERROR_COUNTERS,	  // gen: key=FabricPort.GetErrorCounters
+	UNSUPPORTED_FEATURE_FAN_GET_PROPERTIES,				  // gen: key=Fan.GetProperties
+	UNSUPPORTED_FEATURE_FAN_GET_CONFIG,					  // gen: key=Fan.GetConfig
+	UNSUPPORTED_FEATURE_FAN_SET_DEFAULT_MODE,			  // gen: key=Fan.SetDefaultMode
+	UNSUPPORTED_FEATURE_FAN_SET_FIXED_SPEED_MODE,		  // gen: key=Fan.SetFixedSpeedMode
+	UNSUPPORTED_FEATURE_FAN_SET_SPEED_TABLE_MODE,		  // gen: key=Fan.SetSpeedTableMode
+	UNSUPPORTED_FEATURE_FAN_GET_STATE,					  // gen: key=Fan.GetState
+	UNSUPPORTED_FEATURE_FW_GET_PROPERTIES,				  // gen: key=Firmware.GetProperties
+	UNSUPPORTED_FEATURE_FW_FLASH,						  // gen: key=Firmware.Flash
+	UNSUPPORTED_FEATURE_FW_GET_FLASH_PROGRESS,			  // gen: key=Firmware.GetFlashProgress
+	UNSUPPORTED_FEATURE_FW_GET_CONSOLE_LOGS,			  // gen: key=Firmware.GetConsoleLogs
+	UNSUPPORTED_FEATURE_FREQ_GET_PROPERTIES,			  // gen: key=FrequencyDomain.GetProperties
+	UNSUPPORTED_FEATURE_FREQ_GET_AVAILABLE_CLOCKS,		  // gen: key=FrequencyDomain.GetAvailableClocks
+	UNSUPPORTED_FEATURE_FREQ_GET_RANGE,					  // gen: key=FrequencyDomain.GetRange
+	UNSUPPORTED_FEATURE_FREQ_SET_RANGE,					  // gen: key=FrequencyDomain.SetRange
+	UNSUPPORTED_FEATURE_FREQ_GET_STATE,					  // gen: key=FrequencyDomain.GetState
+	UNSUPPORTED_FEATURE_FREQ_GET_THROTTLE_TIME,			  // gen: key=FrequencyDomain.GetThrottleTime
+	UNSUPPORTED_FEATURE_LED_GET_PROPERTIES,				  // gen: key=Led.GetProperties
+	UNSUPPORTED_FEATURE_LED_GET_STATE,					  // gen: key=Led.GetState
+	UNSUPPORTED_FEATURE_LED_SET_STATE,					  // gen: key=Led.SetState
+	UNSUPPORTED_FEATURE_LED_SET_COLOR,					  // gen: key=Led.SetColor
+	UNSUPPORTED_FEATURE_MEM_GET_PROPERTIES,				  // gen: key=MemoryModule.GetProperties
+	UNSUPPORTED_FEATURE_MEM_GET_STATE,					  // gen: key=MemoryModule.GetState
+	UNSUPPORTED_FEATURE_MEM_GET_BANDWIDTH,				  // gen: key=MemoryModule.GetBandwidth
+	UNSUPPORTED_FEATURE_PERF_GET_PROPERTIES,			  // gen: key=PerformanceDomain.GetProperties
+	UNSUPPORTED_FEATURE_PERF_GET_CONFIG,				  // gen: key=PerformanceDomain.GetConfig
+	UNSUPPORTED_FEATURE_PERF_SET_CONFIG,				  // gen: key=PerformanceDomain.SetConfig
+	UNSUPPORTED_FEATURE_POWER_GET_PROPERTIES,			  // gen: key=PowerDomain.GetProperties
+	UNSUPPORTED_FEATURE_POWER_GET_ENERGY_COUNTER,		  // gen: key=PowerDomain.GetEnergyCounter
+	UNSUPPORTED_FEATURE_POWER_GET_LIMITS_EXT,			  // gen: key=PowerDomain.GetLimitsExt
+	UNSUPPORTED_FEATURE_POWER_SET_LIMITS_EXT,			  // gen: key=PowerDomain.SetLimitsExt
+	UNSUPPORTED_FEATURE_POWER_GET_ENERGY_THRESHOLD,		  // gen: key=PowerDomain.GetEnergyThreshold
+	UNSUPPORTED_FEATURE_POWER_SET_ENERGY_THRESHOLD,		  // gen: key=PowerDomain.SetEnergyThreshold
+	UNSUPPORTED_FEATURE_PSU_GET_PROPERTIES,				  // gen: key=Psu.GetProperties
+	UNSUPPORTED_FEATURE_PSU_GET_STATE,					  // gen: key=Psu.GetState
+	UNSUPPORTED_FEATURE_RAS_GET_PROPERTIES,				  // gen: key=RasErrorSet.GetProperties
+	UNSUPPORTED_FEATURE_RAS_GET_CONFIG,					  // gen: key=RasErrorSet.GetConfig
+	UNSUPPORTED_FEATURE_RAS_SET_CONFIG,					  // gen: key=RasErrorSet.SetConfig
+	UNSUPPORTED_FEATURE_RAS_GET_STATE,					  // gen: key=RasErrorSet.GetState
+	UNSUPPORTED_FEATURE_RAS_GET_STATE_EXP,				  // gen: key=RasErrorSet.GetStateExp
+	UNSUPPORTED_FEATURE_RAS_CLEAR_STATE_EXP,			  // gen: key=RasErrorSet.ClearStateExp
+	UNSUPPORTED_FEATURE_SCHED_GET_PROPERTIES,			  // gen: key=Scheduler.GetProperties
+	UNSUPPORTED_FEATURE_SCHED_GET_CURRENT_MODE,			  // gen: key=Scheduler.GetCurrentMode
+	UNSUPPORTED_FEATURE_SCHED_GET_TIMEOUT_MODE_PROPS,	  // gen: key=Scheduler.GetTimeoutModeProperties
+	UNSUPPORTED_FEATURE_SCHED_GET_TIMESLICE_MODE_PROPS,	  // gen: key=Scheduler.GetTimesliceModeProperties
+	UNSUPPORTED_FEATURE_SCHED_SET_TIMEOUT_MODE,			  // gen: key=Scheduler.SetTimeoutMode
+	UNSUPPORTED_FEATURE_SCHED_SET_TIMESLICE_MODE,		  // gen: key=Scheduler.SetTimesliceMode
+	UNSUPPORTED_FEATURE_SCHED_SET_EXCLUSIVE_MODE,		  // gen: key=Scheduler.SetExclusiveMode
+	UNSUPPORTED_FEATURE_STANDBY_GET_PROPERTIES,			  // gen: key=StandbyDomain.GetProperties
+	UNSUPPORTED_FEATURE_STANDBY_GET_MODE,				  // gen: key=StandbyDomain.GetMode
+	UNSUPPORTED_FEATURE_STANDBY_SET_MODE,				  // gen: key=StandbyDomain.SetMode
+	UNSUPPORTED_FEATURE_TEMP_GET_PROPERTIES,			  // gen: key=TemperatureSensor.GetProperties
+	UNSUPPORTED_FEATURE_TEMP_GET_CONFIG,				  // gen: key=TemperatureSensor.GetConfig
+	UNSUPPORTED_FEATURE_TEMP_SET_CONFIG,				  // gen: key=TemperatureSensor.SetConfig
+	UNSUPPORTED_FEATURE_TEMP_GET_STATE,					  // gen: key=TemperatureSensor.GetState
+} sysman_unsupported_feature_t;							  // gen: enum
 
 // ------------------------------------------------------------------
 // Per-component entry types and group structs
@@ -393,7 +397,7 @@ typedef enum
 
 typedef struct
 {
-	zes_engine_properties_t base;
+	zes_engine_properties_t base; // gen: flatten
 	zes_engine_ext_properties_t extended_properties;
 } sysman_engine_properties_info_t;
 
@@ -404,13 +408,7 @@ typedef struct
 	zes_engine_stats_t activity;
 	uint32_t activity_ext_count;
 	zes_engine_stats_t *activity_ext;
-} sysman_engine_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_engine_entry_t *entries;
-} sysman_engines_t;
+} sysman_engine_t;
 
 typedef struct
 {
@@ -421,13 +419,7 @@ typedef struct
 	zes_fabric_port_state_t *state;
 	zes_fabric_port_throughput_t *throughput;
 	zes_fabric_port_error_counters_t *error_counters;
-} sysman_fabric_port_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_fabric_port_entry_t *entries;
-} sysman_fabric_ports_t;
+} sysman_fabric_port_t;
 
 typedef struct
 {
@@ -435,13 +427,7 @@ typedef struct
 	zes_fan_properties_t *properties;
 	zes_fan_config_t *config;
 	int32_t speed;
-} sysman_fan_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_fan_entry_t *entries;
-} sysman_fans_t;
+} sysman_fan_t;
 
 typedef struct
 {
@@ -449,43 +435,25 @@ typedef struct
 	zes_firmware_properties_t *properties;
 	uint32_t flash_progress;
 	char log[SYSMAN_FIRMWARE_LOG_SIZE];
-} sysman_firmware_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_firmware_entry_t *entries;
-} sysman_firmwares_t;
+} sysman_firmware_t;
 
 typedef struct
 {
 	sysman_freq_rv_t return_values;
 	zes_freq_properties_t *properties;
 	zes_freq_range_t *range;
-	uint32_t available_clock_count;
+	uint32_t available_clocks_count;
 	double *available_clocks;
 	zes_freq_state_t *state;
 	zes_freq_throttle_time_t *throttle_time;
-} sysman_freq_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_freq_entry_t *entries;
-} sysman_freqs_t;
+} sysman_freq_t;
 
 typedef struct
 {
 	sysman_led_rv_t return_values;
 	zes_led_properties_t *properties;
 	zes_led_state_t *state;
-} sysman_led_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_led_entry_t *entries;
-} sysman_leds_t;
+} sysman_led_t;
 
 typedef struct
 {
@@ -493,13 +461,7 @@ typedef struct
 	zes_mem_properties_t *properties;
 	zes_mem_state_t *state;
 	zes_mem_bandwidth_t *bandwidth;
-} sysman_mem_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_mem_entry_t *entries;
-} sysman_mems_t;
+} sysman_mem_t;
 
 typedef struct
 {
@@ -515,27 +477,27 @@ typedef struct
 {
 	zes_overclock_domain_t domain_type;
 	uint32_t controls_bitmask;
-} sysman_oc_controls_entry_t;
+} sysman_oc_control_t;
 
 typedef struct
 {
 	sysman_oc_rv_t return_values;
 	zes_overclock_properties_t *properties;
-	zes_vf_property_t *vf_properties;
+	zes_vf_property_t *vf_properties; // gen: key=VFProperties
 	uint32_t control_infos_count;
 	sysman_oc_control_info_t *control_infos;
 	uint32_t vf_point_value;
-} sysman_oc_entry_t;
+} sysman_oc_t;
 
 typedef struct
 {
-	zes_pci_properties_t base;
+	zes_pci_properties_t base; // gen: flatten
 	zes_pci_link_speed_downgrade_ext_properties_t link_speed_downgrade;
 } sysman_pci_properties_info_t;
 
 typedef struct
 {
-	zes_pci_state_t base;
+	zes_pci_state_t base; // gen: flatten
 	zes_pci_link_speed_downgrade_ext_state_t link_speed_downgrade;
 } sysman_pci_state_info_t;
 
@@ -551,7 +513,7 @@ typedef struct
 
 typedef struct
 {
-	zes_device_ecc_properties_t properties;
+	zes_device_ecc_properties_t properties; // gen: flatten
 	zes_device_ecc_default_properties_ext_t extended_properties;
 } sysman_ecc_state_info_t;
 
@@ -575,10 +537,10 @@ typedef struct
 {
 	uint32_t domains_bitmask;
 	uint32_t controls_count;
-	sysman_oc_controls_entry_t *controls;
+	sysman_oc_control_t *controls;
 	sysman_overclock_state_info_t *state;
 	uint32_t domains_count;
-	sysman_oc_entry_t *domains;
+	sysman_oc_t *domains;
 } sysman_overclock_info_t;
 
 typedef struct
@@ -586,13 +548,7 @@ typedef struct
 	sysman_perf_rv_t return_values;
 	zes_perf_properties_t *properties;
 	double config;
-} sysman_perf_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_perf_entry_t *entries;
-} sysman_perfs_t;
+} sysman_perf_t;
 
 // used in place of sysman_power_ext_properties_t to avoid allocating memory for limits in YAML parsing
 
@@ -604,7 +560,7 @@ typedef struct
 
 typedef struct
 {
-	zes_power_properties_t base;
+	zes_power_properties_t base; // gen: flatten
 	sysman_power_ext_properties_t extended_properties;
 } sysman_power_properties_info_t;
 
@@ -613,29 +569,17 @@ typedef struct
 	sysman_power_rv_t return_values;
 	sysman_power_properties_info_t *properties;
 	zes_power_energy_counter_t *energy_counter;
-	uint32_t limit_count;
+	uint32_t limits_count;
 	zes_power_limit_ext_desc_t *limits;
 	zes_energy_threshold_t *energy_threshold;
-} sysman_power_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_power_entry_t *entries;
-} sysman_powers_t;
+} sysman_power_t;
 
 typedef struct
 {
 	sysman_psu_rv_t return_values;
 	zes_psu_properties_t *properties;
 	zes_psu_state_t *state;
-} sysman_psu_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_psu_entry_t *entries;
-} sysman_psus_t;
+} sysman_psu_t;
 
 typedef struct
 {
@@ -643,13 +587,9 @@ typedef struct
 	zes_ras_properties_t *properties;
 	zes_ras_config_t *config;
 	zes_ras_state_t *state;
-} sysman_ras_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_ras_entry_t *entries;
-} sysman_ras_sets_t;
+	uint32_t state_exp_count;
+	zes_ras_state_exp_t *state_exp;
+} sysman_ras_t;
 
 typedef struct
 {
@@ -659,26 +599,14 @@ typedef struct
 	zes_sched_timeout_properties_t *timeout_mode_properties;
 	zes_sched_timeslice_properties_t *timeslice_mode_properties;
 	ze_bool_t need_reload;
-} sysman_sched_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_sched_entry_t *entries;
-} sysman_scheds_t;
+} sysman_sched_t;
 
 typedef struct
 {
 	sysman_standby_rv_t return_values;
 	zes_standby_properties_t *properties;
 	zes_standby_promo_mode_t mode;
-} sysman_standby_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_standby_entry_t *entries;
-} sysman_standbys_t;
+} sysman_standby_t;
 
 typedef struct
 {
@@ -686,28 +614,16 @@ typedef struct
 	zes_temp_properties_t *properties;
 	double temperature;
 	zes_temp_config_t *config;
-} sysman_temp_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_temp_entry_t *entries;
-} sysman_temps_t;
+} sysman_temp_t;
 
 typedef struct
 {
 	sysman_diag_rv_t return_values;
 	zes_diag_properties_t *properties;
-	uint32_t test_count;
+	uint32_t tests_count;
 	zes_diag_test_t *tests;
 	zes_diag_result_t result;
-} sysman_diag_entry_t;
-
-typedef struct
-{
-	uint32_t count;
-	sysman_diag_entry_t *entries;
-} sysman_diags_t;
+} sysman_diag_t;
 
 // ------------------------------------------------------------------
 // Per-device state
@@ -724,16 +640,16 @@ typedef struct
 // Wrapper for ze_device_properties_t to allow parsing of UUID strings from YAML.
 typedef struct
 {
-	ze_device_properties_t ze;
+	ze_device_properties_t ze; // gen: flatten
 	sysman_uuid_t uuid;
 } sysman_device_core_properties_t;
 
 typedef struct
 {
-	zes_device_properties_t base;
-	zes_device_ext_properties_t extended_properties;
-	sysman_device_core_properties_t core; // YAML parsing helper for base.core.uuid
-	sysman_uuid_t uuid;					  // YAML parsing helper for extended_properties.uuid
+	zes_device_properties_t base;					 // gen: flatten
+	zes_device_ext_properties_t extended_properties; // gen: flatten
+	sysman_device_core_properties_t core;			 // YAML parsing helper for base.core.uuid
+	sysman_uuid_t uuid;								 // YAML parsing helper for extended_properties.uuid
 } sysman_device_properties_info_t;
 
 typedef struct
@@ -743,27 +659,42 @@ typedef struct
 	sysman_unsupported_feature_t *unsupported_features;
 	sysman_device_properties_info_t *properties;
 	zes_device_state_t *state;
-	sysman_pci_info_t pci;
-	sysman_ecc_info_t *ecc;
+	sysman_pci_info_t pci;	// gen: key=PCI
+	sysman_ecc_info_t *ecc; // gen: key=ECC
 	sysman_overclock_info_t *overclock;
 	uint32_t processes_count;
 	zes_process_state_t *processes;
 	zes_event_type_flags_t events;
-	sysman_engines_t engine_groups;
-	sysman_fabric_ports_t fabric_ports;
-	sysman_fans_t fans;
-	sysman_firmwares_t firmwares;
-	sysman_freqs_t frequency_domains;
-	sysman_leds_t leds;
-	sysman_mems_t memory_modules;
-	sysman_perfs_t performance_domains;
-	sysman_powers_t power_domains;
-	sysman_psus_t psus;
-	sysman_ras_sets_t ras_error_sets;
-	sysman_scheds_t schedulers;
-	sysman_standbys_t standby_domains;
-	sysman_temps_t temperature_sensors;
-	sysman_diags_t diagnostics;
+	uint32_t engine_groups_count;
+	sysman_engine_t *engine_groups;
+	uint32_t fabric_ports_count;
+	sysman_fabric_port_t *fabric_ports;
+	uint32_t fans_count;
+	sysman_fan_t *fans;
+	uint32_t firmwares_count;
+	sysman_firmware_t *firmwares;
+	uint32_t frequency_domains_count;
+	sysman_freq_t *frequency_domains;
+	uint32_t leds_count;
+	sysman_led_t *leds;
+	uint32_t memory_modules_count;
+	sysman_mem_t *memory_modules;
+	uint32_t performance_domains_count;
+	sysman_perf_t *performance_domains;
+	uint32_t power_domains_count;
+	sysman_power_t *power_domains;
+	uint32_t psus_count;
+	sysman_psu_t *psus;
+	uint32_t ras_error_sets_count;
+	sysman_ras_t *ras_error_sets;
+	uint32_t schedulers_count;
+	sysman_sched_t *schedulers;
+	uint32_t standby_domains_count;
+	sysman_standby_t *standby_domains;
+	uint32_t temperature_sensors_count;
+	sysman_temp_t *temperature_sensors;
+	uint32_t diagnostics_count;
+	sysman_diag_t *diagnostics;
 } sysman_device_state_t;
 
 // ------------------------------------------------------------------
@@ -789,7 +720,7 @@ typedef struct
 
 typedef struct
 {
-	sysman_system_state_t system;
+	sysman_system_state_t system; // gen: flatten
 	sysman_system_rv_t return_values;
 } sysman_state_t;
 
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state_cyaml.h b/xpumd/level-zero-go/level-zero-stub/sysman_state_cyaml.h
similarity index 52%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state_cyaml.h
rename to xpumd/level-zero-go/level-zero-stub/sysman_state_cyaml.h
index 5248966ef..bbbf777f4 100644
--- a/xpumd/receiver/internal/level-zero-go/level-zero-stub/sysman_state_cyaml.h
+++ b/xpumd/level-zero-go/level-zero-stub/sysman_state_cyaml.h
@@ -2,6 +2,7 @@
  * Copyright (C) 2026 Intel Corporation
  * SPDX-License-Identifier: MIT
  *
+ * Code generated by hack/generate-cyaml.py. DO NOT EDIT.
  */
 
 #ifndef SYSMAN_STATE_CYAML_H
@@ -13,57 +14,58 @@
 
 // Return value schemas (per hierarchy level).
 #define RV(T, n) CYAML_FIELD_UINT(#n, CYAML_FLAG_OPTIONAL, T, n)
+static const cyaml_schema_field_t sysman_device_rv_fields[] = {
+	RV(sysman_device_rv_t, zesDeviceGetProperties),
+	RV(sysman_device_rv_t, zesDeviceGetState),
+	RV(sysman_device_rv_t, zesDeviceReset),
+	RV(sysman_device_rv_t, zesDeviceResetExt),
+	RV(sysman_device_rv_t, zesDeviceProcessesGetState),
+	RV(sysman_device_rv_t, zesDevicePciGetProperties),
+	RV(sysman_device_rv_t, zesDevicePciGetState),
+	RV(sysman_device_rv_t, zesDevicePciGetBars),
+	RV(sysman_device_rv_t, zesDevicePciGetStats),
+	RV(sysman_device_rv_t, zesDevicePciLinkSpeedUpdateExt),
+	RV(sysman_device_rv_t, zesDeviceSetOverclockWaiver),
+	RV(sysman_device_rv_t, zesDeviceGetOverclockDomains),
+	RV(sysman_device_rv_t, zesDeviceGetOverclockControls),
+	RV(sysman_device_rv_t, zesDeviceResetOverclockSettings),
+	RV(sysman_device_rv_t, zesDeviceReadOverclockState),
+	RV(sysman_device_rv_t, zesDeviceEnumOverclockDomains),
+	RV(sysman_device_rv_t, zesDeviceEccAvailable),
+	RV(sysman_device_rv_t, zesDeviceEccConfigurable),
+	RV(sysman_device_rv_t, zesDeviceGetEccState),
+	RV(sysman_device_rv_t, zesDeviceSetEccState),
+	RV(sysman_device_rv_t, zesDeviceEnumEngineGroups),
+	RV(sysman_device_rv_t, zesDeviceEventRegister),
+	RV(sysman_device_rv_t, zesDeviceEnumFabricPorts),
+	RV(sysman_device_rv_t, zesDeviceEnumFans),
+	RV(sysman_device_rv_t, zesDeviceEnumFirmwares),
+	RV(sysman_device_rv_t, zesDeviceEnumFrequencyDomains),
+	RV(sysman_device_rv_t, zesDeviceEnumLeds),
+	RV(sysman_device_rv_t, zesDeviceEnumMemoryModules),
+	RV(sysman_device_rv_t, zesDeviceEnumPerformanceFactorDomains),
+	RV(sysman_device_rv_t, zesDeviceEnumPowerDomains),
+	RV(sysman_device_rv_t, zesDeviceEnumPsus),
+	RV(sysman_device_rv_t, zesDeviceEnumRasErrorSets),
+	RV(sysman_device_rv_t, zesDeviceEnumSchedulers),
+	RV(sysman_device_rv_t, zesDeviceEnumStandbyDomains),
+	RV(sysman_device_rv_t, zesDeviceEnumTemperatureSensors),
+	RV(sysman_device_rv_t, zesDeviceEnumDiagnosticTestSuites),
+	CYAML_FIELD_END};
 
-static const cyaml_schema_field_t global_rv_fields[] = {RV(sysman_system_rv_t, zesInit),
-														RV(sysman_system_rv_t, zesDriverGet), CYAML_FIELD_END};
+static const cyaml_schema_field_t sysman_diag_rv_fields[] = {
+	RV(sysman_diag_rv_t, zesDiagnosticsGetProperties), RV(sysman_diag_rv_t, zesDiagnosticsGetTests),
+	RV(sysman_diag_rv_t, zesDiagnosticsRunTests), CYAML_FIELD_END};
 
-static const cyaml_schema_field_t driver_rv_fields[] = {
+static const cyaml_schema_field_t sysman_driver_rv_fields[] = {
 	RV(sysman_driver_rv_t, zesDriverGetExtensionProperties), RV(sysman_driver_rv_t, zesDeviceGet),
 	RV(sysman_driver_rv_t, zesDriverEventListen), RV(sysman_driver_rv_t, zesDriverEventListenEx), CYAML_FIELD_END};
 
-static const cyaml_schema_field_t device_rv_fields[] = {RV(sysman_device_rv_t, zesDeviceGetProperties),
-														RV(sysman_device_rv_t, zesDeviceGetState),
-														RV(sysman_device_rv_t, zesDeviceReset),
-														RV(sysman_device_rv_t, zesDeviceResetExt),
-														RV(sysman_device_rv_t, zesDeviceProcessesGetState),
-														RV(sysman_device_rv_t, zesDevicePciGetProperties),
-														RV(sysman_device_rv_t, zesDevicePciGetState),
-														RV(sysman_device_rv_t, zesDevicePciGetBars),
-														RV(sysman_device_rv_t, zesDevicePciGetStats),
-														RV(sysman_device_rv_t, zesDevicePciLinkSpeedUpdateExt),
-														RV(sysman_device_rv_t, zesDeviceSetOverclockWaiver),
-														RV(sysman_device_rv_t, zesDeviceGetOverclockDomains),
-														RV(sysman_device_rv_t, zesDeviceGetOverclockControls),
-														RV(sysman_device_rv_t, zesDeviceResetOverclockSettings),
-														RV(sysman_device_rv_t, zesDeviceReadOverclockState),
-														RV(sysman_device_rv_t, zesDeviceEnumOverclockDomains),
-														RV(sysman_device_rv_t, zesDeviceEccAvailable),
-														RV(sysman_device_rv_t, zesDeviceEccConfigurable),
-														RV(sysman_device_rv_t, zesDeviceGetEccState),
-														RV(sysman_device_rv_t, zesDeviceSetEccState),
-														RV(sysman_device_rv_t, zesDeviceEnumEngineGroups),
-														RV(sysman_device_rv_t, zesDeviceEventRegister),
-														RV(sysman_device_rv_t, zesDeviceEnumFabricPorts),
-														RV(sysman_device_rv_t, zesDeviceEnumFans),
-														RV(sysman_device_rv_t, zesDeviceEnumFirmwares),
-														RV(sysman_device_rv_t, zesDeviceEnumFrequencyDomains),
-														RV(sysman_device_rv_t, zesDeviceEnumLeds),
-														RV(sysman_device_rv_t, zesDeviceEnumMemoryModules),
-														RV(sysman_device_rv_t, zesDeviceEnumPerformanceFactorDomains),
-														RV(sysman_device_rv_t, zesDeviceEnumPowerDomains),
-														RV(sysman_device_rv_t, zesDeviceEnumPsus),
-														RV(sysman_device_rv_t, zesDeviceEnumRasErrorSets),
-														RV(sysman_device_rv_t, zesDeviceEnumSchedulers),
-														RV(sysman_device_rv_t, zesDeviceEnumStandbyDomains),
-														RV(sysman_device_rv_t, zesDeviceEnumTemperatureSensors),
-														RV(sysman_device_rv_t, zesDeviceEnumDiagnosticTestSuites),
-														CYAML_FIELD_END};
-
-static const cyaml_schema_field_t engine_rv_fields[] = {
+static const cyaml_schema_field_t sysman_engine_rv_fields[] = {
 	RV(sysman_engine_rv_t, zesEngineGetProperties), RV(sysman_engine_rv_t, zesEngineGetActivity),
 	RV(sysman_engine_rv_t, zesEngineGetActivityExt), CYAML_FIELD_END};
 
-static const cyaml_schema_field_t fabric_port_rv_fields[] = {
+static const cyaml_schema_field_t sysman_fabric_port_rv_fields[] = {
 	RV(sysman_fabric_port_rv_t, zesFabricPortGetProperties),
 	RV(sysman_fabric_port_rv_t, zesFabricPortGetLinkType),
 	RV(sysman_fabric_port_rv_t, zesFabricPortGetConfig),
@@ -74,112 +76,137 @@ static const cyaml_schema_field_t fabric_port_rv_fields[] = {
 	RV(sysman_fabric_port_rv_t, zesFabricPortGetMultiPortThroughput),
 	CYAML_FIELD_END};
 
-static const cyaml_schema_field_t fan_rv_fields[] = {RV(sysman_fan_rv_t, zesFanGetProperties),
-													 RV(sysman_fan_rv_t, zesFanGetConfig),
-													 RV(sysman_fan_rv_t, zesFanSetDefaultMode),
-													 RV(sysman_fan_rv_t, zesFanSetFixedSpeedMode),
-													 RV(sysman_fan_rv_t, zesFanSetSpeedTableMode),
-													 RV(sysman_fan_rv_t, zesFanGetState),
-													 CYAML_FIELD_END};
+static const cyaml_schema_field_t sysman_fan_rv_fields[] = {RV(sysman_fan_rv_t, zesFanGetProperties),
+															RV(sysman_fan_rv_t, zesFanGetConfig),
+															RV(sysman_fan_rv_t, zesFanSetDefaultMode),
+															RV(sysman_fan_rv_t, zesFanSetFixedSpeedMode),
+															RV(sysman_fan_rv_t, zesFanSetSpeedTableMode),
+															RV(sysman_fan_rv_t, zesFanGetState),
+															CYAML_FIELD_END};
 
-static const cyaml_schema_field_t firmware_rv_fields[] = {
+static const cyaml_schema_field_t sysman_firmware_rv_fields[] = {
 	RV(sysman_firmware_rv_t, zesFirmwareGetProperties), RV(sysman_firmware_rv_t, zesFirmwareFlash),
 	RV(sysman_firmware_rv_t, zesFirmwareGetFlashProgress), RV(sysman_firmware_rv_t, zesFirmwareGetConsoleLogs),
 	CYAML_FIELD_END};
 
-static const cyaml_schema_field_t freq_rv_fields[] = {RV(sysman_freq_rv_t, zesFrequencyGetProperties),
-													  RV(sysman_freq_rv_t, zesFrequencyGetAvailableClocks),
-													  RV(sysman_freq_rv_t, zesFrequencyGetRange),
-													  RV(sysman_freq_rv_t, zesFrequencySetRange),
-													  RV(sysman_freq_rv_t, zesFrequencyGetState),
-													  RV(sysman_freq_rv_t, zesFrequencyGetThrottleTime),
-													  CYAML_FIELD_END};
+static const cyaml_schema_field_t sysman_freq_rv_fields[] = {RV(sysman_freq_rv_t, zesFrequencyGetProperties),
+															 RV(sysman_freq_rv_t, zesFrequencyGetAvailableClocks),
+															 RV(sysman_freq_rv_t, zesFrequencyGetRange),
+															 RV(sysman_freq_rv_t, zesFrequencySetRange),
+															 RV(sysman_freq_rv_t, zesFrequencyGetState),
+															 RV(sysman_freq_rv_t, zesFrequencyGetThrottleTime),
+															 CYAML_FIELD_END};
 
-static const cyaml_schema_field_t led_rv_fields[] = {
+static const cyaml_schema_field_t sysman_led_rv_fields[] = {
 	RV(sysman_led_rv_t, zesLedGetProperties), RV(sysman_led_rv_t, zesLedGetState), RV(sysman_led_rv_t, zesLedSetState),
 	RV(sysman_led_rv_t, zesLedSetColor), CYAML_FIELD_END};
 
-static const cyaml_schema_field_t mem_rv_fields[] = {RV(sysman_mem_rv_t, zesMemoryGetProperties),
-													 RV(sysman_mem_rv_t, zesMemoryGetState),
-													 RV(sysman_mem_rv_t, zesMemoryGetBandwidth), CYAML_FIELD_END};
-
-static const cyaml_schema_field_t oc_rv_fields[] = {RV(sysman_oc_rv_t, zesOverclockGetDomainProperties),
-													RV(sysman_oc_rv_t, zesOverclockGetDomainVFProperties),
-													RV(sysman_oc_rv_t, zesOverclockGetDomainControlProperties),
-													RV(sysman_oc_rv_t, zesOverclockGetControlCurrentValue),
-													RV(sysman_oc_rv_t, zesOverclockGetControlPendingValue),
-													RV(sysman_oc_rv_t, zesOverclockSetControlUserValue),
-													RV(sysman_oc_rv_t, zesOverclockGetControlState),
-													RV(sysman_oc_rv_t, zesOverclockGetVFPointValues),
-													RV(sysman_oc_rv_t, zesOverclockSetVFPointValues),
-													CYAML_FIELD_END};
-
-static const cyaml_schema_field_t perf_rv_fields[] = {
+static const cyaml_schema_field_t sysman_mem_rv_fields[] = {
+	RV(sysman_mem_rv_t, zesMemoryGetProperties), RV(sysman_mem_rv_t, zesMemoryGetState),
+	RV(sysman_mem_rv_t, zesMemoryGetBandwidth), CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_oc_rv_fields[] = {RV(sysman_oc_rv_t, zesOverclockGetDomainProperties),
+														   RV(sysman_oc_rv_t, zesOverclockGetDomainVFProperties),
+														   RV(sysman_oc_rv_t, zesOverclockGetDomainControlProperties),
+														   RV(sysman_oc_rv_t, zesOverclockGetControlCurrentValue),
+														   RV(sysman_oc_rv_t, zesOverclockGetControlPendingValue),
+														   RV(sysman_oc_rv_t, zesOverclockSetControlUserValue),
+														   RV(sysman_oc_rv_t, zesOverclockGetControlState),
+														   RV(sysman_oc_rv_t, zesOverclockGetVFPointValues),
+														   RV(sysman_oc_rv_t, zesOverclockSetVFPointValues),
+														   CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_perf_rv_fields[] = {
 	RV(sysman_perf_rv_t, zesPerformanceFactorGetProperties), RV(sysman_perf_rv_t, zesPerformanceFactorGetConfig),
 	RV(sysman_perf_rv_t, zesPerformanceFactorSetConfig), CYAML_FIELD_END};
 
-static const cyaml_schema_field_t power_rv_fields[] = {RV(sysman_power_rv_t, zesPowerGetProperties),
-													   RV(sysman_power_rv_t, zesPowerGetEnergyCounter),
-													   RV(sysman_power_rv_t, zesPowerGetLimitsExt),
-													   RV(sysman_power_rv_t, zesPowerSetLimitsExt),
-													   RV(sysman_power_rv_t, zesPowerGetEnergyThreshold),
-													   RV(sysman_power_rv_t, zesPowerSetEnergyThreshold),
-													   CYAML_FIELD_END};
-
-static const cyaml_schema_field_t psu_rv_fields[] = {RV(sysman_psu_rv_t, zesPsuGetProperties),
-													 RV(sysman_psu_rv_t, zesPsuGetState), CYAML_FIELD_END};
-
-static const cyaml_schema_field_t ras_rv_fields[] = {
-	RV(sysman_ras_rv_t, zesRasGetProperties), RV(sysman_ras_rv_t, zesRasGetConfig),
-	RV(sysman_ras_rv_t, zesRasSetConfig), RV(sysman_ras_rv_t, zesRasGetState), CYAML_FIELD_END};
-
-static const cyaml_schema_field_t sched_rv_fields[] = {RV(sysman_sched_rv_t, zesSchedulerGetProperties),
-													   RV(sysman_sched_rv_t, zesSchedulerGetCurrentMode),
-													   RV(sysman_sched_rv_t, zesSchedulerGetTimeoutModeProperties),
-													   RV(sysman_sched_rv_t, zesSchedulerGetTimesliceModeProperties),
-													   RV(sysman_sched_rv_t, zesSchedulerSetTimeoutMode),
-													   RV(sysman_sched_rv_t, zesSchedulerSetTimesliceMode),
-													   RV(sysman_sched_rv_t, zesSchedulerSetExclusiveMode),
-													   CYAML_FIELD_END};
-
-static const cyaml_schema_field_t standby_rv_fields[] = {RV(sysman_standby_rv_t, zesStandbyGetProperties),
-														 RV(sysman_standby_rv_t, zesStandbyGetMode),
-														 RV(sysman_standby_rv_t, zesStandbySetMode), CYAML_FIELD_END};
-
-static const cyaml_schema_field_t temp_rv_fields[] = {
+static const cyaml_schema_field_t sysman_power_rv_fields[] = {RV(sysman_power_rv_t, zesPowerGetProperties),
+															  RV(sysman_power_rv_t, zesPowerGetEnergyCounter),
+															  RV(sysman_power_rv_t, zesPowerGetLimitsExt),
+															  RV(sysman_power_rv_t, zesPowerSetLimitsExt),
+															  RV(sysman_power_rv_t, zesPowerGetEnergyThreshold),
+															  RV(sysman_power_rv_t, zesPowerSetEnergyThreshold),
+															  CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_psu_rv_fields[] = {RV(sysman_psu_rv_t, zesPsuGetProperties),
+															RV(sysman_psu_rv_t, zesPsuGetState), CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_ras_rv_fields[] = {RV(sysman_ras_rv_t, zesRasGetProperties),
+															RV(sysman_ras_rv_t, zesRasGetConfig),
+															RV(sysman_ras_rv_t, zesRasSetConfig),
+															RV(sysman_ras_rv_t, zesRasGetState),
+															RV(sysman_ras_rv_t, zesRasGetStateExp),
+															RV(sysman_ras_rv_t, zesRasClearStateExp),
+															CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_sched_rv_fields[] = {
+	RV(sysman_sched_rv_t, zesSchedulerGetProperties),
+	RV(sysman_sched_rv_t, zesSchedulerGetCurrentMode),
+	RV(sysman_sched_rv_t, zesSchedulerGetTimeoutModeProperties),
+	RV(sysman_sched_rv_t, zesSchedulerGetTimesliceModeProperties),
+	RV(sysman_sched_rv_t, zesSchedulerSetTimeoutMode),
+	RV(sysman_sched_rv_t, zesSchedulerSetTimesliceMode),
+	RV(sysman_sched_rv_t, zesSchedulerSetExclusiveMode),
+	CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_standby_rv_fields[] = {
+	RV(sysman_standby_rv_t, zesStandbyGetProperties), RV(sysman_standby_rv_t, zesStandbyGetMode),
+	RV(sysman_standby_rv_t, zesStandbySetMode), CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_system_rv_fields[] = {RV(sysman_system_rv_t, zesInit),
+															   RV(sysman_system_rv_t, zesDriverGet), CYAML_FIELD_END};
+
+static const cyaml_schema_field_t sysman_temp_rv_fields[] = {
 	RV(sysman_temp_rv_t, zesTemperatureGetProperties), RV(sysman_temp_rv_t, zesTemperatureGetConfig),
 	RV(sysman_temp_rv_t, zesTemperatureSetConfig), RV(sysman_temp_rv_t, zesTemperatureGetState), CYAML_FIELD_END};
 
-static const cyaml_schema_field_t diag_rv_fields[] = {RV(sysman_diag_rv_t, zesDiagnosticsGetProperties),
-													  RV(sysman_diag_rv_t, zesDiagnosticsGetTests),
-													  RV(sysman_diag_rv_t, zesDiagnosticsRunTests), CYAML_FIELD_END};
 #undef RV
 
-// unsupported features schemas
-static const cyaml_strval_t driver_unsupported_strvals[] = {
-	{"GetExtensionProperties", UNSUPPORTED_FEATURE_GET_EXT_PROPERTIES},
-	{"Driver.DeviceGet", UNSUPPORTED_FEATURE_DRIVER_DEVICE_GET},
-	{"Driver.EventListen", UNSUPPORTED_FEATURE_EVENT_LISTEN},
-	{"Driver.EventListenEx", UNSUPPORTED_FEATURE_EVENT_LISTEN_EX},
-};
+#define SYSMAN_NULLABLE_PTR_FLAGS (CYAML_FLAG_OPTIONAL | CYAML_FLAG_POINTER_NULL_STR)
 
-static const cyaml_strval_t device_unsupported_strvals[] = {
+static const cyaml_schema_value_t double_schema = {CYAML_VALUE_FLOAT(CYAML_FLAG_DEFAULT, double)};
+static const cyaml_schema_value_t uint64_schema = {CYAML_VALUE_UINT(CYAML_FLAG_DEFAULT, uint64_t)};
+static const cyaml_strval_t sysman_unsupported_feature_strvals[] = {
 	{"Device.GetProperties", UNSUPPORTED_FEATURE_GET_PROPERTIES},
 	{"Device.GetState", UNSUPPORTED_FEATURE_GET_STATE},
 	{"Device.ProcessesGetState", UNSUPPORTED_FEATURE_PROCESSES_GET_STATE},
-	{"Device.Reset", UNSUPPORTED_FEATURE_DEVICE_RESET},
-	{"Device.ResetExt", UNSUPPORTED_FEATURE_DEVICE_RESET_EXT},
-	{"Device.SetOverclockWaiver", UNSUPPORTED_FEATURE_SET_OVERCLOCK_WAIVER},
-	{"Device.GetOverclockControls", UNSUPPORTED_FEATURE_GET_OVERCLOCK_CONTROLS},
-	{"Device.EventRegister", UNSUPPORTED_FEATURE_EVENT_REGISTER},
 	{"PCI.GetProperties", UNSUPPORTED_FEATURE_PCI_GET_PROPERTIES},
 	{"PCI.GetState", UNSUPPORTED_FEATURE_PCI_GET_STATE},
 	{"PCI.GetBars", UNSUPPORTED_FEATURE_PCI_GET_BARS},
 	{"PCI.GetStats", UNSUPPORTED_FEATURE_PCI_GET_STATS},
 	{"OverclockDomains", UNSUPPORTED_FEATURE_OVERCLOCK_DOMAINS},
+	{"Device.GetOverclockControls", UNSUPPORTED_FEATURE_GET_OVERCLOCK_CONTROLS},
 	{"Overclock.ReadState", UNSUPPORTED_FEATURE_OVERCLOCK_READ_STATE},
 	{"Overclock.EnumDomains", UNSUPPORTED_FEATURE_OVERCLOCK_ENUM_DOMAINS},
+	{"ECC", UNSUPPORTED_FEATURE_ECC},
+	{"ECC.Configurable", UNSUPPORTED_FEATURE_ECC_CONFIGURABLE},
+	{"ECC.GetState", UNSUPPORTED_FEATURE_ECC_GET_STATE},
+	{"EngineGroups", UNSUPPORTED_FEATURE_ENGINE_GROUPS},
+	{"FabricPorts", UNSUPPORTED_FEATURE_FABRIC_PORTS},
+	{"Fans", UNSUPPORTED_FEATURE_FANS},
+	{"Firmwares", UNSUPPORTED_FEATURE_FIRMWARES},
+	{"FrequencyDomains", UNSUPPORTED_FEATURE_FREQUENCY_DOMAINS},
+	{"Leds", UNSUPPORTED_FEATURE_LEDS},
+	{"MemoryModules", UNSUPPORTED_FEATURE_MEMORY_MODULES},
+	{"PerformanceDomains", UNSUPPORTED_FEATURE_PERFORMANCE_DOMAINS},
+	{"PowerDomains", UNSUPPORTED_FEATURE_POWER_DOMAINS},
+	{"Psus", UNSUPPORTED_FEATURE_PSUS},
+	{"RasErrorSets", UNSUPPORTED_FEATURE_RAS_ERROR_SETS},
+	{"Schedulers", UNSUPPORTED_FEATURE_SCHEDULERS},
+	{"StandbyDomains", UNSUPPORTED_FEATURE_STANDBY_DOMAINS},
+	{"TemperatureSensors", UNSUPPORTED_FEATURE_TEMPERATURE_SENSORS},
+	{"DiagnosticsTestSuites", UNSUPPORTED_FEATURE_DIAGNOSTICS_TEST_SUITES},
+	{"GetExtensionProperties", UNSUPPORTED_FEATURE_GET_EXT_PROPERTIES},
+	{"Driver.DeviceGet", UNSUPPORTED_FEATURE_DRIVER_DEVICE_GET},
+	{"Device.Reset", UNSUPPORTED_FEATURE_DEVICE_RESET},
+	{"Device.ResetExt", UNSUPPORTED_FEATURE_DEVICE_RESET_EXT},
+	{"Device.SetOverclockWaiver", UNSUPPORTED_FEATURE_SET_OVERCLOCK_WAIVER},
 	{"Overclock.ResetSettings", UNSUPPORTED_FEATURE_OVERCLOCK_RESET_SETTINGS},
+	{"ECC.SetState", UNSUPPORTED_FEATURE_ECC_SET_STATE},
+	{"Device.EventRegister", UNSUPPORTED_FEATURE_EVENT_REGISTER},
+	{"Driver.EventListen", UNSUPPORTED_FEATURE_EVENT_LISTEN},
+	{"Driver.EventListenEx", UNSUPPORTED_FEATURE_EVENT_LISTEN_EX},
+	{"FabricPort.GetMultiPortThroughput", UNSUPPORTED_FEATURE_FABRIC_PORT_MULTI_THROUGHPUT},
 	{"OverclockDomain.GetProperties", UNSUPPORTED_FEATURE_OC_GET_DOMAIN_PROPERTIES},
 	{"OverclockDomain.GetVFProperties", UNSUPPORTED_FEATURE_OC_GET_DOMAIN_VF_PROPERTIES},
 	{"OverclockDomain.GetDomainControlProperties", UNSUPPORTED_FEATURE_OC_GET_DOMAIN_CONTROL_PROPERTIES},
@@ -189,19 +216,12 @@ static const cyaml_strval_t device_unsupported_strvals[] = {
 	{"OverclockDomain.GetControlState", UNSUPPORTED_FEATURE_OC_GET_CONTROL_STATE},
 	{"OverclockDomain.GetVFPointValues", UNSUPPORTED_FEATURE_OC_GET_VF_POINT_VALUES},
 	{"OverclockDomain.SetVFPointValues", UNSUPPORTED_FEATURE_OC_SET_VF_POINT_VALUES},
-	{"ECC", UNSUPPORTED_FEATURE_ECC},
-	{"ECC.Configurable", UNSUPPORTED_FEATURE_ECC_CONFIGURABLE},
-	{"ECC.GetState", UNSUPPORTED_FEATURE_ECC_GET_STATE},
-	{"ECC.SetState", UNSUPPORTED_FEATURE_ECC_SET_STATE},
-	{"DiagnosticsTestSuites", UNSUPPORTED_FEATURE_DIAGNOSTICS_TEST_SUITES},
 	{"Diagnostic.GetProperties", UNSUPPORTED_FEATURE_DIAG_GET_PROPERTIES},
 	{"Diagnostic.GetTests", UNSUPPORTED_FEATURE_DIAG_GET_TESTS},
 	{"Diagnostic.RunTests", UNSUPPORTED_FEATURE_DIAG_RUN_TESTS},
-	{"EngineGroups", UNSUPPORTED_FEATURE_ENGINE_GROUPS},
 	{"EngineGroup.GetProperties", UNSUPPORTED_FEATURE_ENGINE_GET_PROPERTIES},
 	{"EngineGroup.GetActivity", UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY},
 	{"EngineGroup.GetActivityExt", UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY_EXT},
-	{"FabricPorts", UNSUPPORTED_FEATURE_FABRIC_PORTS},
 	{"FabricPort.GetProperties", UNSUPPORTED_FEATURE_FABRIC_PORT_GET_PROPERTIES},
 	{"FabricPort.GetLinkType", UNSUPPORTED_FEATURE_FABRIC_PORT_GET_LINK_TYPE},
 	{"FabricPort.GetConfig", UNSUPPORTED_FEATURE_FABRIC_PORT_GET_CONFIG},
@@ -209,55 +229,46 @@ static const cyaml_strval_t device_unsupported_strvals[] = {
 	{"FabricPort.GetState", UNSUPPORTED_FEATURE_FABRIC_PORT_GET_STATE},
 	{"FabricPort.GetThroughput", UNSUPPORTED_FEATURE_FABRIC_PORT_GET_THROUGHPUT},
 	{"FabricPort.GetErrorCounters", UNSUPPORTED_FEATURE_FABRIC_PORT_GET_ERROR_COUNTERS},
-	{"FabricPort.GetMultiPortThroughput", UNSUPPORTED_FEATURE_FABRIC_PORT_MULTI_THROUGHPUT},
-	{"Fans", UNSUPPORTED_FEATURE_FANS},
 	{"Fan.GetProperties", UNSUPPORTED_FEATURE_FAN_GET_PROPERTIES},
 	{"Fan.GetConfig", UNSUPPORTED_FEATURE_FAN_GET_CONFIG},
 	{"Fan.SetDefaultMode", UNSUPPORTED_FEATURE_FAN_SET_DEFAULT_MODE},
 	{"Fan.SetFixedSpeedMode", UNSUPPORTED_FEATURE_FAN_SET_FIXED_SPEED_MODE},
 	{"Fan.SetSpeedTableMode", UNSUPPORTED_FEATURE_FAN_SET_SPEED_TABLE_MODE},
 	{"Fan.GetState", UNSUPPORTED_FEATURE_FAN_GET_STATE},
-	{"Firmwares", UNSUPPORTED_FEATURE_FIRMWARES},
 	{"Firmware.GetProperties", UNSUPPORTED_FEATURE_FW_GET_PROPERTIES},
 	{"Firmware.Flash", UNSUPPORTED_FEATURE_FW_FLASH},
 	{"Firmware.GetFlashProgress", UNSUPPORTED_FEATURE_FW_GET_FLASH_PROGRESS},
 	{"Firmware.GetConsoleLogs", UNSUPPORTED_FEATURE_FW_GET_CONSOLE_LOGS},
-	{"FrequencyDomains", UNSUPPORTED_FEATURE_FREQUENCY_DOMAINS},
 	{"FrequencyDomain.GetProperties", UNSUPPORTED_FEATURE_FREQ_GET_PROPERTIES},
 	{"FrequencyDomain.GetAvailableClocks", UNSUPPORTED_FEATURE_FREQ_GET_AVAILABLE_CLOCKS},
 	{"FrequencyDomain.GetRange", UNSUPPORTED_FEATURE_FREQ_GET_RANGE},
 	{"FrequencyDomain.SetRange", UNSUPPORTED_FEATURE_FREQ_SET_RANGE},
 	{"FrequencyDomain.GetState", UNSUPPORTED_FEATURE_FREQ_GET_STATE},
 	{"FrequencyDomain.GetThrottleTime", UNSUPPORTED_FEATURE_FREQ_GET_THROTTLE_TIME},
-	{"Leds", UNSUPPORTED_FEATURE_LEDS},
 	{"Led.GetProperties", UNSUPPORTED_FEATURE_LED_GET_PROPERTIES},
 	{"Led.GetState", UNSUPPORTED_FEATURE_LED_GET_STATE},
 	{"Led.SetState", UNSUPPORTED_FEATURE_LED_SET_STATE},
 	{"Led.SetColor", UNSUPPORTED_FEATURE_LED_SET_COLOR},
-	{"MemoryModules", UNSUPPORTED_FEATURE_MEMORY_MODULES},
 	{"MemoryModule.GetProperties", UNSUPPORTED_FEATURE_MEM_GET_PROPERTIES},
 	{"MemoryModule.GetState", UNSUPPORTED_FEATURE_MEM_GET_STATE},
 	{"MemoryModule.GetBandwidth", UNSUPPORTED_FEATURE_MEM_GET_BANDWIDTH},
-	{"PerformanceDomains", UNSUPPORTED_FEATURE_PERFORMANCE_DOMAINS},
 	{"PerformanceDomain.GetProperties", UNSUPPORTED_FEATURE_PERF_GET_PROPERTIES},
 	{"PerformanceDomain.GetConfig", UNSUPPORTED_FEATURE_PERF_GET_CONFIG},
 	{"PerformanceDomain.SetConfig", UNSUPPORTED_FEATURE_PERF_SET_CONFIG},
-	{"PowerDomains", UNSUPPORTED_FEATURE_POWER_DOMAINS},
 	{"PowerDomain.GetProperties", UNSUPPORTED_FEATURE_POWER_GET_PROPERTIES},
 	{"PowerDomain.GetEnergyCounter", UNSUPPORTED_FEATURE_POWER_GET_ENERGY_COUNTER},
 	{"PowerDomain.GetLimitsExt", UNSUPPORTED_FEATURE_POWER_GET_LIMITS_EXT},
 	{"PowerDomain.SetLimitsExt", UNSUPPORTED_FEATURE_POWER_SET_LIMITS_EXT},
 	{"PowerDomain.GetEnergyThreshold", UNSUPPORTED_FEATURE_POWER_GET_ENERGY_THRESHOLD},
 	{"PowerDomain.SetEnergyThreshold", UNSUPPORTED_FEATURE_POWER_SET_ENERGY_THRESHOLD},
-	{"Psus", UNSUPPORTED_FEATURE_PSUS},
 	{"Psu.GetProperties", UNSUPPORTED_FEATURE_PSU_GET_PROPERTIES},
 	{"Psu.GetState", UNSUPPORTED_FEATURE_PSU_GET_STATE},
-	{"RasErrorSets", UNSUPPORTED_FEATURE_RAS_ERROR_SETS},
 	{"RasErrorSet.GetProperties", UNSUPPORTED_FEATURE_RAS_GET_PROPERTIES},
 	{"RasErrorSet.GetConfig", UNSUPPORTED_FEATURE_RAS_GET_CONFIG},
 	{"RasErrorSet.SetConfig", UNSUPPORTED_FEATURE_RAS_SET_CONFIG},
 	{"RasErrorSet.GetState", UNSUPPORTED_FEATURE_RAS_GET_STATE},
-	{"Schedulers", UNSUPPORTED_FEATURE_SCHEDULERS},
+	{"RasErrorSet.GetStateExp", UNSUPPORTED_FEATURE_RAS_GET_STATE_EXP},
+	{"RasErrorSet.ClearStateExp", UNSUPPORTED_FEATURE_RAS_CLEAR_STATE_EXP},
 	{"Scheduler.GetProperties", UNSUPPORTED_FEATURE_SCHED_GET_PROPERTIES},
 	{"Scheduler.GetCurrentMode", UNSUPPORTED_FEATURE_SCHED_GET_CURRENT_MODE},
 	{"Scheduler.GetTimeoutModeProperties", UNSUPPORTED_FEATURE_SCHED_GET_TIMEOUT_MODE_PROPS},
@@ -265,311 +276,405 @@ static const cyaml_strval_t device_unsupported_strvals[] = {
 	{"Scheduler.SetTimeoutMode", UNSUPPORTED_FEATURE_SCHED_SET_TIMEOUT_MODE},
 	{"Scheduler.SetTimesliceMode", UNSUPPORTED_FEATURE_SCHED_SET_TIMESLICE_MODE},
 	{"Scheduler.SetExclusiveMode", UNSUPPORTED_FEATURE_SCHED_SET_EXCLUSIVE_MODE},
-	{"StandbyDomains", UNSUPPORTED_FEATURE_STANDBY_DOMAINS},
 	{"StandbyDomain.GetProperties", UNSUPPORTED_FEATURE_STANDBY_GET_PROPERTIES},
 	{"StandbyDomain.GetMode", UNSUPPORTED_FEATURE_STANDBY_GET_MODE},
 	{"StandbyDomain.SetMode", UNSUPPORTED_FEATURE_STANDBY_SET_MODE},
-	{"TemperatureSensors", UNSUPPORTED_FEATURE_TEMPERATURE_SENSORS},
 	{"TemperatureSensor.GetProperties", UNSUPPORTED_FEATURE_TEMP_GET_PROPERTIES},
 	{"TemperatureSensor.GetConfig", UNSUPPORTED_FEATURE_TEMP_GET_CONFIG},
 	{"TemperatureSensor.SetConfig", UNSUPPORTED_FEATURE_TEMP_SET_CONFIG},
 	{"TemperatureSensor.GetState", UNSUPPORTED_FEATURE_TEMP_GET_STATE},
 };
+static const cyaml_schema_value_t sysman_unsupported_feature_schema = {
+	CYAML_VALUE_ENUM(CYAML_FLAG_DEFAULT, sysman_unsupported_feature_t, sysman_unsupported_feature_strvals,
+					 CYAML_ARRAY_LEN(sysman_unsupported_feature_strvals))};
 
-static const cyaml_schema_value_t driver_unsupported_enum_schema = {
-	CYAML_VALUE_ENUM(CYAML_FLAG_DEFAULT, sysman_unsupported_feature_t, driver_unsupported_strvals,
-					 CYAML_ARRAY_LEN(driver_unsupported_strvals))};
-
-static const cyaml_schema_value_t device_unsupported_enum_schema = {
-	CYAML_VALUE_ENUM(CYAML_FLAG_DEFAULT, sysman_unsupported_feature_t, device_unsupported_strvals,
-					 CYAML_ARRAY_LEN(device_unsupported_strvals))};
+static const cyaml_schema_field_t zes_driver_extension_properties_fields[] = {
+	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, zes_driver_extension_properties_t, name, 0),
+	CYAML_FIELD_UINT("Version", CYAML_FLAG_OPTIONAL, zes_driver_extension_properties_t, version), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_driver_extension_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_driver_extension_properties_t, zes_driver_extension_properties_fields)};
 
-#define SYSMAN_NULLABLE_PTR_FLAGS (CYAML_FLAG_OPTIONAL | CYAML_FLAG_POINTER_NULL_STR)
+static const cyaml_schema_field_t sysman_uuid_fields[] = {
+	CYAML_FIELD_STRING("Id", CYAML_FLAG_OPTIONAL, sysman_uuid_t, id, 0), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_uuid_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_uuid_t, sysman_uuid_fields)};
 
-// engines
-static const cyaml_schema_field_t engine_ext_properties_fields[] = {
-	CYAML_FIELD_UINT("CountOfVirtualFunctionInstance", CYAML_FLAG_OPTIONAL, zes_engine_ext_properties_t,
-					 countOfVirtualFunctionInstance),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t engine_properties_fields[] = {
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, base.type),
-	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, base.onSubdevice),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, base.subdeviceId),
-	CYAML_FIELD_MAPPING("ExtendedProperties", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, extended_properties,
-						engine_ext_properties_fields),
+static const cyaml_schema_field_t sysman_device_core_properties_fields[] = {
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.type),
+	CYAML_FIELD_UINT("VendorId", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.vendorId),
+	CYAML_FIELD_UINT("DeviceId", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.deviceId),
+	CYAML_FIELD_UINT("Flags", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.flags),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.subdeviceId),
+	CYAML_FIELD_UINT("CoreClockRate", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.coreClockRate),
+	CYAML_FIELD_UINT("MaxMemAllocSize", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.maxMemAllocSize),
+	CYAML_FIELD_UINT("MaxHardwareContexts", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
+					 ze.maxHardwareContexts),
+	CYAML_FIELD_UINT("MaxCommandQueuePriority", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
+					 ze.maxCommandQueuePriority),
+	CYAML_FIELD_UINT("NumThreadsPerEU", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.numThreadsPerEU),
+	CYAML_FIELD_UINT("PhysicalEUSimdWidth", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
+					 ze.physicalEUSimdWidth),
+	CYAML_FIELD_UINT("NumEUsPerSubslice", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.numEUsPerSubslice),
+	CYAML_FIELD_UINT("NumSubslicesPerSlice", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
+					 ze.numSubslicesPerSlice),
+	CYAML_FIELD_UINT("NumSlices", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.numSlices),
+	CYAML_FIELD_UINT("TimerResolution", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.timerResolution),
+	CYAML_FIELD_UINT("TimestampValidBits", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.timestampValidBits),
+	CYAML_FIELD_UINT("KernelTimestampValidBits", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
+					 ze.kernelTimestampValidBits),
+	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.name, 0),
+	CYAML_FIELD_MAPPING("Uuid", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, uuid, sysman_uuid_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t engine_stats_fields[] = {
-	CYAML_FIELD_UINT("ActiveTime", CYAML_FLAG_OPTIONAL, zes_engine_stats_t, activeTime),
-	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_engine_stats_t, timestamp), CYAML_FIELD_END};
-static const cyaml_schema_value_t engine_stats_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_engine_stats_t, engine_stats_fields)};
-static const cyaml_schema_field_t engine_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_engine_entry_t, return_values, engine_rv_fields),
-	CYAML_FIELD_MAPPING("Properties", CYAML_FLAG_OPTIONAL, sysman_engine_entry_t, properties, engine_properties_fields),
-	CYAML_FIELD_MAPPING("Activity", CYAML_FLAG_OPTIONAL, sysman_engine_entry_t, activity, engine_stats_fields),
-	CYAML_FIELD_SEQUENCE_COUNT("ActivityExt", SYSMAN_NULLABLE_PTR_FLAGS, sysman_engine_entry_t, activity_ext,
-							   activity_ext_count, &engine_stats_schema, 0, CYAML_UNLIMITED),
+static const cyaml_schema_value_t sysman_device_core_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_device_core_properties_t, sysman_device_core_properties_fields)};
+
+static const cyaml_schema_field_t sysman_device_properties_info_fields[] = {
+	CYAML_FIELD_UINT("NumSubdevices", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.numSubdevices),
+	CYAML_FIELD_STRING("SerialNumber", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.serialNumber, 0),
+	CYAML_FIELD_STRING("BoardNumber", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.boardNumber, 0),
+	CYAML_FIELD_STRING("BrandName", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.brandName, 0),
+	CYAML_FIELD_STRING("ModelName", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.modelName, 0),
+	CYAML_FIELD_STRING("VendorName", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.vendorName, 0),
+	CYAML_FIELD_STRING("DriverVersion", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.driverVersion, 0),
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, extended_properties.type),
+	CYAML_FIELD_UINT("Flags", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, extended_properties.flags),
+	CYAML_FIELD_MAPPING("Core", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, core,
+						sysman_device_core_properties_fields),
+	CYAML_FIELD_MAPPING("Uuid", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, uuid, sysman_uuid_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t engine_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_engine_entry_t, engine_entry_fields)};
+static const cyaml_schema_value_t sysman_device_properties_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_device_properties_info_t, sysman_device_properties_info_fields)};
 
-static const cyaml_schema_value_t clock_schema = {CYAML_VALUE_FLOAT(CYAML_FLAG_DEFAULT, double)};
+static const cyaml_schema_field_t zes_device_state_fields[] = {
+	CYAML_FIELD_UINT("Reset", CYAML_FLAG_OPTIONAL, zes_device_state_t, reset),
+	CYAML_FIELD_UINT("Repaired", CYAML_FLAG_OPTIONAL, zes_device_state_t, repaired), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_device_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_device_state_t, zes_device_state_fields)};
 
-// frequencies
-static const cyaml_schema_field_t freq_properties_fields[] = {
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, type),
-	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, onSubdevice),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, subdeviceId),
-	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, canControl),
-	CYAML_FIELD_BOOL("IsThrottleEventSupported", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, isThrottleEventSupported),
-	CYAML_FIELD_FLOAT("Min", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, min),
-	CYAML_FIELD_FLOAT("Max", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, max),
+static const cyaml_schema_field_t zes_pci_address_fields[] = {
+	CYAML_FIELD_UINT("Domain", CYAML_FLAG_OPTIONAL, zes_pci_address_t, domain),
+	CYAML_FIELD_UINT("Bus", CYAML_FLAG_OPTIONAL, zes_pci_address_t, bus),
+	CYAML_FIELD_UINT("Device", CYAML_FLAG_OPTIONAL, zes_pci_address_t, device),
+	CYAML_FIELD_UINT("Function", CYAML_FLAG_OPTIONAL, zes_pci_address_t, function), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_pci_address_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_pci_address_t, zes_pci_address_fields)};
+
+static const cyaml_schema_field_t zes_pci_speed_fields[] = {
+	CYAML_FIELD_INT("Gen", CYAML_FLAG_OPTIONAL, zes_pci_speed_t, gen),
+	CYAML_FIELD_INT("Width", CYAML_FLAG_OPTIONAL, zes_pci_speed_t, width),
+	CYAML_FIELD_INT("MaxBandwidth", CYAML_FLAG_OPTIONAL, zes_pci_speed_t, maxBandwidth), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_pci_speed_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_pci_speed_t, zes_pci_speed_fields)};
+
+static const cyaml_schema_field_t zes_pci_link_speed_downgrade_ext_properties_fields[] = {
+	CYAML_FIELD_BOOL("PciLinkSpeedUpdateCapable", CYAML_FLAG_OPTIONAL, zes_pci_link_speed_downgrade_ext_properties_t,
+					 pciLinkSpeedUpdateCapable),
+	CYAML_FIELD_INT("MaxPciGenSupported", CYAML_FLAG_OPTIONAL, zes_pci_link_speed_downgrade_ext_properties_t,
+					maxPciGenSupported),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t freq_range_fields[] = {
-	CYAML_FIELD_FLOAT("Min", CYAML_FLAG_OPTIONAL, zes_freq_range_t, min),
-	CYAML_FIELD_FLOAT("Max", CYAML_FLAG_OPTIONAL, zes_freq_range_t, max), CYAML_FIELD_END};
-static const cyaml_schema_field_t freq_state_fields[] = {
-	CYAML_FIELD_FLOAT("CurrentVoltage", CYAML_FLAG_OPTIONAL, zes_freq_state_t, currentVoltage),
-	CYAML_FIELD_FLOAT("Actual", CYAML_FLAG_OPTIONAL, zes_freq_state_t, actual),
-	CYAML_FIELD_FLOAT("Request", CYAML_FLAG_OPTIONAL, zes_freq_state_t, request),
-	CYAML_FIELD_FLOAT("Tdp", CYAML_FLAG_OPTIONAL, zes_freq_state_t, tdp),
-	CYAML_FIELD_FLOAT("Efficient", CYAML_FLAG_OPTIONAL, zes_freq_state_t, efficient),
-	CYAML_FIELD_UINT("ThrottleReasons", CYAML_FLAG_OPTIONAL, zes_freq_state_t, throttleReasons),
+static const cyaml_schema_value_t zes_pci_link_speed_downgrade_ext_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_pci_link_speed_downgrade_ext_properties_t,
+						zes_pci_link_speed_downgrade_ext_properties_fields)};
+
+static const cyaml_schema_field_t sysman_pci_properties_info_fields[] = {
+	CYAML_FIELD_MAPPING("Address", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.address,
+						zes_pci_address_fields),
+	CYAML_FIELD_MAPPING("MaxSpeed", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.maxSpeed,
+						zes_pci_speed_fields),
+	CYAML_FIELD_BOOL("HaveBandwidthCounters", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t,
+					 base.haveBandwidthCounters),
+	CYAML_FIELD_BOOL("HavePacketCounters", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.havePacketCounters),
+	CYAML_FIELD_BOOL("HaveReplayCounters", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.haveReplayCounters),
+	CYAML_FIELD_MAPPING("LinkSpeedDowngrade", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, link_speed_downgrade,
+						zes_pci_link_speed_downgrade_ext_properties_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t freq_throttle_fields[] = {
-	CYAML_FIELD_UINT("ThrottleTime", CYAML_FLAG_OPTIONAL, zes_freq_throttle_time_t, throttleTime),
-	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_freq_throttle_time_t, timestamp), CYAML_FIELD_END};
-static const cyaml_schema_field_t freq_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_freq_entry_t, return_values, freq_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_entry_t, properties,
-							freq_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("Range", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_entry_t, range, freq_range_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_entry_t, state, freq_state_fields),
-	CYAML_FIELD_MAPPING_PTR("ThrottleTime", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_entry_t, throttle_time,
-							freq_throttle_fields),
-	{.key = "AvailableClocks",
-	 .value = {.type = CYAML_SEQUENCE,
-			   .flags = SYSMAN_NULLABLE_PTR_FLAGS,
-			   .data_size = sizeof(double),
-			   .sequence = {.entry = &clock_schema, .min = 0, .max = CYAML_UNLIMITED}},
-	 .data_offset = offsetof(sysman_freq_entry_t, available_clocks),
-	 .count_offset = offsetof(sysman_freq_entry_t, available_clock_count),
-	 .count_size = sizeof(uint32_t)},
+static const cyaml_schema_value_t sysman_pci_properties_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_pci_properties_info_t, sysman_pci_properties_info_fields)};
+
+static const cyaml_schema_field_t zes_pci_link_speed_downgrade_ext_state_fields[] = {
+	CYAML_FIELD_BOOL("PciLinkSpeedDowngradeStatus", CYAML_FLAG_OPTIONAL, zes_pci_link_speed_downgrade_ext_state_t,
+					 pciLinkSpeedDowngradeStatus),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t freq_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_freq_entry_t, freq_entry_fields)};
+static const cyaml_schema_value_t zes_pci_link_speed_downgrade_ext_state_schema = {CYAML_VALUE_MAPPING(
+	CYAML_FLAG_DEFAULT, zes_pci_link_speed_downgrade_ext_state_t, zes_pci_link_speed_downgrade_ext_state_fields)};
 
-// memory
-static const cyaml_schema_field_t mem_properties_fields[] = {
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, type),
-	CYAML_FIELD_UINT("Location", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, location),
-	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, onSubdevice),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, subdeviceId),
-	CYAML_FIELD_UINT("PhysicalSize", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, physicalSize),
-	CYAML_FIELD_INT("BusWidth", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, busWidth),
-	CYAML_FIELD_INT("NumChannels", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, numChannels),
+static const cyaml_schema_field_t sysman_pci_state_info_fields[] = {
+	CYAML_FIELD_UINT("Status", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.status),
+	CYAML_FIELD_UINT("QualityIssues", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.qualityIssues),
+	CYAML_FIELD_UINT("StabilityIssues", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.stabilityIssues),
+	CYAML_FIELD_MAPPING("Speed", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.speed, zes_pci_speed_fields),
+	CYAML_FIELD_MAPPING("LinkSpeedDowngrade", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, link_speed_downgrade,
+						zes_pci_link_speed_downgrade_ext_state_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t mem_state_fields[] = {
-	CYAML_FIELD_UINT("Health", CYAML_FLAG_OPTIONAL, zes_mem_state_t, health),
-	CYAML_FIELD_UINT("Free", CYAML_FLAG_OPTIONAL, zes_mem_state_t, free),
-	CYAML_FIELD_UINT("Size", CYAML_FLAG_OPTIONAL, zes_mem_state_t, size), CYAML_FIELD_END};
-static const cyaml_schema_field_t mem_bandwidth_fields[] = {
-	CYAML_FIELD_UINT("ReadCounter", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, readCounter),
-	CYAML_FIELD_UINT("WriteCounter", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, writeCounter),
-	CYAML_FIELD_UINT("MaxBandwidth", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, maxBandwidth),
-	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, timestamp), CYAML_FIELD_END};
-static const cyaml_schema_field_t mem_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_mem_entry_t, return_values, mem_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_mem_entry_t, properties,
-							mem_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_mem_entry_t, state, mem_state_fields),
-	CYAML_FIELD_MAPPING_PTR("Bandwidth", SYSMAN_NULLABLE_PTR_FLAGS, sysman_mem_entry_t, bandwidth,
-							mem_bandwidth_fields),
+static const cyaml_schema_value_t sysman_pci_state_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_pci_state_info_t, sysman_pci_state_info_fields)};
+
+static const cyaml_schema_field_t zes_pci_bar_properties_fields[] = {
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, type),
+	CYAML_FIELD_UINT("Index", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, index),
+	CYAML_FIELD_UINT("Base", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, base),
+	CYAML_FIELD_UINT("Size", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, size), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_pci_bar_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_pci_bar_properties_t, zes_pci_bar_properties_fields)};
+
+static const cyaml_schema_field_t zes_pci_stats_fields[] = {
+	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, timestamp),
+	CYAML_FIELD_UINT("ReplayCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, replayCounter),
+	CYAML_FIELD_UINT("PacketCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, packetCounter),
+	CYAML_FIELD_UINT("RxCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, rxCounter),
+	CYAML_FIELD_UINT("TxCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, txCounter),
+	CYAML_FIELD_MAPPING("Speed", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, speed, zes_pci_speed_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t mem_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_mem_entry_t, mem_entry_fields)};
+static const cyaml_schema_value_t zes_pci_stats_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_pci_stats_t, zes_pci_stats_fields)};
 
-// power limits
-static const cyaml_schema_field_t power_limit_fields[] = {
-	CYAML_FIELD_UINT("Level", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, level),
-	CYAML_FIELD_UINT("Source", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, source),
-	CYAML_FIELD_UINT("LimitUnit", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, limitUnit),
-	CYAML_FIELD_BOOL("EnabledStateLocked", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, enabledStateLocked),
-	CYAML_FIELD_BOOL("Enabled", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, enabled),
-	CYAML_FIELD_BOOL("IntervalValueLocked", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, intervalValueLocked),
-	CYAML_FIELD_INT("Interval", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, interval),
-	CYAML_FIELD_BOOL("LimitValueLocked", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, limitValueLocked),
-	CYAML_FIELD_INT("Limit", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, limit),
+static const cyaml_schema_field_t sysman_pci_info_fields[] = {
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, properties,
+							sysman_pci_properties_info_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, state, sysman_pci_state_info_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("Bars", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, bars, bars_count,
+							   &zes_pci_bar_properties_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_MAPPING_PTR("Stats", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, stats, zes_pci_stats_fields),
+	CYAML_FIELD_UINT("PciLinkSpeedUpdatePendingAction", CYAML_FLAG_OPTIONAL, sysman_pci_info_t,
+					 pci_link_speed_update_pending_action),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t power_limit_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_power_limit_ext_desc_t, power_limit_fields)};
+static const cyaml_schema_value_t sysman_pci_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_pci_info_t, sysman_pci_info_fields)};
 
-// power
-static const cyaml_schema_field_t power_ext_properties_fields[] = {
-	CYAML_FIELD_UINT("Domain", CYAML_FLAG_OPTIONAL, sysman_power_ext_properties_t, domain),
-	CYAML_FIELD_MAPPING("DefaultLimit", CYAML_FLAG_OPTIONAL, sysman_power_ext_properties_t, default_limit,
-						power_limit_fields),
+static const cyaml_schema_field_t zes_device_ecc_default_properties_ext_fields[] = {
+	CYAML_FIELD_UINT("DefaultState", CYAML_FLAG_OPTIONAL, zes_device_ecc_default_properties_ext_t, defaultState),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t power_properties_fields[] = {
-	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.onSubdevice),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.subdeviceId),
-	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.canControl),
-	CYAML_FIELD_BOOL("IsEnergyThresholdSupported", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t,
-					 base.isEnergyThresholdSupported),
-	CYAML_FIELD_INT("DefaultLimit", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.defaultLimit),
-	CYAML_FIELD_INT("MinLimit", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.minLimit),
-	CYAML_FIELD_INT("MaxLimit", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.maxLimit),
-	CYAML_FIELD_MAPPING("ExtendedProperties", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, extended_properties,
-						power_ext_properties_fields),
+static const cyaml_schema_value_t zes_device_ecc_default_properties_ext_schema = {CYAML_VALUE_MAPPING(
+	CYAML_FLAG_DEFAULT, zes_device_ecc_default_properties_ext_t, zes_device_ecc_default_properties_ext_fields)};
+
+static const cyaml_schema_field_t sysman_ecc_state_info_fields[] = {
+	CYAML_FIELD_UINT("CurrentState", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, properties.currentState),
+	CYAML_FIELD_UINT("PendingState", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, properties.pendingState),
+	CYAML_FIELD_UINT("PendingAction", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, properties.pendingAction),
+	CYAML_FIELD_MAPPING("ExtendedProperties", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, extended_properties,
+						zes_device_ecc_default_properties_ext_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t power_energy_fields[] = {
-	CYAML_FIELD_UINT("Energy", CYAML_FLAG_OPTIONAL, zes_power_energy_counter_t, energy),
-	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_power_energy_counter_t, timestamp), CYAML_FIELD_END};
-static const cyaml_schema_field_t power_energy_threshold_fields[] = {
-	CYAML_FIELD_BOOL("Enable", CYAML_FLAG_OPTIONAL, zes_energy_threshold_t, enable),
-	CYAML_FIELD_FLOAT("Threshold", CYAML_FLAG_OPTIONAL, zes_energy_threshold_t, threshold),
-	CYAML_FIELD_UINT("ProcessId", CYAML_FLAG_OPTIONAL, zes_energy_threshold_t, processId), CYAML_FIELD_END};
-static const cyaml_schema_field_t power_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_power_entry_t, return_values, power_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_entry_t, properties,
-							power_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("EnergyCounter", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_entry_t, energy_counter,
-							power_energy_fields),
-	CYAML_FIELD_MAPPING_PTR("EnergyThreshold", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_entry_t, energy_threshold,
-							power_energy_threshold_fields),
-	{.key = "Limits",
-	 .value = {.type = CYAML_SEQUENCE,
-			   .flags = SYSMAN_NULLABLE_PTR_FLAGS,
-			   .data_size = sizeof(zes_power_limit_ext_desc_t),
-			   .sequence = {.entry = &power_limit_schema, .min = 0, .max = CYAML_UNLIMITED}},
-	 .data_offset = offsetof(sysman_power_entry_t, limits),
-	 .count_offset = offsetof(sysman_power_entry_t, limit_count),
-	 .count_size = sizeof(uint32_t)},
+static const cyaml_schema_value_t sysman_ecc_state_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_ecc_state_info_t, sysman_ecc_state_info_fields)};
+
+static const cyaml_schema_field_t sysman_ecc_info_fields[] = {
+	CYAML_FIELD_BOOL("Available", CYAML_FLAG_OPTIONAL, sysman_ecc_info_t, available),
+	CYAML_FIELD_BOOL("Configurable", CYAML_FLAG_OPTIONAL, sysman_ecc_info_t, configurable),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ecc_info_t, state, sysman_ecc_state_info_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t power_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_power_entry_t, power_entry_fields)};
+static const cyaml_schema_value_t sysman_ecc_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_ecc_info_t, sysman_ecc_info_fields)};
 
-// schedulers
-static const cyaml_schema_field_t sched_properties_fields[] = {
-	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, onSubdevice),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, subdeviceId),
-	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, canControl),
-	CYAML_FIELD_UINT("SupportedModes", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, supportedModes),
-	CYAML_FIELD_UINT("Engines", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, engines),
+static const cyaml_schema_field_t sysman_oc_control_fields[] = {
+	CYAML_FIELD_UINT("DomainType", CYAML_FLAG_OPTIONAL, sysman_oc_control_t, domain_type),
+	CYAML_FIELD_UINT("ControlsBitmask", CYAML_FLAG_OPTIONAL, sysman_oc_control_t, controls_bitmask), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_oc_control_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_oc_control_t, sysman_oc_control_fields)};
+
+static const cyaml_schema_field_t sysman_overclock_state_info_fields[] = {
+	CYAML_FIELD_UINT("Mode", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, mode),
+	CYAML_FIELD_BOOL("WaiverSetting", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, waiver_setting),
+	CYAML_FIELD_BOOL("State", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, state),
+	CYAML_FIELD_UINT("PendingAction", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, pending_action),
+	CYAML_FIELD_BOOL("PendingReset", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, pending_reset),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t sched_timeout_fields[] = {
-	CYAML_FIELD_UINT("WatchdogTimeout", CYAML_FLAG_OPTIONAL, zes_sched_timeout_properties_t, watchdogTimeout),
+static const cyaml_schema_value_t sysman_overclock_state_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_overclock_state_info_t, sysman_overclock_state_info_fields)};
+
+static const cyaml_schema_field_t zes_overclock_properties_fields[] = {
+	CYAML_FIELD_UINT("DomainType", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, domainType),
+	CYAML_FIELD_UINT("AvailableControls", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, AvailableControls),
+	CYAML_FIELD_UINT("VFProgramType", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, VFProgramType),
+	CYAML_FIELD_UINT("NumberOfVFPoints", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, NumberOfVFPoints),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t sched_timeslice_fields[] = {
-	CYAML_FIELD_UINT("Interval", CYAML_FLAG_OPTIONAL, zes_sched_timeslice_properties_t, interval),
-	CYAML_FIELD_UINT("YieldTimeout", CYAML_FLAG_OPTIONAL, zes_sched_timeslice_properties_t, yieldTimeout),
+static const cyaml_schema_value_t zes_overclock_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_overclock_properties_t, zes_overclock_properties_fields)};
+
+static const cyaml_schema_field_t zes_vf_property_fields[] = {
+	CYAML_FIELD_FLOAT("MinFreq", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MinFreq),
+	CYAML_FIELD_FLOAT("MaxFreq", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MaxFreq),
+	CYAML_FIELD_FLOAT("StepFreq", CYAML_FLAG_OPTIONAL, zes_vf_property_t, StepFreq),
+	CYAML_FIELD_FLOAT("MinVolt", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MinVolt),
+	CYAML_FIELD_FLOAT("MaxVolt", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MaxVolt),
+	CYAML_FIELD_FLOAT("StepVolt", CYAML_FLAG_OPTIONAL, zes_vf_property_t, StepVolt),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t sched_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_sched_entry_t, return_values, sched_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_sched_entry_t, properties,
-							sched_properties_fields),
-	CYAML_FIELD_UINT("CurrentMode", CYAML_FLAG_OPTIONAL, sysman_sched_entry_t, current_mode),
-	CYAML_FIELD_MAPPING_PTR("TimeoutModeProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_sched_entry_t,
-							timeout_mode_properties, sched_timeout_fields),
-	CYAML_FIELD_MAPPING_PTR("TimesliceModeProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_sched_entry_t,
-							timeslice_mode_properties, sched_timeslice_fields),
-	CYAML_FIELD_BOOL("NeedReload", CYAML_FLAG_OPTIONAL, sysman_sched_entry_t, need_reload),
+static const cyaml_schema_value_t zes_vf_property_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_vf_property_t, zes_vf_property_fields)};
+
+static const cyaml_schema_field_t zes_control_property_fields[] = {
+	CYAML_FIELD_FLOAT("MinValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, MinValue),
+	CYAML_FIELD_FLOAT("MaxValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, MaxValue),
+	CYAML_FIELD_FLOAT("StepValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, StepValue),
+	CYAML_FIELD_FLOAT("RefValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, RefValue),
+	CYAML_FIELD_FLOAT("DefaultValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, DefaultValue),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t sched_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_sched_entry_t, sched_entry_fields)};
+static const cyaml_schema_value_t zes_control_property_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_control_property_t, zes_control_property_fields)};
 
-// temperatures
-static const cyaml_schema_field_t temp_properties_fields[] = {
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, type),
-	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, onSubdevice),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, subdeviceId),
-	CYAML_FIELD_FLOAT("MaxTemperature", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, maxTemperature),
-	CYAML_FIELD_BOOL("IsCriticalTempSupported", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, isCriticalTempSupported),
-	CYAML_FIELD_BOOL("IsThreshold1Supported", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, isThreshold1Supported),
-	CYAML_FIELD_BOOL("IsThreshold2Supported", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, isThreshold2Supported),
+static const cyaml_schema_field_t sysman_oc_control_info_fields[] = {
+	CYAML_FIELD_UINT("ControlType", CYAML_FLAG_OPTIONAL, sysman_oc_control_info_t, control_type),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, properties,
+							zes_control_property_fields),
+	CYAML_FIELD_FLOAT_PTR("CurrentValue", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, current_value),
+	CYAML_FIELD_FLOAT_PTR("PendingValue", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, pending_value),
+	CYAML_FIELD_UINT_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, state),
+	CYAML_FIELD_UINT_PTR("PendingAction", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, pending_action),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t temp_threshold_fields[] = {
-	CYAML_FIELD_BOOL("EnableLowToHigh", CYAML_FLAG_OPTIONAL, zes_temp_threshold_t, enableLowToHigh),
-	CYAML_FIELD_BOOL("EnableHighToLow", CYAML_FLAG_OPTIONAL, zes_temp_threshold_t, enableHighToLow),
-	CYAML_FIELD_FLOAT("Threshold", CYAML_FLAG_OPTIONAL, zes_temp_threshold_t, threshold), CYAML_FIELD_END};
-static const cyaml_schema_field_t temp_config_fields[] = {
-	CYAML_FIELD_BOOL("EnableCritical", CYAML_FLAG_OPTIONAL, zes_temp_config_t, enableCritical),
-	CYAML_FIELD_MAPPING("Threshold1", CYAML_FLAG_OPTIONAL, zes_temp_config_t, threshold1, temp_threshold_fields),
-	CYAML_FIELD_MAPPING("Threshold2", CYAML_FLAG_OPTIONAL, zes_temp_config_t, threshold2, temp_threshold_fields),
+static const cyaml_schema_value_t sysman_oc_control_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_oc_control_info_t, sysman_oc_control_info_fields)};
+
+static const cyaml_schema_field_t sysman_oc_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_oc_t, return_values, sysman_oc_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_t, properties,
+							zes_overclock_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("VFProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_t, vf_properties,
+							zes_vf_property_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("ControlInfos", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_t, control_infos,
+							   control_infos_count, &sysman_oc_control_info_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_UINT("VfPointValue", CYAML_FLAG_OPTIONAL, sysman_oc_t, vf_point_value),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t temp_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_temp_entry_t, return_values, temp_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_temp_entry_t, properties,
-							temp_properties_fields),
-	CYAML_FIELD_FLOAT("Temperature", CYAML_FLAG_OPTIONAL, sysman_temp_entry_t, temperature),
-	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_temp_entry_t, config, temp_config_fields),
+static const cyaml_schema_value_t sysman_oc_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_oc_t, sysman_oc_fields)};
+
+static const cyaml_schema_field_t sysman_overclock_info_fields[] = {
+	CYAML_FIELD_UINT("DomainsBitmask", CYAML_FLAG_OPTIONAL, sysman_overclock_info_t, domains_bitmask),
+	CYAML_FIELD_SEQUENCE_COUNT("Controls", SYSMAN_NULLABLE_PTR_FLAGS, sysman_overclock_info_t, controls, controls_count,
+							   &sysman_oc_control_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_overclock_info_t, state,
+							sysman_overclock_state_info_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("Domains", SYSMAN_NULLABLE_PTR_FLAGS, sysman_overclock_info_t, domains, domains_count,
+							   &sysman_oc_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_overclock_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_overclock_info_t, sysman_overclock_info_fields)};
+
+static const cyaml_schema_field_t zes_process_state_fields[] = {
+	CYAML_FIELD_UINT("ProcessId", CYAML_FLAG_OPTIONAL, zes_process_state_t, processId),
+	CYAML_FIELD_UINT("MemSize", CYAML_FLAG_OPTIONAL, zes_process_state_t, memSize),
+	CYAML_FIELD_UINT("SharedSize", CYAML_FLAG_OPTIONAL, zes_process_state_t, sharedSize),
+	CYAML_FIELD_UINT("Engines", CYAML_FLAG_OPTIONAL, zes_process_state_t, engines), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_process_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_process_state_t, zes_process_state_fields)};
+
+static const cyaml_schema_field_t zes_engine_ext_properties_fields[] = {
+	CYAML_FIELD_UINT("CountOfVirtualFunctionInstance", CYAML_FLAG_OPTIONAL, zes_engine_ext_properties_t,
+					 countOfVirtualFunctionInstance),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_engine_ext_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_engine_ext_properties_t, zes_engine_ext_properties_fields)};
+
+static const cyaml_schema_field_t sysman_engine_properties_info_fields[] = {
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, base.type),
+	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, base.onSubdevice),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, base.subdeviceId),
+	CYAML_FIELD_MAPPING("ExtendedProperties", CYAML_FLAG_OPTIONAL, sysman_engine_properties_info_t, extended_properties,
+						zes_engine_ext_properties_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_engine_properties_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_engine_properties_info_t, sysman_engine_properties_info_fields)};
+
+static const cyaml_schema_field_t zes_engine_stats_fields[] = {
+	CYAML_FIELD_UINT("ActiveTime", CYAML_FLAG_OPTIONAL, zes_engine_stats_t, activeTime),
+	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_engine_stats_t, timestamp), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_engine_stats_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_engine_stats_t, zes_engine_stats_fields)};
+
+static const cyaml_schema_field_t sysman_engine_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_engine_t, return_values, sysman_engine_rv_fields),
+	CYAML_FIELD_MAPPING("Properties", CYAML_FLAG_OPTIONAL, sysman_engine_t, properties,
+						sysman_engine_properties_info_fields),
+	CYAML_FIELD_MAPPING("Activity", CYAML_FLAG_OPTIONAL, sysman_engine_t, activity, zes_engine_stats_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("ActivityExt", SYSMAN_NULLABLE_PTR_FLAGS, sysman_engine_t, activity_ext,
+							   activity_ext_count, &zes_engine_stats_schema, 0, CYAML_UNLIMITED),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t temp_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_temp_entry_t, temp_entry_fields)};
+static const cyaml_schema_value_t sysman_engine_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_engine_t, sysman_engine_fields)};
 
-// fabric_ports
-static const cyaml_schema_field_t fabric_port_id_fields[] = {
+static const cyaml_schema_field_t zes_fabric_port_id_fields[] = {
 	CYAML_FIELD_UINT("FabricId", CYAML_FLAG_OPTIONAL, zes_fabric_port_id_t, fabricId),
 	CYAML_FIELD_UINT("AttachId", CYAML_FLAG_OPTIONAL, zes_fabric_port_id_t, attachId),
 	CYAML_FIELD_UINT("PortNumber", CYAML_FLAG_OPTIONAL, zes_fabric_port_id_t, portNumber), CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_speed_fields[] = {
+static const cyaml_schema_value_t zes_fabric_port_id_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_id_t, zes_fabric_port_id_fields)};
+
+static const cyaml_schema_field_t zes_fabric_port_speed_fields[] = {
 	CYAML_FIELD_INT("BitRate", CYAML_FLAG_OPTIONAL, zes_fabric_port_speed_t, bitRate),
 	CYAML_FIELD_INT("Width", CYAML_FLAG_OPTIONAL, zes_fabric_port_speed_t, width), CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_properties_fields[] = {
+static const cyaml_schema_value_t zes_fabric_port_speed_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_speed_t, zes_fabric_port_speed_fields)};
+
+static const cyaml_schema_field_t zes_fabric_port_properties_fields[] = {
 	CYAML_FIELD_STRING("Model", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, model, 0),
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, subdeviceId),
-	CYAML_FIELD_MAPPING("PortId", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, portId, fabric_port_id_fields),
+	CYAML_FIELD_MAPPING("PortId", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, portId, zes_fabric_port_id_fields),
 	CYAML_FIELD_MAPPING("MaxRxSpeed", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, maxRxSpeed,
-						fabric_port_speed_fields),
+						zes_fabric_port_speed_fields),
 	CYAML_FIELD_MAPPING("MaxTxSpeed", CYAML_FLAG_OPTIONAL, zes_fabric_port_properties_t, maxTxSpeed,
-						fabric_port_speed_fields),
+						zes_fabric_port_speed_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_link_type_fields[] = {
+static const cyaml_schema_value_t zes_fabric_port_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_properties_t, zes_fabric_port_properties_fields)};
+
+static const cyaml_schema_field_t zes_fabric_link_type_fields[] = {
 	CYAML_FIELD_STRING("Desc", CYAML_FLAG_OPTIONAL, zes_fabric_link_type_t, desc, 0), CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_config_fields[] = {
+static const cyaml_schema_value_t zes_fabric_link_type_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_link_type_t, zes_fabric_link_type_fields)};
+
+static const cyaml_schema_field_t zes_fabric_port_config_fields[] = {
 	CYAML_FIELD_BOOL("Enabled", CYAML_FLAG_OPTIONAL, zes_fabric_port_config_t, enabled),
 	CYAML_FIELD_BOOL("Beaconing", CYAML_FLAG_OPTIONAL, zes_fabric_port_config_t, beaconing), CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_state_fields[] = {
+static const cyaml_schema_value_t zes_fabric_port_config_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_config_t, zes_fabric_port_config_fields)};
+
+static const cyaml_schema_field_t zes_fabric_port_state_fields[] = {
 	CYAML_FIELD_UINT("Status", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, status),
 	CYAML_FIELD_UINT("QualityIssues", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, qualityIssues),
 	CYAML_FIELD_UINT("FailureReasons", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, failureReasons),
 	CYAML_FIELD_MAPPING("RemotePortId", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, remotePortId,
-						fabric_port_id_fields),
-	CYAML_FIELD_MAPPING("RxSpeed", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, rxSpeed, fabric_port_speed_fields),
-	CYAML_FIELD_MAPPING("TxSpeed", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, txSpeed, fabric_port_speed_fields),
+						zes_fabric_port_id_fields),
+	CYAML_FIELD_MAPPING("RxSpeed", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, rxSpeed, zes_fabric_port_speed_fields),
+	CYAML_FIELD_MAPPING("TxSpeed", CYAML_FLAG_OPTIONAL, zes_fabric_port_state_t, txSpeed, zes_fabric_port_speed_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_throughput_fields[] = {
+static const cyaml_schema_value_t zes_fabric_port_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_state_t, zes_fabric_port_state_fields)};
+
+static const cyaml_schema_field_t zes_fabric_port_throughput_fields[] = {
 	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_fabric_port_throughput_t, timestamp),
 	CYAML_FIELD_UINT("RxCounter", CYAML_FLAG_OPTIONAL, zes_fabric_port_throughput_t, rxCounter),
 	CYAML_FIELD_UINT("TxCounter", CYAML_FLAG_OPTIONAL, zes_fabric_port_throughput_t, txCounter), CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_errors_fields[] = {
+static const cyaml_schema_value_t zes_fabric_port_throughput_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_throughput_t, zes_fabric_port_throughput_fields)};
+
+static const cyaml_schema_field_t zes_fabric_port_error_counters_fields[] = {
 	CYAML_FIELD_UINT("LinkFailureCount", CYAML_FLAG_OPTIONAL, zes_fabric_port_error_counters_t, linkFailureCount),
 	CYAML_FIELD_UINT("FwCommErrorCount", CYAML_FLAG_OPTIONAL, zes_fabric_port_error_counters_t, fwCommErrorCount),
 	CYAML_FIELD_UINT("FwErrorCount", CYAML_FLAG_OPTIONAL, zes_fabric_port_error_counters_t, fwErrorCount),
 	CYAML_FIELD_UINT("LinkDegradeCount", CYAML_FLAG_OPTIONAL, zes_fabric_port_error_counters_t, linkDegradeCount),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t fabric_port_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_fabric_port_entry_t, return_values,
-						fabric_port_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_entry_t, properties,
-							fabric_port_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("LinkType", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_entry_t, link_type,
-							fabric_link_type_fields),
-	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_entry_t, config,
-							fabric_port_config_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_entry_t, state,
-							fabric_port_state_fields),
-	CYAML_FIELD_MAPPING_PTR("Throughput", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_entry_t, throughput,
-							fabric_port_throughput_fields),
-	CYAML_FIELD_MAPPING_PTR("ErrorCounters", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_entry_t, error_counters,
-							fabric_port_errors_fields),
+static const cyaml_schema_value_t zes_fabric_port_error_counters_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fabric_port_error_counters_t, zes_fabric_port_error_counters_fields)};
+
+static const cyaml_schema_field_t sysman_fabric_port_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_fabric_port_t, return_values,
+						sysman_fabric_port_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_t, properties,
+							zes_fabric_port_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("LinkType", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_t, link_type,
+							zes_fabric_link_type_fields),
+	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_t, config,
+							zes_fabric_port_config_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_t, state,
+							zes_fabric_port_state_fields),
+	CYAML_FIELD_MAPPING_PTR("Throughput", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_t, throughput,
+							zes_fabric_port_throughput_fields),
+	CYAML_FIELD_MAPPING_PTR("ErrorCounters", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fabric_port_t, error_counters,
+							zes_fabric_port_error_counters_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t fabric_port_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_fabric_port_entry_t, fabric_port_entry_fields)};
+static const cyaml_schema_value_t sysman_fabric_port_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_fabric_port_t, sysman_fabric_port_fields)};
 
-// fans
-static const cyaml_schema_field_t fan_properties_fields[] = {
+static const cyaml_schema_field_t zes_fan_properties_fields[] = {
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_fan_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_fan_properties_t, subdeviceId),
 	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_fan_properties_t, canControl),
@@ -578,449 +683,525 @@ static const cyaml_schema_field_t fan_properties_fields[] = {
 	CYAML_FIELD_INT("MaxRPM", CYAML_FLAG_OPTIONAL, zes_fan_properties_t, maxRPM),
 	CYAML_FIELD_INT("MaxPoints", CYAML_FLAG_OPTIONAL, zes_fan_properties_t, maxPoints),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t fan_speed_fields[] = {
+static const cyaml_schema_value_t zes_fan_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fan_properties_t, zes_fan_properties_fields)};
+
+static const cyaml_schema_field_t zes_fan_speed_fields[] = {
 	CYAML_FIELD_INT("Speed", CYAML_FLAG_OPTIONAL, zes_fan_speed_t, speed),
 	CYAML_FIELD_UINT("Units", CYAML_FLAG_OPTIONAL, zes_fan_speed_t, units), CYAML_FIELD_END};
-static const cyaml_schema_field_t fan_temp_speed_fields[] = {
+static const cyaml_schema_value_t zes_fan_speed_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fan_speed_t, zes_fan_speed_fields)};
+
+static const cyaml_schema_field_t zes_fan_temp_speed_fields[] = {
 	CYAML_FIELD_UINT("Temperature", CYAML_FLAG_OPTIONAL, zes_fan_temp_speed_t, temperature),
-	CYAML_FIELD_MAPPING("Speed", CYAML_FLAG_OPTIONAL, zes_fan_temp_speed_t, speed, fan_speed_fields), CYAML_FIELD_END};
-static const cyaml_schema_value_t fan_temp_speed_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fan_temp_speed_t, fan_temp_speed_fields)};
-static const cyaml_schema_field_t fan_speed_table_fields[] = {
+	CYAML_FIELD_MAPPING("Speed", CYAML_FLAG_OPTIONAL, zes_fan_temp_speed_t, speed, zes_fan_speed_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_fan_temp_speed_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fan_temp_speed_t, zes_fan_temp_speed_fields)};
+
+static const cyaml_schema_field_t zes_fan_speed_table_fields[] = {
 	CYAML_FIELD_INT("NumPoints", CYAML_FLAG_OPTIONAL, zes_fan_speed_table_t, numPoints),
 	CYAML_FIELD_SEQUENCE_COUNT("Table", CYAML_FLAG_OPTIONAL, zes_fan_speed_table_t, table, numPoints,
-							   &fan_temp_speed_schema, 0, ZES_FAN_TEMP_SPEED_PAIR_COUNT),
+							   &zes_fan_temp_speed_schema, 0, ZES_FAN_TEMP_SPEED_PAIR_COUNT),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t fan_config_fields[] = {
+static const cyaml_schema_value_t zes_fan_speed_table_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fan_speed_table_t, zes_fan_speed_table_fields)};
+
+static const cyaml_schema_field_t zes_fan_config_fields[] = {
 	CYAML_FIELD_UINT("Mode", CYAML_FLAG_OPTIONAL, zes_fan_config_t, mode),
-	CYAML_FIELD_MAPPING("SpeedFixed", CYAML_FLAG_OPTIONAL, zes_fan_config_t, speedFixed, fan_speed_fields),
-	CYAML_FIELD_MAPPING("SpeedTable", CYAML_FLAG_OPTIONAL, zes_fan_config_t, speedTable, fan_speed_table_fields),
+	CYAML_FIELD_MAPPING("SpeedFixed", CYAML_FLAG_OPTIONAL, zes_fan_config_t, speedFixed, zes_fan_speed_fields),
+	CYAML_FIELD_MAPPING("SpeedTable", CYAML_FLAG_OPTIONAL, zes_fan_config_t, speedTable, zes_fan_speed_table_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t fan_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_fan_entry_t, return_values, fan_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fan_entry_t, properties,
-							fan_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fan_entry_t, config, fan_config_fields),
-	CYAML_FIELD_INT("Speed", CYAML_FLAG_OPTIONAL, sysman_fan_entry_t, speed), CYAML_FIELD_END};
-static const cyaml_schema_value_t fan_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_fan_entry_t, fan_entry_fields)};
-
-// firmwares
-static const cyaml_schema_field_t firmware_properties_fields[] = {
+static const cyaml_schema_value_t zes_fan_config_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_fan_config_t, zes_fan_config_fields)};
+
+static const cyaml_schema_field_t sysman_fan_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_fan_t, return_values, sysman_fan_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fan_t, properties,
+							zes_fan_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_fan_t, config, zes_fan_config_fields),
+	CYAML_FIELD_INT("Speed", CYAML_FLAG_OPTIONAL, sysman_fan_t, speed), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_fan_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_fan_t, sysman_fan_fields)};
+
+static const cyaml_schema_field_t zes_firmware_properties_fields[] = {
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_firmware_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_firmware_properties_t, subdeviceId),
 	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_firmware_properties_t, canControl),
 	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, zes_firmware_properties_t, name, 0),
 	CYAML_FIELD_STRING("Version", CYAML_FLAG_OPTIONAL, zes_firmware_properties_t, version, 0),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t firmware_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_firmware_entry_t, return_values,
-						firmware_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_firmware_entry_t, properties,
-							firmware_properties_fields),
-	CYAML_FIELD_UINT("FlashProgress", CYAML_FLAG_OPTIONAL, sysman_firmware_entry_t, flash_progress),
-	CYAML_FIELD_STRING("Log", CYAML_FLAG_OPTIONAL, sysman_firmware_entry_t, log, 0), CYAML_FIELD_END};
-static const cyaml_schema_value_t firmware_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_firmware_entry_t, firmware_entry_fields)};
-
-// LEDs
-static const cyaml_schema_field_t led_properties_fields[] = {
+static const cyaml_schema_value_t zes_firmware_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_firmware_properties_t, zes_firmware_properties_fields)};
+
+static const cyaml_schema_field_t sysman_firmware_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_firmware_t, return_values,
+						sysman_firmware_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_firmware_t, properties,
+							zes_firmware_properties_fields),
+	CYAML_FIELD_UINT("FlashProgress", CYAML_FLAG_OPTIONAL, sysman_firmware_t, flash_progress),
+	CYAML_FIELD_STRING("Log", CYAML_FLAG_OPTIONAL, sysman_firmware_t, log, 0), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_firmware_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_firmware_t, sysman_firmware_fields)};
+
+static const cyaml_schema_field_t zes_freq_properties_fields[] = {
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, type),
+	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, onSubdevice),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, subdeviceId),
+	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, canControl),
+	CYAML_FIELD_BOOL("IsThrottleEventSupported", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, isThrottleEventSupported),
+	CYAML_FIELD_FLOAT("Min", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, min),
+	CYAML_FIELD_FLOAT("Max", CYAML_FLAG_OPTIONAL, zes_freq_properties_t, max),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_freq_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_freq_properties_t, zes_freq_properties_fields)};
+
+static const cyaml_schema_field_t zes_freq_range_fields[] = {
+	CYAML_FIELD_FLOAT("Min", CYAML_FLAG_OPTIONAL, zes_freq_range_t, min),
+	CYAML_FIELD_FLOAT("Max", CYAML_FLAG_OPTIONAL, zes_freq_range_t, max), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_freq_range_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_freq_range_t, zes_freq_range_fields)};
+
+static const cyaml_schema_field_t zes_freq_state_fields[] = {
+	CYAML_FIELD_FLOAT("CurrentVoltage", CYAML_FLAG_OPTIONAL, zes_freq_state_t, currentVoltage),
+	CYAML_FIELD_FLOAT("Request", CYAML_FLAG_OPTIONAL, zes_freq_state_t, request),
+	CYAML_FIELD_FLOAT("Tdp", CYAML_FLAG_OPTIONAL, zes_freq_state_t, tdp),
+	CYAML_FIELD_FLOAT("Efficient", CYAML_FLAG_OPTIONAL, zes_freq_state_t, efficient),
+	CYAML_FIELD_FLOAT("Actual", CYAML_FLAG_OPTIONAL, zes_freq_state_t, actual),
+	CYAML_FIELD_UINT("ThrottleReasons", CYAML_FLAG_OPTIONAL, zes_freq_state_t, throttleReasons),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_freq_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_freq_state_t, zes_freq_state_fields)};
+
+static const cyaml_schema_field_t zes_freq_throttle_time_fields[] = {
+	CYAML_FIELD_UINT("ThrottleTime", CYAML_FLAG_OPTIONAL, zes_freq_throttle_time_t, throttleTime),
+	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_freq_throttle_time_t, timestamp), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_freq_throttle_time_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_freq_throttle_time_t, zes_freq_throttle_time_fields)};
+
+static const cyaml_schema_field_t sysman_freq_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_freq_t, return_values, sysman_freq_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_t, properties,
+							zes_freq_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("Range", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_t, range, zes_freq_range_fields),
+	{.key = "AvailableClocks",
+	 .value = {.type = CYAML_SEQUENCE,
+			   .flags = SYSMAN_NULLABLE_PTR_FLAGS,
+			   .data_size = sizeof(double),
+			   .sequence = {.entry = &double_schema, .min = 0, .max = CYAML_UNLIMITED}},
+	 .data_offset = offsetof(sysman_freq_t, available_clocks),
+	 .count_offset = offsetof(sysman_freq_t, available_clocks_count),
+	 .count_size = sizeof(uint32_t)},
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_t, state, zes_freq_state_fields),
+	CYAML_FIELD_MAPPING_PTR("ThrottleTime", SYSMAN_NULLABLE_PTR_FLAGS, sysman_freq_t, throttle_time,
+							zes_freq_throttle_time_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_freq_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_freq_t, sysman_freq_fields)};
+
+static const cyaml_schema_field_t zes_led_properties_fields[] = {
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_led_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_led_properties_t, subdeviceId),
 	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_led_properties_t, canControl),
 	CYAML_FIELD_BOOL("HaveRGB", CYAML_FLAG_OPTIONAL, zes_led_properties_t, haveRGB), CYAML_FIELD_END};
-static const cyaml_schema_field_t led_color_fields[] = {
+static const cyaml_schema_value_t zes_led_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_led_properties_t, zes_led_properties_fields)};
+
+static const cyaml_schema_field_t zes_led_color_fields[] = {
 	CYAML_FIELD_FLOAT("Red", CYAML_FLAG_OPTIONAL, zes_led_color_t, red),
 	CYAML_FIELD_FLOAT("Green", CYAML_FLAG_OPTIONAL, zes_led_color_t, green),
 	CYAML_FIELD_FLOAT("Blue", CYAML_FLAG_OPTIONAL, zes_led_color_t, blue), CYAML_FIELD_END};
-static const cyaml_schema_field_t led_state_fields[] = {
+static const cyaml_schema_value_t zes_led_color_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_led_color_t, zes_led_color_fields)};
+
+static const cyaml_schema_field_t zes_led_state_fields[] = {
 	CYAML_FIELD_BOOL("IsOn", CYAML_FLAG_OPTIONAL, zes_led_state_t, isOn),
-	CYAML_FIELD_MAPPING("Color", CYAML_FLAG_OPTIONAL, zes_led_state_t, color, led_color_fields), CYAML_FIELD_END};
-static const cyaml_schema_field_t led_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_led_entry_t, return_values, led_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_led_entry_t, properties,
-							led_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_led_entry_t, state, led_state_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_value_t led_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_led_entry_t, led_entry_fields)};
+	CYAML_FIELD_MAPPING("Color", CYAML_FLAG_OPTIONAL, zes_led_state_t, color, zes_led_color_fields), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_led_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_led_state_t, zes_led_state_fields)};
 
-// ocDomains
-static const cyaml_schema_field_t oc_properties_fields[] = {
-	CYAML_FIELD_UINT("DomainType", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, domainType),
-	CYAML_FIELD_UINT("AvailableControls", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, AvailableControls),
-	CYAML_FIELD_UINT("VFProgramType", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, VFProgramType),
-	CYAML_FIELD_UINT("NumberOfVFPoints", CYAML_FLAG_OPTIONAL, zes_overclock_properties_t, NumberOfVFPoints),
+static const cyaml_schema_field_t sysman_led_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_led_t, return_values, sysman_led_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_led_t, properties,
+							zes_led_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_led_t, state, zes_led_state_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t oc_vf_properties_fields[] = {
-	CYAML_FIELD_FLOAT("MinFreq", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MinFreq),
-	CYAML_FIELD_FLOAT("MaxFreq", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MaxFreq),
-	CYAML_FIELD_FLOAT("StepFreq", CYAML_FLAG_OPTIONAL, zes_vf_property_t, StepFreq),
-	CYAML_FIELD_FLOAT("MinVolt", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MinVolt),
-	CYAML_FIELD_FLOAT("MaxVolt", CYAML_FLAG_OPTIONAL, zes_vf_property_t, MaxVolt),
-	CYAML_FIELD_FLOAT("StepVolt", CYAML_FLAG_OPTIONAL, zes_vf_property_t, StepVolt),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t oc_ctrl_properties_fields[] = {
-	CYAML_FIELD_FLOAT("MinValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, MinValue),
-	CYAML_FIELD_FLOAT("MaxValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, MaxValue),
-	CYAML_FIELD_FLOAT("StepValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, StepValue),
-	CYAML_FIELD_FLOAT("RefValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, RefValue),
-	CYAML_FIELD_FLOAT("DefaultValue", CYAML_FLAG_OPTIONAL, zes_control_property_t, DefaultValue),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t oc_control_info_fields[] = {
-	CYAML_FIELD_UINT("ControlType", CYAML_FLAG_OPTIONAL, sysman_oc_control_info_t, control_type),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, properties,
-							oc_ctrl_properties_fields),
-	CYAML_FIELD_FLOAT_PTR("CurrentValue", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, current_value),
-	CYAML_FIELD_FLOAT_PTR("PendingValue", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, pending_value),
-	CYAML_FIELD_UINT_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, state),
-	CYAML_FIELD_UINT_PTR("PendingAction", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_control_info_t, pending_action),
+static const cyaml_schema_value_t sysman_led_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_led_t, sysman_led_fields)};
+
+static const cyaml_schema_field_t zes_mem_properties_fields[] = {
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, type),
+	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, onSubdevice),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, subdeviceId),
+	CYAML_FIELD_UINT("Location", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, location),
+	CYAML_FIELD_UINT("PhysicalSize", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, physicalSize),
+	CYAML_FIELD_INT("BusWidth", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, busWidth),
+	CYAML_FIELD_INT("NumChannels", CYAML_FLAG_OPTIONAL, zes_mem_properties_t, numChannels),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t oc_control_info_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_oc_control_info_t, oc_control_info_fields)};
-static const cyaml_schema_field_t oc_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_oc_entry_t, return_values, oc_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_entry_t, properties,
-							oc_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("VFProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_oc_entry_t, vf_properties,
-							oc_vf_properties_fields),
-	CYAML_FIELD_SEQUENCE("ControlInfos", CYAML_FLAG_OPTIONAL | CYAML_FLAG_POINTER, sysman_oc_entry_t, control_infos,
-						 &oc_control_info_schema, 0, CYAML_UNLIMITED),
-	CYAML_FIELD_UINT("VfPointValue", CYAML_FLAG_OPTIONAL, sysman_oc_entry_t, vf_point_value),
+static const cyaml_schema_value_t zes_mem_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_mem_properties_t, zes_mem_properties_fields)};
+
+static const cyaml_schema_field_t zes_mem_state_fields[] = {
+	CYAML_FIELD_UINT("Health", CYAML_FLAG_OPTIONAL, zes_mem_state_t, health),
+	CYAML_FIELD_UINT("Free", CYAML_FLAG_OPTIONAL, zes_mem_state_t, free),
+	CYAML_FIELD_UINT("Size", CYAML_FLAG_OPTIONAL, zes_mem_state_t, size), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_mem_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_mem_state_t, zes_mem_state_fields)};
+
+static const cyaml_schema_field_t zes_mem_bandwidth_fields[] = {
+	CYAML_FIELD_UINT("ReadCounter", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, readCounter),
+	CYAML_FIELD_UINT("WriteCounter", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, writeCounter),
+	CYAML_FIELD_UINT("MaxBandwidth", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, maxBandwidth),
+	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_mem_bandwidth_t, timestamp), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_mem_bandwidth_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_mem_bandwidth_t, zes_mem_bandwidth_fields)};
+
+static const cyaml_schema_field_t sysman_mem_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_mem_t, return_values, sysman_mem_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_mem_t, properties,
+							zes_mem_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_mem_t, state, zes_mem_state_fields),
+	CYAML_FIELD_MAPPING_PTR("Bandwidth", SYSMAN_NULLABLE_PTR_FLAGS, sysman_mem_t, bandwidth, zes_mem_bandwidth_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t oc_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_oc_entry_t, oc_entry_fields)};
+static const cyaml_schema_value_t sysman_mem_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_mem_t, sysman_mem_fields)};
 
-// performance
-static const cyaml_schema_field_t perf_properties_fields[] = {
+static const cyaml_schema_field_t zes_perf_properties_fields[] = {
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_perf_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_perf_properties_t, subdeviceId),
 	CYAML_FIELD_UINT("Engines", CYAML_FLAG_OPTIONAL, zes_perf_properties_t, engines), CYAML_FIELD_END};
-static const cyaml_schema_field_t perf_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_perf_entry_t, return_values, perf_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_perf_entry_t, properties,
-							perf_properties_fields),
-	CYAML_FIELD_FLOAT("Config", CYAML_FLAG_OPTIONAL, sysman_perf_entry_t, config), CYAML_FIELD_END};
-static const cyaml_schema_value_t perf_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_perf_entry_t, perf_entry_fields)};
-
-// PSUs
-static const cyaml_schema_field_t psu_properties_fields[] = {
+static const cyaml_schema_value_t zes_perf_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_perf_properties_t, zes_perf_properties_fields)};
+
+static const cyaml_schema_field_t sysman_perf_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_perf_t, return_values, sysman_perf_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_perf_t, properties,
+							zes_perf_properties_fields),
+	CYAML_FIELD_FLOAT("Config", CYAML_FLAG_OPTIONAL, sysman_perf_t, config), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_perf_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_perf_t, sysman_perf_fields)};
+
+static const cyaml_schema_field_t zes_power_limit_ext_desc_fields[] = {
+	CYAML_FIELD_UINT("Level", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, level),
+	CYAML_FIELD_UINT("Source", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, source),
+	CYAML_FIELD_UINT("LimitUnit", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, limitUnit),
+	CYAML_FIELD_BOOL("EnabledStateLocked", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, enabledStateLocked),
+	CYAML_FIELD_BOOL("Enabled", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, enabled),
+	CYAML_FIELD_BOOL("IntervalValueLocked", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, intervalValueLocked),
+	CYAML_FIELD_INT("Interval", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, interval),
+	CYAML_FIELD_BOOL("LimitValueLocked", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, limitValueLocked),
+	CYAML_FIELD_INT("Limit", CYAML_FLAG_OPTIONAL, zes_power_limit_ext_desc_t, limit),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_power_limit_ext_desc_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_power_limit_ext_desc_t, zes_power_limit_ext_desc_fields)};
+
+static const cyaml_schema_field_t sysman_power_ext_properties_fields[] = {
+	CYAML_FIELD_UINT("Domain", CYAML_FLAG_OPTIONAL, sysman_power_ext_properties_t, domain),
+	CYAML_FIELD_MAPPING("DefaultLimit", CYAML_FLAG_OPTIONAL, sysman_power_ext_properties_t, default_limit,
+						zes_power_limit_ext_desc_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_power_ext_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_power_ext_properties_t, sysman_power_ext_properties_fields)};
+
+static const cyaml_schema_field_t sysman_power_properties_info_fields[] = {
+	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.onSubdevice),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.subdeviceId),
+	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.canControl),
+	CYAML_FIELD_BOOL("IsEnergyThresholdSupported", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t,
+					 base.isEnergyThresholdSupported),
+	CYAML_FIELD_INT("DefaultLimit", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.defaultLimit),
+	CYAML_FIELD_INT("MinLimit", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.minLimit),
+	CYAML_FIELD_INT("MaxLimit", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, base.maxLimit),
+	CYAML_FIELD_MAPPING("ExtendedProperties", CYAML_FLAG_OPTIONAL, sysman_power_properties_info_t, extended_properties,
+						sysman_power_ext_properties_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_power_properties_info_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_power_properties_info_t, sysman_power_properties_info_fields)};
+
+static const cyaml_schema_field_t zes_power_energy_counter_fields[] = {
+	CYAML_FIELD_UINT("Energy", CYAML_FLAG_OPTIONAL, zes_power_energy_counter_t, energy),
+	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_power_energy_counter_t, timestamp), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_power_energy_counter_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_power_energy_counter_t, zes_power_energy_counter_fields)};
+
+static const cyaml_schema_field_t zes_energy_threshold_fields[] = {
+	CYAML_FIELD_BOOL("Enable", CYAML_FLAG_OPTIONAL, zes_energy_threshold_t, enable),
+	CYAML_FIELD_FLOAT("Threshold", CYAML_FLAG_OPTIONAL, zes_energy_threshold_t, threshold),
+	CYAML_FIELD_UINT("ProcessId", CYAML_FLAG_OPTIONAL, zes_energy_threshold_t, processId), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_energy_threshold_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_energy_threshold_t, zes_energy_threshold_fields)};
+
+static const cyaml_schema_field_t sysman_power_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_power_t, return_values, sysman_power_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_t, properties,
+							sysman_power_properties_info_fields),
+	CYAML_FIELD_MAPPING_PTR("EnergyCounter", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_t, energy_counter,
+							zes_power_energy_counter_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("Limits", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_t, limits, limits_count,
+							   &zes_power_limit_ext_desc_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_MAPPING_PTR("EnergyThreshold", SYSMAN_NULLABLE_PTR_FLAGS, sysman_power_t, energy_threshold,
+							zes_energy_threshold_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_power_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_power_t, sysman_power_fields)};
+
+static const cyaml_schema_field_t zes_psu_properties_fields[] = {
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_psu_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_psu_properties_t, subdeviceId),
 	CYAML_FIELD_BOOL("HaveFan", CYAML_FLAG_OPTIONAL, zes_psu_properties_t, haveFan),
 	CYAML_FIELD_INT("AmpLimit", CYAML_FLAG_OPTIONAL, zes_psu_properties_t, ampLimit), CYAML_FIELD_END};
-static const cyaml_schema_field_t psu_state_fields[] = {
+static const cyaml_schema_value_t zes_psu_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_psu_properties_t, zes_psu_properties_fields)};
+
+static const cyaml_schema_field_t zes_psu_state_fields[] = {
 	CYAML_FIELD_UINT("VoltStatus", CYAML_FLAG_OPTIONAL, zes_psu_state_t, voltStatus),
 	CYAML_FIELD_BOOL("FanFailed", CYAML_FLAG_OPTIONAL, zes_psu_state_t, fanFailed),
 	CYAML_FIELD_INT("Temperature", CYAML_FLAG_OPTIONAL, zes_psu_state_t, temperature),
 	CYAML_FIELD_INT("Current", CYAML_FLAG_OPTIONAL, zes_psu_state_t, current), CYAML_FIELD_END};
-static const cyaml_schema_field_t psu_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_psu_entry_t, return_values, psu_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_psu_entry_t, properties,
-							psu_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_psu_entry_t, state, psu_state_fields),
+static const cyaml_schema_value_t zes_psu_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_psu_state_t, zes_psu_state_fields)};
+
+static const cyaml_schema_field_t sysman_psu_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_psu_t, return_values, sysman_psu_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_psu_t, properties,
+							zes_psu_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_psu_t, state, zes_psu_state_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t psu_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_psu_entry_t, psu_entry_fields)};
+static const cyaml_schema_value_t sysman_psu_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_psu_t, sysman_psu_fields)};
 
-// RAS
-static const cyaml_schema_value_t uint64_schema = {CYAML_VALUE_UINT(CYAML_FLAG_DEFAULT, uint64_t)};
-static const cyaml_schema_field_t ras_properties_fields[] = {
+static const cyaml_schema_field_t zes_ras_properties_fields[] = {
 	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_ras_properties_t, type),
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_ras_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_ras_properties_t, subdeviceId), CYAML_FIELD_END};
-static const cyaml_schema_field_t ras_state_fields[] = {
+static const cyaml_schema_value_t zes_ras_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_ras_properties_t, zes_ras_properties_fields)};
+
+static const cyaml_schema_field_t zes_ras_state_fields[] = {
 	CYAML_FIELD_SEQUENCE_FIXED("Category", CYAML_FLAG_OPTIONAL, zes_ras_state_t, category, &uint64_schema,
 							   ZES_MAX_RAS_ERROR_CATEGORY_COUNT),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t ras_config_fields[] = {
+static const cyaml_schema_value_t zes_ras_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_ras_state_t, zes_ras_state_fields)};
+
+static const cyaml_schema_field_t zes_ras_config_fields[] = {
 	CYAML_FIELD_UINT("TotalThreshold", CYAML_FLAG_OPTIONAL, zes_ras_config_t, totalThreshold),
 	CYAML_FIELD_MAPPING("DetailedThresholds", CYAML_FLAG_OPTIONAL, zes_ras_config_t, detailedThresholds,
-						ras_state_fields),
+						zes_ras_state_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_field_t ras_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_ras_entry_t, return_values, ras_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_entry_t, properties,
-							ras_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_entry_t, config, ras_config_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_entry_t, state, ras_state_fields),
+static const cyaml_schema_value_t zes_ras_config_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_ras_config_t, zes_ras_config_fields)};
+
+static const cyaml_schema_field_t zes_ras_state_exp_fields[] = {
+	CYAML_FIELD_UINT("Category", CYAML_FLAG_OPTIONAL, zes_ras_state_exp_t, category),
+	CYAML_FIELD_UINT("ErrorCounter", CYAML_FLAG_OPTIONAL, zes_ras_state_exp_t, errorCounter), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_ras_state_exp_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_ras_state_exp_t, zes_ras_state_exp_fields)};
+
+static const cyaml_schema_field_t sysman_ras_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_ras_t, return_values, sysman_ras_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_t, properties,
+							zes_ras_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_t, config, zes_ras_config_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_t, state, zes_ras_state_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("StateExp", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ras_t, state_exp, state_exp_count,
+							   &zes_ras_state_exp_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_ras_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_ras_t, sysman_ras_fields)};
+
+static const cyaml_schema_field_t zes_sched_properties_fields[] = {
+	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, onSubdevice),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, subdeviceId),
+	CYAML_FIELD_BOOL("CanControl", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, canControl),
+	CYAML_FIELD_UINT("Engines", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, engines),
+	CYAML_FIELD_UINT("SupportedModes", CYAML_FLAG_OPTIONAL, zes_sched_properties_t, supportedModes),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t ras_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_ras_entry_t, ras_entry_fields)};
+static const cyaml_schema_value_t zes_sched_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_sched_properties_t, zes_sched_properties_fields)};
 
-// standbys
-static const cyaml_schema_field_t standby_properties_fields[] = {
+static const cyaml_schema_field_t zes_sched_timeout_properties_fields[] = {
+	CYAML_FIELD_UINT("WatchdogTimeout", CYAML_FLAG_OPTIONAL, zes_sched_timeout_properties_t, watchdogTimeout),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_sched_timeout_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_sched_timeout_properties_t, zes_sched_timeout_properties_fields)};
+
+static const cyaml_schema_field_t zes_sched_timeslice_properties_fields[] = {
+	CYAML_FIELD_UINT("Interval", CYAML_FLAG_OPTIONAL, zes_sched_timeslice_properties_t, interval),
+	CYAML_FIELD_UINT("YieldTimeout", CYAML_FLAG_OPTIONAL, zes_sched_timeslice_properties_t, yieldTimeout),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_sched_timeslice_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_sched_timeslice_properties_t, zes_sched_timeslice_properties_fields)};
+
+static const cyaml_schema_field_t sysman_sched_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_sched_t, return_values, sysman_sched_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_sched_t, properties,
+							zes_sched_properties_fields),
+	CYAML_FIELD_UINT("CurrentMode", CYAML_FLAG_OPTIONAL, sysman_sched_t, current_mode),
+	CYAML_FIELD_MAPPING_PTR("TimeoutModeProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_sched_t, timeout_mode_properties,
+							zes_sched_timeout_properties_fields),
+	CYAML_FIELD_MAPPING_PTR("TimesliceModeProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_sched_t,
+							timeslice_mode_properties, zes_sched_timeslice_properties_fields),
+	CYAML_FIELD_BOOL("NeedReload", CYAML_FLAG_OPTIONAL, sysman_sched_t, need_reload),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_sched_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_sched_t, sysman_sched_fields)};
+
+static const cyaml_schema_field_t zes_standby_properties_fields[] = {
 	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_standby_properties_t, type),
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_standby_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_standby_properties_t, subdeviceId), CYAML_FIELD_END};
-static const cyaml_schema_field_t standby_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_standby_entry_t, return_values, standby_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_standby_entry_t, properties,
-							standby_properties_fields),
-	CYAML_FIELD_UINT("Mode", CYAML_FLAG_OPTIONAL, sysman_standby_entry_t, mode), CYAML_FIELD_END};
-static const cyaml_schema_value_t standby_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_standby_entry_t, standby_entry_fields)};
-
-// diagnostics
-static const cyaml_schema_field_t diag_properties_fields[] = {
+static const cyaml_schema_value_t zes_standby_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_standby_properties_t, zes_standby_properties_fields)};
+
+static const cyaml_schema_field_t sysman_standby_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_standby_t, return_values, sysman_standby_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_standby_t, properties,
+							zes_standby_properties_fields),
+	CYAML_FIELD_UINT("Mode", CYAML_FLAG_OPTIONAL, sysman_standby_t, mode), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_standby_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_standby_t, sysman_standby_fields)};
+
+static const cyaml_schema_field_t zes_temp_properties_fields[] = {
+	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, type),
+	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, onSubdevice),
+	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, subdeviceId),
+	CYAML_FIELD_FLOAT("MaxTemperature", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, maxTemperature),
+	CYAML_FIELD_BOOL("IsCriticalTempSupported", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, isCriticalTempSupported),
+	CYAML_FIELD_BOOL("IsThreshold1Supported", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, isThreshold1Supported),
+	CYAML_FIELD_BOOL("IsThreshold2Supported", CYAML_FLAG_OPTIONAL, zes_temp_properties_t, isThreshold2Supported),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_temp_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_temp_properties_t, zes_temp_properties_fields)};
+
+static const cyaml_schema_field_t zes_temp_threshold_fields[] = {
+	CYAML_FIELD_BOOL("EnableLowToHigh", CYAML_FLAG_OPTIONAL, zes_temp_threshold_t, enableLowToHigh),
+	CYAML_FIELD_BOOL("EnableHighToLow", CYAML_FLAG_OPTIONAL, zes_temp_threshold_t, enableHighToLow),
+	CYAML_FIELD_FLOAT("Threshold", CYAML_FLAG_OPTIONAL, zes_temp_threshold_t, threshold), CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_temp_threshold_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_temp_threshold_t, zes_temp_threshold_fields)};
+
+static const cyaml_schema_field_t zes_temp_config_fields[] = {
+	CYAML_FIELD_BOOL("EnableCritical", CYAML_FLAG_OPTIONAL, zes_temp_config_t, enableCritical),
+	CYAML_FIELD_MAPPING("Threshold1", CYAML_FLAG_OPTIONAL, zes_temp_config_t, threshold1, zes_temp_threshold_fields),
+	CYAML_FIELD_MAPPING("Threshold2", CYAML_FLAG_OPTIONAL, zes_temp_config_t, threshold2, zes_temp_threshold_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t zes_temp_config_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_temp_config_t, zes_temp_config_fields)};
+
+static const cyaml_schema_field_t sysman_temp_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_temp_t, return_values, sysman_temp_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_temp_t, properties,
+							zes_temp_properties_fields),
+	CYAML_FIELD_FLOAT("Temperature", CYAML_FLAG_OPTIONAL, sysman_temp_t, temperature),
+	CYAML_FIELD_MAPPING_PTR("Config", SYSMAN_NULLABLE_PTR_FLAGS, sysman_temp_t, config, zes_temp_config_fields),
+	CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_temp_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_temp_t, sysman_temp_fields)};
+
+static const cyaml_schema_field_t zes_diag_properties_fields[] = {
 	CYAML_FIELD_BOOL("OnSubdevice", CYAML_FLAG_OPTIONAL, zes_diag_properties_t, onSubdevice),
 	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, zes_diag_properties_t, subdeviceId),
 	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, zes_diag_properties_t, name, 0),
 	CYAML_FIELD_BOOL("HaveTests", CYAML_FLAG_OPTIONAL, zes_diag_properties_t, haveTests), CYAML_FIELD_END};
-static const cyaml_schema_field_t diag_test_fields[] = {
+static const cyaml_schema_value_t zes_diag_properties_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_diag_properties_t, zes_diag_properties_fields)};
+
+static const cyaml_schema_field_t zes_diag_test_fields[] = {
 	CYAML_FIELD_UINT("Index", CYAML_FLAG_OPTIONAL, zes_diag_test_t, index),
 	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, zes_diag_test_t, name, 0), CYAML_FIELD_END};
-static const cyaml_schema_value_t diag_test_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_diag_test_t, diag_test_fields)};
-static const cyaml_schema_field_t diag_entry_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_diag_entry_t, return_values, diag_rv_fields),
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_diag_entry_t, properties,
-							diag_properties_fields),
-	CYAML_FIELD_SEQUENCE_COUNT("Tests", SYSMAN_NULLABLE_PTR_FLAGS, sysman_diag_entry_t, tests, test_count,
-							   &diag_test_schema, 0, CYAML_UNLIMITED),
-	CYAML_FIELD_UINT("Result", CYAML_FLAG_OPTIONAL, sysman_diag_entry_t, result), CYAML_FIELD_END};
-static const cyaml_schema_value_t diag_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_diag_entry_t, diag_entry_fields)};
-
-// pci_bars
-static const cyaml_schema_field_t pci_bar_fields[] = {
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, type),
-	CYAML_FIELD_UINT("Index", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, index),
-	CYAML_FIELD_UINT("Base", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, base),
-	CYAML_FIELD_UINT("Size", CYAML_FLAG_OPTIONAL, zes_pci_bar_properties_t, size), CYAML_FIELD_END};
-static const cyaml_schema_value_t pci_bar_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_pci_bar_properties_t, pci_bar_fields)};
+static const cyaml_schema_value_t zes_diag_test_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_diag_test_t, zes_diag_test_fields)};
 
-// processes
-static const cyaml_schema_field_t process_fields[] = {
-	CYAML_FIELD_UINT("ProcessId", CYAML_FLAG_OPTIONAL, zes_process_state_t, processId),
-	CYAML_FIELD_UINT("MemSize", CYAML_FLAG_OPTIONAL, zes_process_state_t, memSize),
-	CYAML_FIELD_UINT("SharedSize", CYAML_FLAG_OPTIONAL, zes_process_state_t, sharedSize),
-	CYAML_FIELD_UINT("Engines", CYAML_FLAG_OPTIONAL, zes_process_state_t, engines), CYAML_FIELD_END};
-static const cyaml_schema_value_t process_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_process_state_t, process_fields)};
-
-// device fields schema.
-#define DEV_SEQ(_k, T, entry_schema, entries_member, count_member)                                                     \
-	{.key = (_k),                                                                                                      \
-	 .value = {.type = CYAML_SEQUENCE,                                                                                 \
-			   .flags = SYSMAN_NULLABLE_PTR_FLAGS,                                                                     \
-			   .data_size = sizeof(T),                                                                                 \
-			   .sequence = {.entry = &(entry_schema), .min = 0, .max = CYAML_UNLIMITED}},                              \
-	 .data_offset = offsetof(sysman_device_state_t, entries_member),                                                   \
-	 .count_offset = offsetof(sysman_device_state_t, count_member),                                                    \
-	 .count_size = sizeof(uint32_t)}
-
-static const cyaml_schema_field_t uuid_fields[] = {CYAML_FIELD_STRING("Id", CYAML_FLAG_OPTIONAL, sysman_uuid_t, id, 0),
-												   CYAML_FIELD_END};
-static const cyaml_schema_field_t device_core_fields[] = {
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.type),
-	CYAML_FIELD_UINT("VendorId", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.vendorId),
-	CYAML_FIELD_UINT("DeviceId", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.deviceId),
-	CYAML_FIELD_UINT("Flags", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.flags),
-	CYAML_FIELD_UINT("SubdeviceId", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.subdeviceId),
-	CYAML_FIELD_UINT("CoreClockRate", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.coreClockRate),
-	CYAML_FIELD_UINT("MaxMemAllocSize", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.maxMemAllocSize),
-	CYAML_FIELD_UINT("MaxHardwareContexts", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
-					 ze.maxHardwareContexts),
-	CYAML_FIELD_UINT("MaxCommandQueuePriority", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
-					 ze.maxCommandQueuePriority),
-	CYAML_FIELD_UINT("NumThreadsPerEU", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.numThreadsPerEU),
-	CYAML_FIELD_UINT("PhysicalEUSimdWidth", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
-					 ze.physicalEUSimdWidth),
-	CYAML_FIELD_UINT("NumEUsPerSubslice", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.numEUsPerSubslice),
-	CYAML_FIELD_UINT("NumSubslicesPerSlice", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
-					 ze.numSubslicesPerSlice),
-	CYAML_FIELD_UINT("NumSlices", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.numSlices),
-	CYAML_FIELD_UINT("TimerResolution", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.timerResolution),
-	CYAML_FIELD_UINT("TimestampValidBits", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.timestampValidBits),
-	CYAML_FIELD_UINT("KernelTimestampValidBits", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t,
-					 ze.kernelTimestampValidBits),
-	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, ze.name, 0),
-	CYAML_FIELD_MAPPING("Uuid", CYAML_FLAG_OPTIONAL, sysman_device_core_properties_t, uuid, uuid_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t device_properties_fields[] = {
-	CYAML_FIELD_MAPPING("Core", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, core, device_core_fields),
-	CYAML_FIELD_UINT("NumSubdevices", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.numSubdevices),
-	CYAML_FIELD_STRING("SerialNumber", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.serialNumber, 0),
-	CYAML_FIELD_STRING("BoardNumber", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.boardNumber, 0),
-	CYAML_FIELD_STRING("BrandName", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.brandName, 0),
-	CYAML_FIELD_STRING("ModelName", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.modelName, 0),
-	CYAML_FIELD_STRING("VendorName", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.vendorName, 0),
-	CYAML_FIELD_STRING("DriverVersion", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, base.driverVersion, 0),
-	CYAML_FIELD_UINT("Type", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, extended_properties.type),
-	CYAML_FIELD_UINT("Flags", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, extended_properties.flags),
-	CYAML_FIELD_MAPPING("Uuid", CYAML_FLAG_OPTIONAL, sysman_device_properties_info_t, uuid, uuid_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t device_state_fields[] = {
-	CYAML_FIELD_UINT("Reset", CYAML_FLAG_OPTIONAL, zes_device_state_t, reset),
-	CYAML_FIELD_UINT("Repaired", CYAML_FLAG_OPTIONAL, zes_device_state_t, repaired), CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_address_fields[] = {
-	CYAML_FIELD_UINT("Domain", CYAML_FLAG_OPTIONAL, zes_pci_address_t, domain),
-	CYAML_FIELD_UINT("Bus", CYAML_FLAG_OPTIONAL, zes_pci_address_t, bus),
-	CYAML_FIELD_UINT("Device", CYAML_FLAG_OPTIONAL, zes_pci_address_t, device),
-	CYAML_FIELD_UINT("Function", CYAML_FLAG_OPTIONAL, zes_pci_address_t, function), CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_speed_fields[] = {
-	CYAML_FIELD_INT("Gen", CYAML_FLAG_OPTIONAL, zes_pci_speed_t, gen),
-	CYAML_FIELD_INT("Width", CYAML_FLAG_OPTIONAL, zes_pci_speed_t, width),
-	CYAML_FIELD_INT("MaxBandwidth", CYAML_FLAG_OPTIONAL, zes_pci_speed_t, maxBandwidth), CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_link_speed_downgrade_ext_properties_fields[] = {
-	CYAML_FIELD_BOOL("PciLinkSpeedUpdateCapable", CYAML_FLAG_OPTIONAL,
-					 zes_pci_link_speed_downgrade_ext_properties_t, pciLinkSpeedUpdateCapable),
-	CYAML_FIELD_INT("MaxPciGenSupported", CYAML_FLAG_OPTIONAL,
-					zes_pci_link_speed_downgrade_ext_properties_t, maxPciGenSupported),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_link_speed_downgrade_ext_state_fields[] = {
-	CYAML_FIELD_BOOL("PciLinkSpeedDowngradeStatus", CYAML_FLAG_OPTIONAL,
-					 zes_pci_link_speed_downgrade_ext_state_t, pciLinkSpeedDowngradeStatus),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_properties_schema_fields[] = {
-	CYAML_FIELD_MAPPING("Address", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.address, pci_address_fields),
-	CYAML_FIELD_MAPPING("MaxSpeed", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.maxSpeed, pci_speed_fields),
-	CYAML_FIELD_BOOL("HaveBandwidthCounters", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.haveBandwidthCounters),
-	CYAML_FIELD_BOOL("HavePacketCounters", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.havePacketCounters),
-	CYAML_FIELD_BOOL("HaveReplayCounters", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, base.haveReplayCounters),
-	CYAML_FIELD_MAPPING("LinkSpeedDowngrade", CYAML_FLAG_OPTIONAL, sysman_pci_properties_info_t, link_speed_downgrade,
-						pci_link_speed_downgrade_ext_properties_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_state_schema_fields[] = {
-	CYAML_FIELD_UINT("Status", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.status),
-	CYAML_FIELD_UINT("QualityIssues", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.qualityIssues),
-	CYAML_FIELD_UINT("StabilityIssues", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.stabilityIssues),
-	CYAML_FIELD_MAPPING("Speed", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, base.speed, pci_speed_fields),
-	CYAML_FIELD_MAPPING("LinkSpeedDowngrade", CYAML_FLAG_OPTIONAL, sysman_pci_state_info_t, link_speed_downgrade,
-						pci_link_speed_downgrade_ext_state_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_stats_schema_fields[] = {
-	CYAML_FIELD_UINT("ReplayCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, replayCounter),
-	CYAML_FIELD_UINT("PacketCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, packetCounter),
-	CYAML_FIELD_UINT("RxCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, rxCounter),
-	CYAML_FIELD_UINT("TxCounter", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, txCounter),
-	CYAML_FIELD_UINT("Timestamp", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, timestamp),
-	CYAML_FIELD_MAPPING("Speed", CYAML_FLAG_OPTIONAL, zes_pci_stats_t, speed, pci_speed_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t ecc_ext_properties_fields[] = {
-	CYAML_FIELD_UINT("DefaultState", CYAML_FLAG_OPTIONAL, zes_device_ecc_default_properties_ext_t, defaultState),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t ecc_state_info_fields[] = {
-	CYAML_FIELD_UINT("CurrentState", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, properties.currentState),
-	CYAML_FIELD_UINT("PendingState", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, properties.pendingState),
-	CYAML_FIELD_UINT("PendingAction", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, properties.pendingAction),
-	CYAML_FIELD_MAPPING("ExtendedProperties", CYAML_FLAG_OPTIONAL, sysman_ecc_state_info_t, extended_properties,
-						ecc_ext_properties_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t ecc_info_fields[] = {
-	CYAML_FIELD_BOOL("Available", CYAML_FLAG_OPTIONAL, sysman_ecc_info_t, available),
-	CYAML_FIELD_BOOL("Configurable", CYAML_FLAG_OPTIONAL, sysman_ecc_info_t, configurable),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_ecc_info_t, state, ecc_state_info_fields),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t pci_info_fields[] = {
-	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, properties,
-							pci_properties_schema_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, state, pci_state_schema_fields),
-	CYAML_FIELD_SEQUENCE("Bars", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, bars, &pci_bar_schema, 0,
-						 CYAML_UNLIMITED),
-	CYAML_FIELD_MAPPING_PTR("Stats", SYSMAN_NULLABLE_PTR_FLAGS, sysman_pci_info_t, stats, pci_stats_schema_fields),
-	CYAML_FIELD_UINT("PciLinkSpeedUpdatePendingAction", CYAML_FLAG_OPTIONAL, sysman_pci_info_t,
-					 pci_link_speed_update_pending_action),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t overclock_state_info_fields[] = {
-	CYAML_FIELD_UINT("Mode", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, mode),
-	CYAML_FIELD_BOOL("WaiverSetting", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, waiver_setting),
-	CYAML_FIELD_BOOL("State", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, state),
-	CYAML_FIELD_UINT("PendingAction", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, pending_action),
-	CYAML_FIELD_BOOL("PendingReset", CYAML_FLAG_OPTIONAL, sysman_overclock_state_info_t, pending_reset),
-	CYAML_FIELD_END};
-static const cyaml_schema_field_t oc_controls_entry_fields[] = {
-	CYAML_FIELD_UINT("DomainType", CYAML_FLAG_OPTIONAL, sysman_oc_controls_entry_t, domain_type),
-	CYAML_FIELD_UINT("ControlsBitmask", CYAML_FLAG_OPTIONAL, sysman_oc_controls_entry_t, controls_bitmask),
-	CYAML_FIELD_END};
-static const cyaml_schema_value_t oc_controls_entry_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_oc_controls_entry_t, oc_controls_entry_fields)};
-static const cyaml_schema_field_t overclock_info_fields[] = {
-	CYAML_FIELD_UINT("DomainsBitmask", CYAML_FLAG_OPTIONAL, sysman_overclock_info_t, domains_bitmask),
-	CYAML_FIELD_SEQUENCE("Controls", CYAML_FLAG_OPTIONAL | CYAML_FLAG_POINTER, sysman_overclock_info_t, controls,
-						 &oc_controls_entry_schema, 0, CYAML_UNLIMITED),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_overclock_info_t, state,
-							overclock_state_info_fields),
-	CYAML_FIELD_SEQUENCE("Domains", SYSMAN_NULLABLE_PTR_FLAGS, sysman_overclock_info_t, domains, &oc_entry_schema, 0,
-						 CYAML_UNLIMITED),
-	CYAML_FIELD_END};
+static const cyaml_schema_field_t sysman_diag_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_diag_t, return_values, sysman_diag_rv_fields),
+	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_diag_t, properties,
+							zes_diag_properties_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("Tests", SYSMAN_NULLABLE_PTR_FLAGS, sysman_diag_t, tests, tests_count,
+							   &zes_diag_test_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_UINT("Result", CYAML_FLAG_OPTIONAL, sysman_diag_t, result), CYAML_FIELD_END};
+static const cyaml_schema_value_t sysman_diag_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_diag_t, sysman_diag_fields)};
 
-static const cyaml_schema_field_t device_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_device_state_t, return_values, device_rv_fields),
+static const cyaml_schema_field_t sysman_device_state_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_device_state_t, return_values,
+						sysman_device_rv_fields),
 	CYAML_FIELD_SEQUENCE_COUNT("UnsupportedFeatures", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t,
-							   unsupported_features, unsupported_features_count, &device_unsupported_enum_schema, 0,
+							   unsupported_features, unsupported_features_count, &sysman_unsupported_feature_schema, 0,
 							   CYAML_UNLIMITED),
 	CYAML_FIELD_MAPPING_PTR("Properties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, properties,
-							device_properties_fields),
-	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, state, device_state_fields),
-	CYAML_FIELD_MAPPING("PCI", CYAML_FLAG_OPTIONAL, sysman_device_state_t, pci, pci_info_fields),
-	CYAML_FIELD_MAPPING_PTR("ECC", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, ecc, ecc_info_fields),
-	DEV_SEQ("EngineGroups", sysman_engine_entry_t, engine_entry_schema, engine_groups.entries, engine_groups.count),
-	DEV_SEQ("FabricPorts", sysman_fabric_port_entry_t, fabric_port_entry_schema, fabric_ports.entries,
-			fabric_ports.count),
-	DEV_SEQ("Fans", sysman_fan_entry_t, fan_entry_schema, fans.entries, fans.count),
-	DEV_SEQ("Firmwares", sysman_firmware_entry_t, firmware_entry_schema, firmwares.entries, firmwares.count),
-	DEV_SEQ("Leds", sysman_led_entry_t, led_entry_schema, leds.entries, leds.count),
+							sysman_device_properties_info_fields),
+	CYAML_FIELD_MAPPING_PTR("State", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, state, zes_device_state_fields),
+	CYAML_FIELD_MAPPING("PCI", CYAML_FLAG_OPTIONAL, sysman_device_state_t, pci, sysman_pci_info_fields),
+	CYAML_FIELD_MAPPING_PTR("ECC", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, ecc, sysman_ecc_info_fields),
 	CYAML_FIELD_MAPPING_PTR("Overclock", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, overclock,
-							overclock_info_fields),
-	DEV_SEQ("PowerDomains", sysman_power_entry_t, power_entry_schema, power_domains.entries, power_domains.count),
-	DEV_SEQ("Psus", sysman_psu_entry_t, psu_entry_schema, psus.entries, psus.count),
-	DEV_SEQ("RasErrorSets", sysman_ras_entry_t, ras_entry_schema, ras_error_sets.entries, ras_error_sets.count),
-	DEV_SEQ("Processes", zes_process_state_t, process_schema, processes, processes_count),
-	DEV_SEQ("FrequencyDomains", sysman_freq_entry_t, freq_entry_schema, frequency_domains.entries,
-			frequency_domains.count),
-	DEV_SEQ("MemoryModules", sysman_mem_entry_t, mem_entry_schema, memory_modules.entries, memory_modules.count),
-	DEV_SEQ("Schedulers", sysman_sched_entry_t, sched_entry_schema, schedulers.entries, schedulers.count),
-	DEV_SEQ("TemperatureSensors", sysman_temp_entry_t, temp_entry_schema, temperature_sensors.entries,
-			temperature_sensors.count),
-	DEV_SEQ("StandbyDomains", sysman_standby_entry_t, standby_entry_schema, standby_domains.entries,
-			standby_domains.count),
-	DEV_SEQ("Diagnostics", sysman_diag_entry_t, diag_entry_schema, diagnostics.entries, diagnostics.count),
-	DEV_SEQ("PerformanceDomains", sysman_perf_entry_t, perf_entry_schema, performance_domains.entries,
-			performance_domains.count),
+							sysman_overclock_info_fields),
+	CYAML_FIELD_SEQUENCE_COUNT("Processes", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, processes,
+							   processes_count, &zes_process_state_schema, 0, CYAML_UNLIMITED),
 	CYAML_FIELD_UINT("Events", CYAML_FLAG_OPTIONAL, sysman_device_state_t, events),
+	CYAML_FIELD_SEQUENCE_COUNT("EngineGroups", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, engine_groups,
+							   engine_groups_count, &sysman_engine_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("FabricPorts", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, fabric_ports,
+							   fabric_ports_count, &sysman_fabric_port_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Fans", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, fans, fans_count,
+							   &sysman_fan_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Firmwares", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, firmwares,
+							   firmwares_count, &sysman_firmware_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("FrequencyDomains", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, frequency_domains,
+							   frequency_domains_count, &sysman_freq_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Leds", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, leds, leds_count,
+							   &sysman_led_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("MemoryModules", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, memory_modules,
+							   memory_modules_count, &sysman_mem_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("PerformanceDomains", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t,
+							   performance_domains, performance_domains_count, &sysman_perf_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("PowerDomains", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, power_domains,
+							   power_domains_count, &sysman_power_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Psus", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, psus, psus_count,
+							   &sysman_psu_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("RasErrorSets", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, ras_error_sets,
+							   ras_error_sets_count, &sysman_ras_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Schedulers", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, schedulers,
+							   schedulers_count, &sysman_sched_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("StandbyDomains", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, standby_domains,
+							   standby_domains_count, &sysman_standby_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("TemperatureSensors", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t,
+							   temperature_sensors, temperature_sensors_count, &sysman_temp_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Diagnostics", SYSMAN_NULLABLE_PTR_FLAGS, sysman_device_state_t, diagnostics,
+							   diagnostics_count, &sysman_diag_schema, 0, CYAML_UNLIMITED),
 	CYAML_FIELD_END};
-#undef DEV_SEQ
-
-static const cyaml_schema_value_t device_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_device_state_t, device_fields)};
-
-static const cyaml_schema_field_t ext_properties_fields[] = {
-	CYAML_FIELD_STRING("Name", CYAML_FLAG_OPTIONAL, zes_driver_extension_properties_t, name, 0),
-	CYAML_FIELD_UINT("Version", CYAML_FLAG_OPTIONAL, zes_driver_extension_properties_t, version), CYAML_FIELD_END};
-static const cyaml_schema_value_t ext_properties_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, zes_driver_extension_properties_t, ext_properties_fields)};
+static const cyaml_schema_value_t sysman_device_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_device_state_t, sysman_device_state_fields)};
 
-static const cyaml_schema_field_t driver_fields[] = {
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_drivers_state_t, return_values, driver_rv_fields),
+static const cyaml_schema_field_t sysman_drivers_state_fields[] = {
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_drivers_state_t, return_values,
+						sysman_driver_rv_fields),
 	CYAML_FIELD_SEQUENCE_COUNT("UnsupportedFeatures", SYSMAN_NULLABLE_PTR_FLAGS, sysman_drivers_state_t,
-							   unsupported_features, unsupported_features_count, &driver_unsupported_enum_schema, 0,
+							   unsupported_features, unsupported_features_count, &sysman_unsupported_feature_schema, 0,
 							   CYAML_UNLIMITED),
-	CYAML_FIELD_SEQUENCE("ExtensionProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_drivers_state_t, extension_properties,
-						 &ext_properties_schema, 0, CYAML_UNLIMITED),
-	CYAML_FIELD_SEQUENCE("Devices", SYSMAN_NULLABLE_PTR_FLAGS, sysman_drivers_state_t, devices, &device_schema, 0,
-						 CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("ExtensionProperties", SYSMAN_NULLABLE_PTR_FLAGS, sysman_drivers_state_t,
+							   extension_properties, extension_properties_count,
+							   &zes_driver_extension_properties_schema, 0, CYAML_UNLIMITED),
+	CYAML_FIELD_SEQUENCE_COUNT("Devices", SYSMAN_NULLABLE_PTR_FLAGS, sysman_drivers_state_t, devices, devices_count,
+							   &sysman_device_state_schema, 0, CYAML_UNLIMITED),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t driver_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_drivers_state_t, driver_fields)};
+static const cyaml_schema_value_t sysman_drivers_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_DEFAULT, sysman_drivers_state_t, sysman_drivers_state_fields)};
 
-static const cyaml_schema_field_t state_fields[] = {
+static const cyaml_schema_field_t sysman_state_fields[] = {
 	{.key = "Drivers",
 	 .value = {.type = CYAML_SEQUENCE,
 			   .flags = SYSMAN_NULLABLE_PTR_FLAGS,
 			   .data_size = sizeof(sysman_drivers_state_t),
-			   .sequence = {.entry = &driver_schema, .min = 0, .max = CYAML_UNLIMITED}},
+			   .sequence = {.entry = &sysman_drivers_state_schema, .min = 0, .max = CYAML_UNLIMITED}},
 	 .data_offset = offsetof(sysman_state_t, system.drivers),
 	 .count_offset = offsetof(sysman_state_t, system.drivers_count),
 	 .count_size = sizeof(uint32_t)},
-	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_state_t, return_values, global_rv_fields),
+	CYAML_FIELD_MAPPING("ReturnValues", CYAML_FLAG_OPTIONAL, sysman_state_t, return_values, sysman_system_rv_fields),
 	CYAML_FIELD_END};
-static const cyaml_schema_value_t state_schema = {
-	CYAML_VALUE_MAPPING(CYAML_FLAG_POINTER, sysman_state_t, state_fields)};
+static const cyaml_schema_value_t sysman_state_schema = {
+	CYAML_VALUE_MAPPING(CYAML_FLAG_POINTER, sysman_state_t, sysman_state_fields)};
 
 #undef SYSMAN_NULLABLE_PTR_FLAGS
 
-#endif /* SYSMAN_STATE_CYAML_H */
+#endif /* SYSMAN_STATE_CYAML_H */
\ No newline at end of file
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/test_sysman.c b/xpumd/level-zero-go/level-zero-stub/test_sysman.c
similarity index 97%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/test_sysman.c
rename to xpumd/level-zero-go/level-zero-stub/test_sysman.c
index 396576179..b4630e1e9 100644
--- a/xpumd/receiver/internal/level-zero-go/level-zero-stub/test_sysman.c
+++ b/xpumd/level-zero-go/level-zero-stub/test_sysman.c
@@ -5,6 +5,7 @@
  */
 
 #include "zes_stub.h"
+#include "sysman_state.h"
 #include "../level-zero/zes_api.h"
 
 #include <limits.h>
@@ -46,6 +47,7 @@ static int g_fail = 0;
 #define YAML_NO_DRIVERS "testdata/no_drivers.yaml"
 #define YAML_ALL_COMPONENTS "testdata/all_components.yaml"
 #define YAML_INVALID_UUID "testdata/invalid_uuid.yaml"
+#define YAML_UNSUPPORTED_FEATURES "testdata/unsupported_features.yaml"
 
 // ------------------------------------------------------------------
 // Test cases
@@ -1050,6 +1052,8 @@ static void test_error_cases(void)
 	ASSERT_ZE_RET("zesRasGetConfig: NULL handle", zesRasGetConfig(bad_ras, NULL), ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	ASSERT_ZE_RET("zesRasSetConfig: NULL handle", zesRasSetConfig(bad_ras, NULL), ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	ASSERT_ZE_RET("zesRasGetState: NULL handle", zesRasGetState(bad_ras, 0, NULL), ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
+	ASSERT_ZE_RET("zesRasGetStateExp: NULL handle", zesRasGetStateExp(bad_ras, 0, NULL), ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
+	ASSERT_ZE_RET("zesRasClearStateExp: NULL handle", zesRasClearStateExp(bad_ras, 0), ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 
 	// Schedulers
 	{
@@ -1176,6 +1180,36 @@ static void test_uuid_invalid_load(void)
 	ASSERT("sysman_state_load fails on invalid UUID", sysman_state_load(YAML_INVALID_UUID) != 0);
 }
 
+// ------------------------------------------------------------------
+// UnsupportedFeatures
+// ------------------------------------------------------------------
+
+static void test_unsupported_features(void)
+{
+	printf("test_unsupported_features\n");
+
+	sysman_state_reset();
+	ASSERT("load unsupported_features.yaml", sysman_state_load(YAML_UNSUPPORTED_FEATURES) == 0);
+
+	sysman_state_lock();
+	sysman_drivers_state_t *drv = &g_sysman_state.system.drivers[0];
+	ASSERT("driver UnsupportedFeatures count", drv->unsupported_features_count == 2);
+	ASSERT("driver UnsupportedFeatures[0]",
+		   drv->unsupported_features[0] == UNSUPPORTED_FEATURE_DRIVER_DEVICE_GET);
+	ASSERT("driver UnsupportedFeatures[1]",
+		   drv->unsupported_features[1] == UNSUPPORTED_FEATURE_EVENT_LISTEN);
+
+	sysman_device_state_t *dev = &drv->devices[0];
+	ASSERT("device UnsupportedFeatures count", dev->unsupported_features_count == 2);
+	ASSERT("device UnsupportedFeatures[0]",
+		   dev->unsupported_features[0] == UNSUPPORTED_FEATURE_GET_STATE);
+	ASSERT("device UnsupportedFeatures[1]",
+		   dev->unsupported_features[1] == UNSUPPORTED_FEATURE_FANS);
+	sysman_state_unlock();
+
+	sysman_state_reset();
+}
+
 // ------------------------------------------------------------------
 // Main
 // ------------------------------------------------------------------
@@ -1197,6 +1231,7 @@ int main(void)
 	test_error_cases();
 	test_uuid();
 	test_uuid_invalid_load();
+	test_unsupported_features();
 
 	printf("\n%d passed, %d failed\n", g_pass, g_fail);
 	return g_fail ? 1 : 0;
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/all_components.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/all_components.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/all_components.yaml
rename to xpumd/level-zero-go/level-zero-stub/testdata/all_components.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/invalid_uuid.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/invalid_uuid.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/invalid_uuid.yaml
rename to xpumd/level-zero-go/level-zero-stub/testdata/invalid_uuid.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/no_devices.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/no_devices.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/no_devices.yaml
rename to xpumd/level-zero-go/level-zero-stub/testdata/no_devices.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/no_drivers.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/no_drivers.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/no_drivers.yaml
rename to xpumd/level-zero-go/level-zero-stub/testdata/no_drivers.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/one_device.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/one_device.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/one_device.yaml
rename to xpumd/level-zero-go/level-zero-stub/testdata/one_device.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/two_engines.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/two_engines.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/testdata/two_engines.yaml
rename to xpumd/level-zero-go/level-zero-stub/testdata/two_engines.yaml
diff --git a/xpumd/level-zero-go/level-zero-stub/testdata/unsupported_features.yaml b/xpumd/level-zero-go/level-zero-stub/testdata/unsupported_features.yaml
new file mode 100644
index 000000000..e7d719061
--- /dev/null
+++ b/xpumd/level-zero-go/level-zero-stub/testdata/unsupported_features.yaml
@@ -0,0 +1,8 @@
+Drivers:
+- UnsupportedFeatures:
+  - Driver.DeviceGet
+  - Driver.EventListen
+  Devices:
+  - UnsupportedFeatures:
+    - Device.GetState
+    - Fans
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/zes_stub.c b/xpumd/level-zero-go/level-zero-stub/zes_stub.c
similarity index 91%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/zes_stub.c
rename to xpumd/level-zero-go/level-zero-stub/zes_stub.c
index 669dfbe56..57387613c 100644
--- a/xpumd/receiver/internal/level-zero-go/level-zero-stub/zes_stub.c
+++ b/xpumd/level-zero-go/level-zero-stub/zes_stub.c
@@ -64,65 +64,65 @@ static void *resolve_handle(const void *zes_handle, stub_handle_type_t expected_
 			return NULL;
 		return &device->overclock->domains[handle.bits.comp];
 	case STUB_HANDLE_DIAG:
-		if (handle.bits.comp >= device->diagnostics.count)
+		if (handle.bits.comp >= device->diagnostics_count)
 			return NULL;
-		return &device->diagnostics.entries[handle.bits.comp];
+		return &device->diagnostics[handle.bits.comp];
 	case STUB_HANDLE_ENGINE:
-		if (handle.bits.comp >= device->engine_groups.count)
+		if (handle.bits.comp >= device->engine_groups_count)
 			return NULL;
-		return &device->engine_groups.entries[handle.bits.comp];
+		return &device->engine_groups[handle.bits.comp];
 	case STUB_HANDLE_FABRIC_PORT:
-		if (handle.bits.comp >= device->fabric_ports.count)
+		if (handle.bits.comp >= device->fabric_ports_count)
 			return NULL;
-		return &device->fabric_ports.entries[handle.bits.comp];
+		return &device->fabric_ports[handle.bits.comp];
 	case STUB_HANDLE_FAN:
-		if (handle.bits.comp >= device->fans.count)
+		if (handle.bits.comp >= device->fans_count)
 			return NULL;
-		return &device->fans.entries[handle.bits.comp];
+		return &device->fans[handle.bits.comp];
 	case STUB_HANDLE_FIRMWARE:
-		if (handle.bits.comp >= device->firmwares.count)
+		if (handle.bits.comp >= device->firmwares_count)
 			return NULL;
-		return &device->firmwares.entries[handle.bits.comp];
+		return &device->firmwares[handle.bits.comp];
 	case STUB_HANDLE_FREQ:
-		if (handle.bits.comp >= device->frequency_domains.count)
+		if (handle.bits.comp >= device->frequency_domains_count)
 			return NULL;
-		return &device->frequency_domains.entries[handle.bits.comp];
+		return &device->frequency_domains[handle.bits.comp];
 	case STUB_HANDLE_LED:
-		if (handle.bits.comp >= device->leds.count)
+		if (handle.bits.comp >= device->leds_count)
 			return NULL;
-		return &device->leds.entries[handle.bits.comp];
+		return &device->leds[handle.bits.comp];
 	case STUB_HANDLE_MEM:
-		if (handle.bits.comp >= device->memory_modules.count)
+		if (handle.bits.comp >= device->memory_modules_count)
 			return NULL;
-		return &device->memory_modules.entries[handle.bits.comp];
+		return &device->memory_modules[handle.bits.comp];
 	case STUB_HANDLE_PERF:
-		if (handle.bits.comp >= device->performance_domains.count)
+		if (handle.bits.comp >= device->performance_domains_count)
 			return NULL;
-		return &device->performance_domains.entries[handle.bits.comp];
+		return &device->performance_domains[handle.bits.comp];
 	case STUB_HANDLE_PWR:
-		if (handle.bits.comp >= device->power_domains.count)
+		if (handle.bits.comp >= device->power_domains_count)
 			return NULL;
-		return &device->power_domains.entries[handle.bits.comp];
+		return &device->power_domains[handle.bits.comp];
 	case STUB_HANDLE_PSU:
-		if (handle.bits.comp >= device->psus.count)
+		if (handle.bits.comp >= device->psus_count)
 			return NULL;
-		return &device->psus.entries[handle.bits.comp];
+		return &device->psus[handle.bits.comp];
 	case STUB_HANDLE_RAS:
-		if (handle.bits.comp >= device->ras_error_sets.count)
+		if (handle.bits.comp >= device->ras_error_sets_count)
 			return NULL;
-		return &device->ras_error_sets.entries[handle.bits.comp];
+		return &device->ras_error_sets[handle.bits.comp];
 	case STUB_HANDLE_SCHED:
-		if (handle.bits.comp >= device->schedulers.count)
+		if (handle.bits.comp >= device->schedulers_count)
 			return NULL;
-		return &device->schedulers.entries[handle.bits.comp];
+		return &device->schedulers[handle.bits.comp];
 	case STUB_HANDLE_STANDBY:
-		if (handle.bits.comp >= device->standby_domains.count)
+		if (handle.bits.comp >= device->standby_domains_count)
 			return NULL;
-		return &device->standby_domains.entries[handle.bits.comp];
+		return &device->standby_domains[handle.bits.comp];
 	case STUB_HANDLE_TEMP:
-		if (handle.bits.comp >= device->temperature_sensors.count)
+		if (handle.bits.comp >= device->temperature_sensors_count)
 			return NULL;
-		return &device->temperature_sensors.entries[handle.bits.comp];
+		return &device->temperature_sensors[handle.bits.comp];
 	default:
 		return NULL;
 	}
@@ -612,7 +612,7 @@ ze_result_t zesDeviceEnumOverclockDomains(zes_device_handle_t hDevice, uint32_t
 // Overclock domain functions
 // ------------------------------------------------------------------
 
-static sysman_oc_control_info_t *find_control_info(sysman_oc_entry_t *oc, zes_overclock_control_t ctrl)
+static sysman_oc_control_info_t *find_control_info(sysman_oc_t *oc, zes_overclock_control_t ctrl)
 {
 	if (!oc->control_infos || SYSMAN_ARRAY_PTR_IS_EMPTY(oc->control_infos))
 		return NULL;
@@ -627,7 +627,7 @@ ze_result_t zesOverclockGetDomainProperties(zes_overclock_handle_t hDomainHandle
 											zes_overclock_properties_t *pDomainProperties)
 {
 	sysman_state_lock();
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_DOMAIN_PROPERTIES))
@@ -649,7 +649,7 @@ ze_result_t zesOverclockGetDomainProperties(zes_overclock_handle_t hDomainHandle
 ze_result_t zesOverclockGetDomainVFProperties(zes_overclock_handle_t hDomainHandle, zes_vf_property_t *pVFProperties)
 {
 	sysman_state_lock();
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_DOMAIN_VF_PROPERTIES))
@@ -669,7 +669,7 @@ ze_result_t zesOverclockGetDomainControlProperties(zes_overclock_handle_t hDomai
 												   zes_control_property_t *pControlProperties)
 {
 	sysman_state_lock();
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_DOMAIN_CONTROL_PROPERTIES))
@@ -689,7 +689,7 @@ ze_result_t zesOverclockGetControlCurrentValue(zes_overclock_handle_t hDomainHan
 											   zes_overclock_control_t DomainControl, double *pValue)
 {
 	sysman_state_lock();
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_CONTROL_CURRENT_VALUE))
@@ -709,7 +709,7 @@ ze_result_t zesOverclockGetControlPendingValue(zes_overclock_handle_t hDomainHan
 											   zes_overclock_control_t DomainControl, double *pValue)
 {
 	sysman_state_lock();
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_CONTROL_PENDING_VALUE))
@@ -732,14 +732,13 @@ ze_result_t zesOverclockSetControlUserValue(zes_overclock_handle_t hDomainHandle
 	(void)DomainControl;
 	(void)pValue;
 	(void)pPendingAction;
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_SET_CONTROL_USER_VALUE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (oc->return_values.zesOverclockSetControlUserValue)
 		return sysman_unlock_and_return(oc->return_values.zesOverclockSetControlUserValue);
-	(void)oc;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -747,7 +746,7 @@ ze_result_t zesOverclockGetControlState(zes_overclock_handle_t hDomainHandle, ze
 										zes_control_state_t *pControlState, zes_pending_action_t *pPendingAction)
 {
 	sysman_state_lock();
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_CONTROL_STATE))
@@ -771,7 +770,7 @@ ze_result_t zesOverclockGetVFPointValues(zes_overclock_handle_t hDomainHandle, z
 	(void)VFType;
 	(void)VFArrayType;
 	(void)PointIndex;
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_GET_VF_POINT_VALUES))
@@ -790,14 +789,13 @@ ze_result_t zesOverclockSetVFPointValues(zes_overclock_handle_t hDomainHandle, z
 	(void)VFType;
 	(void)PointIndex;
 	(void)PointValue;
-	sysman_oc_entry_t *oc = (sysman_oc_entry_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
+	sysman_oc_t *oc = (sysman_oc_t *)resolve_handle(hDomainHandle, STUB_HANDLE_OC);
 	if (!oc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDomainHandle, UNSUPPORTED_FEATURE_OC_SET_VF_POINT_VALUES))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (oc->return_values.zesOverclockSetVFPointValues)
 		return sysman_unlock_and_return(oc->return_values.zesOverclockSetVFPointValues);
-	(void)oc;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -816,7 +814,7 @@ ze_result_t zesDeviceEnumDiagnosticTestSuites(zes_device_handle_t hDevice, uint3
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumDiagnosticTestSuites)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumDiagnosticTestSuites);
-	uint32_t n = dev->diagnostics.count;
+	uint32_t n = dev->diagnostics_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phDiagnostics) {
@@ -835,7 +833,7 @@ ze_result_t zesDeviceEnumDiagnosticTestSuites(zes_device_handle_t hDevice, uint3
 ze_result_t zesDiagnosticsGetProperties(zes_diag_handle_t hDiagnostics, zes_diag_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_diag_entry_t *dg = (sysman_diag_entry_t *)resolve_handle(hDiagnostics, STUB_HANDLE_DIAG);
+	sysman_diag_t *dg = (sysman_diag_t *)resolve_handle(hDiagnostics, STUB_HANDLE_DIAG);
 	if (!dg)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDiagnostics, UNSUPPORTED_FEATURE_DIAG_GET_PROPERTIES))
@@ -857,14 +855,14 @@ ze_result_t zesDiagnosticsGetProperties(zes_diag_handle_t hDiagnostics, zes_diag
 ze_result_t zesDiagnosticsGetTests(zes_diag_handle_t hDiagnostics, uint32_t *pCount, zes_diag_test_t *pTests)
 {
 	sysman_state_lock();
-	sysman_diag_entry_t *dg = (sysman_diag_entry_t *)resolve_handle(hDiagnostics, STUB_HANDLE_DIAG);
+	sysman_diag_t *dg = (sysman_diag_t *)resolve_handle(hDiagnostics, STUB_HANDLE_DIAG);
 	if (!dg)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDiagnostics, UNSUPPORTED_FEATURE_DIAG_GET_TESTS))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dg->return_values.zesDiagnosticsGetTests)
 		return sysman_unlock_and_return(dg->return_values.zesDiagnosticsGetTests);
-	uint32_t n = dg->test_count;
+	uint32_t n = dg->tests_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!pTests) {
@@ -884,7 +882,7 @@ ze_result_t zesDiagnosticsRunTests(zes_diag_handle_t hDiagnostics, uint32_t star
 	sysman_state_lock();
 	(void)startIndex;
 	(void)endIndex;
-	sysman_diag_entry_t *dg = (sysman_diag_entry_t *)resolve_handle(hDiagnostics, STUB_HANDLE_DIAG);
+	sysman_diag_t *dg = (sysman_diag_t *)resolve_handle(hDiagnostics, STUB_HANDLE_DIAG);
 	if (!dg)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDiagnostics, UNSUPPORTED_FEATURE_DIAG_RUN_TESTS))
@@ -1006,7 +1004,7 @@ ze_result_t zesDeviceEnumEngineGroups(zes_device_handle_t hDevice, uint32_t *pCo
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumEngineGroups)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumEngineGroups);
-	uint32_t n = dev->engine_groups.count;
+	uint32_t n = dev->engine_groups_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phEngine) {
@@ -1025,7 +1023,7 @@ ze_result_t zesDeviceEnumEngineGroups(zes_device_handle_t hDevice, uint32_t *pCo
 ze_result_t zesEngineGetProperties(zes_engine_handle_t hEngine, zes_engine_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_engine_entry_t *eng = (sysman_engine_entry_t *)resolve_handle(hEngine, STUB_HANDLE_ENGINE);
+	sysman_engine_t *eng = (sysman_engine_t *)resolve_handle(hEngine, STUB_HANDLE_ENGINE);
 	if (!eng)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hEngine, UNSUPPORTED_FEATURE_ENGINE_GET_PROPERTIES))
@@ -1054,7 +1052,7 @@ ze_result_t zesEngineGetProperties(zes_engine_handle_t hEngine, zes_engine_prope
 ze_result_t zesEngineGetActivity(zes_engine_handle_t hEngine, zes_engine_stats_t *pStats)
 {
 	sysman_state_lock();
-	sysman_engine_entry_t *eng = (sysman_engine_entry_t *)resolve_handle(hEngine, STUB_HANDLE_ENGINE);
+	sysman_engine_t *eng = (sysman_engine_t *)resolve_handle(hEngine, STUB_HANDLE_ENGINE);
 	if (!eng)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hEngine, UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY))
@@ -1070,7 +1068,7 @@ ze_result_t zesEngineGetActivity(zes_engine_handle_t hEngine, zes_engine_stats_t
 ze_result_t zesEngineGetActivityExt(zes_engine_handle_t hEngine, uint32_t *pCount, zes_engine_stats_t *pStats)
 {
 	sysman_state_lock();
-	sysman_engine_entry_t *eng = (sysman_engine_entry_t *)resolve_handle(hEngine, STUB_HANDLE_ENGINE);
+	sysman_engine_t *eng = (sysman_engine_t *)resolve_handle(hEngine, STUB_HANDLE_ENGINE);
 	if (!eng)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hEngine, UNSUPPORTED_FEATURE_ENGINE_GET_ACTIVITY_EXT))
@@ -1218,7 +1216,7 @@ ze_result_t zesDeviceEnumFabricPorts(zes_device_handle_t hDevice, uint32_t *pCou
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumFabricPorts)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumFabricPorts);
-	uint32_t n = dev->fabric_ports.count;
+	uint32_t n = dev->fabric_ports_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phPort) {
@@ -1237,7 +1235,7 @@ ze_result_t zesDeviceEnumFabricPorts(zes_device_handle_t hDevice, uint32_t *pCou
 ze_result_t zesFabricPortGetProperties(zes_fabric_port_handle_t hPort, zes_fabric_port_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_GET_PROPERTIES))
@@ -1259,7 +1257,7 @@ ze_result_t zesFabricPortGetProperties(zes_fabric_port_handle_t hPort, zes_fabri
 ze_result_t zesFabricPortGetLinkType(zes_fabric_port_handle_t hPort, zes_fabric_link_type_t *pLinkType)
 {
 	sysman_state_lock();
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_GET_LINK_TYPE))
@@ -1277,7 +1275,7 @@ ze_result_t zesFabricPortGetLinkType(zes_fabric_port_handle_t hPort, zes_fabric_
 ze_result_t zesFabricPortGetConfig(zes_fabric_port_handle_t hPort, zes_fabric_port_config_t *pConfig)
 {
 	sysman_state_lock();
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_GET_CONFIG))
@@ -1300,21 +1298,20 @@ ze_result_t zesFabricPortSetConfig(zes_fabric_port_handle_t hPort, const zes_fab
 {
 	sysman_state_lock();
 	(void)pConfig;
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_SET_CONFIG))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fp->return_values.zesFabricPortSetConfig)
 		return sysman_unlock_and_return(fp->return_values.zesFabricPortSetConfig);
-	(void)fp;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
 ze_result_t zesFabricPortGetState(zes_fabric_port_handle_t hPort, zes_fabric_port_state_t *pState)
 {
 	sysman_state_lock();
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_GET_STATE))
@@ -1336,7 +1333,7 @@ ze_result_t zesFabricPortGetState(zes_fabric_port_handle_t hPort, zes_fabric_por
 ze_result_t zesFabricPortGetThroughput(zes_fabric_port_handle_t hPort, zes_fabric_port_throughput_t *pThroughput)
 {
 	sysman_state_lock();
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_GET_THROUGHPUT))
@@ -1355,7 +1352,7 @@ ze_result_t zesFabricPortGetFabricErrorCounters(zes_fabric_port_handle_t hPort,
 												zes_fabric_port_error_counters_t *pErrors)
 {
 	sysman_state_lock();
-	sysman_fabric_port_entry_t *fp = (sysman_fabric_port_entry_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
+	sysman_fabric_port_t *fp = (sysman_fabric_port_t *)resolve_handle(hPort, STUB_HANDLE_FABRIC_PORT);
 	if (!fp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPort, UNSUPPORTED_FEATURE_FABRIC_PORT_GET_ERROR_COUNTERS))
@@ -1384,15 +1381,14 @@ ze_result_t zesFabricPortGetMultiPortThroughput(zes_device_handle_t hDevice, uin
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hDevice, UNSUPPORTED_FEATURE_FABRIC_PORT_MULTI_THROUGHPUT))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
-	if (dev->fabric_ports.count > 0 && dev->fabric_ports.entries[0].return_values.zesFabricPortGetMultiPortThroughput)
-		return sysman_unlock_and_return(dev->fabric_ports.entries[0].return_values.zesFabricPortGetMultiPortThroughput);
+	if (dev->fabric_ports_count > 0 && dev->fabric_ports[0].return_values.zesFabricPortGetMultiPortThroughput)
+		return sysman_unlock_and_return(dev->fabric_ports[0].return_values.zesFabricPortGetMultiPortThroughput);
 	if (!phPort || !pThroughput)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	for (uint32_t i = 0; i < numPorts; i++) {
 		if (!phPort[i] || !pThroughput[i])
 			continue;
-		sysman_fabric_port_entry_t *port =
-			(sysman_fabric_port_entry_t *)resolve_handle(phPort[i], STUB_HANDLE_FABRIC_PORT);
+		sysman_fabric_port_t *port = (sysman_fabric_port_t *)resolve_handle(phPort[i], STUB_HANDLE_FABRIC_PORT);
 		if (!port || !port->throughput)
 			continue;
 		*pThroughput[i] = *port->throughput;
@@ -1414,7 +1410,7 @@ ze_result_t zesDeviceEnumFans(zes_device_handle_t hDevice, uint32_t *pCount, zes
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumFans)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumFans);
-	uint32_t n = dev->fans.count;
+	uint32_t n = dev->fans_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phFan) {
@@ -1433,7 +1429,7 @@ ze_result_t zesDeviceEnumFans(zes_device_handle_t hDevice, uint32_t *pCount, zes
 ze_result_t zesFanGetProperties(zes_fan_handle_t hFan, zes_fan_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_fan_entry_t *fan = (sysman_fan_entry_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
+	sysman_fan_t *fan = (sysman_fan_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
 	if (!fan)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFan, UNSUPPORTED_FEATURE_FAN_GET_PROPERTIES))
@@ -1455,7 +1451,7 @@ ze_result_t zesFanGetProperties(zes_fan_handle_t hFan, zes_fan_properties_t *pPr
 ze_result_t zesFanGetConfig(zes_fan_handle_t hFan, zes_fan_config_t *pConfig)
 {
 	sysman_state_lock();
-	sysman_fan_entry_t *fan = (sysman_fan_entry_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
+	sysman_fan_t *fan = (sysman_fan_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
 	if (!fan)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFan, UNSUPPORTED_FEATURE_FAN_GET_CONFIG))
@@ -1477,14 +1473,13 @@ ze_result_t zesFanGetConfig(zes_fan_handle_t hFan, zes_fan_config_t *pConfig)
 ze_result_t zesFanSetDefaultMode(zes_fan_handle_t hFan)
 {
 	sysman_state_lock();
-	sysman_fan_entry_t *fan = (sysman_fan_entry_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
+	sysman_fan_t *fan = (sysman_fan_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
 	if (!fan)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFan, UNSUPPORTED_FEATURE_FAN_SET_DEFAULT_MODE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fan->return_values.zesFanSetDefaultMode)
 		return sysman_unlock_and_return(fan->return_values.zesFanSetDefaultMode);
-	(void)fan;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -1492,14 +1487,13 @@ ze_result_t zesFanSetFixedSpeedMode(zes_fan_handle_t hFan, const zes_fan_speed_t
 {
 	sysman_state_lock();
 	(void)speed;
-	sysman_fan_entry_t *fan = (sysman_fan_entry_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
+	sysman_fan_t *fan = (sysman_fan_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
 	if (!fan)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFan, UNSUPPORTED_FEATURE_FAN_SET_FIXED_SPEED_MODE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fan->return_values.zesFanSetFixedSpeedMode)
 		return sysman_unlock_and_return(fan->return_values.zesFanSetFixedSpeedMode);
-	(void)fan;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -1507,14 +1501,13 @@ ze_result_t zesFanSetSpeedTableMode(zes_fan_handle_t hFan, const zes_fan_speed_t
 {
 	sysman_state_lock();
 	(void)speedTable;
-	sysman_fan_entry_t *fan = (sysman_fan_entry_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
+	sysman_fan_t *fan = (sysman_fan_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
 	if (!fan)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFan, UNSUPPORTED_FEATURE_FAN_SET_SPEED_TABLE_MODE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fan->return_values.zesFanSetSpeedTableMode)
 		return sysman_unlock_and_return(fan->return_values.zesFanSetSpeedTableMode);
-	(void)fan;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -1522,7 +1515,7 @@ ze_result_t zesFanGetState(zes_fan_handle_t hFan, zes_fan_speed_units_t units, i
 {
 	sysman_state_lock();
 	(void)units;
-	sysman_fan_entry_t *fan = (sysman_fan_entry_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
+	sysman_fan_t *fan = (sysman_fan_t *)resolve_handle(hFan, STUB_HANDLE_FAN);
 	if (!fan)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFan, UNSUPPORTED_FEATURE_FAN_GET_STATE))
@@ -1549,7 +1542,7 @@ ze_result_t zesDeviceEnumFirmwares(zes_device_handle_t hDevice, uint32_t *pCount
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumFirmwares)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumFirmwares);
-	uint32_t n = dev->firmwares.count;
+	uint32_t n = dev->firmwares_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phFirmware) {
@@ -1568,7 +1561,7 @@ ze_result_t zesDeviceEnumFirmwares(zes_device_handle_t hDevice, uint32_t *pCount
 ze_result_t zesFirmwareGetProperties(zes_firmware_handle_t hFirmware, zes_firmware_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_firmware_entry_t *fw = (sysman_firmware_entry_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
+	sysman_firmware_t *fw = (sysman_firmware_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
 	if (!fw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFirmware, UNSUPPORTED_FEATURE_FW_GET_PROPERTIES))
@@ -1592,21 +1585,20 @@ ze_result_t zesFirmwareFlash(zes_firmware_handle_t hFirmware, void *pImage, uint
 	sysman_state_lock();
 	(void)pImage;
 	(void)size;
-	sysman_firmware_entry_t *fw = (sysman_firmware_entry_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
+	sysman_firmware_t *fw = (sysman_firmware_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
 	if (!fw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFirmware, UNSUPPORTED_FEATURE_FW_FLASH))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fw->return_values.zesFirmwareFlash)
 		return sysman_unlock_and_return(fw->return_values.zesFirmwareFlash);
-	(void)fw;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
 ze_result_t zesFirmwareGetFlashProgress(zes_firmware_handle_t hFirmware, uint32_t *pCompletionPercent)
 {
 	sysman_state_lock();
-	sysman_firmware_entry_t *fw = (sysman_firmware_entry_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
+	sysman_firmware_t *fw = (sysman_firmware_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
 	if (!fw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFirmware, UNSUPPORTED_FEATURE_FW_GET_FLASH_PROGRESS))
@@ -1622,7 +1614,7 @@ ze_result_t zesFirmwareGetFlashProgress(zes_firmware_handle_t hFirmware, uint32_
 ze_result_t zesFirmwareGetConsoleLogs(zes_firmware_handle_t hFirmware, size_t *pSize, char *pFirmwareLog)
 {
 	sysman_state_lock();
-	sysman_firmware_entry_t *fw = (sysman_firmware_entry_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
+	sysman_firmware_t *fw = (sysman_firmware_t *)resolve_handle(hFirmware, STUB_HANDLE_FIRMWARE);
 	if (!fw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFirmware, UNSUPPORTED_FEATURE_FW_GET_CONSOLE_LOGS))
@@ -1660,7 +1652,7 @@ ze_result_t zesDeviceEnumFrequencyDomains(zes_device_handle_t hDevice, uint32_t
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumFrequencyDomains)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumFrequencyDomains);
-	uint32_t n = dev->frequency_domains.count;
+	uint32_t n = dev->frequency_domains_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phFrequency) {
@@ -1679,7 +1671,7 @@ ze_result_t zesDeviceEnumFrequencyDomains(zes_device_handle_t hDevice, uint32_t
 ze_result_t zesFrequencyGetProperties(zes_freq_handle_t hFrequency, zes_freq_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_freq_entry_t *fr = (sysman_freq_entry_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
+	sysman_freq_t *fr = (sysman_freq_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
 	if (!fr)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFrequency, UNSUPPORTED_FEATURE_FREQ_GET_PROPERTIES))
@@ -1701,14 +1693,14 @@ ze_result_t zesFrequencyGetProperties(zes_freq_handle_t hFrequency, zes_freq_pro
 ze_result_t zesFrequencyGetAvailableClocks(zes_freq_handle_t hFrequency, uint32_t *pCount, double *phFrequency)
 {
 	sysman_state_lock();
-	sysman_freq_entry_t *fr = (sysman_freq_entry_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
+	sysman_freq_t *fr = (sysman_freq_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
 	if (!fr)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFrequency, UNSUPPORTED_FEATURE_FREQ_GET_AVAILABLE_CLOCKS))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fr->return_values.zesFrequencyGetAvailableClocks)
 		return sysman_unlock_and_return(fr->return_values.zesFrequencyGetAvailableClocks);
-	uint32_t n = fr->available_clock_count;
+	uint32_t n = fr->available_clocks_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phFrequency) {
@@ -1725,7 +1717,7 @@ ze_result_t zesFrequencyGetAvailableClocks(zes_freq_handle_t hFrequency, uint32_
 ze_result_t zesFrequencyGetRange(zes_freq_handle_t hFrequency, zes_freq_range_t *pLimits)
 {
 	sysman_state_lock();
-	sysman_freq_entry_t *fr = (sysman_freq_entry_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
+	sysman_freq_t *fr = (sysman_freq_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
 	if (!fr)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFrequency, UNSUPPORTED_FEATURE_FREQ_GET_RANGE))
@@ -1744,21 +1736,20 @@ ze_result_t zesFrequencySetRange(zes_freq_handle_t hFrequency, const zes_freq_ra
 {
 	sysman_state_lock();
 	(void)pLimits;
-	sysman_freq_entry_t *fr = (sysman_freq_entry_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
+	sysman_freq_t *fr = (sysman_freq_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
 	if (!fr)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFrequency, UNSUPPORTED_FEATURE_FREQ_SET_RANGE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (fr->return_values.zesFrequencySetRange)
 		return sysman_unlock_and_return(fr->return_values.zesFrequencySetRange);
-	(void)fr;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
 ze_result_t zesFrequencyGetState(zes_freq_handle_t hFrequency, zes_freq_state_t *pState)
 {
 	sysman_state_lock();
-	sysman_freq_entry_t *fr = (sysman_freq_entry_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
+	sysman_freq_t *fr = (sysman_freq_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
 	if (!fr)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFrequency, UNSUPPORTED_FEATURE_FREQ_GET_STATE))
@@ -1780,7 +1771,7 @@ ze_result_t zesFrequencyGetState(zes_freq_handle_t hFrequency, zes_freq_state_t
 ze_result_t zesFrequencyGetThrottleTime(zes_freq_handle_t hFrequency, zes_freq_throttle_time_t *pThrottleTime)
 {
 	sysman_state_lock();
-	sysman_freq_entry_t *fr = (sysman_freq_entry_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
+	sysman_freq_t *fr = (sysman_freq_t *)resolve_handle(hFrequency, STUB_HANDLE_FREQ);
 	if (!fr)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hFrequency, UNSUPPORTED_FEATURE_FREQ_GET_THROTTLE_TIME))
@@ -1809,7 +1800,7 @@ ze_result_t zesDeviceEnumLeds(zes_device_handle_t hDevice, uint32_t *pCount, zes
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumLeds)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumLeds);
-	uint32_t n = dev->leds.count;
+	uint32_t n = dev->leds_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phLed) {
@@ -1828,7 +1819,7 @@ ze_result_t zesDeviceEnumLeds(zes_device_handle_t hDevice, uint32_t *pCount, zes
 ze_result_t zesLedGetProperties(zes_led_handle_t hLed, zes_led_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_led_entry_t *led = (sysman_led_entry_t *)resolve_handle(hLed, STUB_HANDLE_LED);
+	sysman_led_t *led = (sysman_led_t *)resolve_handle(hLed, STUB_HANDLE_LED);
 	if (!led)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hLed, UNSUPPORTED_FEATURE_LED_GET_PROPERTIES))
@@ -1850,7 +1841,7 @@ ze_result_t zesLedGetProperties(zes_led_handle_t hLed, zes_led_properties_t *pPr
 ze_result_t zesLedGetState(zes_led_handle_t hLed, zes_led_state_t *pState)
 {
 	sysman_state_lock();
-	sysman_led_entry_t *led = (sysman_led_entry_t *)resolve_handle(hLed, STUB_HANDLE_LED);
+	sysman_led_t *led = (sysman_led_t *)resolve_handle(hLed, STUB_HANDLE_LED);
 	if (!led)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hLed, UNSUPPORTED_FEATURE_LED_GET_STATE))
@@ -1873,14 +1864,13 @@ ze_result_t zesLedSetState(zes_led_handle_t hLed, ze_bool_t enable)
 {
 	sysman_state_lock();
 	(void)enable;
-	sysman_led_entry_t *led = (sysman_led_entry_t *)resolve_handle(hLed, STUB_HANDLE_LED);
+	sysman_led_t *led = (sysman_led_t *)resolve_handle(hLed, STUB_HANDLE_LED);
 	if (!led)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hLed, UNSUPPORTED_FEATURE_LED_SET_STATE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (led->return_values.zesLedSetState)
 		return sysman_unlock_and_return(led->return_values.zesLedSetState);
-	(void)led;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -1888,14 +1878,13 @@ ze_result_t zesLedSetColor(zes_led_handle_t hLed, const zes_led_color_t *pColor)
 {
 	sysman_state_lock();
 	(void)pColor;
-	sysman_led_entry_t *led = (sysman_led_entry_t *)resolve_handle(hLed, STUB_HANDLE_LED);
+	sysman_led_t *led = (sysman_led_t *)resolve_handle(hLed, STUB_HANDLE_LED);
 	if (!led)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hLed, UNSUPPORTED_FEATURE_LED_SET_COLOR))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (led->return_values.zesLedSetColor)
 		return sysman_unlock_and_return(led->return_values.zesLedSetColor);
-	(void)led;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -1913,7 +1902,7 @@ ze_result_t zesDeviceEnumMemoryModules(zes_device_handle_t hDevice, uint32_t *pC
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumMemoryModules)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumMemoryModules);
-	uint32_t n = dev->memory_modules.count;
+	uint32_t n = dev->memory_modules_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phMemory) {
@@ -1932,7 +1921,7 @@ ze_result_t zesDeviceEnumMemoryModules(zes_device_handle_t hDevice, uint32_t *pC
 ze_result_t zesMemoryGetProperties(zes_mem_handle_t hMemory, zes_mem_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_mem_entry_t *mem = (sysman_mem_entry_t *)resolve_handle(hMemory, STUB_HANDLE_MEM);
+	sysman_mem_t *mem = (sysman_mem_t *)resolve_handle(hMemory, STUB_HANDLE_MEM);
 	if (!mem)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hMemory, UNSUPPORTED_FEATURE_MEM_GET_PROPERTIES))
@@ -1954,7 +1943,7 @@ ze_result_t zesMemoryGetProperties(zes_mem_handle_t hMemory, zes_mem_properties_
 ze_result_t zesMemoryGetState(zes_mem_handle_t hMemory, zes_mem_state_t *pState)
 {
 	sysman_state_lock();
-	sysman_mem_entry_t *mem = (sysman_mem_entry_t *)resolve_handle(hMemory, STUB_HANDLE_MEM);
+	sysman_mem_t *mem = (sysman_mem_t *)resolve_handle(hMemory, STUB_HANDLE_MEM);
 	if (!mem)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hMemory, UNSUPPORTED_FEATURE_MEM_GET_STATE))
@@ -1976,7 +1965,7 @@ ze_result_t zesMemoryGetState(zes_mem_handle_t hMemory, zes_mem_state_t *pState)
 ze_result_t zesMemoryGetBandwidth(zes_mem_handle_t hMemory, zes_mem_bandwidth_t *pBandwidth)
 {
 	sysman_state_lock();
-	sysman_mem_entry_t *mem = (sysman_mem_entry_t *)resolve_handle(hMemory, STUB_HANDLE_MEM);
+	sysman_mem_t *mem = (sysman_mem_t *)resolve_handle(hMemory, STUB_HANDLE_MEM);
 	if (!mem)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hMemory, UNSUPPORTED_FEATURE_MEM_GET_BANDWIDTH))
@@ -2006,7 +1995,7 @@ ze_result_t zesDeviceEnumPerformanceFactorDomains(zes_device_handle_t hDevice, u
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumPerformanceFactorDomains)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumPerformanceFactorDomains);
-	uint32_t n = dev->performance_domains.count;
+	uint32_t n = dev->performance_domains_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phPerf) {
@@ -2025,7 +2014,7 @@ ze_result_t zesDeviceEnumPerformanceFactorDomains(zes_device_handle_t hDevice, u
 ze_result_t zesPerformanceFactorGetProperties(zes_perf_handle_t hPerf, zes_perf_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_perf_entry_t *pf = (sysman_perf_entry_t *)resolve_handle(hPerf, STUB_HANDLE_PERF);
+	sysman_perf_t *pf = (sysman_perf_t *)resolve_handle(hPerf, STUB_HANDLE_PERF);
 	if (!pf)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPerf, UNSUPPORTED_FEATURE_PERF_GET_PROPERTIES))
@@ -2047,7 +2036,7 @@ ze_result_t zesPerformanceFactorGetProperties(zes_perf_handle_t hPerf, zes_perf_
 ze_result_t zesPerformanceFactorGetConfig(zes_perf_handle_t hPerf, double *pFactor)
 {
 	sysman_state_lock();
-	sysman_perf_entry_t *pf = (sysman_perf_entry_t *)resolve_handle(hPerf, STUB_HANDLE_PERF);
+	sysman_perf_t *pf = (sysman_perf_t *)resolve_handle(hPerf, STUB_HANDLE_PERF);
 	if (!pf)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPerf, UNSUPPORTED_FEATURE_PERF_GET_CONFIG))
@@ -2064,14 +2053,13 @@ ze_result_t zesPerformanceFactorSetConfig(zes_perf_handle_t hPerf, double factor
 {
 	sysman_state_lock();
 	(void)factor;
-	sysman_perf_entry_t *pf = (sysman_perf_entry_t *)resolve_handle(hPerf, STUB_HANDLE_PERF);
+	sysman_perf_t *pf = (sysman_perf_t *)resolve_handle(hPerf, STUB_HANDLE_PERF);
 	if (!pf)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPerf, UNSUPPORTED_FEATURE_PERF_SET_CONFIG))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (pf->return_values.zesPerformanceFactorSetConfig)
 		return sysman_unlock_and_return(pf->return_values.zesPerformanceFactorSetConfig);
-	(void)pf;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -2089,7 +2077,7 @@ ze_result_t zesDeviceEnumPowerDomains(zes_device_handle_t hDevice, uint32_t *pCo
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumPowerDomains)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumPowerDomains);
-	uint32_t n = dev->power_domains.count;
+	uint32_t n = dev->power_domains_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phPower) {
@@ -2108,7 +2096,7 @@ ze_result_t zesDeviceEnumPowerDomains(zes_device_handle_t hDevice, uint32_t *pCo
 ze_result_t zesPowerGetProperties(zes_pwr_handle_t hPower, zes_power_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_power_entry_t *pw = (sysman_power_entry_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
+	sysman_power_t *pw = (sysman_power_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
 	if (!pw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPower, UNSUPPORTED_FEATURE_POWER_GET_PROPERTIES))
@@ -2138,7 +2126,7 @@ ze_result_t zesPowerGetProperties(zes_pwr_handle_t hPower, zes_power_properties_
 ze_result_t zesPowerGetEnergyCounter(zes_pwr_handle_t hPower, zes_power_energy_counter_t *pEnergy)
 {
 	sysman_state_lock();
-	sysman_power_entry_t *pw = (sysman_power_entry_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
+	sysman_power_t *pw = (sysman_power_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
 	if (!pw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPower, UNSUPPORTED_FEATURE_POWER_GET_ENERGY_COUNTER))
@@ -2156,14 +2144,14 @@ ze_result_t zesPowerGetEnergyCounter(zes_pwr_handle_t hPower, zes_power_energy_c
 ze_result_t zesPowerGetLimitsExt(zes_pwr_handle_t hPower, uint32_t *pCount, zes_power_limit_ext_desc_t *pSustained)
 {
 	sysman_state_lock();
-	sysman_power_entry_t *pw = (sysman_power_entry_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
+	sysman_power_t *pw = (sysman_power_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
 	if (!pw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPower, UNSUPPORTED_FEATURE_POWER_GET_LIMITS_EXT))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (pw->return_values.zesPowerGetLimitsExt)
 		return sysman_unlock_and_return(pw->return_values.zesPowerGetLimitsExt);
-	uint32_t n = pw->limit_count;
+	uint32_t n = pw->limits_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!pSustained) {
@@ -2182,21 +2170,20 @@ ze_result_t zesPowerSetLimitsExt(zes_pwr_handle_t hPower, uint32_t *pCount, zes_
 	sysman_state_lock();
 	(void)pCount;
 	(void)pSustained;
-	sysman_power_entry_t *pw = (sysman_power_entry_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
+	sysman_power_t *pw = (sysman_power_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
 	if (!pw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPower, UNSUPPORTED_FEATURE_POWER_SET_LIMITS_EXT))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (pw->return_values.zesPowerSetLimitsExt)
 		return sysman_unlock_and_return(pw->return_values.zesPowerSetLimitsExt);
-	(void)pw;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
 ze_result_t zesPowerGetEnergyThreshold(zes_pwr_handle_t hPower, zes_energy_threshold_t *pThreshold)
 {
 	sysman_state_lock();
-	sysman_power_entry_t *pw = (sysman_power_entry_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
+	sysman_power_t *pw = (sysman_power_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
 	if (!pw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPower, UNSUPPORTED_FEATURE_POWER_GET_ENERGY_THRESHOLD))
@@ -2215,14 +2202,13 @@ ze_result_t zesPowerSetEnergyThreshold(zes_pwr_handle_t hPower, double threshold
 {
 	sysman_state_lock();
 	(void)threshold;
-	sysman_power_entry_t *pw = (sysman_power_entry_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
+	sysman_power_t *pw = (sysman_power_t *)resolve_handle(hPower, STUB_HANDLE_PWR);
 	if (!pw)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPower, UNSUPPORTED_FEATURE_POWER_SET_ENERGY_THRESHOLD))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (pw->return_values.zesPowerSetEnergyThreshold)
 		return sysman_unlock_and_return(pw->return_values.zesPowerSetEnergyThreshold);
-	(void)pw;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -2240,7 +2226,7 @@ ze_result_t zesDeviceEnumPsus(zes_device_handle_t hDevice, uint32_t *pCount, zes
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumPsus)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumPsus);
-	uint32_t n = dev->psus.count;
+	uint32_t n = dev->psus_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phPsu) {
@@ -2259,7 +2245,7 @@ ze_result_t zesDeviceEnumPsus(zes_device_handle_t hDevice, uint32_t *pCount, zes
 ze_result_t zesPsuGetProperties(zes_psu_handle_t hPsu, zes_psu_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_psu_entry_t *psu = (sysman_psu_entry_t *)resolve_handle(hPsu, STUB_HANDLE_PSU);
+	sysman_psu_t *psu = (sysman_psu_t *)resolve_handle(hPsu, STUB_HANDLE_PSU);
 	if (!psu)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPsu, UNSUPPORTED_FEATURE_PSU_GET_PROPERTIES))
@@ -2281,7 +2267,7 @@ ze_result_t zesPsuGetProperties(zes_psu_handle_t hPsu, zes_psu_properties_t *pPr
 ze_result_t zesPsuGetState(zes_psu_handle_t hPsu, zes_psu_state_t *pState)
 {
 	sysman_state_lock();
-	sysman_psu_entry_t *psu = (sysman_psu_entry_t *)resolve_handle(hPsu, STUB_HANDLE_PSU);
+	sysman_psu_t *psu = (sysman_psu_t *)resolve_handle(hPsu, STUB_HANDLE_PSU);
 	if (!psu)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hPsu, UNSUPPORTED_FEATURE_PSU_GET_STATE))
@@ -2314,7 +2300,7 @@ ze_result_t zesDeviceEnumRasErrorSets(zes_device_handle_t hDevice, uint32_t *pCo
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumRasErrorSets)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumRasErrorSets);
-	uint32_t n = dev->ras_error_sets.count;
+	uint32_t n = dev->ras_error_sets_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phRas) {
@@ -2333,7 +2319,7 @@ ze_result_t zesDeviceEnumRasErrorSets(zes_device_handle_t hDevice, uint32_t *pCo
 ze_result_t zesRasGetProperties(zes_ras_handle_t hRas, zes_ras_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_ras_entry_t *ras = (sysman_ras_entry_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
+	sysman_ras_t *ras = (sysman_ras_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
 	if (!ras)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hRas, UNSUPPORTED_FEATURE_RAS_GET_PROPERTIES))
@@ -2355,7 +2341,7 @@ ze_result_t zesRasGetProperties(zes_ras_handle_t hRas, zes_ras_properties_t *pPr
 ze_result_t zesRasGetConfig(zes_ras_handle_t hRas, zes_ras_config_t *pConfig)
 {
 	sysman_state_lock();
-	sysman_ras_entry_t *ras = (sysman_ras_entry_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
+	sysman_ras_t *ras = (sysman_ras_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
 	if (!ras)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hRas, UNSUPPORTED_FEATURE_RAS_GET_CONFIG))
@@ -2378,14 +2364,13 @@ ze_result_t zesRasSetConfig(zes_ras_handle_t hRas, const zes_ras_config_t *pConf
 {
 	sysman_state_lock();
 	(void)pConfig;
-	sysman_ras_entry_t *ras = (sysman_ras_entry_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
+	sysman_ras_t *ras = (sysman_ras_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
 	if (!ras)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hRas, UNSUPPORTED_FEATURE_RAS_SET_CONFIG))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (ras->return_values.zesRasSetConfig)
 		return sysman_unlock_and_return(ras->return_values.zesRasSetConfig);
-	(void)ras;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -2393,7 +2378,7 @@ ze_result_t zesRasGetState(zes_ras_handle_t hRas, ze_bool_t clear, zes_ras_state
 {
 	sysman_state_lock();
 	(void)clear;
-	sysman_ras_entry_t *ras = (sysman_ras_entry_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
+	sysman_ras_t *ras = (sysman_ras_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
 	if (!ras)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hRas, UNSUPPORTED_FEATURE_RAS_GET_STATE))
@@ -2412,6 +2397,51 @@ ze_result_t zesRasGetState(zes_ras_handle_t hRas, ze_bool_t clear, zes_ras_state
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
+ze_result_t zesRasGetStateExp(zes_ras_handle_t hRas, uint32_t *pCount, zes_ras_state_exp_t *pStates)
+{
+	sysman_state_lock();
+	sysman_ras_t *ras = (sysman_ras_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
+	if (!ras)
+		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
+	if (is_unsupported(hRas, UNSUPPORTED_FEATURE_RAS_GET_STATE_EXP))
+		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+	if (ras->return_values.zesRasGetStateExp)
+		return sysman_unlock_and_return(ras->return_values.zesRasGetStateExp);
+	if (!pCount)
+		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
+
+	uint32_t n = ras->state_exp_count;
+	if (!pStates) {
+		*pCount = n;
+		return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
+	}
+	n = (*pCount < n) ? *pCount : n;
+	for (uint32_t i = 0; i < n; i++)
+		pStates[i] = ras->state_exp[i];
+	*pCount = n;
+	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
+}
+
+ze_result_t zesRasClearStateExp(zes_ras_handle_t hRas, zes_ras_error_category_exp_t cat)
+{
+	sysman_state_lock();
+	sysman_ras_t *ras = (sysman_ras_t *)resolve_handle(hRas, STUB_HANDLE_RAS);
+	if (!ras)
+		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
+	if (is_unsupported(hRas, UNSUPPORTED_FEATURE_RAS_CLEAR_STATE_EXP))
+		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
+	if (ras->return_values.zesRasClearStateExp)
+		return sysman_unlock_and_return(ras->return_values.zesRasClearStateExp);
+
+	for (uint32_t i = 0; i < ras->state_exp_count; i++) {
+		if (ras->state_exp[i].category == cat) {
+			ras->state_exp[i].errorCounter = 0;
+			return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
+		}
+	}
+	return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_ARGUMENT);
+}
+
 // ------------------------------------------------------------------
 // Schedulers
 // ------------------------------------------------------------------
@@ -2426,7 +2456,7 @@ ze_result_t zesDeviceEnumSchedulers(zes_device_handle_t hDevice, uint32_t *pCoun
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumSchedulers)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumSchedulers);
-	uint32_t n = dev->schedulers.count;
+	uint32_t n = dev->schedulers_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phScheduler) {
@@ -2445,7 +2475,7 @@ ze_result_t zesDeviceEnumSchedulers(zes_device_handle_t hDevice, uint32_t *pCoun
 ze_result_t zesSchedulerGetProperties(zes_sched_handle_t hScheduler, zes_sched_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_GET_PROPERTIES))
@@ -2467,7 +2497,7 @@ ze_result_t zesSchedulerGetProperties(zes_sched_handle_t hScheduler, zes_sched_p
 ze_result_t zesSchedulerGetCurrentMode(zes_sched_handle_t hScheduler, zes_sched_mode_t *pMode)
 {
 	sysman_state_lock();
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_GET_CURRENT_MODE))
@@ -2485,7 +2515,7 @@ ze_result_t zesSchedulerGetTimeoutModeProperties(zes_sched_handle_t hScheduler,
 {
 	sysman_state_lock();
 	(void)getDefaults;
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_GET_TIMEOUT_MODE_PROPS))
@@ -2509,7 +2539,7 @@ ze_result_t zesSchedulerGetTimesliceModeProperties(zes_sched_handle_t hScheduler
 {
 	sysman_state_lock();
 	(void)getDefaults;
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_GET_TIMESLICE_MODE_PROPS))
@@ -2533,7 +2563,7 @@ ze_result_t zesSchedulerSetTimeoutMode(zes_sched_handle_t hScheduler, zes_sched_
 {
 	sysman_state_lock();
 	(void)pProperties;
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_SET_TIMEOUT_MODE))
@@ -2550,7 +2580,7 @@ ze_result_t zesSchedulerSetTimesliceMode(zes_sched_handle_t hScheduler, zes_sche
 										 ze_bool_t *pNeedReload)
 {
 	sysman_state_lock();
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_SET_TIMESLICE_MODE))
@@ -2559,7 +2589,6 @@ ze_result_t zesSchedulerSetTimesliceMode(zes_sched_handle_t hScheduler, zes_sche
 		return sysman_unlock_and_return(sc->return_values.zesSchedulerSetTimesliceMode);
 	if (!pProperties || !pNeedReload)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
-	(void)pProperties;
 	*pNeedReload = sc->need_reload;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
@@ -2567,7 +2596,7 @@ ze_result_t zesSchedulerSetTimesliceMode(zes_sched_handle_t hScheduler, zes_sche
 ze_result_t zesSchedulerSetExclusiveMode(zes_sched_handle_t hScheduler, ze_bool_t *pNeedReload)
 {
 	sysman_state_lock();
-	sysman_sched_entry_t *sc = (sysman_sched_entry_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
+	sysman_sched_t *sc = (sysman_sched_t *)resolve_handle(hScheduler, STUB_HANDLE_SCHED);
 	if (!sc)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hScheduler, UNSUPPORTED_FEATURE_SCHED_SET_EXCLUSIVE_MODE))
@@ -2594,7 +2623,7 @@ ze_result_t zesDeviceEnumStandbyDomains(zes_device_handle_t hDevice, uint32_t *p
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumStandbyDomains)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumStandbyDomains);
-	uint32_t n = dev->standby_domains.count;
+	uint32_t n = dev->standby_domains_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phStandby) {
@@ -2613,7 +2642,7 @@ ze_result_t zesDeviceEnumStandbyDomains(zes_device_handle_t hDevice, uint32_t *p
 ze_result_t zesStandbyGetProperties(zes_standby_handle_t hStandby, zes_standby_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_standby_entry_t *sb = (sysman_standby_entry_t *)resolve_handle(hStandby, STUB_HANDLE_STANDBY);
+	sysman_standby_t *sb = (sysman_standby_t *)resolve_handle(hStandby, STUB_HANDLE_STANDBY);
 	if (!sb)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hStandby, UNSUPPORTED_FEATURE_STANDBY_GET_PROPERTIES))
@@ -2635,7 +2664,7 @@ ze_result_t zesStandbyGetProperties(zes_standby_handle_t hStandby, zes_standby_p
 ze_result_t zesStandbyGetMode(zes_standby_handle_t hStandby, zes_standby_promo_mode_t *pMode)
 {
 	sysman_state_lock();
-	sysman_standby_entry_t *sb = (sysman_standby_entry_t *)resolve_handle(hStandby, STUB_HANDLE_STANDBY);
+	sysman_standby_t *sb = (sysman_standby_t *)resolve_handle(hStandby, STUB_HANDLE_STANDBY);
 	if (!sb)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hStandby, UNSUPPORTED_FEATURE_STANDBY_GET_MODE))
@@ -2652,14 +2681,13 @@ ze_result_t zesStandbySetMode(zes_standby_handle_t hStandby, zes_standby_promo_m
 {
 	sysman_state_lock();
 	(void)mode;
-	sysman_standby_entry_t *sb = (sysman_standby_entry_t *)resolve_handle(hStandby, STUB_HANDLE_STANDBY);
+	sysman_standby_t *sb = (sysman_standby_t *)resolve_handle(hStandby, STUB_HANDLE_STANDBY);
 	if (!sb)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hStandby, UNSUPPORTED_FEATURE_STANDBY_SET_MODE))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (sb->return_values.zesStandbySetMode)
 		return sysman_unlock_and_return(sb->return_values.zesStandbySetMode);
-	(void)sb;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
@@ -2678,7 +2706,7 @@ ze_result_t zesDeviceEnumTemperatureSensors(zes_device_handle_t hDevice, uint32_
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (dev->return_values.zesDeviceEnumTemperatureSensors)
 		return sysman_unlock_and_return(dev->return_values.zesDeviceEnumTemperatureSensors);
-	uint32_t n = dev->temperature_sensors.count;
+	uint32_t n = dev->temperature_sensors_count;
 	if (!pCount)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_POINTER);
 	if (!phTemperature) {
@@ -2697,7 +2725,7 @@ ze_result_t zesDeviceEnumTemperatureSensors(zes_device_handle_t hDevice, uint32_
 ze_result_t zesTemperatureGetProperties(zes_temp_handle_t hTemperature, zes_temp_properties_t *pProperties)
 {
 	sysman_state_lock();
-	sysman_temp_entry_t *temp = (sysman_temp_entry_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
+	sysman_temp_t *temp = (sysman_temp_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
 	if (!temp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hTemperature, UNSUPPORTED_FEATURE_TEMP_GET_PROPERTIES))
@@ -2719,7 +2747,7 @@ ze_result_t zesTemperatureGetProperties(zes_temp_handle_t hTemperature, zes_temp
 ze_result_t zesTemperatureGetConfig(zes_temp_handle_t hTemperature, zes_temp_config_t *pConfig)
 {
 	sysman_state_lock();
-	sysman_temp_entry_t *temp = (sysman_temp_entry_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
+	sysman_temp_t *temp = (sysman_temp_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
 	if (!temp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hTemperature, UNSUPPORTED_FEATURE_TEMP_GET_CONFIG))
@@ -2742,21 +2770,20 @@ ze_result_t zesTemperatureSetConfig(zes_temp_handle_t hTemperature, const zes_te
 {
 	sysman_state_lock();
 	(void)pConfig;
-	sysman_temp_entry_t *temp = (sysman_temp_entry_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
+	sysman_temp_t *temp = (sysman_temp_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
 	if (!temp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hTemperature, UNSUPPORTED_FEATURE_TEMP_SET_CONFIG))
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 	if (temp->return_values.zesTemperatureSetConfig)
 		return sysman_unlock_and_return(temp->return_values.zesTemperatureSetConfig);
-	(void)temp;
 	return sysman_unlock_and_return(ZE_RESULT_SUCCESS);
 }
 
 ze_result_t zesTemperatureGetState(zes_temp_handle_t hTemperature, double *pTemperature)
 {
 	sysman_state_lock();
-	sysman_temp_entry_t *temp = (sysman_temp_entry_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
+	sysman_temp_t *temp = (sysman_temp_t *)resolve_handle(hTemperature, STUB_HANDLE_TEMP);
 	if (!temp)
 		return sysman_unlock_and_return(ZE_RESULT_ERROR_INVALID_NULL_HANDLE);
 	if (is_unsupported(hTemperature, UNSUPPORTED_FEATURE_TEMP_GET_STATE))
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero-stub/zes_stub.h b/xpumd/level-zero-go/level-zero-stub/zes_stub.h
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero-stub/zes_stub.h
rename to xpumd/level-zero-go/level-zero-stub/zes_stub.h
diff --git a/xpumd/level-zero-go/level-zero/checksums-backend.txt b/xpumd/level-zero-go/level-zero/checksums-backend.txt
new file mode 100644
index 000000000..ee34a8a2e
--- /dev/null
+++ b/xpumd/level-zero-go/level-zero/checksums-backend.txt
@@ -0,0 +1,3 @@
+0ce1e715ec5bf30b1304b42acfbda34cc514a0f616dd48c6a31973c4075d8d09  intel-igc-core-2_2.34.4+21428_amd64.deb
+6031a63d6e8a12ce61c14efc15f2c8e727061286e3820b8594e6d00615e04d54  libigdgmm12_22.10.0_amd64.deb
+12b8254e6d3415c32cee9cd13943030b991d91212445c79fe1cc27176a72eca4  libze-intel-gpu1_26.18.38308.1-0_amd64.deb
diff --git a/xpumd/level-zero-go/level-zero/checksums-loader.txt b/xpumd/level-zero-go/level-zero/checksums-loader.txt
new file mode 100644
index 000000000..b1bf5163f
--- /dev/null
+++ b/xpumd/level-zero-go/level-zero/checksums-loader.txt
@@ -0,0 +1,2 @@
+93034c2a8396ad43a6bafb42469839940cfc9dc1ab64781fca3b62cc31b0df82  libze-dev_1.28.6+u24.04_amd64.deb
+8af9dc06d9684a20a3f43754fe109968fba2ba085cfa572a4cc6ef0272f9bcd1  libze1_1.28.6+u24.04_amd64.deb
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero/ze_api.h b/xpumd/level-zero-go/level-zero/ze_api.h
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero/ze_api.h
rename to xpumd/level-zero-go/level-zero/ze_api.h
diff --git a/xpumd/receiver/internal/level-zero-go/level-zero/zes_api.h b/xpumd/level-zero-go/level-zero/zes_api.h
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/level-zero/zes_api.h
rename to xpumd/level-zero-go/level-zero/zes_api.h
diff --git a/xpumd/receiver/internal/level-zero-go/sysman.yml b/xpumd/level-zero-go/sysman.yml
similarity index 90%
rename from xpumd/receiver/internal/level-zero-go/sysman.yml
rename to xpumd/level-zero-go/sysman.yml
index 2c7bbf714..2ce36f129 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman.yml
+++ b/xpumd/level-zero-go/sysman.yml
@@ -23,13 +23,14 @@ TRANSLATOR:
       - {action: replace, from: "^ZES_STRUCTURE_TYPE_", to: "_STRUCTURE_TYPE_"}
       - {action: replace, from: "^ZES_"}
       - {transform: export}
-      # Ignore experimental
-      - {action: ignore, from: "_EXP_"}
+      # Ignore experimental (other than RAS)
+      - {action: ignore, from: "^ZES_[^R].*_EXP[2]?_"}
+      - {action: ignore, from: "^ZES_[^R].*_EXP[2]?$"}
     function:
       - {action: accept, from: "^zes[A-Z]"}
       - {transform: unexport}
-      # Ignore experimental
-      - {action: ignore, from: "Exp[2]?$"}
+      # Ignore experimental (other than RAS)
+      - {action: ignore, from: "^zes[^R].*Exp[2]?$"}
       - {action: ignore, from: "^zesDriverGetExtensionFunctionAddress$"}
       # Ignore deprecated (non-experimental)
       - {action: ignore, from: "^zesDeviceGetCardPowerDomain$"}
@@ -58,9 +59,9 @@ TRANSLATOR:
       - {transform: unexport, from: "[A-Za-z0-9]*Handle$"}
       # Map Ze types to core package
       - {action: replace, from: "^Ze([A-Z])", to: "core.$1"}
-      # Ignore experimental
+      # Ignore experimental (other than RAS)
+      - {action: ignore, from: "^zes_[^r].*_exp[2]?_"}
       - {action: ignore, from: "^zes_vf_handle_t$"}
-      - {action: ignore, from: "_exp[2]?_"}
       # Ignore deprecated (non-experimental)
       - {action: ignore, from: "^zes_oc_mode_t$"}
       - {action: ignore, from: "^zes_oc_capabilities_t$"}
@@ -84,6 +85,7 @@ TRANSLATOR:
       - {target: "^zesFrequencyGetAvailableClocks$", tips: [ref, ref, arr]}
       - {target: "^zesPower(Get|Set)LimitsExt$", tips: [ref, ref, arr]}
       - {target: "^zesEngineGetActivityExt$", tips: [ref, ref, arr]}
+      - {target: "^zesRasGetStateExp$", tips: [ref, ref, arr]}
       # Default tip, everything is ref
       - {target: ., tips: [ref, ref, ref, ref, ref, ref, ref, ref, ref, ref]}
   MemTips:
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/Doxyfile b/xpumd/level-zero-go/sysman/Doxyfile
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/Doxyfile
rename to xpumd/level-zero-go/sysman/Doxyfile
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/cgo_helpers.h b/xpumd/level-zero-go/sysman/cgo_helpers.h
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/cgo_helpers.h
rename to xpumd/level-zero-go/sysman/cgo_helpers.h
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/cgo_helpers_static.go b/xpumd/level-zero-go/sysman/cgo_helpers_static.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/cgo_helpers_static.go
rename to xpumd/level-zero-go/sysman/cgo_helpers_static.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/const.go b/xpumd/level-zero-go/sysman/const.go
similarity index 95%
rename from xpumd/receiver/internal/level-zero-go/sysman/const.go
rename to xpumd/level-zero-go/sysman/const.go
index ebaf98da0..e0388dc45 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/const.go
+++ b/xpumd/level-zero-go/sysman/const.go
@@ -46,6 +46,8 @@ const (
 	POWER_LIMITS_EXT_NAME = "ZES_extension_power_limits"
 	// Engine Activity Extension Name.
 	ENGINE_ACTIVITY_EXT_NAME = "ZES_extension_engine_activity"
+	// RAS Get State Extension Name.
+	RAS_GET_STATE_EXP_NAME = "ZES_extension_ras_state"
 )
 
 // structureType declared in:
@@ -100,12 +102,6 @@ const (
 	_STRUCTURE_TYPE_RESET_PROPERTIES                        structureType = 44
 	_STRUCTURE_TYPE_DEVICE_EXT_PROPERTIES                   structureType = 45
 	_STRUCTURE_TYPE_DEVICE_UUID                             structureType = 46
-	_STRUCTURE_TYPE_MEMORY_PAGE_OFFLINE_STATE_EXP           structureType = 131075
-	_STRUCTURE_TYPE_VF_UTIL_MEM_EXP                         structureType = 131078
-	_STRUCTURE_TYPE_VF_UTIL_ENGINE_EXP                      structureType = 131079
-	_STRUCTURE_TYPE_VF_UTIL_MEM_EXP2                        structureType = 131081
-	_STRUCTURE_TYPE_VF_UTIL_ENGINE_EXP2                     structureType = 131088
-	_STRUCTURE_TYPE_VF_EXP2_CAPABILITIES                    structureType = 131089
 	_STRUCTURE_TYPE_DEVICE_ECC_DEFAULT_PROPERTIES_EXT       structureType = 131090
 	_STRUCTURE_TYPE_PCI_LINK_SPEED_DOWNGRADE_EXT_STATE      structureType = 131091
 	_STRUCTURE_TYPE_PCI_LINK_SPEED_DOWNGRADE_EXT_PROPERTIES structureType = 131092
@@ -1190,3 +1186,53 @@ const (
 	// Value marking end of ZES_ENGINE_ACTIVITY_EXT_VERSION_* ENUMs.
 	ENGINE_ACTIVITY_EXT_VERSION_FORCE_UINT32 EngineActivityExtVersion = 2147483647
 )
+
+// RasStateExpVersion declared in:
+// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zes-ras-state-exp-version-t
+//
+// RAS Get State Extension Version(s)
+type RasStateExpVersion uint32
+
+// RasStateExpVersion enumeration from level-zero/zes_api.h:7788
+const (
+	// version 1.0
+	RAS_STATE_EXP_VERSION_1_0 RasStateExpVersion = 65536
+	// latest known version
+	RAS_STATE_EXP_VERSION_CURRENT RasStateExpVersion = 65536
+	// Value marking end of ZES_RAS_STATE_EXP_VERSION_* ENUMs.
+	RAS_STATE_EXP_VERSION_FORCE_UINT32 RasStateExpVersion = 2147483647
+)
+
+// RasErrorCategoryExp declared in:
+// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zes-ras-error-category-exp-t
+//
+// RAS error categories.
+type RasErrorCategoryExp uint32
+
+// RasErrorCategoryExp enumeration from level-zero/zes_api.h:7810
+const (
+	// The number of accelerator engine resets attempted by the driver.
+	RAS_ERROR_CATEGORY_EXP_RESET RasErrorCategoryExp = iota
+	// The number of hardware exceptions generated by the way workloads have programmed
+	// the hardware
+	RAS_ERROR_CATEGORY_EXP_PROGRAMMING_ERRORS RasErrorCategoryExp = 1
+	// The number of low level driver communication errors have occurred.
+	RAS_ERROR_CATEGORY_EXP_DRIVER_ERRORS RasErrorCategoryExp = 2
+	// The number of errors that have occurred in the compute accelerator hardware
+	RAS_ERROR_CATEGORY_EXP_COMPUTE_ERRORS RasErrorCategoryExp = 3
+	// The number of errors that have occurred in the fixed-function accelerator hardware
+	RAS_ERROR_CATEGORY_EXP_NON_COMPUTE_ERRORS RasErrorCategoryExp = 4
+	// The number of errors that have occurred in caches (L1/L3/register file/shared
+	// local memory/sampler)
+	RAS_ERROR_CATEGORY_EXP_CACHE_ERRORS RasErrorCategoryExp = 5
+	// The number of errors that have occurred in the display.
+	RAS_ERROR_CATEGORY_EXP_DISPLAY_ERRORS RasErrorCategoryExp = 6
+	// The number of errors that have occurred in Memory.
+	RAS_ERROR_CATEGORY_EXP_MEMORY_ERRORS RasErrorCategoryExp = 7
+	// The number of errors that have occurred in Scale Fabric.
+	RAS_ERROR_CATEGORY_EXP_SCALE_ERRORS RasErrorCategoryExp = 8
+	// The number of errors that have occurred in L3 Fabric.
+	RAS_ERROR_CATEGORY_EXP_L3FABRIC_ERRORS RasErrorCategoryExp = 9
+	// Value marking end of ZES_RAS_ERROR_CATEGORY_EXP_* ENUMs.
+	RAS_ERROR_CATEGORY_EXP_FORCE_UINT32 RasErrorCategoryExp = 2147483647
+)
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/doc.go b/xpumd/level-zero-go/sysman/doc.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/doc.go
rename to xpumd/level-zero-go/sysman/doc.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/stub_helper.go b/xpumd/level-zero-go/sysman/stub_helper.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/stub_helper.go
rename to xpumd/level-zero-go/sysman/stub_helper.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/stub_helper_nil.go b/xpumd/level-zero-go/sysman/stub_helper_nil.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/stub_helper_nil.go
rename to xpumd/level-zero-go/sysman/stub_helper_nil.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/sysman.go b/xpumd/level-zero-go/sysman/sysman.go
similarity index 98%
rename from xpumd/receiver/internal/level-zero-go/sysman/sysman.go
rename to xpumd/level-zero-go/sysman/sysman.go
index c271ae972..c34d8e8ad 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/sysman.go
+++ b/xpumd/level-zero-go/sysman/sysman.go
@@ -1135,3 +1135,22 @@ func zesEngineGetActivityExt(HEngine engineHandle, PCount *uint32, PStats []Engi
 	__v := (core.Result)(__ret)
 	return __v
 }
+
+// zesRasGetStateExp function as declared in level-zero/zes_api.h:7850
+func zesRasGetStateExp(HRas rasHandle, PCount *uint32, PState []RasStateExp) core.Result {
+	cHRas, _ := *(*C.zes_ras_handle_t)(unsafe.Pointer(&HRas)), cgoAllocsUnknown
+	cPCount, _ := (*C.uint32_t)(unsafe.Pointer(PCount)), cgoAllocsUnknown
+	cPState, _ := (*C.zes_ras_state_exp_t)(unsafe.Pointer((*sliceHeader)(unsafe.Pointer(&PState)).Data)), cgoAllocsUnknown
+	__ret := C.zesRasGetStateExp(cHRas, cPCount, cPState)
+	__v := (core.Result)(__ret)
+	return __v
+}
+
+// zesRasClearStateExp function as declared in level-zero/zes_api.h:7896
+func zesRasClearStateExp(HRas rasHandle, Category RasErrorCategoryExp) core.Result {
+	cHRas, _ := *(*C.zes_ras_handle_t)(unsafe.Pointer(&HRas)), cgoAllocsUnknown
+	cCategory, _ := (C.zes_ras_error_category_exp_t)(Category), cgoAllocsUnknown
+	__ret := C.zesRasClearStateExp(cHRas, cCategory)
+	__v := (core.Result)(__ret)
+	return __v
+}
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/sysman_static.go b/xpumd/level-zero-go/sysman/sysman_static.go
similarity index 93%
rename from xpumd/receiver/internal/level-zero-go/sysman/sysman_static.go
rename to xpumd/level-zero-go/sysman/sysman_static.go
index 8f382ea0e..2a79d9d75 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/sysman_static.go
+++ b/xpumd/level-zero-go/sysman/sysman_static.go
@@ -176,9 +176,43 @@ func (z *Device) ProcessesGetState() ([]ProcessState, error) {
 
 // EventRegister wraps the zesDeviceEventRegister function:
 // https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zesdeviceeventregister
-func (z *Device) EventRegister(eventType EventTypeFlags) error {
-	ret := zesDeviceEventRegister(z.handle, eventType)
-	return ret.ToError()
+//
+// The method has a built-in fallback to handle cases where the backend driver:
+// a) does not recognize some of the event flags (e.g. due to older driver version) and returns ERROR_INVALID_ENUMERATION
+// b) does not support some event and returns ERROR_UNSUPPORTED_ENUMERATION
+// In this case the method tries to register each flag individually. The method
+// returns the successfully registered set of flags.
+func (z *Device) EventRegister(flags EventTypeFlags) (EventTypeFlags, error) {
+	// Fastpath: try to register all requested flags
+	ret := zesDeviceEventRegister(z.handle, flags)
+	if ret == core.RESULT_SUCCESS {
+		return flags, nil
+	}
+	if flags <= EventTypeFlags(1) || (ret != core.RESULT_ERROR_INVALID_ENUMERATION && ret != core.RESULT_ERROR_UNSUPPORTED_ENUMERATION) {
+		// No flags to retry individually, or an error other than invalid/unsupported enumeration occurred
+		return 0, ret.ToError()
+	}
+
+	// Slowpath: iteratively register bit-by-bit
+	// NOTE: this may leave us in partially registered state, but there's no way to roll back
+	// (there's no way to know the original state before any registration attempts)
+	var registered EventTypeFlags
+	for _, flag := range flags.Bits() {
+		f := EventTypeFlags(flag)
+		if ret := zesDeviceEventRegister(z.handle, f); ret != core.RESULT_SUCCESS {
+			if ret == core.RESULT_ERROR_INVALID_ENUMERATION || ret == core.RESULT_ERROR_UNSUPPORTED_ENUMERATION {
+				continue
+			}
+			// Unexpected (other than invalid/unsupported enumeration) error
+			return 0, ret.ToError()
+		}
+		registered |= f
+	}
+	ret = zesDeviceEventRegister(z.handle, registered)
+	if ret != core.RESULT_SUCCESS {
+		return 0, ret.ToError()
+	}
+	return registered, nil
 }
 
 // PciGetProperties wraps the zesDevicePciGetProperties function:
@@ -1027,7 +1061,7 @@ func (z *Device) EnumRasErrorSets() ([]*Ras, error) {
 	}
 	handles := make([]rasHandle, count)
 	ret := zesDeviceEnumRasErrorSets(z.handle, &count, handles)
-	return handlesToWrappers[rasHandle, Ras](handles), ret.ToError()
+	return handlesToWrappersWithDevice[rasHandle, Ras](handles, z), ret.ToError()
 }
 
 // GetProperties wraps the zesRasGetProperties function:
@@ -1061,6 +1095,51 @@ func (z *Ras) GetState(resetCounters bool) (RasState, error) {
 	return state, ret.ToError()
 }
 
+// GetStateExp wraps the (experimental) zesRasGetStateExp function:
+// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zesrasgetstateexp
+// and if that is not supported, it wraps (legacy) zesRasGetState instead.
+func (z *Ras) GetStateExp() ([]RasStateExp, error) {
+	// experimental API supported by backend?
+	ret := core.RESULT_ERROR_UNSUPPORTED_FEATURE
+	if z.device.extensions[RAS_GET_STATE_EXP_NAME] {
+		count := uint32(0)
+		if ret = zesRasGetStateExp(z.handle, &count, nil); ret == core.RESULT_SUCCESS {
+			states := make([]RasStateExp, count)
+			if ret = zesRasGetStateExp(z.handle, &count, states); ret == core.RESULT_SUCCESS {
+				return states, ret.ToError()
+			}
+		}
+	}
+	if ret != core.RESULT_ERROR_UNSUPPORTED_FEATURE {
+		return nil, ret.ToError()
+	}
+
+	// no => convert legacy API result instead
+	var state RasState
+	if ret = zesRasGetState(z.handle, boolToByte(false), &state); ret != core.RESULT_SUCCESS {
+		return nil, ret.ToError()
+	}
+	states := make([]RasStateExp, len(state.Category))
+	for cat, value := range state.Category {
+		states[cat] = RasStateExp{
+			// RasErrorCategoryExp is superset of RasErrorCat
+			Category:     RasErrorCategoryExp(cat),
+			ErrorCounter: value,
+		}
+	}
+	return states, ret.ToError()
+}
+
+// ClearStateExp wraps the (experimental) zesRasClearStateExp function:
+// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zesrasclearstateexp
+func (z *Ras) ClearStateExp(cat RasErrorCategoryExp) error {
+	ret := core.RESULT_ERROR_UNSUPPORTED_FEATURE
+	if z.device.extensions[RAS_GET_STATE_EXP_NAME] {
+		ret = zesRasClearStateExp(z.handle, cat)
+	}
+	return ret.ToError()
+}
+
 // EnumSchedulers wraps the zesDeviceEnumSchedulers function:
 // https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zesdeviceenumschedulers
 func (z *Device) EnumSchedulers() ([]*Scheduler, error) {
diff --git a/xpumd/level-zero-go/sysman/sysman_static_test.go b/xpumd/level-zero-go/sysman/sysman_static_test.go
new file mode 100644
index 000000000..99def0845
--- /dev/null
+++ b/xpumd/level-zero-go/sysman/sysman_static_test.go
@@ -0,0 +1,1780 @@
+// SPDX-License-Identifier: MIT
+// Copyright (C) 2026 Intel Corporation
+
+package sysman
+
+import (
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/intel/level-zero-go/core"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// Driver config paths (relative to the sysman/ package directory, i.e. go test CWD).
+const (
+	driverConfigDefault       = "testdata/default.yaml"
+	driverConfigDriverGetErr  = "testdata/error_driver_get.yaml"
+	driverConfigDriverErrs    = "testdata/error_driver.yaml"
+	driverConfigDeviceErrs    = "testdata/error_device.yaml"
+	driverConfigComponentErrs = "testdata/error_component.yaml"
+)
+
+type fixedStringProperty interface {
+	core.StringProperty64 | core.StringProperty256
+}
+
+func stringProperty[T fixedStringProperty](value string) T {
+	var prop T
+	switch p := any(&prop).(type) {
+	case *core.StringProperty64:
+		copy(p[:], value)
+	case *core.StringProperty256:
+		copy(p[:], value)
+	default:
+		panic("unsupported string property type")
+	}
+	return prop
+}
+
+// loadDriverConfig reloads the stub with the given driver config file.
+func loadDriverConfig(t *testing.T, path string) {
+	t.Helper()
+	require.NoError(t, stubReload(path))
+}
+
+// getDriver returns drivers[idx] from the currently-loaded stub state.
+func getDriver(t *testing.T, idx int) *Driver {
+	t.Helper()
+	drivers, err := DriverGet()
+	require.NoError(t, err)
+	require.Greater(t, len(drivers), idx, "driver index out of range")
+	return drivers[idx]
+}
+
+// getDevice returns drivers[drvIdx].devices[idx] from the currently-loaded stub state.
+func getDevice(t *testing.T, drvIdx, idx int) *Device {
+	t.Helper()
+	drv := getDriver(t, drvIdx)
+	devices, err := drv.DeviceGet()
+	require.NoError(t, err)
+	require.Greater(t, len(devices), idx, "device index out of range")
+	return devices[idx]
+}
+
+// getComponent is a generic helper that enumerates components on a device and returns
+// the component at the given index.
+func getComponent[C any](t *testing.T, drvIdx, devIdx, idx int, enum func(*Device) ([]*C, error)) *C {
+	t.Helper()
+	dev := getDevice(t, drvIdx, devIdx)
+	items, err := enum(dev)
+	require.NoError(t, err)
+	require.Greater(t, len(items), idx, "component index out of range")
+	return items[idx]
+}
+
+func getEngine(t *testing.T, drvIdx, devIdx, idx int) *Engine {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumEngineGroups)
+}
+
+func getFabricPort(t *testing.T, drvIdx, devIdx, idx int) *FabricPort {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFabricPorts)
+}
+
+func getFan(t *testing.T, drvIdx, devIdx, idx int) *Fan {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFans)
+}
+
+func getFirmware(t *testing.T, drvIdx, devIdx, idx int) *Firmware {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFirmwares)
+}
+
+func getFrequency(t *testing.T, drvIdx, devIdx, idx int) *Frequency {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFrequencyDomains)
+}
+
+func getLed(t *testing.T, drvIdx, devIdx, idx int) *Led {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumLeds)
+}
+
+func getMemory(t *testing.T, drvIdx, devIdx, idx int) *Memory {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumMemoryModules)
+}
+
+func getOcDomain(t *testing.T, drvIdx, devIdx, idx int) *Overclock {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumOverclockDomains)
+}
+
+func getPerf(t *testing.T, drvIdx, devIdx, idx int) *Performance {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumPerformanceFactorDomains)
+}
+
+func getPower(t *testing.T, drvIdx, devIdx, idx int) *Power {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumPowerDomains)
+}
+
+func getPsu(t *testing.T, drvIdx, devIdx, idx int) *Psu {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumPsus)
+}
+
+func getRas(t *testing.T, drvIdx, devIdx, idx int) *Ras {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumRasErrorSets)
+}
+
+func getScheduler(t *testing.T, drvIdx, devIdx, idx int) *Scheduler {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumSchedulers)
+}
+
+func getStandby(t *testing.T, drvIdx, devIdx, idx int) *Standby {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumStandbyDomains)
+}
+
+func getTemperature(t *testing.T, drvIdx, devIdx, idx int) *Temperature {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumTemperatureSensors)
+}
+
+func getDiagnostic(t *testing.T, drvIdx, devIdx, idx int) *Diagnostics {
+	t.Helper()
+	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumDiagnosticTestSuites)
+}
+
+// testBaseCfg holds the minimal config needed by the base test helpers.
+type testBaseCfg struct {
+	name    string
+	cfgFile string
+	wantErr error
+}
+
+// testCfg extends testBaseCfg with addressing fields for device/component wrappers.
+type testCfg struct {
+	testBaseCfg
+	drvIdx  int
+	devIdx  int
+	compIdx int
+}
+
+func (c *testCfg) getDriver(t *testing.T) *Driver {
+	t.Helper()
+	return getDriver(t, c.drvIdx)
+}
+
+func (c *testCfg) getDevice(t *testing.T) *Device {
+	t.Helper()
+	return getDevice(t, c.drvIdx, c.devIdx)
+}
+
+type testOpt func(*testCfg)
+
+func withConfig(cfg string) testOpt { return func(c *testCfg) { c.cfgFile = cfg } }
+func withError(err error) testOpt   { return func(c *testCfg) { c.wantErr = err } }
+func withDrvIdx(idx int) testOpt    { return func(c *testCfg) { c.drvIdx = idx } }
+func withDevIdx(idx int) testOpt    { return func(c *testCfg) { c.devIdx = idx } } //nolint: unused // Included for completeness and future use
+func withCompIdx(idx int) testOpt   { return func(c *testCfg) { c.compIdx = idx } }
+func withName(name string) testOpt  { return func(c *testCfg) { c.name = name } }
+
+func (c *testCfg) applyOpts(opts ...testOpt) {
+	for _, o := range opts {
+		o(c)
+	}
+}
+
+// testGetter is a base helper for testing getter-like functions (that return a value and an error).
+func testGetter[T, R any](t *testing.T, getObj func(*testing.T) T, method func(T) (R, error), check func(*testing.T, R), bcfg *testBaseCfg) {
+	t.Helper()
+	t.Run(bcfg.name, func(t *testing.T) {
+		cfgFile := bcfg.cfgFile
+		if cfgFile == "" {
+			cfgFile = driverConfigDefault
+		}
+		loadDriverConfig(t, cfgFile)
+		got, err := method(getObj(t))
+		if bcfg.wantErr != nil {
+			require.ErrorIs(t, err, bcfg.wantErr)
+		} else {
+			require.NoError(t, err)
+		}
+		if check != nil {
+			check(t, got)
+		}
+	})
+}
+
+// testAction is a base helper for testing action-like functions (that only return an error).
+func testAction[T any](t *testing.T, getObj func(*testing.T) T, action func(T) error, bcfg *testBaseCfg) {
+	t.Helper()
+	t.Run(bcfg.name, func(t *testing.T) {
+		cfgFile := bcfg.cfgFile
+		if cfgFile == "" {
+			cfgFile = driverConfigDefault
+		}
+		loadDriverConfig(t, cfgFile)
+		err := action(getObj(t))
+		if bcfg.wantErr != nil {
+			require.ErrorIs(t, err, bcfg.wantErr)
+		} else {
+			require.NoError(t, err)
+		}
+	})
+}
+
+func testDriverGetterError[R any](t *testing.T, method func(*Driver) (R, error), opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Error", wantErr: core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS}}
+	cfg.applyOpts(opts...)
+	testGetter(t, cfg.getDriver, method, nil, &cfg.testBaseCfg)
+}
+
+func testDriverGetterSuccess[R any](t *testing.T, method func(*Driver) (R, error), check func(*testing.T, R), opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Success"}}
+	cfg.applyOpts(opts...)
+	testGetter(t, cfg.getDriver, method, check, &cfg.testBaseCfg)
+}
+
+func testDeviceGetterError[R any](t *testing.T, method func(*Device) (R, error), opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Error", wantErr: core.RESULT_ERROR_INVALID_ARGUMENT}}
+	cfg.applyOpts(opts...)
+	testGetter(t, cfg.getDevice, method, nil, &cfg.testBaseCfg)
+}
+
+func testDeviceGetterSuccess[R any](t *testing.T, method func(*Device) (R, error), check func(*testing.T, R), opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Success"}}
+	cfg.applyOpts(opts...)
+	testGetter(t, cfg.getDevice, method, check, &cfg.testBaseCfg)
+}
+
+func testComponentGetterError[C, R any](t *testing.T, getComp func(*testing.T, int, int, int) *C, method func(*C) (R, error), opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Error", wantErr: core.RESULT_ERROR_NOT_AVAILABLE}}
+	cfg.applyOpts(opts...)
+	getter := func(t *testing.T) *C { return getComp(t, cfg.drvIdx, cfg.devIdx, cfg.compIdx) }
+	testGetter(t, getter, method, nil, &cfg.testBaseCfg)
+}
+
+func testComponentGetterSuccess[C, R any](t *testing.T, getComp func(*testing.T, int, int, int) *C, method func(*C) (R, error), check func(*testing.T, R), opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Success"}}
+	cfg.applyOpts(opts...)
+	getter := func(t *testing.T) *C { return getComp(t, cfg.drvIdx, cfg.devIdx, cfg.compIdx) }
+	testGetter(t, getter, method, check, &cfg.testBaseCfg)
+}
+
+func testDeviceActionError(t *testing.T, action func(*Device) error, opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Error", wantErr: core.RESULT_ERROR_INVALID_ARGUMENT}}
+	cfg.applyOpts(opts...)
+	testAction(t, cfg.getDevice, action, &cfg.testBaseCfg)
+}
+
+func testDeviceActionSuccess(t *testing.T, action func(*Device) error, opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Success"}}
+	cfg.applyOpts(opts...)
+	testAction(t, cfg.getDevice, action, &cfg.testBaseCfg)
+}
+
+func testComponentActionError[C any](t *testing.T, getComp func(*testing.T, int, int, int) *C, action func(*C) error, opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Error", wantErr: core.RESULT_ERROR_NOT_AVAILABLE}}
+	cfg.applyOpts(opts...)
+	getter := func(t *testing.T) *C { return getComp(t, cfg.drvIdx, cfg.devIdx, cfg.compIdx) }
+	testAction(t, getter, action, &cfg.testBaseCfg)
+}
+
+func testComponentActionSuccess[C any](t *testing.T, getComp func(*testing.T, int, int, int) *C, action func(*C) error, opts ...testOpt) {
+	t.Helper()
+	cfg := &testCfg{testBaseCfg: testBaseCfg{name: "Success"}}
+	cfg.applyOpts(opts...)
+	getter := func(t *testing.T) *C { return getComp(t, cfg.drvIdx, cfg.devIdx, cfg.compIdx) }
+	testAction(t, getter, action, &cfg.testBaseCfg)
+}
+
+// checkValue returns a check function that asserts a value.
+func checkValue[T any](want T) func(*testing.T, T) {
+	return func(t *testing.T, got T) {
+		t.Helper()
+		assert.Equal(t, want, got)
+	}
+}
+
+// checkValueExported returns a check function that asserts exported fields of a value.
+func checkValueExported[T any](want T) func(*testing.T, T) {
+	return func(t *testing.T, got T) {
+		t.Helper()
+		assert.EqualExportedValues(t, want, got)
+	}
+}
+
+// checkLen returns a check function that asserts the length of a slice.
+func checkLen[T any](n int) func(*testing.T, []T) {
+	return func(t *testing.T, v []T) {
+		t.Helper()
+		require.Len(t, v, n)
+	}
+}
+
+// ------------------------------------------------------------------
+// Init
+// ------------------------------------------------------------------
+
+func TestInit(t *testing.T) {
+	t.Run("Error", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDriverGetErr)
+		err := Init(0)
+		require.ErrorIs(t, err, core.RESULT_ERROR_UNINITIALIZED)
+	})
+
+	t.Run("Success", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDefault)
+		err := Init(0)
+		require.NoError(t, err)
+	})
+}
+
+// ------------------------------------------------------------------
+// Driver
+// ------------------------------------------------------------------
+
+func TestDriverGet(t *testing.T) {
+	t.Run("Error", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDriverGetErr)
+		_, err := DriverGet()
+		require.ErrorIs(t, err, core.RESULT_ERROR_UNINITIALIZED)
+	})
+
+	t.Run("Success", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDefault)
+		drivers, err := DriverGet()
+		require.NoError(t, err)
+		require.Len(t, drivers, 2)
+	})
+}
+
+func TestDriverGetExtensionProperties(t *testing.T) {
+	// DriverGet silently swallows GetExtensionProperties errors, so call directly.
+	testDriverGetterError(t, (*Driver).GetExtensionProperties, withConfig(driverConfigDriverErrs))
+	testDriverGetterSuccess(t, (*Driver).GetExtensionProperties,
+		checkValue([]DriverExtensionProperties{
+			{Name: stringProperty[core.StringProperty256]("ZES_extension_ras_state"), Version: 1},
+			{Name: stringProperty[core.StringProperty256]("ZES_extension_bar"), Version: 2},
+		}),
+	)
+}
+
+func TestDriverDeviceGet(t *testing.T) {
+	testDriverGetterError(t, (*Driver).DeviceGet, withConfig(driverConfigDriverErrs))
+	testDriverGetterSuccess(t, (*Driver).DeviceGet, checkLen[*Device](1))
+}
+
+func TestDriverEventListen(t *testing.T) {
+	t.Run("Error", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDriverErrs)
+		drv := getDriver(t, 0)
+		_, _, err := drv.EventListen(time.Second, nil)
+		require.ErrorIs(t, err, core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS)
+	})
+
+	t.Run("Success", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDefault)
+		drv := getDriver(t, 0)
+		dev := getDevice(t, 0, 0)
+		numEvents, events, err := drv.EventListen(0, []*Device{dev})
+		require.NoError(t, err)
+		assert.Equal(t, uint32(1), numEvents)
+		assert.Equal(t, EventTypeFlags(EVENT_TYPE_FLAG_DEVICE_DETACH), events[0])
+	})
+}
+
+func TestDriverEventListenEx(t *testing.T) {
+	t.Run("Error", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDriverErrs)
+		drv := getDriver(t, 0)
+		_, _, err := drv.EventListenEx(time.Second, nil)
+		require.ErrorIs(t, err, core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS)
+	})
+
+	t.Run("Success", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDefault)
+		drv := getDriver(t, 0)
+		dev := getDevice(t, 0, 0)
+		numEvents, events, err := drv.EventListenEx(0, []*Device{dev})
+		require.NoError(t, err)
+		assert.Equal(t, uint32(1), numEvents)
+		assert.Equal(t, EventTypeFlags(EVENT_TYPE_FLAG_DEVICE_DETACH), events[0])
+	})
+}
+
+func TestDeviceGetProperties(t *testing.T) {
+	testDeviceGetterError(t, (*Device).GetProperties, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).GetProperties,
+		checkValueExported(DeviceProperties{
+			DeviceBaseProperties: DeviceBaseProperties{
+				Core: core.DeviceProperties{
+					Type:                     core.DEVICE_TYPE_GPU,
+					VendorId:                 32902,
+					DeviceId:                 3029,
+					Flags:                    core.DevicePropertyFlags(core.DEVICE_PROPERTY_FLAG_INTEGRATED),
+					SubdeviceId:              1,
+					CoreClockRate:            1600,
+					MaxMemAllocSize:          17179869184,
+					MaxHardwareContexts:      256,
+					MaxCommandQueuePriority:  2,
+					NumThreadsPerEU:          8,
+					PhysicalEUSimdWidth:      16,
+					NumEUsPerSubslice:        16,
+					NumSubslicesPerSlice:     8,
+					NumSlices:                2,
+					TimerResolution:          100,
+					TimestampValidBits:       36,
+					KernelTimestampValidBits: 32,
+					Uuid: core.DeviceUuid{
+						Id: uuid.MustParse("12345678-1234-5678-9abc-def000000000"),
+					},
+					Name: stringProperty[core.StringProperty256]("ACME Data Center GPU"),
+				},
+				NumSubdevices: 2,
+				SerialNumber:  stringProperty[core.StringProperty64]("SN-0001"),
+				BoardNumber:   stringProperty[core.StringProperty64]("BOARD-0001"),
+				BrandName:     stringProperty[core.StringProperty64]("ACME"),
+				ModelName:     stringProperty[core.StringProperty64]("Stub GPU 1234"),
+				VendorName:    stringProperty[core.StringProperty64]("ACME Corporation"),
+				DriverVersion: stringProperty[core.StringProperty64]("1.2.3"),
+			},
+		}),
+	)
+	testDeviceGetterSuccess(t, (*Device).GetProperties,
+		checkValueExported(DeviceProperties{
+			DeviceExtProperties: DeviceExtProperties{
+				Uuid: Uuid{
+					Id: uuid.MustParse("abcdef01-2345-6789-abcd-ef0000000000"),
+				},
+				Type:  DEVICE_TYPE_GPU,
+				Flags: 1,
+			},
+		}),
+		withDrvIdx(1), withName("SuccessWithExtProps"),
+	)
+}
+
+func TestDeviceGetState(t *testing.T) {
+	testDeviceGetterError(t, (*Device).GetState, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).GetState,
+		checkValue(DeviceState{
+			Reset:    0,
+			Repaired: REPAIR_STATUS_NOT_PERFORMED,
+		}),
+	)
+}
+
+func TestDeviceReset(t *testing.T) {
+	testDeviceActionError(t, func(d *Device) error { return d.Reset(false) }, withConfig(driverConfigDeviceErrs))
+	testDeviceActionSuccess(t, func(d *Device) error { return d.Reset(false) })
+}
+
+func TestDeviceResetExt(t *testing.T) {
+	testDeviceActionError(t, func(d *Device) error { return d.ResetExt(nil) }, withConfig(driverConfigDeviceErrs))
+	testDeviceActionSuccess(t, func(d *Device) error { return d.ResetExt(nil) })
+}
+
+func TestDeviceProcessesGetState(t *testing.T) {
+	testDeviceGetterError(t, (*Device).ProcessesGetState, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).ProcessesGetState,
+		checkValue([]ProcessState{
+			{
+				ProcessId:  1234,
+				MemSize:    1073741824,
+				SharedSize: 268435456,
+				Engines:    7,
+			},
+			{
+				ProcessId:  5678,
+				MemSize:    536870912,
+				SharedSize: 134217728,
+				Engines:    2,
+			},
+		}),
+	)
+}
+
+func TestDeviceEventRegister(t *testing.T) {
+	events := EventTypeFlags(EVENT_TYPE_FLAG_DEVICE_DETACH | EVENT_TYPE_FLAG_DEVICE_ATTACH | EVENT_TYPE_FLAG_SURVIVABILITY_MODE_DETECTED)
+	eventRegister := func(d *Device) (EventTypeFlags, error) { return d.EventRegister(events) }
+
+	testDeviceGetterError(t, eventRegister, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, eventRegister, checkValue(events))
+}
+
+// ------------------------------------------------------------------
+// Device.Pci
+// ------------------------------------------------------------------
+
+func TestDevicePciGetProperties(t *testing.T) {
+	testDeviceGetterError(t, (*Device).PciGetProperties, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).PciGetProperties,
+		checkValue(PciProperties{
+			PciBaseProperties: PciBaseProperties{
+				Address: PciAddress{Domain: 1, Bus: 5},
+				MaxSpeed: PciSpeed{
+					Gen:          4,
+					Width:        16,
+					MaxBandwidth: 256000000000,
+				},
+				HaveBandwidthCounters: 1,
+				HavePacketCounters:    1,
+				HaveReplayCounters:    1,
+			},
+		}),
+	)
+	testDeviceGetterSuccess(t, (*Device).PciGetProperties,
+		checkValueExported(PciProperties{
+			PciBaseProperties: PciBaseProperties{
+				Address: PciAddress{Domain: 1, Bus: 2, Device: 3, Function: 4},
+				MaxSpeed: PciSpeed{
+					Gen:          5,
+					Width:        16,
+					MaxBandwidth: 512000000000,
+				},
+				HaveBandwidthCounters: 1,
+				HaveReplayCounters:    1,
+			},
+			LinkSpeedDowngrade: &PciLinkSpeedDowngradeExtProperties{
+				PciLinkSpeedUpdateCapable: 1,
+				MaxPciGenSupported:        5,
+			},
+		}),
+		withDrvIdx(1), withName("SuccessWithExt"),
+	)
+}
+
+func TestDevicePciGetState(t *testing.T) {
+	testDeviceGetterError(t, (*Device).PciGetState, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).PciGetState,
+		func(t *testing.T, state PciState) {
+			assert.Equal(t, PciState{
+				PciBaseState: PciBaseState{
+					Status:          PCI_LINK_STATUS_QUALITY_ISSUES,
+					QualityIssues:   PciLinkQualIssueFlags(PCI_LINK_QUAL_ISSUE_FLAG_REPLAYS | PCI_LINK_QUAL_ISSUE_FLAG_SPEED),
+					StabilityIssues: PciLinkStabIssueFlags(PCI_LINK_STAB_ISSUE_FLAG_RETRAINING),
+					Speed: PciSpeed{
+						Gen:          3,
+						Width:        8,
+						MaxBandwidth: 126000000000,
+					},
+				},
+			}, state)
+			assert.Nil(t, state.LinkSpeedDowngrade)
+		})
+
+	testDeviceGetterSuccess(t, (*Device).PciGetState,
+		checkValueExported(PciState{
+			PciBaseState: PciBaseState{
+				Status:        PCI_LINK_STATUS_QUALITY_ISSUES,
+				QualityIssues: PciLinkQualIssueFlags(PCI_LINK_QUAL_ISSUE_FLAG_SPEED),
+				Speed: PciSpeed{
+					Gen:          3,
+					Width:        8,
+					MaxBandwidth: 126000000000,
+				},
+			},
+			LinkSpeedDowngrade: &PciLinkSpeedDowngradeExtState{
+				PciLinkSpeedDowngradeStatus: 1,
+			},
+		}),
+		withDrvIdx(1), withName("SuccessWithExt"))
+}
+
+func TestDevicePciLinkSpeedUpdateExt(t *testing.T) {
+	testDeviceGetterError(t,
+		func(d *Device) (DeviceAction, error) { return d.PciLinkSpeedUpdateExt(true) },
+		withConfig(driverConfigDeviceErrs))
+
+	testDeviceGetterSuccess(t,
+		func(d *Device) (DeviceAction, error) { return d.PciLinkSpeedUpdateExt(true) },
+		checkValue(DEVICE_ACTION_WARM_CARD_RESET),
+		withDrvIdx(1))
+}
+
+func TestDevicePciGetBars(t *testing.T) {
+	testDeviceGetterError(t, (*Device).PciGetBars, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).PciGetBars,
+		checkValue([]PciBarProperties{
+			{Type: PCI_BAR_TYPE_MMIO, Index: 0, Base: 0x80000000, Size: 16777216},
+			{Type: PCI_BAR_TYPE_MEM, Index: 2, Base: 0x100000000, Size: 268435456},
+		}),
+	)
+}
+
+func TestDevicePciGetStats(t *testing.T) {
+	testDeviceGetterError(t, (*Device).PciGetStats, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).PciGetStats,
+		checkValue(PciStats{
+			Timestamp:     999999,
+			ReplayCounter: 77,
+			PacketCounter: 88,
+			RxCounter:     1000000,
+			TxCounter:     2000000,
+			Speed: PciSpeed{
+				Gen:          3,
+				Width:        8,
+				MaxBandwidth: 126000000000,
+			},
+		}),
+	)
+}
+
+// ------------------------------------------------------------------
+// Device overclock helpers (no component handle needed)
+// ------------------------------------------------------------------
+
+func TestDeviceSetOverclockWaiver(t *testing.T) {
+	testDeviceActionError(t, (*Device).SetOverclockWaiver, withConfig(driverConfigDeviceErrs))
+	testDeviceActionSuccess(t, (*Device).SetOverclockWaiver)
+}
+
+func TestDeviceGetOverclockDomains(t *testing.T) {
+	testDeviceGetterError(t, (*Device).GetOverclockDomains, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).GetOverclockDomains,
+		checkValue(OverclockDomains(OVERCLOCK_DOMAIN_CARD|OVERCLOCK_DOMAIN_PACKAGE)),
+	)
+}
+
+func TestDeviceGetOverclockControls(t *testing.T) {
+	getOverclockControls := func(d *Device) (OverclockControls, error) { return d.GetOverclockControls(0) }
+
+	testDeviceGetterError(t, getOverclockControls, withConfig(driverConfigDeviceErrs))
+
+	testDeviceGetterSuccess(t, getOverclockControls,
+		checkValue(OverclockControls(OVERCLOCK_CONTROL_VF|OVERCLOCK_CONTROL_FREQ_OFFSET|OVERCLOCK_CONTROL_VMAX_OFFSET)),
+	)
+}
+
+func TestDeviceResetOverclockSettings(t *testing.T) {
+	testDeviceActionError(t, func(d *Device) error { return d.ResetOverclockSettings(false) }, withConfig(driverConfigDeviceErrs))
+	testDeviceActionSuccess(t, func(d *Device) error { return d.ResetOverclockSettings(false) })
+}
+
+func TestDeviceReadOverclockState(t *testing.T) {
+	testDeviceGetterError(t, (*Device).ReadOverclockState, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).ReadOverclockState,
+		checkValue(OverclockState{
+			Mode:          OVERCLOCK_MODE_MODE_ON,
+			WaiverSetting: true,
+			State:         false,
+			PendingAction: PENDING_ACTION_PENDING_NONE,
+			PendingReset:  false,
+		}),
+	)
+}
+
+func TestDeviceEccAvailable(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EccAvailable, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EccAvailable,
+		func(t *testing.T, available bool) { assert.True(t, available, "EccAvailable") },
+	)
+}
+
+func TestDeviceEccConfigurable(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EccConfigurable, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EccConfigurable,
+		func(t *testing.T, configurable bool) { assert.True(t, configurable, "EccConfigurable") },
+	)
+}
+
+func TestDeviceGetEccState(t *testing.T) {
+	testDeviceGetterError(t, (*Device).GetEccState, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).GetEccState,
+		checkValue(EccProperties{
+			DeviceEccProperties: DeviceEccProperties{
+				CurrentState:  DEVICE_ECC_STATE_ENABLED,
+				PendingState:  DEVICE_ECC_STATE_ENABLED,
+				PendingAction: DEVICE_ACTION_NONE,
+			},
+		}),
+	)
+	testDeviceGetterSuccess(t, (*Device).GetEccState,
+		checkValueExported(EccProperties{
+			DeviceEccProperties: DeviceEccProperties{},
+			ExtendedProperties: &DeviceEccDefaultPropertiesExt{
+				DefaultState: DEVICE_ECC_STATE_ENABLED,
+			},
+		}),
+		withDrvIdx(1), withName("SuccessWithExtProps"),
+	)
+}
+
+func TestDeviceSetEccState(t *testing.T) {
+	setEccState := func(d *Device) (DeviceEccProperties, error) { return d.SetEccState(DeviceEccDesc{}) }
+
+	testDeviceGetterError(t, setEccState,
+		withConfig(driverConfigDeviceErrs),
+	)
+	testDeviceGetterSuccess(t, setEccState,
+		checkValue(DeviceEccProperties{
+			CurrentState: DEVICE_ECC_STATE_ENABLED,
+			PendingState: DEVICE_ECC_STATE_ENABLED,
+		}),
+	)
+}
+
+// ------------------------------------------------------------------
+// Device enum methods
+// ------------------------------------------------------------------
+
+func TestDeviceEnumEngineGroups(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumEngineGroups, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumEngineGroups, checkLen[*Engine](3))
+}
+
+func TestDeviceEnumFrequencyDomains(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumFrequencyDomains, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumFrequencyDomains, checkLen[*Frequency](2))
+}
+
+func TestDeviceEnumMemoryModules(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumMemoryModules, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumMemoryModules, checkLen[*Memory](2))
+}
+
+func TestDeviceEnumPowerDomains(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumPowerDomains, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumPowerDomains, checkLen[*Power](2))
+}
+
+func TestDeviceEnumSchedulers(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumSchedulers, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumSchedulers, checkLen[*Scheduler](2))
+}
+
+func TestDeviceEnumTemperatureSensors(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumTemperatureSensors, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumTemperatureSensors, checkLen[*Temperature](3))
+}
+
+func TestDeviceEnumFabricPorts(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumFabricPorts, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumFabricPorts, checkLen[*FabricPort](2))
+}
+
+func TestDeviceEnumFans(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumFans, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumFans, checkLen[*Fan](2))
+}
+
+func TestDeviceEnumFirmwares(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumFirmwares, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumFirmwares, checkLen[*Firmware](2))
+}
+
+func TestDeviceEnumLeds(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumLeds, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumLeds, checkLen[*Led](2))
+}
+
+func TestDeviceEnumOverclockDomains(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumOverclockDomains, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumOverclockDomains, checkLen[*Overclock](1))
+}
+
+func TestDeviceEnumPerformanceFactorDomains(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumPerformanceFactorDomains, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumPerformanceFactorDomains, checkLen[*Performance](2))
+}
+
+func TestDeviceEnumPsus(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumPsus, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumPsus, checkLen[*Psu](2))
+}
+
+func TestDeviceEnumRasErrorSets(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumRasErrorSets, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumRasErrorSets, checkLen[*Ras](2))
+}
+
+func TestDeviceEnumStandbyDomains(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumStandbyDomains, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumStandbyDomains, checkLen[*Standby](1))
+}
+
+func TestDeviceEnumDiagnosticTestSuites(t *testing.T) {
+	testDeviceGetterError(t, (*Device).EnumDiagnosticTestSuites, withConfig(driverConfigDeviceErrs))
+	testDeviceGetterSuccess(t, (*Device).EnumDiagnosticTestSuites, checkLen[*Diagnostics](2))
+}
+
+func TestDeviceFabricPortGetMultiPortThroughput(t *testing.T) {
+	fabricPortGetMultiPortThroughput := func(d *Device) ([]FabricPortThroughput, error) {
+		// Pass nil (count=0) to avoid the CGo restriction on Go pointer slices.
+		return d.FabricPortGetMultiPortThroughput(nil)
+	}
+
+	testDeviceGetterError(t,
+		fabricPortGetMultiPortThroughput,
+		withConfig(driverConfigComponentErrs), withError(core.RESULT_ERROR_NOT_AVAILABLE),
+	)
+	testDeviceGetterSuccess(t,
+		fabricPortGetMultiPortThroughput,
+		func(t *testing.T, results []FabricPortThroughput) { require.Empty(t, results) },
+	)
+}
+
+// ------------------------------------------------------------------
+// Engine
+// ------------------------------------------------------------------
+
+func TestEngineGetProperties(t *testing.T) {
+	testComponentGetterError(t, getEngine, (*Engine).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getEngine, (*Engine).GetProperties,
+		func(t *testing.T, props EngineProperties) {
+			assert.Equal(t, EngineBaseProperties{
+				Type: ENGINE_GROUP_ALL,
+			}, props.EngineBaseProperties)
+		},
+	)
+	testComponentGetterSuccess(t, getEngine, (*Engine).GetProperties,
+		checkValueExported(EngineProperties{
+			EngineBaseProperties: EngineBaseProperties{
+				Type: ENGINE_GROUP_ALL,
+			},
+			ExtendedProperties: &EngineExtProperties{
+				CountOfVirtualFunctionInstance: 4,
+			},
+		}),
+		withDrvIdx(1), withName("SuccessWithExtProps"),
+	)
+}
+
+func TestEngineGetActivity(t *testing.T) {
+	testComponentGetterError(t, getEngine, (*Engine).GetActivity, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getEngine, (*Engine).GetActivity,
+		checkValue(EngineStats{
+			ActiveTime: 12345678,
+			Timestamp:  87654321,
+		}),
+	)
+}
+
+func TestEngineGetActivityExt(t *testing.T) {
+	testComponentGetterError(t, getEngine, (*Engine).GetActivityExt, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getEngine, (*Engine).GetActivityExt,
+		func(t *testing.T, stats []EngineStats) {
+			require.Empty(t, stats)
+		},
+	)
+}
+
+// ------------------------------------------------------------------
+// Frequency
+// ------------------------------------------------------------------
+
+func TestFrequencyGetProperties(t *testing.T) {
+	testComponentGetterError(t, getFrequency, (*Frequency).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFrequency, (*Frequency).GetProperties,
+		checkValue(FreqProperties{
+			Type:                     FREQ_DOMAIN_GPU,
+			OnSubdevice:              1,
+			SubdeviceId:              1,
+			CanControl:               1,
+			IsThrottleEventSupported: 1,
+			Min:                      300.0,
+			Max:                      1600.0,
+		}),
+	)
+}
+
+func TestFrequencyGetAvailableClocks(t *testing.T) {
+	testComponentGetterError(t, getFrequency, (*Frequency).GetAvailableClocks, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFrequency, (*Frequency).GetAvailableClocks,
+		func(t *testing.T, clocks []float64) {
+			require.Len(t, clocks, 3)
+			assert.Equal(t, 300.0, clocks[0], "clocks[0]")
+			assert.Equal(t, 900.0, clocks[1], "clocks[1]")
+			assert.Equal(t, 1600.0, clocks[2], "clocks[2]")
+		},
+	)
+}
+
+func TestFrequencyGetRange(t *testing.T) {
+	testComponentGetterError(t, getFrequency, (*Frequency).GetRange, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFrequency, (*Frequency).GetRange,
+		checkValue(FreqRange{
+			Min: 300.0,
+			Max: 1600.0,
+		}),
+	)
+}
+
+func TestFrequencySetRange(t *testing.T) {
+	testComponentActionError(t, getFrequency, func(f *Frequency) error { return f.SetRange(&FreqRange{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getFrequency, func(f *Frequency) error { return f.SetRange(&FreqRange{}) })
+}
+
+func TestFrequencyGetState(t *testing.T) {
+	testComponentGetterError(t, getFrequency, (*Frequency).GetState, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFrequency, (*Frequency).GetState,
+		checkValue(FreqState{
+			CurrentVoltage: 0.85,
+			Request:        1400.0,
+			Tdp:            1600.0,
+			Efficient:      300.0,
+			Actual:         1200.0,
+			ThrottleReasons: FreqThrottleReasonFlags(
+				FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT | FREQ_THROTTLE_REASON_FLAG_SW_RANGE,
+			),
+		}),
+	)
+}
+
+func TestFrequencyGetThrottleTime(t *testing.T) {
+	testComponentGetterError(t, getFrequency, (*Frequency).GetThrottleTime, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFrequency, (*Frequency).GetThrottleTime,
+		checkValue(FreqThrottleTime{
+			ThrottleTime: 5000,
+			Timestamp:    100000,
+		}),
+	)
+}
+
+// ------------------------------------------------------------------
+// Memory
+// ------------------------------------------------------------------
+
+func TestMemoryGetProperties(t *testing.T) {
+	testComponentGetterError(t, getMemory, (*Memory).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getMemory, (*Memory).GetProperties,
+		checkValue(MemProperties{
+			Type:         MEM_TYPE_HBM,
+			OnSubdevice:  1,
+			SubdeviceId:  1,
+			Location:     MEM_LOC_DEVICE,
+			PhysicalSize: 17179869184,
+			BusWidth:     128,
+			NumChannels:  8,
+		}),
+	)
+}
+
+func TestMemoryGetState(t *testing.T) {
+	testComponentGetterError(t, getMemory, (*Memory).GetState, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getMemory, (*Memory).GetState,
+		checkValue(MemState{
+			Health: MEM_HEALTH_OK,
+			Free:   8589934592,
+			Size:   17179869184,
+		}),
+	)
+}
+
+func TestMemoryGetBandwidth(t *testing.T) {
+	testComponentGetterError(t, getMemory, (*Memory).GetBandwidth, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getMemory, (*Memory).GetBandwidth,
+		checkValue(MemBandwidth{
+			ReadCounter:  1073741824,
+			WriteCounter: 536870912,
+			MaxBandwidth: 512000000000,
+			Timestamp:    123456789,
+		}),
+	)
+}
+
+// ------------------------------------------------------------------
+// Power
+// ------------------------------------------------------------------
+
+func TestPowerGetProperties(t *testing.T) {
+	testComponentGetterError(t, getPower, (*Power).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPower, (*Power).GetProperties,
+		func(t *testing.T, props PowerProperties) {
+			assert.Equal(t, PowerBaseProperties{
+				OnSubdevice:                1,
+				SubdeviceId:                1,
+				CanControl:                 1,
+				IsEnergyThresholdSupported: 1,
+				DefaultLimit:               200000,
+				MinLimit:                   100000,
+				MaxLimit:                   300000,
+			}, props.PowerBaseProperties)
+		},
+	)
+	testComponentGetterSuccess(t, getPower, (*Power).GetProperties,
+		checkValueExported(PowerProperties{
+			PowerBaseProperties: PowerBaseProperties{
+				OnSubdevice:                1,
+				SubdeviceId:                1,
+				CanControl:                 1,
+				IsEnergyThresholdSupported: 1,
+				DefaultLimit:               150000,
+				MinLimit:                   90000,
+				MaxLimit:                   225000,
+			},
+			ExtendedProperties: &PowerExtProperties{
+				Domain: POWER_DOMAIN_PACKAGE,
+				DefaultLimit: &PowerLimitExtDesc{
+					Level:               POWER_LEVEL_SUSTAINED,
+					Source:              POWER_SOURCE_ANY,
+					LimitUnit:           LIMIT_UNIT_UNKNOWN,
+					EnabledStateLocked:  1,
+					Enabled:             1,
+					IntervalValueLocked: 1,
+					Interval:            250,
+					LimitValueLocked:    1,
+					Limit:               150000,
+				},
+			},
+		}),
+		withDrvIdx(1), withName("SuccessWithExtProps"),
+	)
+}
+
+func TestPowerGetEnergyCounter(t *testing.T) {
+	testComponentGetterError(t, getPower, (*Power).GetEnergyCounter, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPower, (*Power).GetEnergyCounter,
+		checkValue(PowerEnergyCounter{
+			Energy:    5000000,
+			Timestamp: 123456789,
+		}),
+	)
+}
+
+func TestPowerGetEnergyThreshold(t *testing.T) {
+	testComponentGetterError(t, getPower, (*Power).GetEnergyThreshold, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPower, (*Power).GetEnergyThreshold,
+		checkValue(EnergyThreshold{
+			Enable:    1,
+			Threshold: 10.5,
+			ProcessId: 4321,
+		}),
+	)
+}
+
+func TestPowerSetEnergyThreshold(t *testing.T) {
+	testComponentActionError(t, getPower, func(p *Power) error { return p.SetEnergyThreshold(0) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getPower, func(p *Power) error { return p.SetEnergyThreshold(0) })
+}
+
+func TestPowerGetLimitsExt(t *testing.T) {
+	testComponentGetterError(t, getPower, (*Power).GetLimitsExt, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPower, (*Power).GetLimitsExt,
+		checkValue([]PowerLimitExtDesc{
+			{
+				Level:               POWER_LEVEL_SUSTAINED,
+				Source:              POWER_SOURCE_ANY,
+				LimitUnit:           LIMIT_UNIT_UNKNOWN,
+				EnabledStateLocked:  0,
+				Enabled:             1,
+				IntervalValueLocked: 0,
+				Interval:            1000,
+				LimitValueLocked:    0,
+				Limit:               200000,
+			},
+			{
+				Level:               POWER_LEVEL_BURST,
+				Source:              POWER_SOURCE_ANY,
+				LimitUnit:           LIMIT_UNIT_UNKNOWN,
+				EnabledStateLocked:  0,
+				Enabled:             1,
+				IntervalValueLocked: 0,
+				Interval:            0,
+				LimitValueLocked:    0,
+				Limit:               250000,
+			},
+		}),
+	)
+}
+
+func TestPowerSetLimitsExt(t *testing.T) {
+	testComponentActionError(t, getPower, func(p *Power) error { return p.SetLimitsExt(nil) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getPower, func(p *Power) error { return p.SetLimitsExt(nil) })
+}
+
+// ------------------------------------------------------------------
+// Scheduler
+// ------------------------------------------------------------------
+
+func TestSchedulerGetProperties(t *testing.T) {
+	testComponentGetterError(t, getScheduler, (*Scheduler).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler, (*Scheduler).GetProperties,
+		checkValue(SchedProperties{
+			OnSubdevice:    0,
+			SubdeviceId:    0,
+			CanControl:     1,
+			SupportedModes: 7,
+			Engines:        7,
+		}),
+	)
+}
+
+func TestSchedulerGetCurrentMode(t *testing.T) {
+	testComponentGetterError(t, getScheduler, (*Scheduler).GetCurrentMode, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler, (*Scheduler).GetCurrentMode,
+		checkValue(SCHED_MODE_TIMESLICE),
+	)
+}
+
+func TestSchedulerGetTimeoutModeProperties(t *testing.T) {
+	testComponentGetterError(t, getScheduler, func(s *Scheduler) (SchedTimeoutProperties, error) { return s.GetTimeoutModeProperties(false) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler,
+		func(s *Scheduler) (SchedTimeoutProperties, error) { return s.GetTimeoutModeProperties(false) },
+		checkValue(SchedTimeoutProperties{
+			WatchdogTimeout: 5000000,
+		}),
+	)
+}
+
+func TestSchedulerGetTimesliceModeProperties(t *testing.T) {
+	testComponentGetterError(t, getScheduler, func(s *Scheduler) (SchedTimesliceProperties, error) { return s.GetTimesliceModeProperties(false) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler,
+		func(s *Scheduler) (SchedTimesliceProperties, error) { return s.GetTimesliceModeProperties(false) },
+		checkValue(SchedTimesliceProperties{
+			Interval:     2000,
+			YieldTimeout: 500,
+		}),
+	)
+}
+
+func TestSchedulerSetTimeoutMode(t *testing.T) {
+	testComponentGetterError(t, getScheduler, func(s *Scheduler) (bool, error) { return s.SetTimeoutMode(&SchedTimeoutProperties{}) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler,
+		func(s *Scheduler) (bool, error) { return s.SetTimeoutMode(&SchedTimeoutProperties{}) },
+		func(t *testing.T, needReload bool) { assert.False(t, needReload, "needReload") },
+	)
+}
+
+func TestSchedulerSetTimesliceMode(t *testing.T) {
+	testComponentGetterError(t, getScheduler, func(s *Scheduler) (bool, error) { return s.SetTimesliceMode(&SchedTimesliceProperties{}) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler,
+		func(s *Scheduler) (bool, error) { return s.SetTimesliceMode(&SchedTimesliceProperties{}) },
+		func(t *testing.T, needReload bool) { assert.False(t, needReload, "needReload") },
+	)
+}
+
+func TestSchedulerSetExclusiveMode(t *testing.T) {
+	testComponentGetterError(t, getScheduler, func(s *Scheduler) (bool, error) { return s.SetExclusiveMode() }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getScheduler,
+		func(s *Scheduler) (bool, error) { return s.SetExclusiveMode() },
+		func(t *testing.T, needReload bool) { assert.False(t, needReload, "needReload") },
+	)
+}
+
+// ------------------------------------------------------------------
+// Temperature
+// ------------------------------------------------------------------
+
+func TestTemperatureGetProperties(t *testing.T) {
+	testComponentGetterError(t, getTemperature, (*Temperature).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getTemperature, (*Temperature).GetProperties,
+		checkValue(TempProperties{
+			OnSubdevice:             1,
+			SubdeviceId:             1,
+			Type:                    TEMP_SENSORS_GLOBAL,
+			MaxTemperature:          110.0,
+			IsCriticalTempSupported: 1,
+			IsThreshold1Supported:   1,
+			IsThreshold2Supported:   1,
+		}),
+	)
+}
+
+func TestTemperatureGetConfig(t *testing.T) {
+	testComponentGetterError(t, getTemperature, (*Temperature).GetConfig, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getTemperature, (*Temperature).GetConfig,
+		checkValue(TempConfig{
+			EnableCritical: 1,
+			Threshold1: TempThreshold{
+				EnableLowToHigh: 1,
+				EnableHighToLow: 1,
+				Threshold:       90.0,
+			},
+			Threshold2: TempThreshold{
+				EnableLowToHigh: 1,
+				EnableHighToLow: 1,
+				Threshold:       100.0,
+			},
+		}),
+	)
+}
+
+func TestTemperatureSetConfig(t *testing.T) {
+	testComponentActionError(t, getTemperature, func(temp *Temperature) error { return temp.SetConfig(&TempConfig{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getTemperature, func(temp *Temperature) error { return temp.SetConfig(&TempConfig{}) })
+}
+
+func TestTemperatureGetState(t *testing.T) {
+	testComponentGetterError(t, getTemperature, (*Temperature).GetState, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getTemperature, (*Temperature).GetState,
+		checkValue(48.0),
+	)
+}
+
+// ------------------------------------------------------------------
+// FabricPort
+// ------------------------------------------------------------------
+
+func TestFabricPortGetProperties(t *testing.T) {
+	testComponentGetterError(t, getFabricPort, (*FabricPort).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFabricPort, (*FabricPort).GetProperties,
+		checkValue(FabricPortProperties{
+			Model:       stringProperty[core.StringProperty256]("Xe-Link"),
+			OnSubdevice: 1,
+			SubdeviceId: 1,
+			PortId: FabricPortId{
+				FabricId:   10,
+				AttachId:   20,
+				PortNumber: 3,
+			},
+			MaxRxSpeed: FabricPortSpeed{BitRate: 53125000000, Width: 4},
+			MaxTxSpeed: FabricPortSpeed{BitRate: 50000000000, Width: 4},
+		}),
+	)
+}
+
+func TestFabricPortGetLinkType(t *testing.T) {
+	testComponentGetterError(t, getFabricPort, (*FabricPort).GetLinkType, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFabricPort, (*FabricPort).GetLinkType,
+		checkValue(FabricLinkType{
+			Desc: stringProperty[core.StringProperty256]("Xe-Link"),
+		}),
+	)
+}
+
+func TestFabricPortGetConfig(t *testing.T) {
+	testComponentGetterError(t, getFabricPort, (*FabricPort).GetConfig, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFabricPort, (*FabricPort).GetConfig,
+		checkValue(FabricPortConfig{
+			Enabled:   1,
+			Beaconing: 1,
+		}),
+	)
+}
+
+func TestFabricPortSetConfig(t *testing.T) {
+	testComponentActionError(t, getFabricPort, func(fp *FabricPort) error { return fp.SetConfig(&FabricPortConfig{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getFabricPort, func(fp *FabricPort) error { return fp.SetConfig(&FabricPortConfig{}) })
+}
+
+func TestFabricPortGetState(t *testing.T) {
+	testComponentGetterError(t, getFabricPort, (*FabricPort).GetState, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFabricPort, (*FabricPort).GetState,
+		checkValue(FabricPortState{
+			Status: FABRIC_PORT_STATUS_DEGRADED,
+			QualityIssues: FabricPortQualIssueFlags(
+				FABRIC_PORT_QUAL_ISSUE_FLAG_LINK_ERRORS | FABRIC_PORT_QUAL_ISSUE_FLAG_SPEED,
+			),
+			FailureReasons: FabricPortFailureFlags(
+				FABRIC_PORT_FAILURE_FLAG_FAILED | FABRIC_PORT_FAILURE_FLAG_FLAPPING,
+			),
+			RemotePortId: FabricPortId{
+				FabricId:   11,
+				AttachId:   21,
+				PortNumber: 4,
+			},
+			RxSpeed: FabricPortSpeed{BitRate: 49000000000, Width: 4},
+			TxSpeed: FabricPortSpeed{BitRate: 47000000000, Width: 4},
+		}),
+	)
+}
+
+func TestFabricPortGetThroughput(t *testing.T) {
+	testComponentGetterError(t, getFabricPort, (*FabricPort).GetThroughput, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFabricPort, (*FabricPort).GetThroughput,
+		checkValue(FabricPortThroughput{
+			Timestamp: 777777,
+			RxCounter: 111111,
+			TxCounter: 222222,
+		}),
+	)
+}
+
+func TestFabricPortGetFabricErrorCounters(t *testing.T) {
+	testComponentGetterError(t, getFabricPort, (*FabricPort).GetFabricErrorCounters, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFabricPort, (*FabricPort).GetFabricErrorCounters,
+		checkValue(FabricPortErrorCounters{
+			LinkFailureCount: 5,
+			FwCommErrorCount: 6,
+			FwErrorCount:     7,
+			LinkDegradeCount: 8,
+		}),
+	)
+}
+
+// ------------------------------------------------------------------
+// Fan
+// ------------------------------------------------------------------
+
+func TestFanGetProperties(t *testing.T) {
+	testComponentGetterError(t, getFan, (*Fan).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFan, (*Fan).GetProperties,
+		checkValue(FanProperties{
+			OnSubdevice:    1,
+			SubdeviceId:    1,
+			CanControl:     1,
+			SupportedModes: 7,
+			SupportedUnits: 3,
+			MaxRPM:         3000,
+			MaxPoints:      16,
+		}),
+	)
+}
+
+func TestFanGetConfig(t *testing.T) {
+	testComponentGetterError(t, getFan, (*Fan).GetConfig, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFan, (*Fan).GetConfig,
+		checkValue(FanConfig{
+			Mode: FAN_SPEED_MODE_FIXED,
+			SpeedFixed: FanSpeed{
+				Speed: 1500,
+				Units: FAN_SPEED_UNITS_RPM,
+			},
+		}),
+	)
+}
+
+func TestFanSetDefaultMode(t *testing.T) {
+	testComponentActionError(t, getFan, (*Fan).SetDefaultMode, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getFan, (*Fan).SetDefaultMode)
+}
+
+func TestFanSetFixedSpeedMode(t *testing.T) {
+	testComponentActionError(t, getFan, func(f *Fan) error { return f.SetFixedSpeedMode(FanSpeed{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getFan, func(f *Fan) error { return f.SetFixedSpeedMode(FanSpeed{}) })
+}
+
+func TestFanSetSpeedTableMode(t *testing.T) {
+	testComponentActionError(t, getFan, func(f *Fan) error { return f.SetSpeedTableMode(&FanSpeedTable{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getFan, func(f *Fan) error { return f.SetSpeedTableMode(&FanSpeedTable{}) })
+}
+
+func TestFanGetState(t *testing.T) {
+	testComponentGetterError(t, getFan, func(f *Fan) (int32, error) { return f.GetState(0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFan,
+		func(f *Fan) (int32, error) { return f.GetState(0) },
+		checkValue(int32(1500)),
+	)
+}
+
+// ------------------------------------------------------------------
+// Firmware
+// ------------------------------------------------------------------
+
+func TestFirmwareGetProperties(t *testing.T) {
+	testComponentGetterError(t, getFirmware, (*Firmware).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFirmware, (*Firmware).GetProperties,
+		checkValue(FirmwareProperties{
+			OnSubdevice: 0,
+			SubdeviceId: 0,
+			CanControl:  1,
+			Name:        stringProperty[core.StringProperty64]("GFX"),
+			Version:     stringProperty[core.StringProperty64]("1.2.3.4"),
+		}),
+	)
+}
+
+func TestFirmwareFlash(t *testing.T) {
+	testComponentActionError(t, getFirmware, func(fw *Firmware) error { return fw.Flash([]byte{0x00}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getFirmware, func(fw *Firmware) error { return fw.Flash([]byte{0x00}) })
+}
+
+func TestFirmwareGetFlashProgress(t *testing.T) {
+	testComponentGetterError(t, getFirmware, (*Firmware).GetFlashProgress, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFirmware, (*Firmware).GetFlashProgress,
+		checkValue(uint32(100)),
+	)
+}
+
+func TestFirmwareGetConsoleLogs(t *testing.T) {
+	testComponentGetterError(t, getFirmware, (*Firmware).GetConsoleLogs, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getFirmware, (*Firmware).GetConsoleLogs,
+		checkValue("test log\x00"),
+	)
+}
+
+// ------------------------------------------------------------------
+// Led
+// ------------------------------------------------------------------
+
+func TestLedGetProperties(t *testing.T) {
+	testComponentGetterError(t, getLed, (*Led).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getLed, (*Led).GetProperties,
+		checkValue(LedProperties{
+			OnSubdevice: 0,
+			SubdeviceId: 0,
+			CanControl:  1,
+			HaveRGB:     1,
+		}),
+	)
+}
+
+func TestLedGetState(t *testing.T) {
+	testComponentGetterError(t, getLed, (*Led).GetState, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getLed, (*Led).GetState,
+		checkValue(LedState{
+			IsOn: 1,
+			Color: LedColor{
+				Red:   1.0,
+				Green: 0.5,
+			},
+		}),
+	)
+}
+
+func TestLedSetState(t *testing.T) {
+	testComponentActionError(t, getLed, func(l *Led) error { return l.SetState(false) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getLed, func(l *Led) error { return l.SetState(false) })
+}
+
+func TestLedSetColor(t *testing.T) {
+	testComponentActionError(t, getLed, func(l *Led) error { return l.SetColor(LedColor{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getLed, func(l *Led) error { return l.SetColor(LedColor{}) })
+}
+
+// ------------------------------------------------------------------
+// Overclock
+// ------------------------------------------------------------------
+
+func TestOverclockGetDomainProperties(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, (*Overclock).GetDomainProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain, (*Overclock).GetDomainProperties,
+		checkValue(OverclockProperties{
+			DomainType:        OVERCLOCK_DOMAIN_CARD,
+			AvailableControls: 3,
+			VFProgramType:     VF_PROGRAM_TYPE_VF_ARBITRARY,
+			NumberOfVFPoints:  16,
+		}),
+	)
+}
+
+func TestOverclockGetDomainVFProperties(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, (*Overclock).GetDomainVFProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain, (*Overclock).GetDomainVFProperties,
+		checkValue(VfProperty{
+			MinFreq:  300.0,
+			MaxFreq:  1600.0,
+			StepFreq: 25.0,
+			MinVolt:  700.0,
+			MaxVolt:  1200.0,
+			StepVolt: 10.0,
+		}),
+	)
+}
+
+func TestOverclockGetDomainControlProperties(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, func(oc *Overclock) (ControlProperty, error) { return oc.GetDomainControlProperties(0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain,
+		func(oc *Overclock) (ControlProperty, error) { return oc.GetDomainControlProperties(0) },
+		checkValue(ControlProperty{
+			MinValue:     100.0,
+			MaxValue:     2000.0,
+			StepValue:    50.0,
+			RefValue:     900.0,
+			DefaultValue: 1100.0,
+		}),
+	)
+}
+
+func TestOverclockGetControlCurrentValue(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, func(oc *Overclock) (float64, error) { return oc.GetControlCurrentValue(0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain,
+		func(oc *Overclock) (float64, error) { return oc.GetControlCurrentValue(0) },
+		checkValue(1200.0),
+	)
+}
+
+func TestOverclockGetControlPendingValue(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, func(oc *Overclock) (float64, error) { return oc.GetControlPendingValue(0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain,
+		func(oc *Overclock) (float64, error) { return oc.GetControlPendingValue(0) },
+		checkValue(1100.0),
+	)
+}
+
+func TestOverclockSetControlUserValue(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, func(oc *Overclock) (PendingAction, error) { return oc.SetControlUserValue(0, 0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain,
+		func(oc *Overclock) (PendingAction, error) { return oc.SetControlUserValue(0, 0) },
+		checkValue(PENDING_ACTION_PENDING_NONE),
+	)
+}
+
+func TestOverclockGetControlState(t *testing.T) {
+	t.Run("Error", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigComponentErrs)
+		_, _, err := getOcDomain(t, 0, 0, 0).GetControlState(0)
+		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
+	})
+	t.Run("Success", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDefault)
+		state, action, err := getOcDomain(t, 0, 0, 0).GetControlState(0)
+		require.NoError(t, err)
+		assert.Equal(t, CONTROL_STATE_STATE_ACTIVE, state, "state")
+		assert.Equal(t, PENDING_ACTION_PENDING_NONE, action, "action")
+	})
+}
+
+func TestOverclockGetVFPointValues(t *testing.T) {
+	testComponentGetterError(t, getOcDomain, func(oc *Overclock) (uint32, error) { return oc.GetVFPointValues(0, 0, 0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getOcDomain,
+		func(oc *Overclock) (uint32, error) { return oc.GetVFPointValues(0, 0, 0) },
+		checkValue(uint32(42)),
+	)
+}
+
+func TestOverclockSetVFPointValues(t *testing.T) {
+	testComponentActionError(t, getOcDomain, func(oc *Overclock) error { return oc.SetVFPointValues(0, 0, 0) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getOcDomain, func(oc *Overclock) error { return oc.SetVFPointValues(0, 0, 0) })
+}
+
+// ------------------------------------------------------------------
+// Performance
+// ------------------------------------------------------------------
+
+func TestPerformanceGetProperties(t *testing.T) {
+	testComponentGetterError(t, getPerf, (*Performance).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPerf, (*Performance).GetProperties,
+		checkValue(PerfProperties{
+			OnSubdevice: 0,
+			SubdeviceId: 0,
+			Engines:     7,
+		}),
+	)
+}
+
+func TestPerformanceGetConfig(t *testing.T) {
+	testComponentGetterError(t, getPerf, (*Performance).GetConfig, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPerf, (*Performance).GetConfig,
+		checkValue(1.0),
+	)
+}
+
+func TestPerformanceSetConfig(t *testing.T) {
+	testComponentActionError(t, getPerf, func(p *Performance) error { return p.SetConfig(0) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getPerf, func(p *Performance) error { return p.SetConfig(0) })
+}
+
+// ------------------------------------------------------------------
+// Psu
+// ------------------------------------------------------------------
+
+func TestPsuGetProperties(t *testing.T) {
+	testComponentGetterError(t, getPsu, (*Psu).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPsu, (*Psu).GetProperties,
+		checkValue(PsuProperties{
+			OnSubdevice: 0,
+			SubdeviceId: 0,
+			HaveFan:     1,
+			AmpLimit:    30,
+		}),
+	)
+}
+
+func TestPsuGetState(t *testing.T) {
+	testComponentGetterError(t, getPsu, (*Psu).GetState, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getPsu, (*Psu).GetState,
+		checkValue(PsuState{
+			VoltStatus:  PSU_VOLTAGE_STATUS_NORMAL,
+			FanFailed:   0,
+			Temperature: 45,
+			Current:     10,
+		}),
+	)
+}
+
+// ------------------------------------------------------------------
+// Ras
+// ------------------------------------------------------------------
+
+func TestRasGetProperties(t *testing.T) {
+	testComponentGetterError(t, getRas, (*Ras).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getRas, (*Ras).GetProperties,
+		checkValue(RasProperties{
+			Type:        RAS_ERROR_TYPE_CORRECTABLE,
+			OnSubdevice: 1,
+			SubdeviceId: 1,
+		}),
+		withCompIdx(0), withName("SuccessCorrectable"),
+	)
+	testComponentGetterSuccess(t, getRas, (*Ras).GetProperties,
+		checkValue(RasProperties{
+			Type:        RAS_ERROR_TYPE_UNCORRECTABLE,
+			OnSubdevice: 1,
+			SubdeviceId: 1,
+		}),
+		withCompIdx(1), withName("SuccessUncorrectable"),
+	)
+}
+
+func TestRasGetConfig(t *testing.T) {
+	testComponentGetterError(t, getRas, (*Ras).GetConfig, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getRas, (*Ras).GetConfig,
+		checkValue(RasConfig{
+			TotalThreshold: 100,
+			DetailedThresholds: RasState{Category: [7]uint64{
+				10, 11, 12, 13, 14, 15, 16,
+			}},
+		}),
+	)
+}
+
+func TestRasSetConfig(t *testing.T) {
+	testComponentActionError(t, getRas, func(r *Ras) error { return r.SetConfig(&RasConfig{}) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getRas, func(r *Ras) error { return r.SetConfig(&RasConfig{}) })
+}
+
+func TestRasGetState(t *testing.T) {
+	testComponentGetterError(t, getRas, func(r *Ras) (RasState, error) { return r.GetState(false) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getRas,
+		func(r *Ras) (RasState, error) { return r.GetState(false) },
+		checkValue(RasState{
+			Category: [7]uint64{0, 0, 0, 8, 9, 10, 11},
+		}),
+		withCompIdx(0), withName("SuccessCorrectable"),
+	)
+	testComponentGetterSuccess(t, getRas,
+		func(r *Ras) (RasState, error) { return r.GetState(false) },
+		checkValue(RasState{
+			Category: [7]uint64{3, 2, 1, 0, 0, 0, 0},
+		}),
+		withCompIdx(1), withName("SuccessUncorrectable"),
+	)
+}
+
+func TestRasGetStateExp(t *testing.T) {
+	testComponentGetterError(t, getRas,
+		func(r *Ras) ([]RasStateExp, error) { return r.GetStateExp() },
+		withConfig(driverConfigComponentErrs), withError(core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS),
+	)
+	testComponentGetterSuccess(t, getRas,
+		func(r *Ras) ([]RasStateExp, error) { return r.GetStateExp() },
+		checkValue([]RasStateExp{{
+			Category:     RAS_ERROR_CATEGORY_EXP_MEMORY_ERRORS,
+			ErrorCounter: 1,
+		}, {
+			Category:     RAS_ERROR_CATEGORY_EXP_L3FABRIC_ERRORS,
+			ErrorCounter: 2,
+		}}),
+		withCompIdx(0), withName("SuccessCorrectable"),
+	)
+	testComponentGetterSuccess(t, getRas,
+		func(r *Ras) ([]RasStateExp, error) { return r.GetStateExp() },
+		checkValue([]RasStateExp{{
+			Category:     RAS_ERROR_CATEGORY_EXP_RESET,
+			ErrorCounter: 3,
+		}, {
+			Category:     RAS_ERROR_CATEGORY_EXP_PROGRAMMING_ERRORS,
+			ErrorCounter: 4,
+		}}),
+		withCompIdx(1), withName("SuccessUncorrectable"),
+	)
+}
+
+func TestRasClearStateExp(t *testing.T) {
+	testComponentActionError(t, getRas,
+		func(r *Ras) error { return r.ClearStateExp(0) },
+		withConfig(driverConfigComponentErrs), withError(core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS),
+	)
+	t.Run("Success", func(t *testing.T) {
+		loadDriverConfig(t, driverConfigDefault)
+		// uncorrectable
+		states, err := getRas(t, 0, 0, 1).GetStateExp()
+		require.NoError(t, err)
+		assert.EqualExportedValues(t, []RasStateExp{{
+			Category:     RAS_ERROR_CATEGORY_EXP_RESET,
+			ErrorCounter: 3,
+		}, {
+			Category:     RAS_ERROR_CATEGORY_EXP_PROGRAMMING_ERRORS,
+			ErrorCounter: 4,
+		}}, states)
+		// single counter reset
+		err = getRas(t, 0, 0, 1).ClearStateExp(RAS_ERROR_CATEGORY_EXP_RESET)
+		require.NoError(t, err)
+		// just that zeroed?
+		states, err = getRas(t, 0, 0, 1).GetStateExp()
+		require.NoError(t, err)
+		assert.EqualExportedValues(t, []RasStateExp{{
+			Category:     RAS_ERROR_CATEGORY_EXP_RESET,
+			ErrorCounter: 0,
+		}, {
+			Category:     RAS_ERROR_CATEGORY_EXP_PROGRAMMING_ERRORS,
+			ErrorCounter: 4,
+		}}, states)
+	})
+}
+
+// ------------------------------------------------------------------
+// Standby
+// ------------------------------------------------------------------
+
+func TestStandbyGetProperties(t *testing.T) {
+	testComponentGetterError(t, getStandby, (*Standby).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getStandby, (*Standby).GetProperties,
+		checkValue(StandbyProperties{
+			Type:        STANDBY_TYPE_GLOBAL,
+			OnSubdevice: 0,
+			SubdeviceId: 0,
+		}),
+	)
+}
+
+func TestStandbyGetMode(t *testing.T) {
+	testComponentGetterError(t, getStandby, (*Standby).GetMode, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getStandby, (*Standby).GetMode,
+		checkValue(STANDBY_PROMO_MODE_DEFAULT),
+	)
+}
+
+func TestStandbySetMode(t *testing.T) {
+	testComponentActionError(t, getStandby, func(s *Standby) error { return s.SetMode(0) }, withConfig(driverConfigComponentErrs))
+	testComponentActionSuccess(t, getStandby, func(s *Standby) error { return s.SetMode(0) })
+}
+
+// ------------------------------------------------------------------
+// Diagnostics
+// ------------------------------------------------------------------
+
+func TestDiagnosticsGetProperties(t *testing.T) {
+	testComponentGetterError(t, getDiagnostic, (*Diagnostics).GetProperties, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getDiagnostic, (*Diagnostics).GetProperties,
+		checkValue(DiagProperties{
+			OnSubdevice: 0,
+			SubdeviceId: 0,
+			Name:        stringProperty[core.StringProperty64]("GPU"),
+			HaveTests:   0,
+		}),
+	)
+}
+
+func TestDiagnosticsGetTests(t *testing.T) {
+	testComponentGetterError(t, getDiagnostic, (*Diagnostics).GetTests, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getDiagnostic, (*Diagnostics).GetTests,
+		func(t *testing.T, tests []DiagTest) {
+			require.Empty(t, tests)
+		},
+	)
+}
+
+func TestDiagnosticsRunTests(t *testing.T) {
+	testComponentGetterError(t, getDiagnostic, func(d *Diagnostics) ([]DiagResult, error) { return d.RunTests(0, 0) }, withConfig(driverConfigComponentErrs))
+	testComponentGetterSuccess(t, getDiagnostic,
+		func(d *Diagnostics) ([]DiagResult, error) { return d.RunTests(0, 0) },
+		func(t *testing.T, results []DiagResult) {
+			require.Len(t, results, 1)
+			assert.Equal(t, DIAG_RESULT_NO_ERRORS, results[0], "results[0]")
+		},
+	)
+}
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/testdata/default.yaml b/xpumd/level-zero-go/sysman/testdata/default.yaml
similarity index 94%
rename from xpumd/receiver/internal/level-zero-go/sysman/testdata/default.yaml
rename to xpumd/level-zero-go/sysman/testdata/default.yaml
index 5982f73e1..3fc1535a6 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/testdata/default.yaml
+++ b/xpumd/level-zero-go/sysman/testdata/default.yaml
@@ -6,7 +6,7 @@
 
 Drivers:
   - ExtensionProperties:
-      - Name: "ZES_extension_foo"
+      - Name: "ZES_extension_ras_state"
         Version: 1
       - Name: "ZES_extension_bar"
         Version: 2
@@ -275,6 +275,9 @@ Drivers:
             Range:
               Min: 800.0
               Max: 3200.0
+            State:
+              Actual: 1000.0
+              Request: 1400.0
 
         Leds:
           - Properties:
@@ -366,6 +369,9 @@ Drivers:
               SubdeviceId: 1
               CanControl: false
               IsEnergyThresholdSupported: false
+            EnergyCounter:
+              Energy: 1000000
+              Timestamp: 123456789
 
         Psus:
           - Properties:
@@ -392,11 +398,25 @@ Drivers:
               DetailedThresholds:
                 Category: [10, 11, 12, 13, 14, 15, 16]
             State:
-              Category: [5, 6, 7, 8, 9, 10, 11]
+              # first 3 correctable categories are always zero:
+              # https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/PROG.html#querying-ras-errors
+              Category: [0, 0, 0, 8, 9, 10, 11]
+            StateExp:
+              - Category: 7 # ZES_RAS_ERROR_CATEGORY_EXP_MEMORY_ERRORS
+                ErrorCounter: 1
+              - Category: 9 # ZES_RAS_ERROR_CATEGORY_EXP_L3FABRIC_ERRORS
+                ErrorCounter: 2
           - Properties:
               Type: 1 # ZES_RAS_ERROR_TYPE_UNCORRECTABLE
-              OnSubdevice: false
-              SubdeviceId: 0
+              OnSubdevice: true
+              SubdeviceId: 1
+            State:
+              Category: [3, 2, 1, 0, 0, 0, 0]
+            StateExp:
+              - Category: 0 # ZES_RAS_ERROR_CATEGORY_EXP_RESET
+                ErrorCounter: 3
+              - Category: 1 # ZES_RAS_ERROR_CATEGORY_EXP_PROGRAMMING_ERRORS
+                ErrorCounter: 4
 
         Schedulers:
           - Properties:
@@ -551,6 +571,9 @@ Drivers:
                   Interval: 250
                   LimitValueLocked: true
                   Limit: 150000
+            EnergyCounter:
+              Energy: 150000
+              Timestamp: 123456789
         Psus: []
         RasErrorSets: []
         Schedulers: []
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/testdata/error_component.yaml b/xpumd/level-zero-go/sysman/testdata/error_component.yaml
similarity index 95%
rename from xpumd/receiver/internal/level-zero-go/sysman/testdata/error_component.yaml
rename to xpumd/level-zero-go/sysman/testdata/error_component.yaml
index fc5c73c20..72aa24e12 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/testdata/error_component.yaml
+++ b/xpumd/level-zero-go/sysman/testdata/error_component.yaml
@@ -9,7 +9,10 @@
 
 EventNumDeviceEvents: 0
 Drivers:
-  - ExtensionProperties: []
+  - ExtensionProperties:
+      # to get specified errors for experimental RAS APIs
+      - Name: "ZES_extension_ras_state"
+        Version: 1
     Devices:
       - ECC:
           Available: true
@@ -97,6 +100,8 @@ Drivers:
               zesRasGetConfig: 0x70010001 # ZE_RESULT_ERROR_NOT_AVAILABLE
               zesRasSetConfig: 0x70010001 # ZE_RESULT_ERROR_NOT_AVAILABLE
               zesRasGetState: 0x70010001 # ZE_RESULT_ERROR_NOT_AVAILABLE
+              zesRasGetStateExp: 0x70010000 # ZE_RESULT_ERROR_INSUFFICIENT_PERMISSIONS
+              zesRasClearStateExp: 0x70010000 # ZE_RESULT_ERROR_INSUFFICIENT_PERMISSIONS
         Schedulers:
           - ReturnValues:
               zesSchedulerGetProperties: 0x70010001 # ZE_RESULT_ERROR_NOT_AVAILABLE
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/testdata/error_device.yaml b/xpumd/level-zero-go/sysman/testdata/error_device.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/testdata/error_device.yaml
rename to xpumd/level-zero-go/sysman/testdata/error_device.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/testdata/error_driver.yaml b/xpumd/level-zero-go/sysman/testdata/error_driver.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/testdata/error_driver.yaml
rename to xpumd/level-zero-go/sysman/testdata/error_driver.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/testdata/error_driver_get.yaml b/xpumd/level-zero-go/sysman/testdata/error_driver_get.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/testdata/error_driver_get.yaml
rename to xpumd/level-zero-go/sysman/testdata/error_driver_get.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/types-mangle-const.yaml b/xpumd/level-zero-go/sysman/types-mangle-const.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/types-mangle-const.yaml
rename to xpumd/level-zero-go/sysman/types-mangle-const.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/types-mangle.yaml b/xpumd/level-zero-go/sysman/types-mangle.yaml
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/types-mangle.yaml
rename to xpumd/level-zero-go/sysman/types-mangle.yaml
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/types.go b/xpumd/level-zero-go/sysman/types.go
similarity index 99%
rename from xpumd/receiver/internal/level-zero-go/sysman/types.go
rename to xpumd/level-zero-go/sysman/types.go
index 59a20935a..fb0308752 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/types.go
+++ b/xpumd/level-zero-go/sysman/types.go
@@ -1012,6 +1012,15 @@ type EngineExtProperties struct {
 	_                              [4]byte
 }
 
+// RasStateExp declared in:
+// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zes-ras-state-exp-t
+//
+// Extension structure for providing RAS error counters for different error sets.
+type RasStateExp struct {
+	Category     RasErrorCategoryExp
+	ErrorCounter uint64
+}
+
 // InitFlags declared in:
 // https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zes-init-flags-t
 //
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/types_static.go b/xpumd/level-zero-go/sysman/types_static.go
similarity index 99%
rename from xpumd/receiver/internal/level-zero-go/sysman/types_static.go
rename to xpumd/level-zero-go/sysman/types_static.go
index 552c0522c..a755e54ae 100644
--- a/xpumd/receiver/internal/level-zero-go/sysman/types_static.go
+++ b/xpumd/level-zero-go/sysman/types_static.go
@@ -182,12 +182,17 @@ func (w *Psu) setHandle(h psuHandle) {
 // https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#ras-functions
 type Ras struct {
 	handle rasHandle
+	device *Device
 }
 
 func (w *Ras) setHandle(h rasHandle) {
 	w.handle = h
 }
 
+func (w *Ras) setDevice(d *Device) {
+	w.device = d
+}
+
 // Scheduler provides access to Sysman API scheduler functions:
 // https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#scheduler-functions
 type Scheduler struct {
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_ControlState_string.go b/xpumd/level-zero-go/sysman/zz_ControlState_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_ControlState_string.go
rename to xpumd/level-zero-go/sysman/zz_ControlState_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceAction_string.go b/xpumd/level-zero-go/sysman/zz_DeviceAction_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceAction_string.go
rename to xpumd/level-zero-go/sysman/zz_DeviceAction_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceEccDefaultPropertiesExtVersion_string.go b/xpumd/level-zero-go/sysman/zz_DeviceEccDefaultPropertiesExtVersion_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceEccDefaultPropertiesExtVersion_string.go
rename to xpumd/level-zero-go/sysman/zz_DeviceEccDefaultPropertiesExtVersion_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceEccState_string.go b/xpumd/level-zero-go/sysman/zz_DeviceEccState_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceEccState_string.go
rename to xpumd/level-zero-go/sysman/zz_DeviceEccState_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_DevicePropertyFlag_string.go b/xpumd/level-zero-go/sysman/zz_DevicePropertyFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_DevicePropertyFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_DevicePropertyFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceType_string.go b/xpumd/level-zero-go/sysman/zz_DeviceType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_DeviceType_string.go
rename to xpumd/level-zero-go/sysman/zz_DeviceType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_DiagResult_string.go b/xpumd/level-zero-go/sysman/zz_DiagResult_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_DiagResult_string.go
rename to xpumd/level-zero-go/sysman/zz_DiagResult_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_EngineActivityExtVersion_string.go b/xpumd/level-zero-go/sysman/zz_EngineActivityExtVersion_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_EngineActivityExtVersion_string.go
rename to xpumd/level-zero-go/sysman/zz_EngineActivityExtVersion_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_EngineGroup_string.go b/xpumd/level-zero-go/sysman/zz_EngineGroup_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_EngineGroup_string.go
rename to xpumd/level-zero-go/sysman/zz_EngineGroup_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_EngineTypeFlag_string.go b/xpumd/level-zero-go/sysman/zz_EngineTypeFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_EngineTypeFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_EngineTypeFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_EventTypeFlag_string.go b/xpumd/level-zero-go/sysman/zz_EventTypeFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_EventTypeFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_EventTypeFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FabricPortFailureFlag_string.go b/xpumd/level-zero-go/sysman/zz_FabricPortFailureFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FabricPortFailureFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_FabricPortFailureFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FabricPortQualIssueFlag_string.go b/xpumd/level-zero-go/sysman/zz_FabricPortQualIssueFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FabricPortQualIssueFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_FabricPortQualIssueFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FabricPortStatus_string.go b/xpumd/level-zero-go/sysman/zz_FabricPortStatus_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FabricPortStatus_string.go
rename to xpumd/level-zero-go/sysman/zz_FabricPortStatus_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FanSpeedMode_string.go b/xpumd/level-zero-go/sysman/zz_FanSpeedMode_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FanSpeedMode_string.go
rename to xpumd/level-zero-go/sysman/zz_FanSpeedMode_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FanSpeedUnits_string.go b/xpumd/level-zero-go/sysman/zz_FanSpeedUnits_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FanSpeedUnits_string.go
rename to xpumd/level-zero-go/sysman/zz_FanSpeedUnits_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FreqDomain_string.go b/xpumd/level-zero-go/sysman/zz_FreqDomain_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FreqDomain_string.go
rename to xpumd/level-zero-go/sysman/zz_FreqDomain_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_FreqThrottleReasonFlag_string.go b/xpumd/level-zero-go/sysman/zz_FreqThrottleReasonFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_FreqThrottleReasonFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_FreqThrottleReasonFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_InitFlag_string.go b/xpumd/level-zero-go/sysman/zz_InitFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_InitFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_InitFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_LimitUnit_string.go b/xpumd/level-zero-go/sysman/zz_LimitUnit_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_LimitUnit_string.go
rename to xpumd/level-zero-go/sysman/zz_LimitUnit_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_MemHealth_string.go b/xpumd/level-zero-go/sysman/zz_MemHealth_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_MemHealth_string.go
rename to xpumd/level-zero-go/sysman/zz_MemHealth_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_MemLoc_string.go b/xpumd/level-zero-go/sysman/zz_MemLoc_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_MemLoc_string.go
rename to xpumd/level-zero-go/sysman/zz_MemLoc_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_MemType_string.go b/xpumd/level-zero-go/sysman/zz_MemType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_MemType_string.go
rename to xpumd/level-zero-go/sysman/zz_MemType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_OverclockControl_string.go b/xpumd/level-zero-go/sysman/zz_OverclockControl_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_OverclockControl_string.go
rename to xpumd/level-zero-go/sysman/zz_OverclockControl_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_OverclockDomain_string.go b/xpumd/level-zero-go/sysman/zz_OverclockDomain_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_OverclockDomain_string.go
rename to xpumd/level-zero-go/sysman/zz_OverclockDomain_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_OverclockMode_string.go b/xpumd/level-zero-go/sysman/zz_OverclockMode_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_OverclockMode_string.go
rename to xpumd/level-zero-go/sysman/zz_OverclockMode_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PciBarType_string.go b/xpumd/level-zero-go/sysman/zz_PciBarType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PciBarType_string.go
rename to xpumd/level-zero-go/sysman/zz_PciBarType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkQualIssueFlag_string.go b/xpumd/level-zero-go/sysman/zz_PciLinkQualIssueFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkQualIssueFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_PciLinkQualIssueFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkSpeedDowngradeExtVersion_string.go b/xpumd/level-zero-go/sysman/zz_PciLinkSpeedDowngradeExtVersion_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkSpeedDowngradeExtVersion_string.go
rename to xpumd/level-zero-go/sysman/zz_PciLinkSpeedDowngradeExtVersion_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkStabIssueFlag_string.go b/xpumd/level-zero-go/sysman/zz_PciLinkStabIssueFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkStabIssueFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_PciLinkStabIssueFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkStatus_string.go b/xpumd/level-zero-go/sysman/zz_PciLinkStatus_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PciLinkStatus_string.go
rename to xpumd/level-zero-go/sysman/zz_PciLinkStatus_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PendingAction_string.go b/xpumd/level-zero-go/sysman/zz_PendingAction_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PendingAction_string.go
rename to xpumd/level-zero-go/sysman/zz_PendingAction_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PowerDomain_string.go b/xpumd/level-zero-go/sysman/zz_PowerDomain_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PowerDomain_string.go
rename to xpumd/level-zero-go/sysman/zz_PowerDomain_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PowerLevel_string.go b/xpumd/level-zero-go/sysman/zz_PowerLevel_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PowerLevel_string.go
rename to xpumd/level-zero-go/sysman/zz_PowerLevel_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PowerLimitsExtVersion_string.go b/xpumd/level-zero-go/sysman/zz_PowerLimitsExtVersion_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PowerLimitsExtVersion_string.go
rename to xpumd/level-zero-go/sysman/zz_PowerLimitsExtVersion_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PowerSource_string.go b/xpumd/level-zero-go/sysman/zz_PowerSource_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PowerSource_string.go
rename to xpumd/level-zero-go/sysman/zz_PowerSource_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_PsuVoltageStatus_string.go b/xpumd/level-zero-go/sysman/zz_PsuVoltageStatus_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_PsuVoltageStatus_string.go
rename to xpumd/level-zero-go/sysman/zz_PsuVoltageStatus_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_RasErrorCat_string.go b/xpumd/level-zero-go/sysman/zz_RasErrorCat_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_RasErrorCat_string.go
rename to xpumd/level-zero-go/sysman/zz_RasErrorCat_string.go
diff --git a/xpumd/level-zero-go/sysman/zz_RasErrorCategoryExp_string.go b/xpumd/level-zero-go/sysman/zz_RasErrorCategoryExp_string.go
new file mode 100644
index 000000000..580bfa884
--- /dev/null
+++ b/xpumd/level-zero-go/sysman/zz_RasErrorCategoryExp_string.go
@@ -0,0 +1,42 @@
+// Code generated by "stringer -type=RasErrorCategoryExp -trimprefix=RAS_ERROR_CATEGORY_EXP_ -output=zz_RasErrorCategoryExp_string.go const.go"; DO NOT EDIT.
+
+package sysman
+
+import "strconv"
+
+func _() {
+	// An "invalid array index" compiler error signifies that the constant values have changed.
+	// Re-run the stringer command to generate them again.
+	var x [1]struct{}
+	_ = x[RAS_ERROR_CATEGORY_EXP_RESET-0]
+	_ = x[RAS_ERROR_CATEGORY_EXP_PROGRAMMING_ERRORS-1]
+	_ = x[RAS_ERROR_CATEGORY_EXP_DRIVER_ERRORS-2]
+	_ = x[RAS_ERROR_CATEGORY_EXP_COMPUTE_ERRORS-3]
+	_ = x[RAS_ERROR_CATEGORY_EXP_NON_COMPUTE_ERRORS-4]
+	_ = x[RAS_ERROR_CATEGORY_EXP_CACHE_ERRORS-5]
+	_ = x[RAS_ERROR_CATEGORY_EXP_DISPLAY_ERRORS-6]
+	_ = x[RAS_ERROR_CATEGORY_EXP_MEMORY_ERRORS-7]
+	_ = x[RAS_ERROR_CATEGORY_EXP_SCALE_ERRORS-8]
+	_ = x[RAS_ERROR_CATEGORY_EXP_L3FABRIC_ERRORS-9]
+	_ = x[RAS_ERROR_CATEGORY_EXP_FORCE_UINT32-2147483647]
+}
+
+const (
+	_RasErrorCategoryExp_name_0 = "RESETPROGRAMMING_ERRORSDRIVER_ERRORSCOMPUTE_ERRORSNON_COMPUTE_ERRORSCACHE_ERRORSDISPLAY_ERRORSMEMORY_ERRORSSCALE_ERRORSL3FABRIC_ERRORS"
+	_RasErrorCategoryExp_name_1 = "FORCE_UINT32"
+)
+
+var (
+	_RasErrorCategoryExp_index_0 = [...]uint8{0, 5, 23, 36, 50, 68, 80, 94, 107, 119, 134}
+)
+
+func (i RasErrorCategoryExp) String() string {
+	switch {
+	case i <= 9:
+		return _RasErrorCategoryExp_name_0[_RasErrorCategoryExp_index_0[i]:_RasErrorCategoryExp_index_0[i+1]]
+	case i == 2147483647:
+		return _RasErrorCategoryExp_name_1
+	default:
+		return "RasErrorCategoryExp(" + strconv.FormatInt(int64(i), 10) + ")"
+	}
+}
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_RasErrorType_string.go b/xpumd/level-zero-go/sysman/zz_RasErrorType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_RasErrorType_string.go
rename to xpumd/level-zero-go/sysman/zz_RasErrorType_string.go
diff --git a/xpumd/level-zero-go/sysman/zz_RasStateExpVersion_string.go b/xpumd/level-zero-go/sysman/zz_RasStateExpVersion_string.go
new file mode 100644
index 000000000..5bc741ace
--- /dev/null
+++ b/xpumd/level-zero-go/sysman/zz_RasStateExpVersion_string.go
@@ -0,0 +1,30 @@
+// Code generated by "stringer -type=RasStateExpVersion -trimprefix=RAS_STATE_EXP_VERSION_ -output=zz_RasStateExpVersion_string.go const.go"; DO NOT EDIT.
+
+package sysman
+
+import "strconv"
+
+func _() {
+	// An "invalid array index" compiler error signifies that the constant values have changed.
+	// Re-run the stringer command to generate them again.
+	var x [1]struct{}
+	_ = x[RAS_STATE_EXP_VERSION_1_0-65536]
+	_ = x[RAS_STATE_EXP_VERSION_CURRENT-65536]
+	_ = x[RAS_STATE_EXP_VERSION_FORCE_UINT32-2147483647]
+}
+
+const (
+	_RasStateExpVersion_name_0 = "1_0"
+	_RasStateExpVersion_name_1 = "FORCE_UINT32"
+)
+
+func (i RasStateExpVersion) String() string {
+	switch {
+	case i == 65536:
+		return _RasStateExpVersion_name_0
+	case i == 2147483647:
+		return _RasStateExpVersion_name_1
+	default:
+		return "RasStateExpVersion(" + strconv.FormatInt(int64(i), 10) + ")"
+	}
+}
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_RepairStatus_string.go b/xpumd/level-zero-go/sysman/zz_RepairStatus_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_RepairStatus_string.go
rename to xpumd/level-zero-go/sysman/zz_RepairStatus_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_ResetReasonFlag_string.go b/xpumd/level-zero-go/sysman/zz_ResetReasonFlag_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_ResetReasonFlag_string.go
rename to xpumd/level-zero-go/sysman/zz_ResetReasonFlag_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_ResetType_string.go b/xpumd/level-zero-go/sysman/zz_ResetType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_ResetType_string.go
rename to xpumd/level-zero-go/sysman/zz_ResetType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_SchedMode_string.go b/xpumd/level-zero-go/sysman/zz_SchedMode_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_SchedMode_string.go
rename to xpumd/level-zero-go/sysman/zz_SchedMode_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_StandbyPromoMode_string.go b/xpumd/level-zero-go/sysman/zz_StandbyPromoMode_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_StandbyPromoMode_string.go
rename to xpumd/level-zero-go/sysman/zz_StandbyPromoMode_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_StandbyType_string.go b/xpumd/level-zero-go/sysman/zz_StandbyType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_StandbyType_string.go
rename to xpumd/level-zero-go/sysman/zz_StandbyType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_TempSensors_string.go b/xpumd/level-zero-go/sysman/zz_TempSensors_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_TempSensors_string.go
rename to xpumd/level-zero-go/sysman/zz_TempSensors_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_VfArrayType_string.go b/xpumd/level-zero-go/sysman/zz_VfArrayType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_VfArrayType_string.go
rename to xpumd/level-zero-go/sysman/zz_VfArrayType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_VfProgramType_string.go b/xpumd/level-zero-go/sysman/zz_VfProgramType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_VfProgramType_string.go
rename to xpumd/level-zero-go/sysman/zz_VfProgramType_string.go
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/zz_VfType_string.go b/xpumd/level-zero-go/sysman/zz_VfType_string.go
similarity index 100%
rename from xpumd/receiver/internal/level-zero-go/sysman/zz_VfType_string.go
rename to xpumd/level-zero-go/sysman/zz_VfType_string.go
diff --git a/xpumd/processor/doc.go b/xpumd/processor/doc.go
deleted file mode 100644
index 8144ad64a..000000000
--- a/xpumd/processor/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright (C) 2026 Intel Corporation
-//
-// SPDX-License-Identifier: MIT
-
-package processor
-
-//go:generate go tool -modfile ../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/processor/README.md b/xpumd/processor/intelxpustatus/README.md
similarity index 100%
rename from xpumd/processor/README.md
rename to xpumd/processor/intelxpustatus/README.md
diff --git a/xpumd/processor/config.go b/xpumd/processor/intelxpustatus/config.go
similarity index 99%
rename from xpumd/processor/config.go
rename to xpumd/processor/intelxpustatus/config.go
index 6a51b2c70..965f06724 100644
--- a/xpumd/processor/config.go
+++ b/xpumd/processor/intelxpustatus/config.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package processor
+package intelxpustatus
 
 import (
 	"fmt"
diff --git a/xpumd/processor/config_test.go b/xpumd/processor/intelxpustatus/config_test.go
similarity index 99%
rename from xpumd/processor/config_test.go
rename to xpumd/processor/intelxpustatus/config_test.go
index 53582a504..2937ba7a5 100644
--- a/xpumd/processor/config_test.go
+++ b/xpumd/processor/intelxpustatus/config_test.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package processor
+package intelxpustatus
 
 import (
 	"testing"
diff --git a/xpumd/processor/intelxpustatus/doc.go b/xpumd/processor/intelxpustatus/doc.go
new file mode 100644
index 000000000..55bebb538
--- /dev/null
+++ b/xpumd/processor/intelxpustatus/doc.go
@@ -0,0 +1,8 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelxpustatus
+
+//go:generate go tool -modfile ../../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/processor/factory.go b/xpumd/processor/intelxpustatus/factory.go
similarity index 90%
rename from xpumd/processor/factory.go
rename to xpumd/processor/intelxpustatus/factory.go
index 116ac6f7c..198e2b99f 100644
--- a/xpumd/processor/factory.go
+++ b/xpumd/processor/intelxpustatus/factory.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package processor
+package intelxpustatus
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"go.opentelemetry.io/collector/processor"
 	"go.opentelemetry.io/collector/processor/processorhelper"
 
-	"github.com/intel/xpumanager/xpumd/processor/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/processor/intelxpustatus/internal/metadata"
 )
 
 // NewFactory returns a factory for the processor.
diff --git a/xpumd/processor/generated_component_test.go b/xpumd/processor/intelxpustatus/generated_component_test.go
similarity index 99%
rename from xpumd/processor/generated_component_test.go
rename to xpumd/processor/intelxpustatus/generated_component_test.go
index 535faa681..99c1a0afd 100644
--- a/xpumd/processor/generated_component_test.go
+++ b/xpumd/processor/intelxpustatus/generated_component_test.go
@@ -1,6 +1,6 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
-package processor
+package intelxpustatus
 
 import (
 	"context"
diff --git a/xpumd/processor/intelxpustatus/generated_package_test.go b/xpumd/processor/intelxpustatus/generated_package_test.go
new file mode 100644
index 000000000..b64484a99
--- /dev/null
+++ b/xpumd/processor/intelxpustatus/generated_package_test.go
@@ -0,0 +1,12 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package intelxpustatus
+
+import (
+	"go.uber.org/goleak"
+	"testing"
+)
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}
diff --git a/xpumd/processor/go.mod b/xpumd/processor/intelxpustatus/go.mod
similarity index 56%
rename from xpumd/processor/go.mod
rename to xpumd/processor/intelxpustatus/go.mod
index f42049631..8a5ac38cf 100644
--- a/xpumd/processor/go.mod
+++ b/xpumd/processor/intelxpustatus/go.mod
@@ -1,18 +1,18 @@
-module github.com/intel/xpumanager/xpumd/processor
+module github.com/intel/xpumanager/xpumd/processor/intelxpustatus
 
-go 1.26
+go 1.26.0
 
 require (
 	github.com/stretchr/testify v1.11.1
-	go.opentelemetry.io/collector/component v1.57.0
-	go.opentelemetry.io/collector/component/componenttest v0.151.0
-	go.opentelemetry.io/collector/confmap v1.57.0
-	go.opentelemetry.io/collector/consumer v1.57.0
-	go.opentelemetry.io/collector/consumer/consumertest v0.151.0
-	go.opentelemetry.io/collector/pdata v1.57.0
-	go.opentelemetry.io/collector/processor v1.57.0
-	go.opentelemetry.io/collector/processor/processorhelper v0.151.0
-	go.opentelemetry.io/collector/processor/processortest v0.151.0
+	go.opentelemetry.io/collector/component v1.59.0
+	go.opentelemetry.io/collector/component/componenttest v0.153.0
+	go.opentelemetry.io/collector/confmap v1.59.0
+	go.opentelemetry.io/collector/consumer v1.59.0
+	go.opentelemetry.io/collector/consumer/consumertest v0.153.0
+	go.opentelemetry.io/collector/pdata v1.59.0
+	go.opentelemetry.io/collector/processor v1.59.0
+	go.opentelemetry.io/collector/processor/processorhelper v0.153.0
+	go.opentelemetry.io/collector/processor/processortest v0.153.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.28.0
 )
@@ -37,14 +37,14 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/collector/component/componentstatus v0.151.0 // indirect
-	go.opentelemetry.io/collector/consumer/xconsumer v0.151.0 // indirect
-	go.opentelemetry.io/collector/featuregate v1.57.0 // indirect
-	go.opentelemetry.io/collector/internal/componentalias v0.151.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.151.0 // indirect
-	go.opentelemetry.io/collector/pdata/testdata v0.151.0 // indirect
-	go.opentelemetry.io/collector/pipeline v1.57.0 // indirect
-	go.opentelemetry.io/collector/processor/xprocessor v0.151.0 // indirect
+	go.opentelemetry.io/collector/component/componentstatus v0.153.0 // indirect
+	go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.59.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata/testdata v0.153.0 // indirect
+	go.opentelemetry.io/collector/pipeline v1.59.0 // indirect
+	go.opentelemetry.io/collector/processor/xprocessor v0.153.0 // indirect
 	go.opentelemetry.io/otel v1.43.0 // indirect
 	go.opentelemetry.io/otel/metric v1.43.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
@@ -52,8 +52,8 @@ require (
 	go.opentelemetry.io/otel/trace v1.43.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/intel/xpumanager/xpumd/common => ../common
+replace github.com/intel/xpumanager/xpumd/common => ../../common
diff --git a/xpumd/processor/go.sum b/xpumd/processor/intelxpustatus/go.sum
similarity index 66%
rename from xpumd/processor/go.sum
rename to xpumd/processor/intelxpustatus/go.sum
index 7de8e1893..a5aeda1f0 100644
--- a/xpumd/processor/go.sum
+++ b/xpumd/processor/intelxpustatus/go.sum
@@ -51,42 +51,42 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/collector/component v1.57.0 h1:WKIqx2Bs0JaAZxDEhsLradXpYxnwAxVFzWhQUmu2q3w=
-go.opentelemetry.io/collector/component v1.57.0/go.mod h1:rXLy5mV78e7Gqp/dzFB+nbAFSEuJCipJfp8LbkrvOMg=
-go.opentelemetry.io/collector/component/componentstatus v0.151.0 h1:S2L2y/r+MrqSR8CG/SpbN4WbbUQC5sK+1VgBR2rN660=
-go.opentelemetry.io/collector/component/componentstatus v0.151.0/go.mod h1:cDj64a2MAE/pWA1x/jR+oYZQ0d4LBYHcxxONYuijREE=
-go.opentelemetry.io/collector/component/componenttest v0.151.0 h1:0rYcx913VAfD1VyVA9MKPjTrdinUaJGEaOhom8MX5zY=
-go.opentelemetry.io/collector/component/componenttest v0.151.0/go.mod h1:vmhG58+J9QHOHaNu8LUD5d13LqldvkzI2jil4+lk+x0=
-go.opentelemetry.io/collector/confmap v1.57.0 h1:5AuK920dJmV8zxQAiODi2JHPl2r1HmEHHMaBSC+qF5I=
-go.opentelemetry.io/collector/confmap v1.57.0/go.mod h1:ifmog4kqEMM037qX04qEbom5CcxhmkadLUqhi2Vkuec=
-go.opentelemetry.io/collector/consumer v1.57.0 h1:jyDh4GkYPuIXNB0UJIh33NAzZoTCVNkwS+XWdlI08P8=
-go.opentelemetry.io/collector/consumer v1.57.0/go.mod h1:tJKbog9Xw/8y66aWd/C+21BMuQkOWn/lF4bzJDRC9OM=
-go.opentelemetry.io/collector/consumer/consumertest v0.151.0 h1:qByIVlFh9RAR/newAk/sN5i1zoIXKa2K1hRNVfye8LU=
-go.opentelemetry.io/collector/consumer/consumertest v0.151.0/go.mod h1:eAGCGxkq+aABLmlr3PvMOqz3ZJbmn/lUqCbbffabSi4=
-go.opentelemetry.io/collector/consumer/xconsumer v0.151.0 h1:eKIYxuPBEIrjZMAkyKBUWrlpHAE9OgxXBjq7PMSeXkE=
-go.opentelemetry.io/collector/consumer/xconsumer v0.151.0/go.mod h1:9K97TkCN7XYfwKzPzktozrWc3Qw/4A1T4XgMn9TnG0c=
-go.opentelemetry.io/collector/featuregate v1.57.0 h1:KPDSUKYn6MHwgyGRSGPPcW/G96HH93pxuvvPwM+R8nY=
-go.opentelemetry.io/collector/featuregate v1.57.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
-go.opentelemetry.io/collector/internal/componentalias v0.151.0 h1:5IJn4XXRbjGrJCuIByHzxgHqwC0Hcl99tM+PoyYzjJY=
-go.opentelemetry.io/collector/internal/componentalias v0.151.0/go.mod h1:c70sQuXHQZWSYCyc0y/VynqJdmEeBunSmEy3xfLQPWE=
-go.opentelemetry.io/collector/internal/testutil v0.151.0 h1:CFjDItLuqzblItOsnK6IPSdrsOaZCaDjYpB8qWG+XHI=
-go.opentelemetry.io/collector/internal/testutil v0.151.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
-go.opentelemetry.io/collector/pdata v1.57.0 h1:oDWBMjEIqyJO3GJEB+iwqxj47rxDK19OKzwaFEaE4sg=
-go.opentelemetry.io/collector/pdata v1.57.0/go.mod h1:wZojinP6mNhLXudH8QXx/bjWzOsKMxi/FXwnk+12G/w=
-go.opentelemetry.io/collector/pdata/pprofile v0.151.0 h1:hsU0+DpkvhJh3xL1Y8CX2vAPdLMoJLiw+C+rAMsaxZc=
-go.opentelemetry.io/collector/pdata/pprofile v0.151.0/go.mod h1:5zfGTQqRuaKyh2SRaZi4SV4nSD8TzY1kYoOjniOD3uk=
-go.opentelemetry.io/collector/pdata/testdata v0.151.0 h1:ye09e8UMADdVrQjLgCznZxmM8ra7ciAuOCteHDzgHjc=
-go.opentelemetry.io/collector/pdata/testdata v0.151.0/go.mod h1:h5+Ys9F+pf64cGt5cZCDtRsrkOnvjgpcONr8pFA3KBc=
-go.opentelemetry.io/collector/pipeline v1.57.0 h1:nlevGN75Vt/Fp0HTaDjZpUHQf5QFA6o2asSmzSoBVkA=
-go.opentelemetry.io/collector/pipeline v1.57.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
-go.opentelemetry.io/collector/processor v1.57.0 h1:EyW3f4pvt/gsfM3JKgRn2WZEyknGzZk5TES3FmwNLgg=
-go.opentelemetry.io/collector/processor v1.57.0/go.mod h1:EdKVhK9Oj8Cj2EdYqD/rDKdklLcdwpfSM/q6+KZOMbc=
-go.opentelemetry.io/collector/processor/processorhelper v0.151.0 h1:Q0RU7BM46GjLC2KPxyk8jHaud9XOVaDjp98hkL1uF38=
-go.opentelemetry.io/collector/processor/processorhelper v0.151.0/go.mod h1:+WKnK3S2itxLll8XxgTiCt8o2YA9amYpCFTm51l3zV0=
-go.opentelemetry.io/collector/processor/processortest v0.151.0 h1:J+7wLfpyO+gE/yfct11Sy1F6e+/KkLe1/gnh6jDbvbE=
-go.opentelemetry.io/collector/processor/processortest v0.151.0/go.mod h1:SKl5FdxTH4bsi90E8e1W79Q94Uoh+OfEMq7yoZqUYVE=
-go.opentelemetry.io/collector/processor/xprocessor v0.151.0 h1:TQhnUOP1vbdQ7zKD7SXfjtpthnfwWg23r8a6yeXDN84=
-go.opentelemetry.io/collector/processor/xprocessor v0.151.0/go.mod h1:36fKMHBSieF/Se9ErxfNJkMP40IkwerFcuVwG8oF/n0=
+go.opentelemetry.io/collector/component v1.59.0 h1:WtulkwzsdAOM/LE0cH/IiudUgiyb2ueVDDeEh5HsXzo=
+go.opentelemetry.io/collector/component v1.59.0/go.mod h1:5eQCM0tS6qbG2XJ6Bt67kgCxuhCbg4csVv6SywyHZ6w=
+go.opentelemetry.io/collector/component/componentstatus v0.153.0 h1:bZu1Qs1eHw5ZY2UEKq0f5IcctDgc6zjUYwCE1T22Tmw=
+go.opentelemetry.io/collector/component/componentstatus v0.153.0/go.mod h1:SfYWwh6pA9jJUcjuX+zIJ9kyn+2Z9SSLMM3xYOBsVW4=
+go.opentelemetry.io/collector/component/componenttest v0.153.0 h1:u6O1l+9PUNnI22k8q4sF9wgLAUyt+y2Ov7xi1yZ+wE4=
+go.opentelemetry.io/collector/component/componenttest v0.153.0/go.mod h1:Ym/d5UxnoHmrCI5LsVANBicikNiqtwjk8uWBM+Z4jDM=
+go.opentelemetry.io/collector/confmap v1.59.0 h1:asxEEiWwNuGfmTVSctYArOTF8jcxYpS4NmPtvvFhNNI=
+go.opentelemetry.io/collector/confmap v1.59.0/go.mod h1:X5SjFINrF0cb0hcM8PwnW2z+0L/pHA1H1yPPtm2j0tY=
+go.opentelemetry.io/collector/consumer v1.59.0 h1:EFDQ8ZTWwHEratWusKgW26W20LeAWdXj235iD9MxpuA=
+go.opentelemetry.io/collector/consumer v1.59.0/go.mod h1:wrOSfXkKjzEeHYxhKGukuB9+NFV/CboWwEH1oEXhMtw=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0 h1:fCqkOWNVK/qipg4SX60zICs3jhKDjcrtF1oxJR6msCk=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0/go.mod h1:YfVqyCrvEfvsbbrpfiH97fITh4vmIBzZT112tUluqx0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 h1:Jt1Aiiq9zDILzppRTEdZXaA830KBjjP1i2kWL+h5br0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0/go.mod h1:IzJ/dTOtEUMjY0DYu6kO946u5jbiDDUG8+sLaLhJ+HY=
+go.opentelemetry.io/collector/featuregate v1.59.0 h1:pu70/9eWRjAjzGnr3VmqwY+k6fmU3esLp15AqxfBBz0=
+go.opentelemetry.io/collector/featuregate v1.59.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0 h1:tr5I5hsJPJBbVPGjvOVVPPK4dLR5ZLqVEckuOfnzzMs=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0/go.mod h1:tFSKiuWKJJgfxANyVnbKPVZkOF7N0bFXvCxCEgqMKuo=
+go.opentelemetry.io/collector/internal/testutil v0.153.0 h1:GJEaPLohao+7wtm08yGf73RGi1rpIHvqzxOb7Xn8sP0=
+go.opentelemetry.io/collector/internal/testutil v0.153.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
+go.opentelemetry.io/collector/pdata v1.59.0 h1:lO1IcaO9+HUVdFh+RATCUG3oTP+uCZzsE7HJ0MjmzRc=
+go.opentelemetry.io/collector/pdata v1.59.0/go.mod h1:AH6M14C6qhesnUpcvigkvFMiX9KtdSWQENMBNyNhe7I=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0 h1:IurcS9g28cVrtIvc1oUVN8vSm5j0t79Pd8GZgd1PV28=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0/go.mod h1:nX33dLKrwdoz/FQeIs6JKPeZcS1KbU2VIOwH7K0F05c=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0 h1:pO/+b8Rz5PG0G+TskdYdQEjhXnNG2bQoiRRMwic6X0I=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0/go.mod h1:JVjUfJv9YFL3JUhisxMdLe2DX7we227Ry9JiTgwlEro=
+go.opentelemetry.io/collector/pipeline v1.59.0 h1:AyEcAPy5ZuUFpqis9i97WEIAcFh/mEEo90+1wr4urNU=
+go.opentelemetry.io/collector/pipeline v1.59.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
+go.opentelemetry.io/collector/processor v1.59.0 h1:uSIMwLaKLzHNiv8625LP3BLUMCqRaBc1ay2o7uW19PQ=
+go.opentelemetry.io/collector/processor v1.59.0/go.mod h1:IrCFcSdmqIWfNeTWOxncNcdQGVOf0LlKY6A3pHEpGiw=
+go.opentelemetry.io/collector/processor/processorhelper v0.153.0 h1:GTZ9czCDJPMs7YcfnymBPQFzbi9db+MAcb6TCnSnTOI=
+go.opentelemetry.io/collector/processor/processorhelper v0.153.0/go.mod h1:Wm3JJZWpc5133jiHAsDDgG8iMtmfHWKWBtP7Z7eOi4c=
+go.opentelemetry.io/collector/processor/processortest v0.153.0 h1:aMH8+omUXs2iCKL4Cphmzzrn4lB4jm6ZgWRvKKV+B/c=
+go.opentelemetry.io/collector/processor/processortest v0.153.0/go.mod h1:LAPHps5FhQyd0MnNd1ZHmoykG/EWsIpJLs7fivFf5Mc=
+go.opentelemetry.io/collector/processor/xprocessor v0.153.0 h1:mXtOAwZAXcHgAgVRzAk4NRoyj7yHV88LVFrn0CCedog=
+go.opentelemetry.io/collector/processor/xprocessor v0.153.0/go.mod h1:yGFU58TvheCedrVkdqU8jW/vnCFqcyYElf+5lidn0nA=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
 go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
@@ -111,8 +111,8 @@ go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
 go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/xpumd/processor/internal/metadata/generated_status.go b/xpumd/processor/intelxpustatus/internal/metadata/generated_status.go
similarity index 55%
rename from xpumd/processor/internal/metadata/generated_status.go
rename to xpumd/processor/intelxpustatus/internal/metadata/generated_status.go
index f2d902360..a863002bf 100644
--- a/xpumd/processor/internal/metadata/generated_status.go
+++ b/xpumd/processor/intelxpustatus/internal/metadata/generated_status.go
@@ -1,5 +1,7 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
+// Package metadata contains the autogenerated telemetry and
+// build information for the processor/intelxpustatus component.
 package metadata
 
 import (
@@ -8,7 +10,7 @@ import (
 
 var (
 	Type      = component.MustNewType("intelxpustatus")
-	ScopeName = "github.com/intel/xpumanager/xpumd/processor"
+	ScopeName = "github.com/intel/xpumanager/xpumd/processor/intelxpustatus"
 )
 
 const (
diff --git a/xpumd/processor/metadata.yaml b/xpumd/processor/intelxpustatus/metadata.yaml
similarity index 100%
rename from xpumd/processor/metadata.yaml
rename to xpumd/processor/intelxpustatus/metadata.yaml
diff --git a/xpumd/processor/processor.go b/xpumd/processor/intelxpustatus/processor.go
similarity index 99%
rename from xpumd/processor/processor.go
rename to xpumd/processor/intelxpustatus/processor.go
index 2633a7f9e..1d04b3bda 100644
--- a/xpumd/processor/processor.go
+++ b/xpumd/processor/intelxpustatus/processor.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package processor
+package intelxpustatus
 
 import (
 	"context"
diff --git a/xpumd/processor/processor_test.go b/xpumd/processor/intelxpustatus/processor_test.go
similarity index 99%
rename from xpumd/processor/processor_test.go
rename to xpumd/processor/intelxpustatus/processor_test.go
index 5a988b8d5..8b87f0744 100644
--- a/xpumd/processor/processor_test.go
+++ b/xpumd/processor/intelxpustatus/processor_test.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package processor
+package intelxpustatus
 
 import (
 	"testing"
diff --git a/xpumd/receiver/doc.go b/xpumd/receiver/doc.go
deleted file mode 100644
index 454561cb8..000000000
--- a/xpumd/receiver/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright (C) 2026 Intel Corporation
-//
-// SPDX-License-Identifier: MIT
-
-package receiver
-
-//go:generate go tool -modfile ../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/receiver/intelcrashlog/README.md b/xpumd/receiver/intelcrashlog/README.md
new file mode 100644
index 000000000..9bbead515
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/README.md
@@ -0,0 +1,53 @@
+# Intel Crashlog Receiver
+
+## Overview
+
+The Intel Crashlog Receiver watches a directory for new GPU crash dump files
+and emits each file content as a log record.
+
+See the [Crash Log Framework project](https://github.com/intel/crashlog) for more details.
+
+> [!CAUTION]
+> Crashlog files must be created atomically (e.g. by writing to a temporary
+> file and then renaming it) to avoid the receiver processing an incomplete
+> file.
+
+## Configuration
+
+### Example Configuration
+
+```yaml
+receivers:
+  intel_crashlog:
+    directory: /var/log/crashlog
+    glob: "*.bin"
+    ignore_older_than: 10m
+    add_attributes:
+      hw.vendor: ACME
+```
+
+### Configuration Parameters
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `directory` | string | *required* | Directory to watch for new crashlog files |
+| `glob` | string | *required* | Filename glob pattern matched against the base name of each file,  use `*` to match all files |
+| `ignore_older_than` | duration | `0s` | Ignore files whose modification time is older than `startup_time - ignore_older_than`. `0s` means only files modified after startup are processed |
+| `add_attributes` | map[string]string | `{}` | Static key/value attributes added to every emitted log record |
+
+## Log Record Format
+
+Each crashlog file produces a single log record:
+
+| Field | Value |
+|-------|-------|
+| `Timestamp` | File modification time |
+| `ObservedTimestamp` | Time the receiver processed the file |
+| `Body` | Raw file contents (bytes) |
+
+### Attributes
+
+| Attribute | Type | Description |
+|-----------|------|-------------|
+| `file.name` | string | Base name of the crashlog file |
+| `pci.bdf` | string | PCI Bus:Device.Function address parsed from the filename (e.g. `0000:00:1e.2`). Omitted if no BDF is found in the filename |
diff --git a/xpumd/receiver/intelcrashlog/config.go b/xpumd/receiver/intelcrashlog/config.go
new file mode 100644
index 000000000..5d6d258ae
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/config.go
@@ -0,0 +1,49 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelcrashlog
+
+import (
+	"fmt"
+	"path/filepath"
+	"time"
+)
+
+// Config defines configuration for the Intel Crashlog receiver.
+type Config struct {
+	// Directory is the path to watch for new crashlog files.
+	// Must not be empty.
+	Directory string `mapstructure:"directory"`
+
+	// Glob is a filename glob pattern matched against the base name of files.
+	// Must not be empty.
+	Glob string `mapstructure:"glob"`
+
+	// IgnoreOlderThan causes files whose modification time is older than
+	// (startup_time - ignore_older_than) to be ignored.
+	// Zero (the default) means only files modified at or after startup time are processed.
+	IgnoreOlderThan time.Duration `mapstructure:"ignore_older_than"`
+
+	// AddAttributes is a map of static key/value pairs added to every emitted log record.
+	AddAttributes map[string]string `mapstructure:"add_attributes"`
+}
+
+// Validate checks the receiver configuration.
+func (c *Config) Validate() error {
+	if c.Directory == "" {
+		return fmt.Errorf("directory must not be empty")
+	}
+	if c.Glob == "" {
+		return fmt.Errorf("glob must not be empty")
+	}
+	if _, err := filepath.Match(c.Glob, ""); err != nil {
+		return fmt.Errorf("glob is not a valid pattern: %w", err)
+	}
+
+	if c.IgnoreOlderThan < 0 {
+		return fmt.Errorf("ignore_older_than must not be negative")
+	}
+	return nil
+}
diff --git a/xpumd/receiver/intelcrashlog/doc.go b/xpumd/receiver/intelcrashlog/doc.go
new file mode 100644
index 000000000..ebf2a9540
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/doc.go
@@ -0,0 +1,8 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelcrashlog
+
+//go:generate go tool -modfile ../../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/receiver/intelcrashlog/factory.go b/xpumd/receiver/intelcrashlog/factory.go
new file mode 100644
index 000000000..87b848756
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/factory.go
@@ -0,0 +1,41 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelcrashlog
+
+import (
+	"context"
+	"fmt"
+
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/consumer"
+	"go.opentelemetry.io/collector/receiver"
+
+	"github.com/intel/xpumanager/xpumd/receiver/intelcrashlog/internal/metadata"
+)
+
+// NewFactory creates a factory for the receiver.
+func NewFactory() receiver.Factory {
+	return receiver.NewFactory(
+		metadata.Type,
+		createDefaultConfig,
+		receiver.WithLogs(createLogsReceiver, metadata.LogsStability),
+	)
+}
+
+func createDefaultConfig() component.Config {
+	return &Config{
+		Directory:        "",
+		IgnoreOlderThan: 0,
+	}
+}
+
+func createLogsReceiver(_ context.Context, settings receiver.Settings, cfg component.Config, nextConsumer consumer.Logs) (receiver.Logs, error) {
+	c, ok := cfg.(*Config)
+	if !ok {
+		return nil, fmt.Errorf("invalid config type: %T", cfg)
+	}
+	return newReceiver(settings, c, nextConsumer), nil
+}
diff --git a/xpumd/receiver/intelcrashlog/generated_component_test.go b/xpumd/receiver/intelcrashlog/generated_component_test.go
new file mode 100644
index 000000000..ed07ee1fe
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/generated_component_test.go
@@ -0,0 +1,87 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package intelcrashlog
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/component/componenttest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/consumer/consumertest"
+	"go.opentelemetry.io/collector/receiver"
+	"go.opentelemetry.io/collector/receiver/receivertest"
+)
+
+var typ = component.MustNewType("intel_crashlog")
+
+func TestComponentFactoryType(t *testing.T) {
+	require.Equal(t, typ, NewFactory().Type())
+}
+
+func TestComponentConfigStruct(t *testing.T) {
+	require.NoError(t, componenttest.CheckConfigStruct(NewFactory().CreateDefaultConfig()))
+}
+
+func TestComponentLifecycle(t *testing.T) {
+	factory := NewFactory()
+
+	tests := []struct {
+		createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error)
+		name     string
+	}{
+
+		{
+			name: "logs",
+			createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) {
+				return factory.CreateLogs(ctx, set, cfg, consumertest.NewNop())
+			},
+		},
+	}
+
+	cm, err := confmaptest.LoadConf("metadata.yaml")
+	require.NoError(t, err)
+	cfg := factory.CreateDefaultConfig()
+	sub, err := cm.Sub("tests::config")
+	require.NoError(t, err)
+	require.NoError(t, sub.Unmarshal(&cfg))
+
+	for _, tt := range tests {
+		t.Run(tt.name+"-shutdown", func(t *testing.T) {
+			c, err := tt.createFn(context.Background(), receivertest.NewNopSettings(typ), cfg)
+			require.NoError(t, err)
+			err = c.Shutdown(context.Background())
+			require.NoError(t, err)
+		})
+		t.Run(tt.name+"-lifecycle", func(t *testing.T) {
+			firstRcvr, err := tt.createFn(context.Background(), receivertest.NewNopSettings(typ), cfg)
+			require.NoError(t, err)
+			host := newMdatagenNopHost()
+			require.NoError(t, err)
+			require.NoError(t, firstRcvr.Start(context.Background(), host))
+			require.NoError(t, firstRcvr.Shutdown(context.Background()))
+			secondRcvr, err := tt.createFn(context.Background(), receivertest.NewNopSettings(typ), cfg)
+			require.NoError(t, err)
+			require.NoError(t, secondRcvr.Start(context.Background(), host))
+			require.NoError(t, secondRcvr.Shutdown(context.Background()))
+		})
+	}
+}
+
+var _ component.Host = (*mdatagenNopHost)(nil)
+
+type mdatagenNopHost struct{}
+
+func newMdatagenNopHost() component.Host {
+	return &mdatagenNopHost{}
+}
+
+func (mnh *mdatagenNopHost) GetExtensions() map[component.ID]component.Component {
+	return nil
+}
+
+func (mnh *mdatagenNopHost) GetFactory(_ component.Kind, _ component.Type) component.Factory {
+	return nil
+}
diff --git a/xpumd/processor/generated_package_test.go b/xpumd/receiver/intelcrashlog/generated_package_test.go
similarity index 87%
rename from xpumd/processor/generated_package_test.go
rename to xpumd/receiver/intelcrashlog/generated_package_test.go
index 95dc08796..d3fec4fbd 100644
--- a/xpumd/processor/generated_package_test.go
+++ b/xpumd/receiver/intelcrashlog/generated_package_test.go
@@ -1,6 +1,6 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
-package processor
+package intelcrashlog
 
 import (
 	"go.uber.org/goleak"
diff --git a/xpumd/receiver/intelcrashlog/go.mod b/xpumd/receiver/intelcrashlog/go.mod
new file mode 100644
index 000000000..a8fa86a13
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/go.mod
@@ -0,0 +1,63 @@
+module github.com/intel/xpumanager/xpumd/receiver/intelcrashlog
+
+go 1.26.0
+
+require (
+	github.com/fsnotify/fsnotify v1.10.1
+	github.com/stretchr/testify v1.11.1
+	go.opentelemetry.io/collector/component v1.59.0
+	go.opentelemetry.io/collector/component/componenttest v0.153.0
+	go.opentelemetry.io/collector/confmap v1.58.0
+	go.opentelemetry.io/collector/consumer v1.59.0
+	go.opentelemetry.io/collector/consumer/consumertest v0.153.0
+	go.opentelemetry.io/collector/pdata v1.59.0
+	go.opentelemetry.io/collector/receiver v1.59.0
+	go.opentelemetry.io/collector/receiver/receivertest v0.153.0
+	go.uber.org/goleak v1.3.0
+	go.uber.org/zap v1.28.0
+)
+
+require (
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/hashicorp/go-version v1.9.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/knadh/koanf/maps v0.1.2 // indirect
+	github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
+	github.com/knadh/koanf/v2 v2.3.4 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror v0.153.0 // indirect
+	go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.59.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.153.0 // indirect
+	go.opentelemetry.io/collector/pipeline v1.59.0 // indirect
+	go.opentelemetry.io/collector/receiver/xreceiver v0.153.0 // indirect
+	go.opentelemetry.io/otel v1.43.0 // indirect
+	go.opentelemetry.io/otel/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/trace v1.43.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/sys v0.45.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
+	google.golang.org/grpc v1.81.1 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+replace (
+	github.com/intel/xpumanager/xpumd => ../..
+	github.com/intel/xpumanager/xpumd/common => ../../common
+)
diff --git a/xpumd/receiver/go.sum b/xpumd/receiver/intelcrashlog/go.sum
similarity index 59%
rename from xpumd/receiver/go.sum
rename to xpumd/receiver/intelcrashlog/go.sum
index 92338146b..766daa759 100644
--- a/xpumd/receiver/go.sum
+++ b/xpumd/receiver/intelcrashlog/go.sum
@@ -3,6 +3,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
+github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -53,50 +55,40 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/collector/component v1.57.0 h1:WKIqx2Bs0JaAZxDEhsLradXpYxnwAxVFzWhQUmu2q3w=
-go.opentelemetry.io/collector/component v1.57.0/go.mod h1:rXLy5mV78e7Gqp/dzFB+nbAFSEuJCipJfp8LbkrvOMg=
-go.opentelemetry.io/collector/component/componenttest v0.151.0 h1:0rYcx913VAfD1VyVA9MKPjTrdinUaJGEaOhom8MX5zY=
-go.opentelemetry.io/collector/component/componenttest v0.151.0/go.mod h1:vmhG58+J9QHOHaNu8LUD5d13LqldvkzI2jil4+lk+x0=
-go.opentelemetry.io/collector/confmap v1.57.0 h1:5AuK920dJmV8zxQAiODi2JHPl2r1HmEHHMaBSC+qF5I=
-go.opentelemetry.io/collector/confmap v1.57.0/go.mod h1:ifmog4kqEMM037qX04qEbom5CcxhmkadLUqhi2Vkuec=
-go.opentelemetry.io/collector/consumer v1.57.0 h1:jyDh4GkYPuIXNB0UJIh33NAzZoTCVNkwS+XWdlI08P8=
-go.opentelemetry.io/collector/consumer v1.57.0/go.mod h1:tJKbog9Xw/8y66aWd/C+21BMuQkOWn/lF4bzJDRC9OM=
-go.opentelemetry.io/collector/consumer/consumererror v0.151.0 h1:tspiI5WE/xwYNAzR61I1XhmNYhSXdsR0Yf1Dk2MZIfQ=
-go.opentelemetry.io/collector/consumer/consumererror v0.151.0/go.mod h1:dxnhPRnw3kjyweDy9pGWUNVueem15kxlvqRp0qY5k6U=
-go.opentelemetry.io/collector/consumer/consumertest v0.151.0 h1:qByIVlFh9RAR/newAk/sN5i1zoIXKa2K1hRNVfye8LU=
-go.opentelemetry.io/collector/consumer/consumertest v0.151.0/go.mod h1:eAGCGxkq+aABLmlr3PvMOqz3ZJbmn/lUqCbbffabSi4=
-go.opentelemetry.io/collector/consumer/xconsumer v0.151.0 h1:eKIYxuPBEIrjZMAkyKBUWrlpHAE9OgxXBjq7PMSeXkE=
-go.opentelemetry.io/collector/consumer/xconsumer v0.151.0/go.mod h1:9K97TkCN7XYfwKzPzktozrWc3Qw/4A1T4XgMn9TnG0c=
-go.opentelemetry.io/collector/featuregate v1.57.0 h1:KPDSUKYn6MHwgyGRSGPPcW/G96HH93pxuvvPwM+R8nY=
-go.opentelemetry.io/collector/featuregate v1.57.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
-go.opentelemetry.io/collector/internal/componentalias v0.151.0 h1:5IJn4XXRbjGrJCuIByHzxgHqwC0Hcl99tM+PoyYzjJY=
-go.opentelemetry.io/collector/internal/componentalias v0.151.0/go.mod h1:c70sQuXHQZWSYCyc0y/VynqJdmEeBunSmEy3xfLQPWE=
-go.opentelemetry.io/collector/internal/testutil v0.151.0 h1:CFjDItLuqzblItOsnK6IPSdrsOaZCaDjYpB8qWG+XHI=
-go.opentelemetry.io/collector/internal/testutil v0.151.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
-go.opentelemetry.io/collector/pdata v1.57.0 h1:oDWBMjEIqyJO3GJEB+iwqxj47rxDK19OKzwaFEaE4sg=
-go.opentelemetry.io/collector/pdata v1.57.0/go.mod h1:wZojinP6mNhLXudH8QXx/bjWzOsKMxi/FXwnk+12G/w=
-go.opentelemetry.io/collector/pdata/pprofile v0.151.0 h1:hsU0+DpkvhJh3xL1Y8CX2vAPdLMoJLiw+C+rAMsaxZc=
-go.opentelemetry.io/collector/pdata/pprofile v0.151.0/go.mod h1:5zfGTQqRuaKyh2SRaZi4SV4nSD8TzY1kYoOjniOD3uk=
-go.opentelemetry.io/collector/pdata/testdata v0.151.0 h1:ye09e8UMADdVrQjLgCznZxmM8ra7ciAuOCteHDzgHjc=
-go.opentelemetry.io/collector/pdata/testdata v0.151.0/go.mod h1:h5+Ys9F+pf64cGt5cZCDtRsrkOnvjgpcONr8pFA3KBc=
-go.opentelemetry.io/collector/pipeline v1.57.0 h1:nlevGN75Vt/Fp0HTaDjZpUHQf5QFA6o2asSmzSoBVkA=
-go.opentelemetry.io/collector/pipeline v1.57.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
-go.opentelemetry.io/collector/pipeline/xpipeline v0.151.0 h1:IywvWUfCS2cGOoNFowmq7CAeeyyZzp4MKUGB8gDlk9E=
-go.opentelemetry.io/collector/pipeline/xpipeline v0.151.0/go.mod h1:hwkQnowliexFbNCUL/UawKdJvk2zGEegdoycPbAYIYE=
-go.opentelemetry.io/collector/receiver v1.57.0 h1:Aq8hcLByUOOrouekGPsxvaAHbUMxa4NM2Ok84KHjdcE=
-go.opentelemetry.io/collector/receiver v1.57.0/go.mod h1:6y2UO4pmiT85z9JApUmRiP/7yX7zY5cmxbMgXvvMOA0=
-go.opentelemetry.io/collector/receiver/receiverhelper v0.151.0 h1:c7xgG4o9xZgUsPTOG5bOSB4rjJS0htobDLJZsyQtP1s=
-go.opentelemetry.io/collector/receiver/receiverhelper v0.151.0/go.mod h1:5IBpuOFU8qZ5etUM3PulFKW9KUwr7z2nlD8ma3+m1wI=
-go.opentelemetry.io/collector/receiver/receivertest v0.151.0 h1:U1iALsnbrAM3QdT4977y/S+Tbe68iS42qoeY5zgGXfE=
-go.opentelemetry.io/collector/receiver/receivertest v0.151.0/go.mod h1:MBAEOfep8HMpdOcD5j1LOpP/GTjqz5hmZijGyYGxkGE=
-go.opentelemetry.io/collector/receiver/xreceiver v0.151.0 h1:Ib86H9rBBD76wmpKQFRlwYqugvxbDtq8Lg6bVROBw4k=
-go.opentelemetry.io/collector/receiver/xreceiver v0.151.0/go.mod h1:9Jqb3YKmgkZeLmHx5QBLBgdoLiu2T9q4B+o6LGTR/8U=
-go.opentelemetry.io/collector/scraper v0.151.0 h1:IRF0VQvzMsxrHM8m5O/d4c/xJ3LXldp7Ve0td2SI+Rc=
-go.opentelemetry.io/collector/scraper v0.151.0/go.mod h1:VIGfL02pUo0P3DFMnVnXAPjC8wEkBZb4zPQwvCUVOh0=
-go.opentelemetry.io/collector/scraper/scraperhelper v0.151.0 h1:UOqx57FyK3YIYy1hPmlr2pN9A9IuTk1e8R4pQ6kFsBo=
-go.opentelemetry.io/collector/scraper/scraperhelper v0.151.0/go.mod h1:F9JjShF6tCgXYkw06LtBAdDkDwzBdZibNQw35owLiSg=
-go.opentelemetry.io/collector/scraper/scrapertest v0.151.0 h1:dthC8H7O94WRmCQ3qU8SEWGqgSo+D6RAiXj7JMssjfw=
-go.opentelemetry.io/collector/scraper/scrapertest v0.151.0/go.mod h1:2mPxyCAv6N03Zx+YIQ0C3e6fjIKL+ofiwYXXp1TVafc=
+go.opentelemetry.io/collector/component v1.59.0 h1:WtulkwzsdAOM/LE0cH/IiudUgiyb2ueVDDeEh5HsXzo=
+go.opentelemetry.io/collector/component v1.59.0/go.mod h1:5eQCM0tS6qbG2XJ6Bt67kgCxuhCbg4csVv6SywyHZ6w=
+go.opentelemetry.io/collector/component/componenttest v0.153.0 h1:u6O1l+9PUNnI22k8q4sF9wgLAUyt+y2Ov7xi1yZ+wE4=
+go.opentelemetry.io/collector/component/componenttest v0.153.0/go.mod h1:Ym/d5UxnoHmrCI5LsVANBicikNiqtwjk8uWBM+Z4jDM=
+go.opentelemetry.io/collector/confmap v1.58.0 h1:lKk7XZ/BEA0eSlQWanBkhjDZewB/tu5EK2+PV/qlBws=
+go.opentelemetry.io/collector/confmap v1.58.0/go.mod h1:2O/WadVBFwRzpO+3skcvjqDxD+OaS0TKKDDpPBaR4bs=
+go.opentelemetry.io/collector/consumer v1.59.0 h1:EFDQ8ZTWwHEratWusKgW26W20LeAWdXj235iD9MxpuA=
+go.opentelemetry.io/collector/consumer v1.59.0/go.mod h1:wrOSfXkKjzEeHYxhKGukuB9+NFV/CboWwEH1oEXhMtw=
+go.opentelemetry.io/collector/consumer/consumererror v0.153.0 h1:x64J2xnSOoOp3yZRWioZ03vNAF19aBioUsRlZ4eC6x8=
+go.opentelemetry.io/collector/consumer/consumererror v0.153.0/go.mod h1:5zJ8TYQisuMjWJNaW6S86cHY1rf3DzXOVvsN8pA3Cc8=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0 h1:fCqkOWNVK/qipg4SX60zICs3jhKDjcrtF1oxJR6msCk=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0/go.mod h1:YfVqyCrvEfvsbbrpfiH97fITh4vmIBzZT112tUluqx0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 h1:Jt1Aiiq9zDILzppRTEdZXaA830KBjjP1i2kWL+h5br0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0/go.mod h1:IzJ/dTOtEUMjY0DYu6kO946u5jbiDDUG8+sLaLhJ+HY=
+go.opentelemetry.io/collector/featuregate v1.59.0 h1:pu70/9eWRjAjzGnr3VmqwY+k6fmU3esLp15AqxfBBz0=
+go.opentelemetry.io/collector/featuregate v1.59.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0 h1:tr5I5hsJPJBbVPGjvOVVPPK4dLR5ZLqVEckuOfnzzMs=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0/go.mod h1:tFSKiuWKJJgfxANyVnbKPVZkOF7N0bFXvCxCEgqMKuo=
+go.opentelemetry.io/collector/internal/testutil v0.153.0 h1:GJEaPLohao+7wtm08yGf73RGi1rpIHvqzxOb7Xn8sP0=
+go.opentelemetry.io/collector/internal/testutil v0.153.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
+go.opentelemetry.io/collector/pdata v1.59.0 h1:lO1IcaO9+HUVdFh+RATCUG3oTP+uCZzsE7HJ0MjmzRc=
+go.opentelemetry.io/collector/pdata v1.59.0/go.mod h1:AH6M14C6qhesnUpcvigkvFMiX9KtdSWQENMBNyNhe7I=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0 h1:IurcS9g28cVrtIvc1oUVN8vSm5j0t79Pd8GZgd1PV28=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0/go.mod h1:nX33dLKrwdoz/FQeIs6JKPeZcS1KbU2VIOwH7K0F05c=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0 h1:pO/+b8Rz5PG0G+TskdYdQEjhXnNG2bQoiRRMwic6X0I=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0/go.mod h1:JVjUfJv9YFL3JUhisxMdLe2DX7we227Ry9JiTgwlEro=
+go.opentelemetry.io/collector/pipeline v1.59.0 h1:AyEcAPy5ZuUFpqis9i97WEIAcFh/mEEo90+1wr4urNU=
+go.opentelemetry.io/collector/pipeline v1.59.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
+go.opentelemetry.io/collector/receiver v1.59.0 h1:2jf2guECLyWno3OqNaefjfo+Tt3MSm6uz1WsbIXv5Ao=
+go.opentelemetry.io/collector/receiver v1.59.0/go.mod h1:rklWFy0kaMMghuGlrTxqYP96V810HwDVwIgKpP6kn2o=
+go.opentelemetry.io/collector/receiver/receivertest v0.153.0 h1:YHvywYcyV1G0I5r/J0OxgOJZPLLyrMAMA0Q7VdBYFxc=
+go.opentelemetry.io/collector/receiver/receivertest v0.153.0/go.mod h1:Zkf5hQ9qk9ACx/WBMZIaSri6LIJzFgfRxmScigP05tg=
+go.opentelemetry.io/collector/receiver/xreceiver v0.153.0 h1:yz6By4iJzOsvl9GxVOXTn0GoSr5ZxOuvk9+24obhqDQ=
+go.opentelemetry.io/collector/receiver/xreceiver v0.153.0/go.mod h1:4cM85JHe5weHwUAc60P/vPKU1uLtrhI46lzDOsSpqz4=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
 go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
@@ -121,16 +113,16 @@ go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
 go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
-golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
-golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
+google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/xpumd/receiver/internal/metadata/generated_logs.go b/xpumd/receiver/intelcrashlog/internal/metadata/generated_logs.go
similarity index 100%
rename from xpumd/receiver/internal/metadata/generated_logs.go
rename to xpumd/receiver/intelcrashlog/internal/metadata/generated_logs.go
diff --git a/xpumd/receiver/internal/metadata/generated_logs_test.go b/xpumd/receiver/intelcrashlog/internal/metadata/generated_logs_test.go
similarity index 100%
rename from xpumd/receiver/internal/metadata/generated_logs_test.go
rename to xpumd/receiver/intelcrashlog/internal/metadata/generated_logs_test.go
diff --git a/xpumd/receiver/intelcrashlog/internal/metadata/generated_status.go b/xpumd/receiver/intelcrashlog/internal/metadata/generated_status.go
new file mode 100644
index 000000000..083cdc710
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/internal/metadata/generated_status.go
@@ -0,0 +1,18 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+// Package metadata contains the autogenerated telemetry and
+// build information for the receiver/intel_crashlog component.
+package metadata
+
+import (
+	"go.opentelemetry.io/collector/component"
+)
+
+var (
+	Type      = component.MustNewType("intel_crashlog")
+	ScopeName = "github.com/intel/xpumanager/xpumd/receiver/intelcrashlog"
+)
+
+const (
+	LogsStability = component.StabilityLevelDevelopment
+)
diff --git a/xpumd/receiver/intelcrashlog/metadata.yaml b/xpumd/receiver/intelcrashlog/metadata.yaml
new file mode 100644
index 000000000..e6bf035a1
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/metadata.yaml
@@ -0,0 +1,9 @@
+display_name: Intel Crashlog Receiver
+type: intel_crashlog
+
+status:
+  class: receiver
+  stability:
+    development: [logs]
+  codeowners:
+    active: [marquiz]
diff --git a/xpumd/receiver/intelcrashlog/receiver.go b/xpumd/receiver/intelcrashlog/receiver.go
new file mode 100644
index 000000000..e266cd5d5
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/receiver.go
@@ -0,0 +1,214 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelcrashlog
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"sync"
+	"time"
+
+	"github.com/fsnotify/fsnotify"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/consumer"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/plog"
+	"go.opentelemetry.io/collector/receiver"
+	"go.uber.org/zap"
+
+	"github.com/intel/xpumanager/xpumd/receiver/intelcrashlog/internal/metadata"
+)
+
+// bdfRegexp matches PCI BDF addresses of the form DDDD:BB:DD.F (e.g. 0000:00:1e.2).
+var bdfRegexp = regexp.MustCompile(`(?:^|[^0-9a-zA-Z])([0-9a-fA-F]{4}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F])(?:[^0-9a-zA-Z]|$)`)
+
+type crashlogReceiver struct {
+	config   *Config
+	consumer consumer.Logs
+	logger   *zap.SugaredLogger
+
+	processedFiles  map[string]bool
+	ignoreOlderThan time.Time
+
+	watcher *fsnotify.Watcher
+	cancel  context.CancelFunc
+	wg      sync.WaitGroup
+}
+
+func newReceiver(settings receiver.Settings, cfg *Config, nextConsumer consumer.Logs) *crashlogReceiver {
+	return &crashlogReceiver{
+		config:         cfg,
+		consumer:       nextConsumer,
+		logger:         settings.Logger.Sugar(),
+		processedFiles: make(map[string]bool),
+	}
+}
+
+func (r *crashlogReceiver) Start(ctx context.Context, _ component.Host) error {
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		return fmt.Errorf("failed to create filesystem watcher: %w", err)
+	}
+
+	if err := watcher.Add(r.config.Directory); err != nil {
+		_ = watcher.Close()
+		return fmt.Errorf("failed to watch directory %q: %w", r.config.Directory, err)
+	}
+
+	r.watcher = watcher
+	r.ignoreOlderThan = time.Now().Add(-r.config.IgnoreOlderThan)
+
+	ctx, cancel := context.WithCancel(ctx)
+	r.cancel = cancel
+
+	r.wg.Go(func() { r.run(ctx) })
+
+	return nil
+}
+
+func (r *crashlogReceiver) Shutdown(_ context.Context) error {
+	if r.cancel != nil {
+		r.cancel()
+	}
+	if r.watcher != nil {
+		_ = r.watcher.Close()
+	}
+	r.wg.Wait()
+	return nil
+}
+
+func (r *crashlogReceiver) run(ctx context.Context) {
+	// Scan directory for existing files.
+	if err := r.scanDirectory(ctx); err != nil {
+		r.logger.Errorw("initial directory scan failed", "directory", r.config.Directory, "error", err)
+	}
+
+	for {
+		select {
+		case <-ctx.Done():
+			return
+
+		case event, ok := <-r.watcher.Events:
+			if !ok {
+				return
+			}
+			// NOTE: Write notifications are unneeded on Linux (files must be created atomically with rename)
+			if event.Has(fsnotify.Create) {
+				r.handlePath(ctx, event.Name)
+			}
+			// Prune the processed-files map.
+			// NOTE: Will be re-processed/re-emitted if a new file with the same name appears later.
+			if event.Has(fsnotify.Remove | fsnotify.Rename) {
+				delete(r.processedFiles, event.Name)
+			}
+
+		case err, ok := <-r.watcher.Errors:
+			if !ok {
+				return
+			}
+			r.logger.Warnw("watcher error", "error", err)
+		}
+	}
+}
+
+// scanDirectory processes all existing files in the watched directory.
+func (r *crashlogReceiver) scanDirectory(ctx context.Context) error {
+	entries, err := os.ReadDir(r.config.Directory)
+	if err != nil {
+		return fmt.Errorf("failed to read directory %q: %w", r.config.Directory, err)
+	}
+
+	for _, entry := range entries {
+		if ctx.Err() != nil {
+			break
+		}
+		r.handlePath(ctx, filepath.Join(r.config.Directory, entry.Name()))
+	}
+
+	return nil
+}
+
+// handlePath checks a filepath and processes it, if eligible.
+func (r *crashlogReceiver) handlePath(ctx context.Context, path string) {
+	if matched, err := filepath.Match(r.config.Glob, filepath.Base(path)); err != nil || !matched {
+		if err != nil {
+			// NOTE: this should never happen since the glob is validated at startup, but log it just in case.
+			r.logger.Errorw("invalid glob pattern", "glob", r.config.Glob, "error", err)
+		}
+		return
+	}
+
+	info, err := os.Lstat(path)
+	if err != nil {
+		r.logger.Errorw("failed to stat file", "path", path, "error", err)
+		return
+	}
+	if !info.Mode().IsRegular() {
+		r.logger.Debugw("skipping non-regular file", "path", path)
+		return
+	}
+
+	if info.ModTime().Before(r.ignoreOlderThan) {
+		r.logger.Debugw("skipping old file", "path", path, "modTime", info.ModTime())
+		return
+	}
+
+	if p := r.processedFiles[path]; p {
+		r.logger.Debugw("skipping already processed file", "path", path)
+		return
+	}
+
+	r.emitFile(ctx, path, info)
+}
+
+// emitFile reads the crashlog file and emits a log record.
+func (r *crashlogReceiver) emitFile(ctx context.Context, path string, info os.FileInfo) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		r.logger.Errorw("failed to read crashlog", "path", path, "error", err)
+		return
+	}
+	r.processedFiles[path] = true
+
+	logs := plog.NewLogs()
+	rl := logs.ResourceLogs().AppendEmpty()
+	sl := rl.ScopeLogs().AppendEmpty()
+	sl.Scope().SetName(metadata.ScopeName)
+	lr := sl.LogRecords().AppendEmpty()
+
+	lr.SetObservedTimestamp(pcommon.NewTimestampFromTime(time.Now()))
+	lr.SetTimestamp(pcommon.NewTimestampFromTime(info.ModTime()))
+	lr.Body().SetEmptyBytes().FromRaw(data)
+
+	attrs := lr.Attributes()
+	attrs.PutStr("file.name", filepath.Base(path))
+
+	if bdf := parseBDF(filepath.Base(path)); bdf != "" {
+		attrs.PutStr("pci.bdf", bdf)
+	}
+
+	for key, val := range r.config.AddAttributes {
+		attrs.PutStr(key, val)
+	}
+
+	if err := r.consumer.ConsumeLogs(ctx, logs); err != nil {
+		r.logger.Errorw("failed to emit crashlog", "path", path, "error", err)
+	} else {
+		r.logger.Debugw("emitted crashlog", "path", path, "attributes", attrs)
+	}
+}
+
+// parseBDF extracts the PCI BDF address found in string or returns an empty string.
+func parseBDF(s string) string {
+	m := bdfRegexp.FindStringSubmatch(s)
+	if m == nil {
+		return ""
+	}
+	return m[1]
+}
diff --git a/xpumd/receiver/intelcrashlog/receiver_test.go b/xpumd/receiver/intelcrashlog/receiver_test.go
new file mode 100644
index 000000000..1dd5c8424
--- /dev/null
+++ b/xpumd/receiver/intelcrashlog/receiver_test.go
@@ -0,0 +1,153 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package intelcrashlog
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/component/componenttest"
+	"go.opentelemetry.io/collector/consumer/consumertest"
+	"go.opentelemetry.io/collector/receiver/receivertest"
+)
+
+func startReceiver(t *testing.T, cfg *Config, sink *consumertest.LogsSink) {
+	t.Helper()
+	rcvr := newReceiver(receivertest.NewNopSettings(typ), cfg, sink)
+	require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost()))
+	t.Cleanup(func() { require.NoError(t, rcvr.Shutdown(context.Background())) })
+}
+
+// waitForLogs polls until requested number of log records have been received.
+func waitForLogs(t *testing.T, sink *consumertest.LogsSink, logCount int) {
+	t.Helper()
+	require.Eventually(t, func() bool {
+		return sink.LogRecordCount() >= logCount
+	}, 5*time.Second, 10*time.Millisecond)
+}
+
+// atomicFileWrite writes a file atomically.
+func atomicFileWrite(t *testing.T, dst string, content []byte) {
+	t.Helper()
+	staging := filepath.Join(t.TempDir(), filepath.Base(dst))
+	require.NoError(t, os.WriteFile(staging, content, 0o600))
+	require.NoError(t, os.Rename(staging, dst))
+}
+
+func TestReceiverFsnotify(t *testing.T) {
+	dir := t.TempDir()
+	sink := &consumertest.LogsSink{}
+	startReceiver(t, &Config{
+		Directory:       dir,
+		Glob:            "*.bin",
+		IgnoreOlderThan: time.Minute,
+		AddAttributes:   map[string]string{"hw.vendor": "ACME", "hw.type": "gpu"},
+	}, sink)
+
+	content := []byte{0xde, 0xad, 0xbe, 0xef}
+
+	atomicFileWrite(t, filepath.Join(dir, "dev-0000:3a:00.0-crashlog.bin"), content)
+
+	waitForLogs(t, sink, 1)
+
+	lr := sink.AllLogs()[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
+	assert.Equal(t, content, lr.Body().Bytes().AsRaw())
+
+	name, ok := lr.Attributes().Get("file.name")
+	require.True(t, ok)
+	assert.Equal(t, "dev-0000:3a:00.0-crashlog.bin", name.AsString())
+
+	bdf, ok := lr.Attributes().Get("pci.bdf")
+	require.True(t, ok)
+	assert.Equal(t, "0000:3a:00.0", bdf.AsString())
+
+	vendor, ok := lr.Attributes().Get("hw.vendor")
+	require.True(t, ok)
+	assert.Equal(t, "ACME", vendor.AsString())
+
+	hwType, ok := lr.Attributes().Get("hw.type")
+	require.True(t, ok)
+	assert.Equal(t, "gpu", hwType.AsString())
+}
+
+func TestReceiverIgnoreOlderThan(t *testing.T) {
+	dir := t.TempDir()
+
+	// Create an old file (manipulate mtime)
+	oldFile := filepath.Join(dir, "old.bin")
+	require.NoError(t, os.WriteFile(oldFile, []byte{0xde, 0xad}, 0o600))
+	timestamp := time.Now().Add(-2 * time.Hour)
+	require.NoError(t, os.Chtimes(oldFile, timestamp, timestamp))
+
+	// Create a fresh file whose mtime is current.
+	freshFile := filepath.Join(dir, "fresh.bin")
+	require.NoError(t, os.WriteFile(freshFile, []byte{0xbe, 0xef}, 0o600))
+
+	sink := &consumertest.LogsSink{}
+	startReceiver(t, &Config{Directory: dir, Glob: "*.bin", IgnoreOlderThan: time.Minute}, sink)
+
+	waitForLogs(t, sink, 1)
+
+	// Assert that old.bin is never emitted, even after the scan completes.
+	require.Never(t, func() bool { return sink.LogRecordCount() > 1 }, time.Second, 10*time.Millisecond)
+
+	name, ok := sink.AllLogs()[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().Get("file.name")
+	require.True(t, ok)
+	assert.Equal(t, "fresh.bin", name.AsString())
+}
+
+func TestReceiverGlob(t *testing.T) {
+	dir := t.TempDir()
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "a.bin"), []byte{0x01, 0x02}, 0o600))
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "b.txt"), []byte{0x03, 0x04}, 0o600))
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "c.bin"), []byte{0x05, 0x06}, 0o600))
+
+	sink := &consumertest.LogsSink{}
+	startReceiver(t, &Config{Directory: dir, Glob: "*.bin", IgnoreOlderThan: time.Minute}, sink)
+
+	waitForLogs(t, sink, 2)
+
+	// b.txt must never appear; count must stay exactly at 2.
+	require.Never(t, func() bool { return sink.LogRecordCount() > 2 }, time.Second, 10*time.Millisecond)
+
+	// Collect emitted filenames for order-independent assertions.
+	names := make(map[string]struct{})
+	for _, logs := range sink.AllLogs() {
+		rl := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords()
+		for i := range rl.Len() {
+			name, ok := rl.At(i).Attributes().Get("file.name")
+			require.True(t, ok)
+			names[name.AsString()] = struct{}{}
+		}
+	}
+
+	require.Contains(t, names, "a.bin")
+	require.Contains(t, names, "c.bin")
+	assert.NotContains(t, names, "b.txt")
+}
+
+func TestReceiverDuplicatesFiles(t *testing.T) {
+	dir := t.TempDir()
+	filePath := filepath.Join(dir, "crash.bin")
+	require.NoError(t, os.WriteFile(filePath, []byte{0xca, 0xfe}, 0o600))
+
+	sink := &consumertest.LogsSink{}
+	startReceiver(t, &Config{Directory: dir, Glob: "*.bin", IgnoreOlderThan: time.Minute}, sink)
+
+	waitForLogs(t, sink, 1)
+
+	// Overwrite the file multiple times to trigger Write events.
+	for range 3 {
+		require.NoError(t, os.WriteFile(filePath, []byte{0xba, 0xbe}, 0o600))
+	}
+
+	require.Never(t, func() bool { return sink.LogRecordCount() > 1 }, time.Second, 10*time.Millisecond)
+}
diff --git a/xpumd/receiver/config.go b/xpumd/receiver/intelxpu/config.go
similarity index 95%
rename from xpumd/receiver/config.go
rename to xpumd/receiver/intelxpu/config.go
index 3794e8b8c..d271d59ff 100644
--- a/xpumd/receiver/config.go
+++ b/xpumd/receiver/intelxpu/config.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package receiver
+package intelxpu
 
 import (
 	"fmt"
@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/scraper/scraperhelper"
 
-	"github.com/intel/xpumanager/xpumd/receiver/sysman"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman"
 )
 
 // Config defines configuration for the receiver.
diff --git a/xpumd/receiver/sysman/doc.go b/xpumd/receiver/intelxpu/doc.go
similarity index 90%
rename from xpumd/receiver/sysman/doc.go
rename to xpumd/receiver/intelxpu/doc.go
index 0c1802273..d76e30c85 100644
--- a/xpumd/receiver/sysman/doc.go
+++ b/xpumd/receiver/intelxpu/doc.go
@@ -3,6 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-package sysman
+package intelxpu
 
 //go:generate go tool -modfile ../../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/receiver/factory.go b/xpumd/receiver/intelxpu/factory.go
similarity index 90%
rename from xpumd/receiver/factory.go
rename to xpumd/receiver/intelxpu/factory.go
index d20dd5704..ebb84d112 100644
--- a/xpumd/receiver/factory.go
+++ b/xpumd/receiver/intelxpu/factory.go
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-package receiver
+package intelxpu
 
 import (
 	"context"
@@ -14,8 +14,8 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/scraper/scraperhelper"
 
-	"github.com/intel/xpumanager/xpumd/receiver/internal/metadata"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman"
 )
 
 var (
diff --git a/xpumd/receiver/generated_component_test.go b/xpumd/receiver/intelxpu/generated_component_test.go
similarity index 96%
rename from xpumd/receiver/generated_component_test.go
rename to xpumd/receiver/intelxpu/generated_component_test.go
index 0fc48c8af..489ba51be 100644
--- a/xpumd/receiver/generated_component_test.go
+++ b/xpumd/receiver/intelxpu/generated_component_test.go
@@ -1,6 +1,6 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
-package receiver
+package intelxpu
 
 import (
 	"testing"
diff --git a/xpumd/receiver/generated_package_test.go b/xpumd/receiver/intelxpu/generated_package_test.go
similarity index 89%
rename from xpumd/receiver/generated_package_test.go
rename to xpumd/receiver/intelxpu/generated_package_test.go
index 76c598987..bae41f8a2 100644
--- a/xpumd/receiver/generated_package_test.go
+++ b/xpumd/receiver/intelxpu/generated_package_test.go
@@ -1,6 +1,6 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
-package receiver
+package intelxpu
 
 import (
 	"go.uber.org/goleak"
diff --git a/xpumd/receiver/go.mod b/xpumd/receiver/intelxpu/go.mod
similarity index 54%
rename from xpumd/receiver/go.mod
rename to xpumd/receiver/intelxpu/go.mod
index bb0ffab60..272d0ed1d 100644
--- a/xpumd/receiver/go.mod
+++ b/xpumd/receiver/intelxpu/go.mod
@@ -1,22 +1,22 @@
-module github.com/intel/xpumanager/xpumd/receiver
+module github.com/intel/xpumanager/xpumd/receiver/intelxpu
 
-go 1.26
+go 1.26.0
 
 require (
 	github.com/google/go-cmp v0.7.0
 	github.com/intel/level-zero-go v0.0.0
 	github.com/intel/xpumanager/xpumd/common v0.0.0
 	github.com/stretchr/testify v1.11.1
-	go.opentelemetry.io/collector/component v1.57.0
-	go.opentelemetry.io/collector/component/componenttest v0.151.0
-	go.opentelemetry.io/collector/confmap v1.57.0
-	go.opentelemetry.io/collector/consumer v1.57.0
-	go.opentelemetry.io/collector/pdata v1.57.0
-	go.opentelemetry.io/collector/receiver v1.57.0
-	go.opentelemetry.io/collector/receiver/receivertest v0.151.0
-	go.opentelemetry.io/collector/scraper v0.151.0
-	go.opentelemetry.io/collector/scraper/scraperhelper v0.151.0
-	go.opentelemetry.io/collector/scraper/scrapertest v0.151.0
+	go.opentelemetry.io/collector/component v1.59.0
+	go.opentelemetry.io/collector/component/componenttest v0.153.0
+	go.opentelemetry.io/collector/confmap v1.59.0
+	go.opentelemetry.io/collector/consumer v1.59.0
+	go.opentelemetry.io/collector/pdata v1.59.0
+	go.opentelemetry.io/collector/receiver v1.59.0
+	go.opentelemetry.io/collector/receiver/receivertest v0.153.0
+	go.opentelemetry.io/collector/scraper v0.153.0
+	go.opentelemetry.io/collector/scraper/scraperhelper v0.153.0
+	go.opentelemetry.io/collector/scraper/scrapertest v0.153.0
 	go.opentelemetry.io/otel v1.43.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.28.0
@@ -41,30 +41,30 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror v0.151.0 // indirect
-	go.opentelemetry.io/collector/consumer/xconsumer v0.151.0 // indirect
-	go.opentelemetry.io/collector/featuregate v1.57.0 // indirect
-	go.opentelemetry.io/collector/internal/componentalias v0.151.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.151.0 // indirect
-	go.opentelemetry.io/collector/pipeline v1.57.0 // indirect
-	go.opentelemetry.io/collector/pipeline/xpipeline v0.151.0 // indirect
-	go.opentelemetry.io/collector/receiver/receiverhelper v0.151.0 // indirect
-	go.opentelemetry.io/collector/receiver/xreceiver v0.151.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror v0.153.0 // indirect
+	go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.59.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.153.0 // indirect
+	go.opentelemetry.io/collector/pipeline v1.59.0 // indirect
+	go.opentelemetry.io/collector/pipeline/xpipeline v0.153.0 // indirect
+	go.opentelemetry.io/collector/receiver/receiverhelper v0.153.0 // indirect
+	go.opentelemetry.io/collector/receiver/xreceiver v0.153.0 // indirect
 	go.opentelemetry.io/otel/metric v1.43.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
 	go.opentelemetry.io/otel/trace v1.43.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
-	google.golang.org/grpc v1.80.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
+	google.golang.org/grpc v1.81.1 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace (
-	github.com/intel/level-zero-go => ./internal/level-zero-go
+	github.com/intel/level-zero-go => ../../level-zero-go
 	github.com/intel/xpumanager/xpumd => ..
-	github.com/intel/xpumanager/xpumd/common => ../common
+	github.com/intel/xpumanager/xpumd/common => ../../common
 )
diff --git a/xpumd/receiver/intelxpu/go.sum b/xpumd/receiver/intelxpu/go.sum
new file mode 100644
index 000000000..879ef8e90
--- /dev/null
+++ b/xpumd/receiver/intelxpu/go.sum
@@ -0,0 +1,140 @@
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
+github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/go-version v1.9.0 h1:CeOIz6k+LoN3qX9Z0tyQrPtiB1DFYRPfCIBtaXPSCnA=
+github.com/hashicorp/go-version v1.9.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
+github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
+github.com/knadh/koanf/providers/confmap v1.0.0 h1:mHKLJTE7iXEys6deO5p6olAiZdG5zwp8Aebir+/EaRE=
+github.com/knadh/koanf/providers/confmap v1.0.0/go.mod h1:txHYHiI2hAtF0/0sCmcuol4IDcuQbKTybiB1nOcUo1A=
+github.com/knadh/koanf/v2 v2.3.4 h1:fnynNSDlujWE+v83hAp8wKr/cdoxHLO0629SN+U8Urc=
+github.com/knadh/koanf/v2 v2.3.4/go.mod h1:gRb40VRAbd4iJMYYD5IxZ6hfuopFcXBpc9bbQpZwo28=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/collector/component v1.59.0 h1:WtulkwzsdAOM/LE0cH/IiudUgiyb2ueVDDeEh5HsXzo=
+go.opentelemetry.io/collector/component v1.59.0/go.mod h1:5eQCM0tS6qbG2XJ6Bt67kgCxuhCbg4csVv6SywyHZ6w=
+go.opentelemetry.io/collector/component/componenttest v0.153.0 h1:u6O1l+9PUNnI22k8q4sF9wgLAUyt+y2Ov7xi1yZ+wE4=
+go.opentelemetry.io/collector/component/componenttest v0.153.0/go.mod h1:Ym/d5UxnoHmrCI5LsVANBicikNiqtwjk8uWBM+Z4jDM=
+go.opentelemetry.io/collector/confmap v1.59.0 h1:asxEEiWwNuGfmTVSctYArOTF8jcxYpS4NmPtvvFhNNI=
+go.opentelemetry.io/collector/confmap v1.59.0/go.mod h1:X5SjFINrF0cb0hcM8PwnW2z+0L/pHA1H1yPPtm2j0tY=
+go.opentelemetry.io/collector/consumer v1.59.0 h1:EFDQ8ZTWwHEratWusKgW26W20LeAWdXj235iD9MxpuA=
+go.opentelemetry.io/collector/consumer v1.59.0/go.mod h1:wrOSfXkKjzEeHYxhKGukuB9+NFV/CboWwEH1oEXhMtw=
+go.opentelemetry.io/collector/consumer/consumererror v0.153.0 h1:x64J2xnSOoOp3yZRWioZ03vNAF19aBioUsRlZ4eC6x8=
+go.opentelemetry.io/collector/consumer/consumererror v0.153.0/go.mod h1:5zJ8TYQisuMjWJNaW6S86cHY1rf3DzXOVvsN8pA3Cc8=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0 h1:fCqkOWNVK/qipg4SX60zICs3jhKDjcrtF1oxJR6msCk=
+go.opentelemetry.io/collector/consumer/consumertest v0.153.0/go.mod h1:YfVqyCrvEfvsbbrpfiH97fITh4vmIBzZT112tUluqx0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0 h1:Jt1Aiiq9zDILzppRTEdZXaA830KBjjP1i2kWL+h5br0=
+go.opentelemetry.io/collector/consumer/xconsumer v0.153.0/go.mod h1:IzJ/dTOtEUMjY0DYu6kO946u5jbiDDUG8+sLaLhJ+HY=
+go.opentelemetry.io/collector/featuregate v1.59.0 h1:pu70/9eWRjAjzGnr3VmqwY+k6fmU3esLp15AqxfBBz0=
+go.opentelemetry.io/collector/featuregate v1.59.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0 h1:tr5I5hsJPJBbVPGjvOVVPPK4dLR5ZLqVEckuOfnzzMs=
+go.opentelemetry.io/collector/internal/componentalias v0.153.0/go.mod h1:tFSKiuWKJJgfxANyVnbKPVZkOF7N0bFXvCxCEgqMKuo=
+go.opentelemetry.io/collector/internal/testutil v0.153.0 h1:GJEaPLohao+7wtm08yGf73RGi1rpIHvqzxOb7Xn8sP0=
+go.opentelemetry.io/collector/internal/testutil v0.153.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
+go.opentelemetry.io/collector/pdata v1.59.0 h1:lO1IcaO9+HUVdFh+RATCUG3oTP+uCZzsE7HJ0MjmzRc=
+go.opentelemetry.io/collector/pdata v1.59.0/go.mod h1:AH6M14C6qhesnUpcvigkvFMiX9KtdSWQENMBNyNhe7I=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0 h1:IurcS9g28cVrtIvc1oUVN8vSm5j0t79Pd8GZgd1PV28=
+go.opentelemetry.io/collector/pdata/pprofile v0.153.0/go.mod h1:nX33dLKrwdoz/FQeIs6JKPeZcS1KbU2VIOwH7K0F05c=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0 h1:pO/+b8Rz5PG0G+TskdYdQEjhXnNG2bQoiRRMwic6X0I=
+go.opentelemetry.io/collector/pdata/testdata v0.153.0/go.mod h1:JVjUfJv9YFL3JUhisxMdLe2DX7we227Ry9JiTgwlEro=
+go.opentelemetry.io/collector/pipeline v1.59.0 h1:AyEcAPy5ZuUFpqis9i97WEIAcFh/mEEo90+1wr4urNU=
+go.opentelemetry.io/collector/pipeline v1.59.0/go.mod h1:RD90NG3Jbk965Xaqym3JyHkuol4uZJjQVUkD9ddXJIs=
+go.opentelemetry.io/collector/pipeline/xpipeline v0.153.0 h1:b2GvTGxFqcRFHARtU95/pOh9uhdY8TDTcrA5TOy3mhs=
+go.opentelemetry.io/collector/pipeline/xpipeline v0.153.0/go.mod h1:EPU4bxOCNAI6Jny7ijUzRNATGNkcTMMBazY+NK2Ifng=
+go.opentelemetry.io/collector/receiver v1.59.0 h1:2jf2guECLyWno3OqNaefjfo+Tt3MSm6uz1WsbIXv5Ao=
+go.opentelemetry.io/collector/receiver v1.59.0/go.mod h1:rklWFy0kaMMghuGlrTxqYP96V810HwDVwIgKpP6kn2o=
+go.opentelemetry.io/collector/receiver/receiverhelper v0.153.0 h1:r7TaXD7T4PiwXXRVKocgpc87ygMQnFflOqUJaOtpfug=
+go.opentelemetry.io/collector/receiver/receiverhelper v0.153.0/go.mod h1:+0HjBFgKb+dCW4sKngg/gMiS5K5rAPsFQE+UoFlwU08=
+go.opentelemetry.io/collector/receiver/receivertest v0.153.0 h1:YHvywYcyV1G0I5r/J0OxgOJZPLLyrMAMA0Q7VdBYFxc=
+go.opentelemetry.io/collector/receiver/receivertest v0.153.0/go.mod h1:Zkf5hQ9qk9ACx/WBMZIaSri6LIJzFgfRxmScigP05tg=
+go.opentelemetry.io/collector/receiver/xreceiver v0.153.0 h1:yz6By4iJzOsvl9GxVOXTn0GoSr5ZxOuvk9+24obhqDQ=
+go.opentelemetry.io/collector/receiver/xreceiver v0.153.0/go.mod h1:4cM85JHe5weHwUAc60P/vPKU1uLtrhI46lzDOsSpqz4=
+go.opentelemetry.io/collector/scraper v0.153.0 h1:1CM5t0Wb9HACV+ksfQmkm5vxFPXfaGRh+pGOJV+3c7E=
+go.opentelemetry.io/collector/scraper v0.153.0/go.mod h1:b5996k8D1wwc1HZTqvp4SdpJuGRnemM/ZbH8559Zie8=
+go.opentelemetry.io/collector/scraper/scraperhelper v0.153.0 h1:LiVh0m5iADNf+d85OZ4p1qRXRpIqc76HDnM+/bbjkJM=
+go.opentelemetry.io/collector/scraper/scraperhelper v0.153.0/go.mod h1:JvUFq7Oc8nIfnKdPXQxKkdbNGSo1CurkT9eOVxcj5h8=
+go.opentelemetry.io/collector/scraper/scrapertest v0.153.0 h1:uXIY66EIabAqvisD+Uw0dblAQAexOKBxQZ6p9SAggDQ=
+go.opentelemetry.io/collector/scraper/scrapertest v0.153.0/go.mod h1:q94YXKKSv4rwUEAGOohcinzb6jSLMFJv13LbO1gxQaM=
+go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
+go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
+go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
+go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
+go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
+go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
+go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
+go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
+go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
+go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
+go.opentelemetry.io/proto/slim/otlp v1.10.0 h1:iR97Vs/ZDR+y9TfuP9b1XBtdPWeC+OMslIBmhcLU7jM=
+go.opentelemetry.io/proto/slim/otlp v1.10.0/go.mod h1:lV9250stpjYLPNA5viFabIgP2QlUGRT1GdTgAf8SIUk=
+go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.3.0 h1:RUF5rO0hAlgiJt1fzQVzcVs3vZVNHIcMLgOgG4rWNcQ=
+go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.3.0/go.mod h1:I89cynRj8y+383o7tEQVg2SVA6SRgDVIouWPUVXjx0U=
+go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.3.0 h1:CQvJSldHRUN6Z8jsUeYv8J0lXRvygALXIzsmAeCcZE0=
+go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.3.0/go.mod h1:xSQ+mEfJe/GjK1LXEyVOoSI1N9JV9ZI923X5kup43W4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
+go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
+google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/xpumd/receiver/intelxpu/internal/metadata/generated_logs.go b/xpumd/receiver/intelxpu/internal/metadata/generated_logs.go
new file mode 100644
index 000000000..37d557a42
--- /dev/null
+++ b/xpumd/receiver/intelxpu/internal/metadata/generated_logs.go
@@ -0,0 +1,92 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package metadata
+
+import (
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/plog"
+	"go.opentelemetry.io/collector/receiver"
+)
+
+// LogsBuilder provides an interface for scrapers to report logs while taking care of all the transformations
+// required to produce log representation defined in metadata and user config.
+type LogsBuilder struct {
+	logsBuffer       plog.Logs
+	logRecordsBuffer plog.LogRecordSlice
+	buildInfo        component.BuildInfo // contains version information.
+}
+
+// LogBuilderOption applies changes to default logs builder.
+type LogBuilderOption interface {
+	apply(*LogsBuilder)
+}
+
+func NewLogsBuilder(settings receiver.Settings) *LogsBuilder {
+	lb := &LogsBuilder{
+		logsBuffer:       plog.NewLogs(),
+		logRecordsBuffer: plog.NewLogRecordSlice(),
+		buildInfo:        settings.BuildInfo,
+	}
+
+	return lb
+}
+
+// ResourceLogsOption applies changes to provided resource logs.
+type ResourceLogsOption interface {
+	apply(plog.ResourceLogs)
+}
+
+type resourceLogsOptionFunc func(plog.ResourceLogs)
+
+func (rlof resourceLogsOptionFunc) apply(rl plog.ResourceLogs) {
+	rlof(rl)
+}
+
+// WithLogsResource sets the provided resource on the emitted ResourceLogs.
+// It's recommended to use ResourceBuilder to create the resource.
+func WithLogsResource(res pcommon.Resource) ResourceLogsOption {
+	return resourceLogsOptionFunc(func(rl plog.ResourceLogs) {
+		res.CopyTo(rl.Resource())
+	})
+}
+
+// AppendLogRecord adds a log record to the logs builder.
+func (lb *LogsBuilder) AppendLogRecord(lr plog.LogRecord) {
+	lr.MoveTo(lb.logRecordsBuffer.AppendEmpty())
+}
+
+// EmitForResource saves all the generated logs under a new resource and updates the internal state to be ready for
+// recording another set of log records as part of another resource. This function can be helpful when one scraper
+// needs to emit logs from several resources. Otherwise calling this function is not required,
+// just `Emit` function can be called instead.
+// Resource attributes should be provided as ResourceLogsOption arguments.
+func (lb *LogsBuilder) EmitForResource(options ...ResourceLogsOption) {
+	rl := plog.NewResourceLogs()
+	ils := rl.ScopeLogs().AppendEmpty()
+	ils.Scope().SetName(ScopeName)
+	ils.Scope().SetVersion(lb.buildInfo.Version)
+
+	for _, op := range options {
+		op.apply(rl)
+	}
+
+	if lb.logRecordsBuffer.Len() > 0 {
+		lb.logRecordsBuffer.MoveAndAppendTo(ils.LogRecords())
+		lb.logRecordsBuffer = plog.NewLogRecordSlice()
+	}
+
+	if ils.LogRecords().Len() > 0 {
+		rl.MoveTo(lb.logsBuffer.ResourceLogs().AppendEmpty())
+	}
+}
+
+// Emit returns all the logs accumulated by the logs builder and updates the internal state to be ready for
+// recording another set of logs. This function will be responsible for applying all the transformations required to
+// produce logs representation defined in metadata and user config.
+func (lb *LogsBuilder) Emit(options ...ResourceLogsOption) plog.Logs {
+	lb.EmitForResource(options...)
+	logs := lb.logsBuffer
+	lb.logsBuffer = plog.NewLogs()
+	return logs
+}
diff --git a/xpumd/receiver/intelxpu/internal/metadata/generated_logs_test.go b/xpumd/receiver/intelxpu/internal/metadata/generated_logs_test.go
new file mode 100644
index 000000000..8bf5b84fb
--- /dev/null
+++ b/xpumd/receiver/intelxpu/internal/metadata/generated_logs_test.go
@@ -0,0 +1,64 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package metadata
+
+import (
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/plog"
+	"go.opentelemetry.io/collector/receiver/receivertest"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest/observer"
+	"testing"
+	"time"
+)
+
+func TestLogsBuilderAppendLogRecord(t *testing.T) {
+	observedZapCore, _ := observer.New(zap.WarnLevel)
+	settings := receivertest.NewNopSettings(receivertest.NopType)
+	settings.Logger = zap.New(observedZapCore)
+	lb := NewLogsBuilder(settings)
+
+	res := pcommon.NewResource()
+
+	// append the first log record
+	lr := plog.NewLogRecord()
+	lr.SetTimestamp(pcommon.NewTimestampFromTime(time.Now()))
+	lr.Attributes().PutStr("type", "log")
+	lr.Body().SetStr("the first log record")
+
+	// append the second log record
+	lr2 := plog.NewLogRecord()
+	lr2.SetTimestamp(pcommon.NewTimestampFromTime(time.Now()))
+	lr2.Attributes().PutStr("type", "event")
+	lr2.Body().SetStr("the second log record")
+
+	lb.AppendLogRecord(lr)
+	lb.AppendLogRecord(lr2)
+
+	logs := lb.Emit(WithLogsResource(res))
+	assert.Equal(t, 1, logs.ResourceLogs().Len())
+
+	rl := logs.ResourceLogs().At(0)
+	assert.Equal(t, 1, rl.ScopeLogs().Len())
+
+	sl := rl.ScopeLogs().At(0)
+	assert.Equal(t, ScopeName, sl.Scope().Name())
+	assert.Equal(t, lb.buildInfo.Version, sl.Scope().Version())
+
+	assert.Equal(t, 2, sl.LogRecords().Len())
+
+	attrVal, ok := sl.LogRecords().At(0).Attributes().Get("type")
+	assert.True(t, ok)
+	assert.Equal(t, "log", attrVal.Str())
+
+	assert.Equal(t, pcommon.ValueTypeStr, sl.LogRecords().At(0).Body().Type())
+	assert.Equal(t, "the first log record", sl.LogRecords().At(0).Body().Str())
+
+	attrVal, ok = sl.LogRecords().At(1).Attributes().Get("type")
+	assert.True(t, ok)
+	assert.Equal(t, "event", attrVal.Str())
+
+	assert.Equal(t, pcommon.ValueTypeStr, sl.LogRecords().At(1).Body().Type())
+	assert.Equal(t, "the second log record", sl.LogRecords().At(1).Body().Str())
+}
diff --git a/xpumd/receiver/internal/metadata/generated_status.go b/xpumd/receiver/intelxpu/internal/metadata/generated_status.go
similarity index 60%
rename from xpumd/receiver/internal/metadata/generated_status.go
rename to xpumd/receiver/intelxpu/internal/metadata/generated_status.go
index 8311a18b5..4168aa9d4 100644
--- a/xpumd/receiver/internal/metadata/generated_status.go
+++ b/xpumd/receiver/intelxpu/internal/metadata/generated_status.go
@@ -1,5 +1,7 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
+// Package metadata contains the autogenerated telemetry and
+// build information for the receiver/intelxpu component.
 package metadata
 
 import (
@@ -8,7 +10,7 @@ import (
 
 var (
 	Type      = component.MustNewType("intelxpu")
-	ScopeName = "github.com/intel/xpumanager/xpumd/receiver"
+	ScopeName = "github.com/intel/xpumanager/xpumd/receiver/intelxpu"
 )
 
 const (
diff --git a/xpumd/receiver/metadata.yaml b/xpumd/receiver/intelxpu/metadata.yaml
similarity index 100%
rename from xpumd/receiver/metadata.yaml
rename to xpumd/receiver/intelxpu/metadata.yaml
diff --git a/xpumd/receiver/semantics.md b/xpumd/receiver/intelxpu/semantics.md
similarity index 95%
rename from xpumd/receiver/semantics.md
rename to xpumd/receiver/intelxpu/semantics.md
index b65188d77..3d3591d11 100644
--- a/xpumd/receiver/semantics.md
+++ b/xpumd/receiver/intelxpu/semantics.md
@@ -79,7 +79,7 @@ and the whole device PSU), so their aggregation will just mislead.
 As to `hw.status{hw.state=...}` state metrics (having values 0 and 1),
 summing them could be useful, but only if good and bad states can be
 differentiated from each other, and currently specification does not
-state how this should be done.
+explicitly state how this should be done.
 
 
 _Use inconsistent namespacing & linking_
@@ -111,7 +111,7 @@ Instead of bandwidth metrics being namespaced consistently e.g. under `hw.gpu.me
 
 Above `hw.<metric-type>` metrics require information about parent item, type and location, whereas `hw.<component>.<metric-type>` metrics need less of those.
 
-There's also no specific HW info metric type, that could act as parent when there are no metrics available from the parent component.
+There's also no specific "HW exists" info metric type, that could act as parent when there are no metrics available from the parent component.
 
 
 _Require tautological attribute(s)_
@@ -124,6 +124,15 @@ Instead of it adding relevant information, e.g. to which component
 fan, memory, network, temperature, voltage metrics belong to (CPU,
 GPU...).
 
+All OTel HW metrics are supposed to carry all HW attributes. With the
+amount of attributes GPUs have / need, this means large amounts of
+both generated and manually maintained (basically duplicated) extra
+code.
+
+Majority of shared attributes (ones not relevant for differentiating
+metrics from each other) could instead be properties of a separate "HW
+exists" info metric.
+
 
 _Use inconsistent metric names_
 
@@ -317,8 +326,8 @@ stack below it.
 
 Current item linking uses [alternative 1](#alternative-1) for simplicity.
 
-For now, exporter HW metric types and their attributes are mix of OTel
-specified ones and Intel specific ones.
+For now, exporter uses a mix of OTel spec and Intel specific HW metric
+types / namespaces and their attributes.
 
 `hw.status` metrics:
 
@@ -351,8 +360,10 @@ Used attributes:
   * In `com.intel.*` vendor namespace:
     * Attribs for all metrics: `.subdevice_id`
     * Metric specific attribs: `.power.limit.*`, `.speed.throttle_reason`, `.subdevice_count`
-  * In OTel  `hw.*` namespace:
+  * In OTel `hw.*` namespace:
     * Metric specific attribs: `hw.frequency.domain`, `hw.gpu.type`, `hw.memory.*`, `hw.limit_type`
+  * In OTel `error.*` namespace:
+    * `error.category` attribute (for `hw.errors`)
   * In `pci.*` namespace:
     * Attribs for all metrics: `pci.bdf`
     * Device info/state attribs: `pci.device_id`, `pci.lanes`, `pci.link_gen`, `pci.vendor_id`
diff --git a/xpumd/receiver/sysman/aggregated.go b/xpumd/receiver/intelxpu/sysman/aggregated.go
similarity index 100%
rename from xpumd/receiver/sysman/aggregated.go
rename to xpumd/receiver/intelxpu/sysman/aggregated.go
diff --git a/xpumd/receiver/sysman/aggregated_test.go b/xpumd/receiver/intelxpu/sysman/aggregated_test.go
similarity index 100%
rename from xpumd/receiver/sysman/aggregated_test.go
rename to xpumd/receiver/intelxpu/sysman/aggregated_test.go
diff --git a/xpumd/receiver/sysman/common.go b/xpumd/receiver/intelxpu/sysman/common.go
similarity index 100%
rename from xpumd/receiver/sysman/common.go
rename to xpumd/receiver/intelxpu/sysman/common.go
diff --git a/xpumd/receiver/sysman/config.go b/xpumd/receiver/intelxpu/sysman/config.go
similarity index 77%
rename from xpumd/receiver/sysman/config.go
rename to xpumd/receiver/intelxpu/sysman/config.go
index f44441bf2..455cee970 100644
--- a/xpumd/receiver/sysman/config.go
+++ b/xpumd/receiver/intelxpu/sysman/config.go
@@ -9,16 +9,14 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 	"go.opentelemetry.io/collector/component"
-	"go.uber.org/zap/zapcore"
 )
 
 // Config defines configuration for the Sysman scraper.
 type Config struct {
 	metadata.MetricsBuilderConfig `mapstructure:",squash"`
 	SamplingInterval              time.Duration `mapstructure:"sampling_interval"`
-	LogLevel                      zapcore.Level `mapstructure:"log_level"`
 
 	aggregatedMetricsBufferSize int
 }
@@ -26,8 +24,7 @@ type Config struct {
 // defaultConfig creates the default configuration for the scraper.
 func defaultConfig() component.Config {
 	return &Config{
-		MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(),
-		LogLevel:             zapcore.InfoLevel,
+		MetricsBuilderConfig: metadata.NewDefaultMetricsBuilderConfig(),
 		SamplingInterval:     1 * time.Second,
 	}
 }
diff --git a/xpumd/receiver/sysman/device.go b/xpumd/receiver/intelxpu/sysman/device.go
similarity index 74%
rename from xpumd/receiver/sysman/device.go
rename to xpumd/receiver/intelxpu/sysman/device.go
index 044f62750..20c48a295 100644
--- a/xpumd/receiver/sysman/device.go
+++ b/xpumd/receiver/intelxpu/sysman/device.go
@@ -10,12 +10,13 @@ import (
 	"iter"
 	"net/url"
 	"strings"
+	"sync"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 type deviceRegistry struct {
@@ -28,6 +29,7 @@ type driver struct {
 }
 
 type device struct {
+	sync.RWMutex
 	*l0sysman.Device
 	logger     *zap.SugaredLogger
 	attributes deviceAttributes
@@ -37,26 +39,31 @@ type device struct {
 	aggregatedMetricsBufferSize int
 }
 
-type eccInfo struct {
+type pciState struct {
+	stateDisabled bool
+	statesSeen    map[l0sysman.PciLinkStatus]bool
+	qualitySeen   l0sysman.PciLinkQualIssueFlags
+	stabilitySeen l0sysman.PciLinkStabIssueFlags
+	stats         *l0sysman.PciStats
+}
+
+type eccState struct {
 	states       map[string]bool
 	current      string
 	configurable bool
 }
 
+// deviceState has values that can change after enumeration.
 type deviceState struct {
 	devStateDisabled bool
-	pciStateDisabled bool
-	pciStatesSeen    map[l0sysman.PciLinkStatus]bool
-	pciQualitySeen   l0sysman.PciLinkQualIssueFlags
-	pciStabilitySeen l0sysman.PciLinkStabIssueFlags
-	pciStats         *l0sysman.PciStats
-	maxBandwidth     int64
-	ecc              *eccInfo
+	pci              pciState
+	ecc              *eccState
 }
 
-// deviceAttributes fields for numeric items which values may be
-// be missing (e.g. pciLinkGen) are stored as strings instead of ints
-// to be able to better indicate missing info (= "" instead of "0").
+// deviceAttributes fields for numeric items that are always reported,
+// but which value may be unknown (e.g. pciLinkGen), are stored as
+// strings instead of ints. That way it's clearer when info is missing
+// (value = "" instead of "0").
 type deviceAttributes struct {
 	hwID              string
 	hwName            string
@@ -70,6 +77,7 @@ type deviceAttributes struct {
 	hwFirmwareVersion string
 	hwGpuType         metadata.AttributeHwGpuType
 	subDevCount       int64
+	maxBandwidth      int64 // zero = not available, skip PCI BW max/ratio metrics
 	pciLanes          string
 	pciLinkGen        string
 	demandPaging      bool
@@ -83,6 +91,8 @@ func newDeviceRegistry(logger *zap.SugaredLogger, aggregatedMetricsBufferSize in
 	if err != nil {
 		return nil, fmt.Errorf("failed to get ZES drivers: %w", err)
 	}
+	logger.Debugw("Sysman drivers", "enumerated", len(drivers))
+
 	for i, drv := range drivers {
 		devs, err := enumDevices(drv, logger, aggregatedMetricsBufferSize)
 		if err != nil {
@@ -124,6 +134,8 @@ func enumDevices(driver *l0sysman.Driver, logger *zap.SugaredLogger, aggregatedM
 	if err != nil {
 		return nil, fmt.Errorf("failed to get ZES devices: %w", err)
 	}
+	logger.Infow("Sysman devices", "enumerated", len(zesDevs))
+
 	devs := make([]*device, len(zesDevs))
 	for i, d := range zesDevs {
 		name := fmt.Sprintf("gpu-%d", i+1) // match error log index
@@ -135,41 +147,61 @@ func enumDevices(driver *l0sysman.Driver, logger *zap.SugaredLogger, aggregatedM
 		devs[i] = dev
 	}
 
-	logger.Infow("Sysman devices", "created", len(devs), "enumerated", len(zesDevs))
 	return devs, nil
 }
 
+// newDevice creates a new device. Use init() to scan the device.
 func newDevice(name string, dev *l0sysman.Device, logger *zap.SugaredLogger, aggregatedMetricsBufferSize int) (*device, error) {
-	props, err := dev.GetProperties()
-	if err != nil {
-		return nil, fmt.Errorf("device GetProperties() failed: %w", err)
-	}
-
 	d := &device{
 		Device: dev,
 		logger: logger,
 		attributes: deviceAttributes{
-			// TODO: use (Sysman ext) props.Uuid.Id.String()?
-			hwID:           props.Core.Uuid.Id.String(),
-			hwName:         name,
-			hwNamePci:      name + "-pci",
-			pciDeviceID:    fmt.Sprintf("%04x", props.Core.DeviceId),
-			pciVendorID:    fmt.Sprintf("%04x", props.Core.VendorId),
-			hwModel:        props.ModelName.String(),
-			hwSerialNumber: props.SerialNumber.String(),
-			hwVendor:       props.VendorName.String(),
-			subDevCount:    int64(props.NumSubdevices),
-			hwGpuType:      gpuType(props.Flags),
-			demandPaging:   props.Flags&l0sysman.DevicePropertyFlags(l0sysman.DEVICE_PROPERTY_FLAG_ONDEMANDPAGING) != 0,
-		},
-		state: deviceState{
-			ecc: &eccInfo{
-				states: map[string]bool{},
-			},
+			hwName:    name,
+			hwNamePci: name + "-pci",
 		},
 		aggregatedMetricsBufferSize: aggregatedMetricsBufferSize,
 	}
 
+	if err := d.init(); err != nil {
+		return nil, err
+	}
+	return d, nil
+}
+
+// init scans and initializes the device attributes, state and scrapers. May be
+// called multiple times for re-scanning. Transactional: on error the device is not altered.
+// Must be called with device lock held.
+func (d *device) init() error {
+	// Intermediate startup timings
+	d.logger.Debugw("Device init() called", "name", d.attributes.hwName)
+
+	props, err := d.GetProperties()
+	if err != nil {
+		return fmt.Errorf("device GetProperties() failed: %w", err)
+	}
+
+	// Preserve name fields assigned at construction, refresh everything else.
+	d.attributes = deviceAttributes{
+		hwName:    d.attributes.hwName,
+		hwNamePci: d.attributes.hwNamePci,
+		// TODO: use (Sysman ext) props.Uuid.Id.String()?
+		hwID:           props.Core.Uuid.Id.String(),
+		pciDeviceID:    fmt.Sprintf("%04x", props.Core.DeviceId),
+		pciVendorID:    fmt.Sprintf("%04x", props.Core.VendorId),
+		hwModel:        props.ModelName.String(),
+		hwSerialNumber: props.SerialNumber.String(),
+		hwVendor:       props.VendorName.String(),
+		subDevCount:    int64(props.NumSubdevices),
+		hwGpuType:      gpuType(props.Flags),
+		demandPaging:   props.Flags&l0sysman.DevicePropertyFlags(l0sysman.DEVICE_PROPERTY_FLAG_ONDEMANDPAGING) != 0,
+	}
+	d.state = deviceState{
+		ecc: &eccState{
+			states: map[string]bool{},
+		},
+	}
+	d.scrapers = nil
+
 	_ = d.updateEccState()
 	if d.state.ecc.configurable {
 		d.attributes.eccSupport = metadata.AttributeHwMemoryEccConfigurable
@@ -177,16 +209,11 @@ func newDevice(name string, dev *l0sysman.Device, logger *zap.SugaredLogger, agg
 		d.attributes.eccSupport = metadata.MapAttributeHwMemoryEcc[d.state.ecc.current]
 	}
 
-	// Get firmware info
-	fwInfos := []string{}
-	for i, fw := range enumFirmwares(d) {
-		fwInfos = append(fwInfos, fmt.Sprintf("%d:%s:%s:%s", i, fw.attributes.firmwareName, fw.attributes.subdeviceId, url.QueryEscape(fw.attributes.firmwareVersion)))
-	}
-	d.attributes.hwFirmwareVersion = strings.Join(fwInfos, ",")
+	d.logger.Debugw("Device init() props + ECC done", "name", d.attributes.hwName)
 
-	// get device PCI attributes
-	if pci, err := dev.PciGetProperties(); err != nil {
-		logger.Errorw("Device PciGetProperties() failed: no PCI attributes", "error", err, "deviceAttributes", d.attributes)
+	// Get device PCI attributes
+	if pci, err := d.PciGetProperties(); err != nil {
+		d.logger.Errorw("Device PciGetProperties() failed: no PCI attributes", "error", err, "deviceAttributes", d.attributes)
 	} else {
 		d.attributes.pciBDF = fmt.Sprintf("%04x:%02x:%02x.%x", pci.Address.Domain, pci.Address.Bus, pci.Address.Device, pci.Address.Function)
 		if pci.MaxSpeed.Gen > 0 {
@@ -196,13 +223,13 @@ func newDevice(name string, dev *l0sysman.Device, logger *zap.SugaredLogger, agg
 			d.attributes.pciLanes = fmt.Sprintf("%d", pci.MaxSpeed.Width)
 		}
 		if pci.MaxSpeed.MaxBandwidth > 0 {
-			d.state.maxBandwidth = pci.MaxSpeed.MaxBandwidth
+			d.attributes.maxBandwidth = pci.MaxSpeed.MaxBandwidth
 		} else {
 			d.logger.Infow("Device PciGetProperties(): PCI max BW not available", "attributes", d.attributes)
 		}
 		if pci.HaveBandwidthCounters != 0 {
-			if stats, err := dev.PciGetStats(); err == nil {
-				d.state.pciStats = &stats
+			if stats, err := d.PciGetStats(); err == nil {
+				d.state.pci.stats = &stats
 			} else {
 				d.logger.Infow("Device PciGetStats() failed: PCI BW not available", zap.Error(err), "attributes", d.attributes)
 			}
@@ -211,24 +238,36 @@ func newDevice(name string, dev *l0sysman.Device, logger *zap.SugaredLogger, agg
 		}
 	}
 
-	// check device + PCI state availability
+	// Check device + PCI state availability
 	if _, err := d.GetState(); err != nil {
 		d.logger.Infow("Device GetState() failed: device state not available", zap.Error(err), "deviceAttributes", d.attributes)
 		d.state.devStateDisabled = true
 	}
 	if _, err := d.PciGetState(); err != nil {
 		d.logger.Infow("Device PciGetState() failed: PCI state not available", zap.Error(err), "deviceAttributes", d.attributes)
-		d.state.pciStateDisabled = true
+		d.state.pci.stateDisabled = true
 	}
 
 	// TODO: report types & sizes of device PCI BARs?
 	// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zesdevicepcigetbars
 
+	// After this, enumerations do enough logging for timing info to be available at adequate granularity
+	d.logger.Debugw("Device init() state + PCI props done", "name", d.attributes.hwName, "BDF", d.attributes.pciBDF)
+
+	// Enumerate device firmwares into versions attribute
+	fwInfos := []string{}
+	for i, fw := range enumFirmwares(d) {
+		fwInfos = append(fwInfos, fmt.Sprintf("%d:%s:%s:%s", i, fw.attributes.firmwareName, fw.attributes.subdeviceId, url.QueryEscape(fw.attributes.firmwareVersion)))
+	}
+	d.attributes.hwFirmwareVersion = strings.Join(fwInfos, ",")
+
+	// Enumerate all device metrics
 	for _, s := range subsystems {
 		d.scrapers = append(d.scrapers, s.enumDevice(d)...)
 	}
 
-	return d, nil
+	d.logger.Debugw("Device init() done", "name", d.attributes.hwName, "BDF", d.attributes.pciBDF)
+	return nil
 }
 
 func gpuType(flags l0sysman.DevicePropertyFlags) metadata.AttributeHwGpuType {
@@ -244,6 +283,7 @@ func gpuType(flags l0sysman.DevicePropertyFlags) metadata.AttributeHwGpuType {
 	}
 }
 
+// updateEccState updates the ECC state of the device. Must be called with device lock held.
 func (d *device) updateEccState() error {
 	configurable := false
 	retval := error(nil)
@@ -278,6 +318,9 @@ func (d *device) updateEccState() error {
 }
 
 func (d *device) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
+	d.RLock()
+	defer d.RUnlock()
+
 	if d.state.ecc.configurable {
 		err := d.updateEccState()
 		if !d.state.ecc.configurable {
@@ -362,7 +405,7 @@ func (d *device) scrapeDevState(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 
 // scrapePciState reports device PCI link state(s)
 func (d *device) scrapePciState(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
-	if d.state.pciStateDisabled {
+	if d.state.pci.stateDisabled {
 		return
 	}
 
@@ -370,32 +413,32 @@ func (d *device) scrapePciState(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 	pci, err := d.PciGetState()
 	if err != nil {
 		d.logger.Errorw("Device PciGetState() failed: PCI link state metrics disabled", zap.Error(err), "deviceAttributes", d.attributes)
-		d.state.pciStateDisabled = true
+		d.state.pci.stateDisabled = true
 		return
 	}
 
-	if d.state.pciStatesSeen == nil {
+	if d.state.pci.statesSeen == nil {
 		// skip unknown PCI state reporting until state has been known
 		if pci.Status == l0sysman.PCI_LINK_STATUS_UNKNOWN {
 			return
 		}
-		d.state.pciStatesSeen = map[l0sysman.PciLinkStatus]bool{}
+		d.state.pci.statesSeen = map[l0sysman.PciLinkStatus]bool{}
 	}
 
 	// Collect states that are either active, or have been reported before.
 	// Because names of the PCI statuses and quality & stability issues do not overlap,
 	// single mapping is enough for all of them
 	states := map[string]bool{}
-	for flag := range d.state.pciStatesSeen {
+	for flag := range d.state.pci.statesSeen {
 		states[flag.String()] = false
 	}
 
 	// status is enumerator, not a bitmask, so only one of these is relevant
 	switch pci.Status {
 	case l0sysman.PCI_LINK_STATUS_QUALITY_ISSUES:
-		d.state.pciQualitySeen |= pci.QualityIssues
+		d.state.pci.qualitySeen |= pci.QualityIssues
 	case l0sysman.PCI_LINK_STATUS_STABILITY_ISSUES:
-		d.state.pciStabilitySeen |= pci.StabilityIssues
+		d.state.pci.stabilitySeen |= pci.StabilityIssues
 	default:
 		switch pci.Status {
 		// recognized values
@@ -403,20 +446,20 @@ func (d *device) scrapePciState(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 		case l0sysman.PCI_LINK_STATUS_UNKNOWN:
 		default:
 			// report each unrecognized value from Sysman backend only once
-			if !d.state.pciStatesSeen[pci.Status] {
+			if !d.state.pci.statesSeen[pci.Status] {
 				d.logger.Errorw("Unrecognized PciGetState() value", "pci.Status", pci.Status, "attributes", d.attributes)
 			}
 		}
-		d.state.pciStatesSeen[pci.Status] = true
+		d.state.pci.statesSeen[pci.Status] = true
 		states[pci.Status.String()] = true
 	}
 
 	// add (issue) states from bitmasks
-	for _, bit := range d.state.pciQualitySeen.Bits() {
+	for _, bit := range d.state.pci.qualitySeen.Bits() {
 		issue := bit.String() + "_issue"
 		states[issue] = (l0sysman.PciLinkQualIssueFlag(pci.QualityIssues) & bit) != 0
 	}
-	for _, bit := range d.state.pciStabilitySeen.Bits() {
+	for _, bit := range d.state.pci.stabilitySeen.Bits() {
 		issue := bit.String() + "_issue"
 		states[issue] = (l0sysman.PciLinkStabIssueFlag(pci.StabilityIssues) & bit) != 0
 	}
@@ -443,14 +486,14 @@ func (d *device) scrapePciState(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 }
 
 func (d *device) scrapePciStats(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
-	if d.state.pciStats == nil {
+	if d.state.pci.stats == nil {
 		return
 	}
 
 	stats, err := d.PciGetStats()
 	if err != nil {
 		d.logger.Errorw("Device PciGetStats() failed: PCI BW metrics disabled", zap.Error(err), "attributes", d.attributes)
-		d.state.pciStats = nil
+		d.state.pci.stats = nil
 		return
 	}
 
@@ -476,10 +519,10 @@ func (d *device) scrapePciStats(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 
 	// TODO: Sysman spec states neither timestamp nor counter bits,
 	// so their values are assumed to wrap at full type width
-	timeDiff := u64CounterDiff(d.state.pciStats.Timestamp, stats.Timestamp)
-	rxDiff := u64CounterDiff(d.state.pciStats.RxCounter, stats.RxCounter)
-	txDiff := u64CounterDiff(d.state.pciStats.TxCounter, stats.TxCounter)
-	d.state.pciStats = &stats
+	timeDiff := u64CounterDiff(d.state.pci.stats.Timestamp, stats.Timestamp)
+	rxDiff := u64CounterDiff(d.state.pci.stats.RxCounter, stats.RxCounter)
+	txDiff := u64CounterDiff(d.state.pci.stats.TxCounter, stats.TxCounter)
+	d.state.pci.stats = &stats
 
 	if timeDiff == 0 {
 		return
@@ -499,12 +542,12 @@ func (d *device) scrapePciStats(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 		d.attributes.pciBDF,
 	)
 
-	if d.state.maxBandwidth > 0 {
+	if d.attributes.maxBandwidth > 0 {
 		// TODO: verify that max is for read+write, not just one direction
 
 		// max BW
 		mb.RecordHwGpuBandwidthLimitDataPoint(
-			ts, d.state.maxBandwidth,
+			ts, d.attributes.maxBandwidth,
 			d.attributes.hwID,
 			d.attributes.hwNamePci,
 			d.attributes.pciBDF,
@@ -512,7 +555,7 @@ func (d *device) scrapePciStats(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 
 		// BW utilization ratio
 		mb.RecordHwGpuBandwidthUtilizationDataPoint(
-			ts, rate/float64(d.state.maxBandwidth),
+			ts, rate/float64(d.attributes.maxBandwidth),
 			d.attributes.hwID,
 			d.attributes.hwNamePci,
 			d.attributes.pciBDF,
@@ -521,6 +564,8 @@ func (d *device) scrapePciStats(mb *metadata.MetricsBuilder, ts pcommon.Timestam
 }
 
 func (d *device) pollAggregatedMetrics() {
+	d.RLock()
+	defer d.RUnlock()
 	for _, s := range d.scrapers {
 		s.pollAggregatedMetrics()
 	}
diff --git a/xpumd/receiver/intelxpu/sysman/doc.go b/xpumd/receiver/intelxpu/sysman/doc.go
new file mode 100644
index 000000000..2e0d32271
--- /dev/null
+++ b/xpumd/receiver/intelxpu/sysman/doc.go
@@ -0,0 +1,8 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package sysman
+
+//go:generate go tool -modfile ../../../tools/go.mod mdatagen metadata.yaml
diff --git a/xpumd/receiver/sysman/documentation.md b/xpumd/receiver/intelxpu/sysman/documentation.md
similarity index 94%
rename from xpumd/receiver/sysman/documentation.md
rename to xpumd/receiver/intelxpu/sysman/documentation.md
index 1e8377d88..0e17042f7 100644
--- a/xpumd/receiver/sysman/documentation.md
+++ b/xpumd/receiver/intelxpu/sysman/documentation.md
@@ -30,6 +30,26 @@ Energy consumed by the hardware component.
 | com.intel.subdevice_id | Sub-device ID of the hardware component. | Any Str | Recommended | - |
 | hw.sensor_location | Location of the sensor. | Any Str | Recommended | - |
 
+### hw.errors
+
+Number of GPU errors. Correctable `error.type` error metrics are reported only when non-zero.
+
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
+| ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
+| {error} | Sum | Int | Cumulative | true | Development |
+
+#### Attributes
+
+| Name | Description | Values | Requirement Level | Semantic Convention |
+| ---- | ----------- | ------ | ----------------- | ------------------- |
+| hw.id | Unique identifier for the hardware component. | Any Str | Recommended | - |
+| hw.name | An easily-recognizable name for the hardware component. | Any Str | Recommended | - |
+| pci.bdf | PCI BDF (`<domain>:<bus>:<device>.<function>`) for the device. | Any Str | Recommended | - |
+| com.intel.subdevice_id | Sub-device ID of the hardware component. | Any Str | Recommended | - |
+| hw.type | Type of the hardware component. | Str: ``frequency``, ``gpu``, ``memory``, ``pci_link`` | Recommended | - |
+| error.type | Error type. | Str: ``correctable``, ``uncorrectable`` | Recommended | - |
+| error.category | Error category. | Any Str | Recommended | - |
+
 ### hw.frequency
 
 Operating frequency of the hardware component.
@@ -275,7 +295,7 @@ Memory bandwidth (read+write) utilization ratio.
 
 ### hw.memory.free
 
-Free memory. Reported only when `hw.memory.size` (and memory usage metrics) are unavailable.
+Free memory. Reported only when `hw.memory.size` (and derived memory usage+ratio metrics) are unavailable.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
@@ -333,7 +353,7 @@ Current memory bandwidth (read+write) usage in bytes/sec.
 
 ### hw.memory.size
 
-Physical size of the memory.
+Memory size. If physical memory size info is unavailable, provides max allocatable size.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
diff --git a/xpumd/receiver/sysman/engine.go b/xpumd/receiver/intelxpu/sysman/engine.go
similarity index 97%
rename from xpumd/receiver/sysman/engine.go
rename to xpumd/receiver/intelxpu/sysman/engine.go
index 1d22f1316..80b1d9549 100644
--- a/xpumd/receiver/sysman/engine.go
+++ b/xpumd/receiver/intelxpu/sysman/engine.go
@@ -12,7 +12,7 @@ import (
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 func init() {
diff --git a/xpumd/receiver/sysman/events.go b/xpumd/receiver/intelxpu/sysman/events.go
similarity index 71%
rename from xpumd/receiver/sysman/events.go
rename to xpumd/receiver/intelxpu/sysman/events.go
index 97a74bfd1..0c4bfb626 100644
--- a/xpumd/receiver/sysman/events.go
+++ b/xpumd/receiver/intelxpu/sysman/events.go
@@ -18,7 +18,7 @@ import (
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
 	"github.com/intel/xpumanager/xpumd/common"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 // allEventTypeFlags is the bitmask of all known Sysman event types.
@@ -60,11 +60,13 @@ func newSysmanEventsReceiver(devices *deviceRegistry, logger *zap.SugaredLogger,
 	for i, drv := range r.drivers {
 		registered := 0
 		for j, dev := range drv.devices {
-			if err := dev.EventRegister(allEventTypeFlags); err != nil {
+			eventsMask, err := dev.EventRegister(allEventTypeFlags)
+			if err != nil {
 				r.logger.Errorw("Device EventRegister() failed: device events unavailable",
 					zap.Error(err), "deviceID", j+1, "deviceAttributes", dev.attributes)
 				continue
 			}
+			logger.Debugw("Registered Sysman device events", "eventsMask", eventsMask, "deviceAttributes", dev.attributes)
 			registered++
 		}
 		logger.Infow("Sysman devices registered for events", "registered", registered, "enumerated", len(drv.devices), "driverIndex", i)
@@ -138,40 +140,59 @@ func (r *sysmanEventsReceiver) runEventListener(ctx context.Context, drv *driver
 		sl := rl.ScopeLogs().AppendEmpty()
 		sl.Scope().SetName(metadata.ScopeName)
 
-		appendDeviceEventLogs(sl, drv.devices, deviceEvents)
+		ts := pcommon.NewTimestampFromTime(time.Now())
 
+		for i, flags := range deviceEvents {
+			if flags != 0 {
+				appendDeviceEventLogs(sl, drv.devices[i], flags, ts)
+			}
+		}
 		if err := r.consumer.ConsumeLogs(ctx, ld); err != nil {
 			r.logger.Warnw("ConsumeLogs failed", zap.Error(err))
 		}
+
+		// Rescan on DEVICE_ATTACH, after ConsumeLogs so that events are
+		// delivered before re-init (case of hangs or crashes).
+		// NOTE: rescan is inline here for simplicity; it stalls event processing
+		// for this driver briefly. If that proves disruptive, move to a
+		// dedicated per-device worker goroutine with a coalescing channel.
+		for i, flags := range deviceEvents {
+			if flags&l0sysman.EventTypeFlags(l0sysman.EVENT_TYPE_FLAG_DEVICE_ATTACH) != 0 {
+				dev := drv.devices[i]
+				dev.Lock()
+				r.logger.Infow("Rescanning device on DEVICE_ATTACH", "deviceAttributes", dev.attributes)
+				if err := dev.init(); err != nil {
+					r.logger.Errorw("Device rescan failed", zap.Error(err))
+				} else {
+					r.logger.Debugw("Device rescanned successfully", "deviceAttributes", dev.attributes)
+				}
+				dev.Unlock()
+			}
+		}
 	}
 }
 
-func appendDeviceEventLogs(sl plog.ScopeLogs, devices []*device, deviceEvents []l0sysman.EventTypeFlags) {
-	ts := pcommon.NewTimestampFromTime(time.Now())
-
-	for i, flags := range deviceEvents {
-		if flags == 0 {
-			continue
-		}
-		attrs := devices[i].attributes
-		// Decode each flag as a separate log record.
-		for _, flag := range flags.Bits() {
-			lr := sl.LogRecords().AppendEmpty()
-			lr.SetTimestamp(ts)
-			sev := eventSeverity(flag)
-			lr.SetSeverityNumber(sev)
-			lr.SetSeverityText(sev.String())
-			lr.SetEventName(common.EventNamePrefix + flag.String())
-			lr.Body().SetStr(flag.String())
-
-			lrAttrs := lr.Attributes()
-			lrAttrs.PutStr("hw.id", attrs.hwID)
-			lrAttrs.PutStr("hw.name", attrs.hwName)
-			lrAttrs.PutStr("hw.model", attrs.hwModel)
-			lrAttrs.PutStr("pci.bdf", attrs.pciBDF)
-			lrAttrs.PutStr("pci.device_id", attrs.pciDeviceID)
-			lrAttrs.PutStr("pci.vendor_id", attrs.pciVendorID)
-		}
+func appendDeviceEventLogs(sl plog.ScopeLogs, dev *device, flags l0sysman.EventTypeFlags, ts pcommon.Timestamp) {
+	dev.RLock()
+	defer dev.RUnlock()
+	attrs := dev.attributes
+
+	for _, flag := range flags.Bits() {
+		lr := sl.LogRecords().AppendEmpty()
+		lr.SetTimestamp(ts)
+		sev := eventSeverity(flag)
+		lr.SetSeverityNumber(sev)
+		lr.SetSeverityText(sev.String())
+		lr.SetEventName(common.EventNamePrefix + flag.String())
+		lr.Body().SetStr(flag.String())
+
+		lrAttrs := lr.Attributes()
+		lrAttrs.PutStr("hw.id", attrs.hwID)
+		lrAttrs.PutStr("hw.name", attrs.hwName)
+		lrAttrs.PutStr("hw.model", attrs.hwModel)
+		lrAttrs.PutStr("pci.bdf", attrs.pciBDF)
+		lrAttrs.PutStr("pci.device_id", attrs.pciDeviceID)
+		lrAttrs.PutStr("pci.vendor_id", attrs.pciVendorID)
 	}
 }
 
diff --git a/xpumd/receiver/sysman/events_test.go b/xpumd/receiver/intelxpu/sysman/events_test.go
similarity index 100%
rename from xpumd/receiver/sysman/events_test.go
rename to xpumd/receiver/intelxpu/sysman/events_test.go
diff --git a/xpumd/receiver/sysman/factory.go b/xpumd/receiver/intelxpu/sysman/factory.go
similarity index 87%
rename from xpumd/receiver/sysman/factory.go
rename to xpumd/receiver/intelxpu/sysman/factory.go
index 8742c7a85..2c68aaded 100644
--- a/xpumd/receiver/sysman/factory.go
+++ b/xpumd/receiver/intelxpu/sysman/factory.go
@@ -9,11 +9,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/scraper"
-	"go.uber.org/zap"
 )
 
 // Handle is a wrapper that provides access to both periodic scraper (metrics)
@@ -48,7 +47,7 @@ func makeMetricsScraper(p *sysmanProvider) scraper.CreateMetricsFunc {
 			return nil, fmt.Errorf("invalid config type: %T", scfg)
 		}
 
-		logger := settings.Logger.WithOptions(zap.IncreaseLevel(cfg.LogLevel)).Sugar()
+		logger := settings.Logger.Sugar()
 		devices, err := p.get(logger, cfg)
 		if err != nil {
 			return nil, err
@@ -69,7 +68,7 @@ func makeMetricsScraper(p *sysmanProvider) scraper.CreateMetricsFunc {
 
 // CreateLogsReceiver creates a sysman logs (events) receiver.
 func (f *Handle) CreateLogsReceiver(settings component.TelemetrySettings, cfg *Config, nextConsumer consumer.Logs) (component.Component, error) {
-	logger := settings.Logger.WithOptions(zap.IncreaseLevel(cfg.LogLevel)).Sugar()
+	logger := settings.Logger.Sugar()
 	devices, err := f.provider.get(logger, cfg)
 	if err != nil {
 		return nil, err
diff --git a/xpumd/receiver/sysman/firmware.go b/xpumd/receiver/intelxpu/sysman/firmware.go
similarity index 100%
rename from xpumd/receiver/sysman/firmware.go
rename to xpumd/receiver/intelxpu/sysman/firmware.go
diff --git a/xpumd/receiver/sysman/frequency.go b/xpumd/receiver/intelxpu/sysman/frequency.go
similarity index 99%
rename from xpumd/receiver/sysman/frequency.go
rename to xpumd/receiver/intelxpu/sysman/frequency.go
index 73ee229eb..dda04e02d 100644
--- a/xpumd/receiver/sysman/frequency.go
+++ b/xpumd/receiver/intelxpu/sysman/frequency.go
@@ -14,7 +14,7 @@ import (
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 func init() {
diff --git a/xpumd/receiver/sysman/generated_component_test.go b/xpumd/receiver/intelxpu/sysman/generated_component_test.go
similarity index 100%
rename from xpumd/receiver/sysman/generated_component_test.go
rename to xpumd/receiver/intelxpu/sysman/generated_component_test.go
diff --git a/xpumd/receiver/sysman/generated_package_test.go b/xpumd/receiver/intelxpu/sysman/generated_package_test.go
similarity index 100%
rename from xpumd/receiver/sysman/generated_package_test.go
rename to xpumd/receiver/intelxpu/sysman/generated_package_test.go
diff --git a/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_config.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_config.go
new file mode 100644
index 000000000..358fb01e8
--- /dev/null
+++ b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_config.go
@@ -0,0 +1,1506 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package metadata
+
+import (
+	"fmt"
+
+	"go.opentelemetry.io/collector/confmap"
+)
+
+// HwEnergyMetricAttributeKey specifies the key of an attribute for the hw.energy metric.
+type HwEnergyMetricAttributeKey string
+
+const (
+	HwEnergyMetricAttributeKeyHwID                HwEnergyMetricAttributeKey = "hw.id"
+	HwEnergyMetricAttributeKeyHwName              HwEnergyMetricAttributeKey = "hw.name"
+	HwEnergyMetricAttributeKeyPciBdf              HwEnergyMetricAttributeKey = "pci.bdf"
+	HwEnergyMetricAttributeKeyComIntelSubdeviceID HwEnergyMetricAttributeKey = "com.intel.subdevice_id"
+	HwEnergyMetricAttributeKeyHwSensorLocation    HwEnergyMetricAttributeKey = "hw.sensor_location"
+)
+
+// HwEnergyMetricConfig provides config for the hw.energy metric.
+type HwEnergyMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                       `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwEnergyMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwEnergyMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwEnergyMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwEnergyMetricAttributeKeyHwID, HwEnergyMetricAttributeKeyHwName, HwEnergyMetricAttributeKeyPciBdf, HwEnergyMetricAttributeKeyComIntelSubdeviceID, HwEnergyMetricAttributeKeyHwSensorLocation:
+		default:
+			return fmt.Errorf("metric hw.energy doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.sensor_location]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwErrorsMetricAttributeKey specifies the key of an attribute for the hw.errors metric.
+type HwErrorsMetricAttributeKey string
+
+const (
+	HwErrorsMetricAttributeKeyHwID                HwErrorsMetricAttributeKey = "hw.id"
+	HwErrorsMetricAttributeKeyHwName              HwErrorsMetricAttributeKey = "hw.name"
+	HwErrorsMetricAttributeKeyPciBdf              HwErrorsMetricAttributeKey = "pci.bdf"
+	HwErrorsMetricAttributeKeyComIntelSubdeviceID HwErrorsMetricAttributeKey = "com.intel.subdevice_id"
+	HwErrorsMetricAttributeKeyHwType              HwErrorsMetricAttributeKey = "hw.type"
+	HwErrorsMetricAttributeKeyErrorType           HwErrorsMetricAttributeKey = "error.type"
+	HwErrorsMetricAttributeKeyErrorCategory       HwErrorsMetricAttributeKey = "error.category"
+)
+
+// HwErrorsMetricConfig provides config for the hw.errors metric.
+type HwErrorsMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                       `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwErrorsMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwErrorsMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwErrorsMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwErrorsMetricAttributeKeyHwID, HwErrorsMetricAttributeKeyHwName, HwErrorsMetricAttributeKeyPciBdf, HwErrorsMetricAttributeKeyComIntelSubdeviceID, HwErrorsMetricAttributeKeyHwType, HwErrorsMetricAttributeKeyErrorType, HwErrorsMetricAttributeKeyErrorCategory:
+		default:
+			return fmt.Errorf("metric hw.errors doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.type, error.type, error.category]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwFrequencyMetricAttributeKey specifies the key of an attribute for the hw.frequency metric.
+type HwFrequencyMetricAttributeKey string
+
+const (
+	HwFrequencyMetricAttributeKeyHwID                HwFrequencyMetricAttributeKey = "hw.id"
+	HwFrequencyMetricAttributeKeyHwName              HwFrequencyMetricAttributeKey = "hw.name"
+	HwFrequencyMetricAttributeKeyPciBdf              HwFrequencyMetricAttributeKey = "pci.bdf"
+	HwFrequencyMetricAttributeKeyComIntelSubdeviceID HwFrequencyMetricAttributeKey = "com.intel.subdevice_id"
+	HwFrequencyMetricAttributeKeyHwFrequencyDomain   HwFrequencyMetricAttributeKey = "hw.frequency.domain"
+	HwFrequencyMetricAttributeKeyAggregation         HwFrequencyMetricAttributeKey = "aggregation"
+)
+
+// HwFrequencyMetricConfig provides config for the hw.frequency metric.
+type HwFrequencyMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                          `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwFrequencyMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwFrequencyMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwFrequencyMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwFrequencyMetricAttributeKeyHwID, HwFrequencyMetricAttributeKeyHwName, HwFrequencyMetricAttributeKeyPciBdf, HwFrequencyMetricAttributeKeyComIntelSubdeviceID, HwFrequencyMetricAttributeKeyHwFrequencyDomain, HwFrequencyMetricAttributeKeyAggregation:
+		default:
+			return fmt.Errorf("metric hw.frequency doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.frequency.domain, aggregation]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwFrequencyLimitMetricAttributeKey specifies the key of an attribute for the hw.frequency.limit metric.
+type HwFrequencyLimitMetricAttributeKey string
+
+const (
+	HwFrequencyLimitMetricAttributeKeyHwID                HwFrequencyLimitMetricAttributeKey = "hw.id"
+	HwFrequencyLimitMetricAttributeKeyHwName              HwFrequencyLimitMetricAttributeKey = "hw.name"
+	HwFrequencyLimitMetricAttributeKeyPciBdf              HwFrequencyLimitMetricAttributeKey = "pci.bdf"
+	HwFrequencyLimitMetricAttributeKeyComIntelSubdeviceID HwFrequencyLimitMetricAttributeKey = "com.intel.subdevice_id"
+	HwFrequencyLimitMetricAttributeKeyHwFrequencyDomain   HwFrequencyLimitMetricAttributeKey = "hw.frequency.domain"
+	HwFrequencyLimitMetricAttributeKeyHwLimitType         HwFrequencyLimitMetricAttributeKey = "hw.limit_type"
+)
+
+// HwFrequencyLimitMetricConfig provides config for the hw.frequency.limit metric.
+type HwFrequencyLimitMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                               `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwFrequencyLimitMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwFrequencyLimitMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwFrequencyLimitMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwFrequencyLimitMetricAttributeKeyHwID, HwFrequencyLimitMetricAttributeKeyHwName, HwFrequencyLimitMetricAttributeKeyPciBdf, HwFrequencyLimitMetricAttributeKeyComIntelSubdeviceID, HwFrequencyLimitMetricAttributeKeyHwFrequencyDomain, HwFrequencyLimitMetricAttributeKeyHwLimitType:
+		default:
+			return fmt.Errorf("metric hw.frequency.limit doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.frequency.domain, hw.limit_type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwFrequencyRequestMetricAttributeKey specifies the key of an attribute for the hw.frequency.request metric.
+type HwFrequencyRequestMetricAttributeKey string
+
+const (
+	HwFrequencyRequestMetricAttributeKeyHwID                HwFrequencyRequestMetricAttributeKey = "hw.id"
+	HwFrequencyRequestMetricAttributeKeyHwName              HwFrequencyRequestMetricAttributeKey = "hw.name"
+	HwFrequencyRequestMetricAttributeKeyPciBdf              HwFrequencyRequestMetricAttributeKey = "pci.bdf"
+	HwFrequencyRequestMetricAttributeKeyComIntelSubdeviceID HwFrequencyRequestMetricAttributeKey = "com.intel.subdevice_id"
+	HwFrequencyRequestMetricAttributeKeyHwFrequencyDomain   HwFrequencyRequestMetricAttributeKey = "hw.frequency.domain"
+)
+
+// HwFrequencyRequestMetricConfig provides config for the hw.frequency.request metric.
+type HwFrequencyRequestMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                 `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwFrequencyRequestMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwFrequencyRequestMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwFrequencyRequestMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwFrequencyRequestMetricAttributeKeyHwID, HwFrequencyRequestMetricAttributeKeyHwName, HwFrequencyRequestMetricAttributeKeyPciBdf, HwFrequencyRequestMetricAttributeKeyComIntelSubdeviceID, HwFrequencyRequestMetricAttributeKeyHwFrequencyDomain:
+		default:
+			return fmt.Errorf("metric hw.frequency.request doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.frequency.domain]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwFrequencySamplesMetricAttributeKey specifies the key of an attribute for the hw.frequency.samples metric.
+type HwFrequencySamplesMetricAttributeKey string
+
+const (
+	HwFrequencySamplesMetricAttributeKeyHwID                HwFrequencySamplesMetricAttributeKey = "hw.id"
+	HwFrequencySamplesMetricAttributeKeyHwName              HwFrequencySamplesMetricAttributeKey = "hw.name"
+	HwFrequencySamplesMetricAttributeKeyPciBdf              HwFrequencySamplesMetricAttributeKey = "pci.bdf"
+	HwFrequencySamplesMetricAttributeKeyComIntelSubdeviceID HwFrequencySamplesMetricAttributeKey = "com.intel.subdevice_id"
+	HwFrequencySamplesMetricAttributeKeyHwFrequencyDomain   HwFrequencySamplesMetricAttributeKey = "hw.frequency.domain"
+	HwFrequencySamplesMetricAttributeKeySampleStatus        HwFrequencySamplesMetricAttributeKey = "sample.status"
+)
+
+// HwFrequencySamplesMetricConfig provides config for the hw.frequency.samples metric.
+type HwFrequencySamplesMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                 `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwFrequencySamplesMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwFrequencySamplesMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwFrequencySamplesMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwFrequencySamplesMetricAttributeKeyHwID, HwFrequencySamplesMetricAttributeKeyHwName, HwFrequencySamplesMetricAttributeKeyPciBdf, HwFrequencySamplesMetricAttributeKeyComIntelSubdeviceID, HwFrequencySamplesMetricAttributeKeyHwFrequencyDomain, HwFrequencySamplesMetricAttributeKeySampleStatus:
+		default:
+			return fmt.Errorf("metric hw.frequency.samples doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.frequency.domain, sample.status]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwFrequencyThrottleStatusMetricAttributeKey specifies the key of an attribute for the hw.frequency.throttle_status metric.
+type HwFrequencyThrottleStatusMetricAttributeKey string
+
+const (
+	HwFrequencyThrottleStatusMetricAttributeKeyHwID                        HwFrequencyThrottleStatusMetricAttributeKey = "hw.id"
+	HwFrequencyThrottleStatusMetricAttributeKeyHwName                      HwFrequencyThrottleStatusMetricAttributeKey = "hw.name"
+	HwFrequencyThrottleStatusMetricAttributeKeyPciBdf                      HwFrequencyThrottleStatusMetricAttributeKey = "pci.bdf"
+	HwFrequencyThrottleStatusMetricAttributeKeyComIntelSubdeviceID         HwFrequencyThrottleStatusMetricAttributeKey = "com.intel.subdevice_id"
+	HwFrequencyThrottleStatusMetricAttributeKeyHwFrequencyDomain           HwFrequencyThrottleStatusMetricAttributeKey = "hw.frequency.domain"
+	HwFrequencyThrottleStatusMetricAttributeKeyComIntelSpeedThrottleReason HwFrequencyThrottleStatusMetricAttributeKey = "com.intel.speed.throttle_reason"
+)
+
+// HwFrequencyThrottleStatusMetricConfig provides config for the hw.frequency.throttle_status metric.
+type HwFrequencyThrottleStatusMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                        `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwFrequencyThrottleStatusMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwFrequencyThrottleStatusMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwFrequencyThrottleStatusMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwFrequencyThrottleStatusMetricAttributeKeyHwID, HwFrequencyThrottleStatusMetricAttributeKeyHwName, HwFrequencyThrottleStatusMetricAttributeKeyPciBdf, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSubdeviceID, HwFrequencyThrottleStatusMetricAttributeKeyHwFrequencyDomain, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSpeedThrottleReason:
+		default:
+			return fmt.Errorf("metric hw.frequency.throttle_status doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.frequency.domain, com.intel.speed.throttle_reason]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwGpuBandwidthLimitMetricAttributeKey specifies the key of an attribute for the hw.gpu.bandwidth.limit metric.
+type HwGpuBandwidthLimitMetricAttributeKey string
+
+const (
+	HwGpuBandwidthLimitMetricAttributeKeyHwID   HwGpuBandwidthLimitMetricAttributeKey = "hw.id"
+	HwGpuBandwidthLimitMetricAttributeKeyHwName HwGpuBandwidthLimitMetricAttributeKey = "hw.name"
+	HwGpuBandwidthLimitMetricAttributeKeyPciBdf HwGpuBandwidthLimitMetricAttributeKey = "pci.bdf"
+)
+
+// HwGpuBandwidthLimitMetricConfig provides config for the hw.gpu.bandwidth.limit metric.
+type HwGpuBandwidthLimitMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                  `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwGpuBandwidthLimitMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwGpuBandwidthLimitMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwGpuBandwidthLimitMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwGpuBandwidthLimitMetricAttributeKeyHwID, HwGpuBandwidthLimitMetricAttributeKeyHwName, HwGpuBandwidthLimitMetricAttributeKeyPciBdf:
+		default:
+			return fmt.Errorf("metric hw.gpu.bandwidth.limit doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwGpuBandwidthUtilizationMetricAttributeKey specifies the key of an attribute for the hw.gpu.bandwidth.utilization metric.
+type HwGpuBandwidthUtilizationMetricAttributeKey string
+
+const (
+	HwGpuBandwidthUtilizationMetricAttributeKeyHwID   HwGpuBandwidthUtilizationMetricAttributeKey = "hw.id"
+	HwGpuBandwidthUtilizationMetricAttributeKeyHwName HwGpuBandwidthUtilizationMetricAttributeKey = "hw.name"
+	HwGpuBandwidthUtilizationMetricAttributeKeyPciBdf HwGpuBandwidthUtilizationMetricAttributeKey = "pci.bdf"
+)
+
+// HwGpuBandwidthUtilizationMetricConfig provides config for the hw.gpu.bandwidth.utilization metric.
+type HwGpuBandwidthUtilizationMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                        `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwGpuBandwidthUtilizationMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwGpuBandwidthUtilizationMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwGpuBandwidthUtilizationMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwGpuBandwidthUtilizationMetricAttributeKeyHwID, HwGpuBandwidthUtilizationMetricAttributeKeyHwName, HwGpuBandwidthUtilizationMetricAttributeKeyPciBdf:
+		default:
+			return fmt.Errorf("metric hw.gpu.bandwidth.utilization doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwGpuInfoMetricAttributeKey specifies the key of an attribute for the hw.gpu.info metric.
+type HwGpuInfoMetricAttributeKey string
+
+const (
+	HwGpuInfoMetricAttributeKeyHwID                   HwGpuInfoMetricAttributeKey = "hw.id"
+	HwGpuInfoMetricAttributeKeyHwName                 HwGpuInfoMetricAttributeKey = "hw.name"
+	HwGpuInfoMetricAttributeKeyPciBdf                 HwGpuInfoMetricAttributeKey = "pci.bdf"
+	HwGpuInfoMetricAttributeKeyPciVendorID            HwGpuInfoMetricAttributeKey = "pci.vendor_id"
+	HwGpuInfoMetricAttributeKeyPciDeviceID            HwGpuInfoMetricAttributeKey = "pci.device_id"
+	HwGpuInfoMetricAttributeKeyHwModel                HwGpuInfoMetricAttributeKey = "hw.model"
+	HwGpuInfoMetricAttributeKeyHwSerialNumber         HwGpuInfoMetricAttributeKey = "hw.serial_number"
+	HwGpuInfoMetricAttributeKeyHwVendor               HwGpuInfoMetricAttributeKey = "hw.vendor"
+	HwGpuInfoMetricAttributeKeyHwFirmwareVersion      HwGpuInfoMetricAttributeKey = "hw.firmware_version"
+	HwGpuInfoMetricAttributeKeyHwGpuType              HwGpuInfoMetricAttributeKey = "hw.gpu.type"
+	HwGpuInfoMetricAttributeKeyComIntelSubdeviceCount HwGpuInfoMetricAttributeKey = "com.intel.subdevice_count"
+	HwGpuInfoMetricAttributeKeyPciLanes               HwGpuInfoMetricAttributeKey = "pci.lanes"
+	HwGpuInfoMetricAttributeKeyPciLinkGen             HwGpuInfoMetricAttributeKey = "pci.link_gen"
+	HwGpuInfoMetricAttributeKeyHwMemoryDemandPaging   HwGpuInfoMetricAttributeKey = "hw.memory.demand_paging"
+	HwGpuInfoMetricAttributeKeyHwMemoryEcc            HwGpuInfoMetricAttributeKey = "hw.memory.ecc"
+)
+
+// HwGpuInfoMetricConfig provides config for the hw.gpu.info metric.
+type HwGpuInfoMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                        `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwGpuInfoMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwGpuInfoMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwGpuInfoMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwGpuInfoMetricAttributeKeyHwID, HwGpuInfoMetricAttributeKeyHwName, HwGpuInfoMetricAttributeKeyPciBdf, HwGpuInfoMetricAttributeKeyPciVendorID, HwGpuInfoMetricAttributeKeyPciDeviceID, HwGpuInfoMetricAttributeKeyHwModel, HwGpuInfoMetricAttributeKeyHwSerialNumber, HwGpuInfoMetricAttributeKeyHwVendor, HwGpuInfoMetricAttributeKeyHwFirmwareVersion, HwGpuInfoMetricAttributeKeyHwGpuType, HwGpuInfoMetricAttributeKeyComIntelSubdeviceCount, HwGpuInfoMetricAttributeKeyPciLanes, HwGpuInfoMetricAttributeKeyPciLinkGen, HwGpuInfoMetricAttributeKeyHwMemoryDemandPaging, HwGpuInfoMetricAttributeKeyHwMemoryEcc:
+		default:
+			return fmt.Errorf("metric hw.gpu.info doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, pci.vendor_id, pci.device_id, hw.model, hw.serial_number, hw.vendor, hw.firmware_version, hw.gpu.type, com.intel.subdevice_count, pci.lanes, pci.link_gen, hw.memory.demand_paging, hw.memory.ecc]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwGpuIoMetricAttributeKey specifies the key of an attribute for the hw.gpu.io metric.
+type HwGpuIoMetricAttributeKey string
+
+const (
+	HwGpuIoMetricAttributeKeyHwID               HwGpuIoMetricAttributeKey = "hw.id"
+	HwGpuIoMetricAttributeKeyHwName             HwGpuIoMetricAttributeKey = "hw.name"
+	HwGpuIoMetricAttributeKeyPciBdf             HwGpuIoMetricAttributeKey = "pci.bdf"
+	HwGpuIoMetricAttributeKeyNetworkIoDirection HwGpuIoMetricAttributeKey = "network.io.direction"
+)
+
+// HwGpuIoMetricConfig provides config for the hw.gpu.io metric.
+type HwGpuIoMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                      `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwGpuIoMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwGpuIoMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwGpuIoMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwGpuIoMetricAttributeKeyHwID, HwGpuIoMetricAttributeKeyHwName, HwGpuIoMetricAttributeKeyPciBdf, HwGpuIoMetricAttributeKeyNetworkIoDirection:
+		default:
+			return fmt.Errorf("metric hw.gpu.io doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, network.io.direction]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwGpuIoRateMetricAttributeKey specifies the key of an attribute for the hw.gpu.io.rate metric.
+type HwGpuIoRateMetricAttributeKey string
+
+const (
+	HwGpuIoRateMetricAttributeKeyHwID   HwGpuIoRateMetricAttributeKey = "hw.id"
+	HwGpuIoRateMetricAttributeKeyHwName HwGpuIoRateMetricAttributeKey = "hw.name"
+	HwGpuIoRateMetricAttributeKeyPciBdf HwGpuIoRateMetricAttributeKey = "pci.bdf"
+)
+
+// HwGpuIoRateMetricConfig provides config for the hw.gpu.io.rate metric.
+type HwGpuIoRateMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                          `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwGpuIoRateMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwGpuIoRateMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwGpuIoRateMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwGpuIoRateMetricAttributeKeyHwID, HwGpuIoRateMetricAttributeKeyHwName, HwGpuIoRateMetricAttributeKeyPciBdf:
+		default:
+			return fmt.Errorf("metric hw.gpu.io.rate doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwGpuUtilizationMetricAttributeKey specifies the key of an attribute for the hw.gpu.utilization metric.
+type HwGpuUtilizationMetricAttributeKey string
+
+const (
+	HwGpuUtilizationMetricAttributeKeyHwID                HwGpuUtilizationMetricAttributeKey = "hw.id"
+	HwGpuUtilizationMetricAttributeKeyHwName              HwGpuUtilizationMetricAttributeKey = "hw.name"
+	HwGpuUtilizationMetricAttributeKeyPciBdf              HwGpuUtilizationMetricAttributeKey = "pci.bdf"
+	HwGpuUtilizationMetricAttributeKeyComIntelSubdeviceID HwGpuUtilizationMetricAttributeKey = "com.intel.subdevice_id"
+	HwGpuUtilizationMetricAttributeKeyHwGpuTask           HwGpuUtilizationMetricAttributeKey = "hw.gpu.task"
+)
+
+// HwGpuUtilizationMetricConfig provides config for the hw.gpu.utilization metric.
+type HwGpuUtilizationMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                               `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwGpuUtilizationMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwGpuUtilizationMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwGpuUtilizationMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwGpuUtilizationMetricAttributeKeyHwID, HwGpuUtilizationMetricAttributeKeyHwName, HwGpuUtilizationMetricAttributeKeyPciBdf, HwGpuUtilizationMetricAttributeKeyComIntelSubdeviceID, HwGpuUtilizationMetricAttributeKeyHwGpuTask:
+		default:
+			return fmt.Errorf("metric hw.gpu.utilization doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.gpu.task]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryBandwidthLimitMetricAttributeKey specifies the key of an attribute for the hw.memory.bandwidth.limit metric.
+type HwMemoryBandwidthLimitMetricAttributeKey string
+
+const (
+	HwMemoryBandwidthLimitMetricAttributeKeyHwID                HwMemoryBandwidthLimitMetricAttributeKey = "hw.id"
+	HwMemoryBandwidthLimitMetricAttributeKeyHwName              HwMemoryBandwidthLimitMetricAttributeKey = "hw.name"
+	HwMemoryBandwidthLimitMetricAttributeKeyPciBdf              HwMemoryBandwidthLimitMetricAttributeKey = "pci.bdf"
+	HwMemoryBandwidthLimitMetricAttributeKeyComIntelSubdeviceID HwMemoryBandwidthLimitMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryLocation    HwMemoryBandwidthLimitMetricAttributeKey = "hw.memory.location"
+	HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryType        HwMemoryBandwidthLimitMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemoryBandwidthLimitMetricConfig provides config for the hw.memory.bandwidth.limit metric.
+type HwMemoryBandwidthLimitMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                     `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryBandwidthLimitMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryBandwidthLimitMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryBandwidthLimitMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryBandwidthLimitMetricAttributeKeyHwID, HwMemoryBandwidthLimitMetricAttributeKeyHwName, HwMemoryBandwidthLimitMetricAttributeKeyPciBdf, HwMemoryBandwidthLimitMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.bandwidth.limit doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryBandwidthUtilizationMetricAttributeKey specifies the key of an attribute for the hw.memory.bandwidth.utilization metric.
+type HwMemoryBandwidthUtilizationMetricAttributeKey string
+
+const (
+	HwMemoryBandwidthUtilizationMetricAttributeKeyHwID                HwMemoryBandwidthUtilizationMetricAttributeKey = "hw.id"
+	HwMemoryBandwidthUtilizationMetricAttributeKeyHwName              HwMemoryBandwidthUtilizationMetricAttributeKey = "hw.name"
+	HwMemoryBandwidthUtilizationMetricAttributeKeyPciBdf              HwMemoryBandwidthUtilizationMetricAttributeKey = "pci.bdf"
+	HwMemoryBandwidthUtilizationMetricAttributeKeyComIntelSubdeviceID HwMemoryBandwidthUtilizationMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryLocation    HwMemoryBandwidthUtilizationMetricAttributeKey = "hw.memory.location"
+	HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryType        HwMemoryBandwidthUtilizationMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemoryBandwidthUtilizationMetricConfig provides config for the hw.memory.bandwidth.utilization metric.
+type HwMemoryBandwidthUtilizationMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                           `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryBandwidthUtilizationMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryBandwidthUtilizationMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryBandwidthUtilizationMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryBandwidthUtilizationMetricAttributeKeyHwID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwName, HwMemoryBandwidthUtilizationMetricAttributeKeyPciBdf, HwMemoryBandwidthUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.bandwidth.utilization doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryFreeMetricAttributeKey specifies the key of an attribute for the hw.memory.free metric.
+type HwMemoryFreeMetricAttributeKey string
+
+const (
+	HwMemoryFreeMetricAttributeKeyHwID                HwMemoryFreeMetricAttributeKey = "hw.id"
+	HwMemoryFreeMetricAttributeKeyHwName              HwMemoryFreeMetricAttributeKey = "hw.name"
+	HwMemoryFreeMetricAttributeKeyPciBdf              HwMemoryFreeMetricAttributeKey = "pci.bdf"
+	HwMemoryFreeMetricAttributeKeyComIntelSubdeviceID HwMemoryFreeMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryFreeMetricAttributeKeyHwMemoryLocation    HwMemoryFreeMetricAttributeKey = "hw.memory.location"
+	HwMemoryFreeMetricAttributeKeyHwMemoryType        HwMemoryFreeMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemoryFreeMetricConfig provides config for the hw.memory.free metric.
+type HwMemoryFreeMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                           `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryFreeMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryFreeMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryFreeMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryFreeMetricAttributeKeyHwID, HwMemoryFreeMetricAttributeKeyHwName, HwMemoryFreeMetricAttributeKeyPciBdf, HwMemoryFreeMetricAttributeKeyComIntelSubdeviceID, HwMemoryFreeMetricAttributeKeyHwMemoryLocation, HwMemoryFreeMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.free doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryIoMetricAttributeKey specifies the key of an attribute for the hw.memory.io metric.
+type HwMemoryIoMetricAttributeKey string
+
+const (
+	HwMemoryIoMetricAttributeKeyHwID                HwMemoryIoMetricAttributeKey = "hw.id"
+	HwMemoryIoMetricAttributeKeyHwName              HwMemoryIoMetricAttributeKey = "hw.name"
+	HwMemoryIoMetricAttributeKeyPciBdf              HwMemoryIoMetricAttributeKey = "pci.bdf"
+	HwMemoryIoMetricAttributeKeyComIntelSubdeviceID HwMemoryIoMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryIoMetricAttributeKeyHwMemoryLocation    HwMemoryIoMetricAttributeKey = "hw.memory.location"
+	HwMemoryIoMetricAttributeKeyHwMemoryType        HwMemoryIoMetricAttributeKey = "hw.memory.type"
+	HwMemoryIoMetricAttributeKeyNetworkIoDirection  HwMemoryIoMetricAttributeKey = "network.io.direction"
+)
+
+// HwMemoryIoMetricConfig provides config for the hw.memory.io metric.
+type HwMemoryIoMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                         `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryIoMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryIoMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryIoMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryIoMetricAttributeKeyHwID, HwMemoryIoMetricAttributeKeyHwName, HwMemoryIoMetricAttributeKeyPciBdf, HwMemoryIoMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoMetricAttributeKeyHwMemoryLocation, HwMemoryIoMetricAttributeKeyHwMemoryType, HwMemoryIoMetricAttributeKeyNetworkIoDirection:
+		default:
+			return fmt.Errorf("metric hw.memory.io doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type, network.io.direction]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryIoRateMetricAttributeKey specifies the key of an attribute for the hw.memory.io.rate metric.
+type HwMemoryIoRateMetricAttributeKey string
+
+const (
+	HwMemoryIoRateMetricAttributeKeyHwID                HwMemoryIoRateMetricAttributeKey = "hw.id"
+	HwMemoryIoRateMetricAttributeKeyHwName              HwMemoryIoRateMetricAttributeKey = "hw.name"
+	HwMemoryIoRateMetricAttributeKeyPciBdf              HwMemoryIoRateMetricAttributeKey = "pci.bdf"
+	HwMemoryIoRateMetricAttributeKeyComIntelSubdeviceID HwMemoryIoRateMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryIoRateMetricAttributeKeyHwMemoryLocation    HwMemoryIoRateMetricAttributeKey = "hw.memory.location"
+	HwMemoryIoRateMetricAttributeKeyHwMemoryType        HwMemoryIoRateMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemoryIoRateMetricConfig provides config for the hw.memory.io.rate metric.
+type HwMemoryIoRateMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                             `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryIoRateMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryIoRateMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryIoRateMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryIoRateMetricAttributeKeyHwID, HwMemoryIoRateMetricAttributeKeyHwName, HwMemoryIoRateMetricAttributeKeyPciBdf, HwMemoryIoRateMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoRateMetricAttributeKeyHwMemoryLocation, HwMemoryIoRateMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.io.rate doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemorySizeMetricAttributeKey specifies the key of an attribute for the hw.memory.size metric.
+type HwMemorySizeMetricAttributeKey string
+
+const (
+	HwMemorySizeMetricAttributeKeyHwID                HwMemorySizeMetricAttributeKey = "hw.id"
+	HwMemorySizeMetricAttributeKeyHwName              HwMemorySizeMetricAttributeKey = "hw.name"
+	HwMemorySizeMetricAttributeKeyPciBdf              HwMemorySizeMetricAttributeKey = "pci.bdf"
+	HwMemorySizeMetricAttributeKeyComIntelSubdeviceID HwMemorySizeMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemorySizeMetricAttributeKeyHwMemoryLocation    HwMemorySizeMetricAttributeKey = "hw.memory.location"
+	HwMemorySizeMetricAttributeKeyHwMemoryType        HwMemorySizeMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemorySizeMetricConfig provides config for the hw.memory.size metric.
+type HwMemorySizeMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                           `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemorySizeMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemorySizeMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemorySizeMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemorySizeMetricAttributeKeyHwID, HwMemorySizeMetricAttributeKeyHwName, HwMemorySizeMetricAttributeKeyPciBdf, HwMemorySizeMetricAttributeKeyComIntelSubdeviceID, HwMemorySizeMetricAttributeKeyHwMemoryLocation, HwMemorySizeMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.size doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryUsageMetricAttributeKey specifies the key of an attribute for the hw.memory.usage metric.
+type HwMemoryUsageMetricAttributeKey string
+
+const (
+	HwMemoryUsageMetricAttributeKeyHwID                HwMemoryUsageMetricAttributeKey = "hw.id"
+	HwMemoryUsageMetricAttributeKeyHwName              HwMemoryUsageMetricAttributeKey = "hw.name"
+	HwMemoryUsageMetricAttributeKeyPciBdf              HwMemoryUsageMetricAttributeKey = "pci.bdf"
+	HwMemoryUsageMetricAttributeKeyComIntelSubdeviceID HwMemoryUsageMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryUsageMetricAttributeKeyHwMemoryLocation    HwMemoryUsageMetricAttributeKey = "hw.memory.location"
+	HwMemoryUsageMetricAttributeKeyHwMemoryType        HwMemoryUsageMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemoryUsageMetricConfig provides config for the hw.memory.usage metric.
+type HwMemoryUsageMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                            `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryUsageMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryUsageMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryUsageMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryUsageMetricAttributeKeyHwID, HwMemoryUsageMetricAttributeKeyHwName, HwMemoryUsageMetricAttributeKeyPciBdf, HwMemoryUsageMetricAttributeKeyComIntelSubdeviceID, HwMemoryUsageMetricAttributeKeyHwMemoryLocation, HwMemoryUsageMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.usage doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwMemoryUtilizationMetricAttributeKey specifies the key of an attribute for the hw.memory.utilization metric.
+type HwMemoryUtilizationMetricAttributeKey string
+
+const (
+	HwMemoryUtilizationMetricAttributeKeyHwID                HwMemoryUtilizationMetricAttributeKey = "hw.id"
+	HwMemoryUtilizationMetricAttributeKeyHwName              HwMemoryUtilizationMetricAttributeKey = "hw.name"
+	HwMemoryUtilizationMetricAttributeKeyPciBdf              HwMemoryUtilizationMetricAttributeKey = "pci.bdf"
+	HwMemoryUtilizationMetricAttributeKeyComIntelSubdeviceID HwMemoryUtilizationMetricAttributeKey = "com.intel.subdevice_id"
+	HwMemoryUtilizationMetricAttributeKeyHwMemoryLocation    HwMemoryUtilizationMetricAttributeKey = "hw.memory.location"
+	HwMemoryUtilizationMetricAttributeKeyHwMemoryType        HwMemoryUtilizationMetricAttributeKey = "hw.memory.type"
+)
+
+// HwMemoryUtilizationMetricConfig provides config for the hw.memory.utilization metric.
+type HwMemoryUtilizationMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                                  `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwMemoryUtilizationMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwMemoryUtilizationMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwMemoryUtilizationMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwMemoryUtilizationMetricAttributeKeyHwID, HwMemoryUtilizationMetricAttributeKeyHwName, HwMemoryUtilizationMetricAttributeKeyPciBdf, HwMemoryUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryUtilizationMetricAttributeKeyHwMemoryType:
+		default:
+			return fmt.Errorf("metric hw.memory.utilization doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwPowerMetricAttributeKey specifies the key of an attribute for the hw.power metric.
+type HwPowerMetricAttributeKey string
+
+const (
+	HwPowerMetricAttributeKeyHwID                HwPowerMetricAttributeKey = "hw.id"
+	HwPowerMetricAttributeKeyHwName              HwPowerMetricAttributeKey = "hw.name"
+	HwPowerMetricAttributeKeyPciBdf              HwPowerMetricAttributeKey = "pci.bdf"
+	HwPowerMetricAttributeKeyComIntelSubdeviceID HwPowerMetricAttributeKey = "com.intel.subdevice_id"
+	HwPowerMetricAttributeKeyHwSensorLocation    HwPowerMetricAttributeKey = "hw.sensor_location"
+)
+
+// HwPowerMetricConfig provides config for the hw.power metric.
+type HwPowerMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                      `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwPowerMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwPowerMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwPowerMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwPowerMetricAttributeKeyHwID, HwPowerMetricAttributeKeyHwName, HwPowerMetricAttributeKeyPciBdf, HwPowerMetricAttributeKeyComIntelSubdeviceID, HwPowerMetricAttributeKeyHwSensorLocation:
+		default:
+			return fmt.Errorf("metric hw.power doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.sensor_location]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwPowerLimitMetricAttributeKey specifies the key of an attribute for the hw.power.limit metric.
+type HwPowerLimitMetricAttributeKey string
+
+const (
+	HwPowerLimitMetricAttributeKeyHwID                     HwPowerLimitMetricAttributeKey = "hw.id"
+	HwPowerLimitMetricAttributeKeyHwName                   HwPowerLimitMetricAttributeKey = "hw.name"
+	HwPowerLimitMetricAttributeKeyPciBdf                   HwPowerLimitMetricAttributeKey = "pci.bdf"
+	HwPowerLimitMetricAttributeKeyComIntelSubdeviceID      HwPowerLimitMetricAttributeKey = "com.intel.subdevice_id"
+	HwPowerLimitMetricAttributeKeyHwSensorLocation         HwPowerLimitMetricAttributeKey = "hw.sensor_location"
+	HwPowerLimitMetricAttributeKeyComIntelPowerLimitLevel  HwPowerLimitMetricAttributeKey = "com.intel.power.limit.level"
+	HwPowerLimitMetricAttributeKeyComIntelPowerLimitSource HwPowerLimitMetricAttributeKey = "com.intel.power.limit.source"
+)
+
+// HwPowerLimitMetricConfig provides config for the hw.power.limit metric.
+type HwPowerLimitMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                           `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwPowerLimitMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwPowerLimitMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwPowerLimitMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwPowerLimitMetricAttributeKeyHwID, HwPowerLimitMetricAttributeKeyHwName, HwPowerLimitMetricAttributeKeyPciBdf, HwPowerLimitMetricAttributeKeyComIntelSubdeviceID, HwPowerLimitMetricAttributeKeyHwSensorLocation, HwPowerLimitMetricAttributeKeyComIntelPowerLimitLevel, HwPowerLimitMetricAttributeKeyComIntelPowerLimitSource:
+		default:
+			return fmt.Errorf("metric hw.power.limit doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.sensor_location, com.intel.power.limit.level, com.intel.power.limit.source]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwStatusMetricAttributeKey specifies the key of an attribute for the hw.status metric.
+type HwStatusMetricAttributeKey string
+
+const (
+	HwStatusMetricAttributeKeyHwID                HwStatusMetricAttributeKey = "hw.id"
+	HwStatusMetricAttributeKeyHwName              HwStatusMetricAttributeKey = "hw.name"
+	HwStatusMetricAttributeKeyPciBdf              HwStatusMetricAttributeKey = "pci.bdf"
+	HwStatusMetricAttributeKeyComIntelSubdeviceID HwStatusMetricAttributeKey = "com.intel.subdevice_id"
+	HwStatusMetricAttributeKeyHwState             HwStatusMetricAttributeKey = "hw.state"
+	HwStatusMetricAttributeKeyHwType              HwStatusMetricAttributeKey = "hw.type"
+)
+
+// HwStatusMetricConfig provides config for the hw.status metric.
+type HwStatusMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                       `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwStatusMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwStatusMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwStatusMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwStatusMetricAttributeKeyHwID, HwStatusMetricAttributeKeyHwName, HwStatusMetricAttributeKeyPciBdf, HwStatusMetricAttributeKeyComIntelSubdeviceID, HwStatusMetricAttributeKeyHwState, HwStatusMetricAttributeKeyHwType:
+		default:
+			return fmt.Errorf("metric hw.status doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.state, hw.type]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// HwTemperatureMetricAttributeKey specifies the key of an attribute for the hw.temperature metric.
+type HwTemperatureMetricAttributeKey string
+
+const (
+	HwTemperatureMetricAttributeKeyHwID                HwTemperatureMetricAttributeKey = "hw.id"
+	HwTemperatureMetricAttributeKeyHwName              HwTemperatureMetricAttributeKey = "hw.name"
+	HwTemperatureMetricAttributeKeyPciBdf              HwTemperatureMetricAttributeKey = "pci.bdf"
+	HwTemperatureMetricAttributeKeyComIntelSubdeviceID HwTemperatureMetricAttributeKey = "com.intel.subdevice_id"
+	HwTemperatureMetricAttributeKeyHwSensorLocation    HwTemperatureMetricAttributeKey = "hw.sensor_location"
+	HwTemperatureMetricAttributeKeyStatistic           HwTemperatureMetricAttributeKey = "statistic"
+)
+
+// HwTemperatureMetricConfig provides config for the hw.temperature metric.
+type HwTemperatureMetricConfig struct {
+	Enabled          bool `mapstructure:"enabled"`
+	enabledSetByUser bool
+
+	AggregationStrategy string                            `mapstructure:"aggregation_strategy"`
+	EnabledAttributes   []HwTemperatureMetricAttributeKey `mapstructure:"attributes"`
+}
+
+func (ms *HwTemperatureMetricConfig) Unmarshal(parser *confmap.Conf) error {
+	if parser == nil {
+		return nil
+	}
+
+	err := parser.Unmarshal(ms)
+	if err != nil {
+		return err
+	}
+
+	ms.enabledSetByUser = parser.IsSet("enabled")
+	return nil
+}
+
+func (ms *HwTemperatureMetricConfig) Validate() error {
+	for _, val := range ms.EnabledAttributes {
+		switch val {
+		case HwTemperatureMetricAttributeKeyHwID, HwTemperatureMetricAttributeKeyHwName, HwTemperatureMetricAttributeKeyPciBdf, HwTemperatureMetricAttributeKeyComIntelSubdeviceID, HwTemperatureMetricAttributeKeyHwSensorLocation, HwTemperatureMetricAttributeKeyStatistic:
+		default:
+			return fmt.Errorf("metric hw.temperature doesn't have an attribute %v, valid attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.sensor_location, statistic]", val)
+		}
+	}
+
+	switch ms.AggregationStrategy {
+	case AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax:
+	default:
+		return fmt.Errorf("invalid aggregation strategy %q, valid strategies: [%s, %s, %s, %s]", ms.AggregationStrategy, AggregationStrategySum, AggregationStrategyAvg, AggregationStrategyMin, AggregationStrategyMax)
+	}
+
+	return nil
+}
+
+// MetricsConfig provides config for sysman metrics.
+type MetricsConfig struct {
+	HwEnergy                     HwEnergyMetricConfig                     `mapstructure:"hw.energy"`
+	HwErrors                     HwErrorsMetricConfig                     `mapstructure:"hw.errors"`
+	HwFrequency                  HwFrequencyMetricConfig                  `mapstructure:"hw.frequency"`
+	HwFrequencyLimit             HwFrequencyLimitMetricConfig             `mapstructure:"hw.frequency.limit"`
+	HwFrequencyRequest           HwFrequencyRequestMetricConfig           `mapstructure:"hw.frequency.request"`
+	HwFrequencySamples           HwFrequencySamplesMetricConfig           `mapstructure:"hw.frequency.samples"`
+	HwFrequencyThrottleStatus    HwFrequencyThrottleStatusMetricConfig    `mapstructure:"hw.frequency.throttle_status"`
+	HwGpuBandwidthLimit          HwGpuBandwidthLimitMetricConfig          `mapstructure:"hw.gpu.bandwidth.limit"`
+	HwGpuBandwidthUtilization    HwGpuBandwidthUtilizationMetricConfig    `mapstructure:"hw.gpu.bandwidth.utilization"`
+	HwGpuInfo                    HwGpuInfoMetricConfig                    `mapstructure:"hw.gpu.info"`
+	HwGpuIo                      HwGpuIoMetricConfig                      `mapstructure:"hw.gpu.io"`
+	HwGpuIoRate                  HwGpuIoRateMetricConfig                  `mapstructure:"hw.gpu.io.rate"`
+	HwGpuUtilization             HwGpuUtilizationMetricConfig             `mapstructure:"hw.gpu.utilization"`
+	HwMemoryBandwidthLimit       HwMemoryBandwidthLimitMetricConfig       `mapstructure:"hw.memory.bandwidth.limit"`
+	HwMemoryBandwidthUtilization HwMemoryBandwidthUtilizationMetricConfig `mapstructure:"hw.memory.bandwidth.utilization"`
+	HwMemoryFree                 HwMemoryFreeMetricConfig                 `mapstructure:"hw.memory.free"`
+	HwMemoryIo                   HwMemoryIoMetricConfig                   `mapstructure:"hw.memory.io"`
+	HwMemoryIoRate               HwMemoryIoRateMetricConfig               `mapstructure:"hw.memory.io.rate"`
+	HwMemorySize                 HwMemorySizeMetricConfig                 `mapstructure:"hw.memory.size"`
+	HwMemoryUsage                HwMemoryUsageMetricConfig                `mapstructure:"hw.memory.usage"`
+	HwMemoryUtilization          HwMemoryUtilizationMetricConfig          `mapstructure:"hw.memory.utilization"`
+	HwPower                      HwPowerMetricConfig                      `mapstructure:"hw.power"`
+	HwPowerLimit                 HwPowerLimitMetricConfig                 `mapstructure:"hw.power.limit"`
+	HwStatus                     HwStatusMetricConfig                     `mapstructure:"hw.status"`
+	HwTemperature                HwTemperatureMetricConfig                `mapstructure:"hw.temperature"`
+}
+
+func DefaultMetricsConfig() MetricsConfig {
+	return MetricsConfig{
+		HwEnergy: HwEnergyMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwEnergyMetricAttributeKey{HwEnergyMetricAttributeKeyHwID, HwEnergyMetricAttributeKeyHwName, HwEnergyMetricAttributeKeyPciBdf, HwEnergyMetricAttributeKeyComIntelSubdeviceID, HwEnergyMetricAttributeKeyHwSensorLocation},
+		},
+		HwErrors: HwErrorsMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwErrorsMetricAttributeKey{HwErrorsMetricAttributeKeyHwID, HwErrorsMetricAttributeKeyHwName, HwErrorsMetricAttributeKeyPciBdf, HwErrorsMetricAttributeKeyComIntelSubdeviceID, HwErrorsMetricAttributeKeyHwType, HwErrorsMetricAttributeKeyErrorType, HwErrorsMetricAttributeKeyErrorCategory},
+		},
+		HwFrequency: HwFrequencyMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwFrequencyMetricAttributeKey{HwFrequencyMetricAttributeKeyHwID, HwFrequencyMetricAttributeKeyHwName, HwFrequencyMetricAttributeKeyPciBdf, HwFrequencyMetricAttributeKeyComIntelSubdeviceID, HwFrequencyMetricAttributeKeyHwFrequencyDomain, HwFrequencyMetricAttributeKeyAggregation},
+		},
+		HwFrequencyLimit: HwFrequencyLimitMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwFrequencyLimitMetricAttributeKey{HwFrequencyLimitMetricAttributeKeyHwID, HwFrequencyLimitMetricAttributeKeyHwName, HwFrequencyLimitMetricAttributeKeyPciBdf, HwFrequencyLimitMetricAttributeKeyComIntelSubdeviceID, HwFrequencyLimitMetricAttributeKeyHwFrequencyDomain, HwFrequencyLimitMetricAttributeKeyHwLimitType},
+		},
+		HwFrequencyRequest: HwFrequencyRequestMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwFrequencyRequestMetricAttributeKey{HwFrequencyRequestMetricAttributeKeyHwID, HwFrequencyRequestMetricAttributeKeyHwName, HwFrequencyRequestMetricAttributeKeyPciBdf, HwFrequencyRequestMetricAttributeKeyComIntelSubdeviceID, HwFrequencyRequestMetricAttributeKeyHwFrequencyDomain},
+		},
+		HwFrequencySamples: HwFrequencySamplesMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwFrequencySamplesMetricAttributeKey{HwFrequencySamplesMetricAttributeKeyHwID, HwFrequencySamplesMetricAttributeKeyHwName, HwFrequencySamplesMetricAttributeKeyPciBdf, HwFrequencySamplesMetricAttributeKeyComIntelSubdeviceID, HwFrequencySamplesMetricAttributeKeyHwFrequencyDomain, HwFrequencySamplesMetricAttributeKeySampleStatus},
+		},
+		HwFrequencyThrottleStatus: HwFrequencyThrottleStatusMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwFrequencyThrottleStatusMetricAttributeKey{HwFrequencyThrottleStatusMetricAttributeKeyHwID, HwFrequencyThrottleStatusMetricAttributeKeyHwName, HwFrequencyThrottleStatusMetricAttributeKeyPciBdf, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSubdeviceID, HwFrequencyThrottleStatusMetricAttributeKeyHwFrequencyDomain, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSpeedThrottleReason},
+		},
+		HwGpuBandwidthLimit: HwGpuBandwidthLimitMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwGpuBandwidthLimitMetricAttributeKey{HwGpuBandwidthLimitMetricAttributeKeyHwID, HwGpuBandwidthLimitMetricAttributeKeyHwName, HwGpuBandwidthLimitMetricAttributeKeyPciBdf},
+		},
+		HwGpuBandwidthUtilization: HwGpuBandwidthUtilizationMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwGpuBandwidthUtilizationMetricAttributeKey{HwGpuBandwidthUtilizationMetricAttributeKeyHwID, HwGpuBandwidthUtilizationMetricAttributeKeyHwName, HwGpuBandwidthUtilizationMetricAttributeKeyPciBdf},
+		},
+		HwGpuInfo: HwGpuInfoMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwGpuInfoMetricAttributeKey{HwGpuInfoMetricAttributeKeyHwID, HwGpuInfoMetricAttributeKeyHwName, HwGpuInfoMetricAttributeKeyPciBdf, HwGpuInfoMetricAttributeKeyPciVendorID, HwGpuInfoMetricAttributeKeyPciDeviceID, HwGpuInfoMetricAttributeKeyHwModel, HwGpuInfoMetricAttributeKeyHwSerialNumber, HwGpuInfoMetricAttributeKeyHwVendor, HwGpuInfoMetricAttributeKeyHwFirmwareVersion, HwGpuInfoMetricAttributeKeyHwGpuType, HwGpuInfoMetricAttributeKeyComIntelSubdeviceCount, HwGpuInfoMetricAttributeKeyPciLanes, HwGpuInfoMetricAttributeKeyPciLinkGen, HwGpuInfoMetricAttributeKeyHwMemoryDemandPaging, HwGpuInfoMetricAttributeKeyHwMemoryEcc},
+		},
+		HwGpuIo: HwGpuIoMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwGpuIoMetricAttributeKey{HwGpuIoMetricAttributeKeyHwID, HwGpuIoMetricAttributeKeyHwName, HwGpuIoMetricAttributeKeyPciBdf, HwGpuIoMetricAttributeKeyNetworkIoDirection},
+		},
+		HwGpuIoRate: HwGpuIoRateMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwGpuIoRateMetricAttributeKey{HwGpuIoRateMetricAttributeKeyHwID, HwGpuIoRateMetricAttributeKeyHwName, HwGpuIoRateMetricAttributeKeyPciBdf},
+		},
+		HwGpuUtilization: HwGpuUtilizationMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwGpuUtilizationMetricAttributeKey{HwGpuUtilizationMetricAttributeKeyHwID, HwGpuUtilizationMetricAttributeKeyHwName, HwGpuUtilizationMetricAttributeKeyPciBdf, HwGpuUtilizationMetricAttributeKeyComIntelSubdeviceID, HwGpuUtilizationMetricAttributeKeyHwGpuTask},
+		},
+		HwMemoryBandwidthLimit: HwMemoryBandwidthLimitMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwMemoryBandwidthLimitMetricAttributeKey{HwMemoryBandwidthLimitMetricAttributeKeyHwID, HwMemoryBandwidthLimitMetricAttributeKeyHwName, HwMemoryBandwidthLimitMetricAttributeKeyPciBdf, HwMemoryBandwidthLimitMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryType},
+		},
+		HwMemoryBandwidthUtilization: HwMemoryBandwidthUtilizationMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwMemoryBandwidthUtilizationMetricAttributeKey{HwMemoryBandwidthUtilizationMetricAttributeKeyHwID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwName, HwMemoryBandwidthUtilizationMetricAttributeKeyPciBdf, HwMemoryBandwidthUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryType},
+		},
+		HwMemoryFree: HwMemoryFreeMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwMemoryFreeMetricAttributeKey{HwMemoryFreeMetricAttributeKeyHwID, HwMemoryFreeMetricAttributeKeyHwName, HwMemoryFreeMetricAttributeKeyPciBdf, HwMemoryFreeMetricAttributeKeyComIntelSubdeviceID, HwMemoryFreeMetricAttributeKeyHwMemoryLocation, HwMemoryFreeMetricAttributeKeyHwMemoryType},
+		},
+		HwMemoryIo: HwMemoryIoMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwMemoryIoMetricAttributeKey{HwMemoryIoMetricAttributeKeyHwID, HwMemoryIoMetricAttributeKeyHwName, HwMemoryIoMetricAttributeKeyPciBdf, HwMemoryIoMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoMetricAttributeKeyHwMemoryLocation, HwMemoryIoMetricAttributeKeyHwMemoryType, HwMemoryIoMetricAttributeKeyNetworkIoDirection},
+		},
+		HwMemoryIoRate: HwMemoryIoRateMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwMemoryIoRateMetricAttributeKey{HwMemoryIoRateMetricAttributeKeyHwID, HwMemoryIoRateMetricAttributeKeyHwName, HwMemoryIoRateMetricAttributeKeyPciBdf, HwMemoryIoRateMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoRateMetricAttributeKeyHwMemoryLocation, HwMemoryIoRateMetricAttributeKeyHwMemoryType},
+		},
+		HwMemorySize: HwMemorySizeMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwMemorySizeMetricAttributeKey{HwMemorySizeMetricAttributeKeyHwID, HwMemorySizeMetricAttributeKeyHwName, HwMemorySizeMetricAttributeKeyPciBdf, HwMemorySizeMetricAttributeKeyComIntelSubdeviceID, HwMemorySizeMetricAttributeKeyHwMemoryLocation, HwMemorySizeMetricAttributeKeyHwMemoryType},
+		},
+		HwMemoryUsage: HwMemoryUsageMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwMemoryUsageMetricAttributeKey{HwMemoryUsageMetricAttributeKeyHwID, HwMemoryUsageMetricAttributeKeyHwName, HwMemoryUsageMetricAttributeKeyPciBdf, HwMemoryUsageMetricAttributeKeyComIntelSubdeviceID, HwMemoryUsageMetricAttributeKeyHwMemoryLocation, HwMemoryUsageMetricAttributeKeyHwMemoryType},
+		},
+		HwMemoryUtilization: HwMemoryUtilizationMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwMemoryUtilizationMetricAttributeKey{HwMemoryUtilizationMetricAttributeKeyHwID, HwMemoryUtilizationMetricAttributeKeyHwName, HwMemoryUtilizationMetricAttributeKeyPciBdf, HwMemoryUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryUtilizationMetricAttributeKeyHwMemoryType},
+		},
+		HwPower: HwPowerMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwPowerMetricAttributeKey{HwPowerMetricAttributeKeyHwID, HwPowerMetricAttributeKeyHwName, HwPowerMetricAttributeKeyPciBdf, HwPowerMetricAttributeKeyComIntelSubdeviceID, HwPowerMetricAttributeKeyHwSensorLocation},
+		},
+		HwPowerLimit: HwPowerLimitMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwPowerLimitMetricAttributeKey{HwPowerLimitMetricAttributeKeyHwID, HwPowerLimitMetricAttributeKeyHwName, HwPowerLimitMetricAttributeKeyPciBdf, HwPowerLimitMetricAttributeKeyComIntelSubdeviceID, HwPowerLimitMetricAttributeKeyHwSensorLocation, HwPowerLimitMetricAttributeKeyComIntelPowerLimitLevel, HwPowerLimitMetricAttributeKeyComIntelPowerLimitSource},
+		},
+		HwStatus: HwStatusMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategySum,
+			EnabledAttributes:   []HwStatusMetricAttributeKey{HwStatusMetricAttributeKeyHwID, HwStatusMetricAttributeKeyHwName, HwStatusMetricAttributeKeyPciBdf, HwStatusMetricAttributeKeyComIntelSubdeviceID, HwStatusMetricAttributeKeyHwState, HwStatusMetricAttributeKeyHwType},
+		},
+		HwTemperature: HwTemperatureMetricConfig{
+			Enabled:             true,
+			AggregationStrategy: AggregationStrategyAvg,
+			EnabledAttributes:   []HwTemperatureMetricAttributeKey{HwTemperatureMetricAttributeKeyHwID, HwTemperatureMetricAttributeKeyHwName, HwTemperatureMetricAttributeKeyPciBdf, HwTemperatureMetricAttributeKeyComIntelSubdeviceID, HwTemperatureMetricAttributeKeyHwSensorLocation, HwTemperatureMetricAttributeKeyStatistic},
+		},
+	}
+}
+
+// MetricsBuilderConfig is a configuration for sysman metrics builder.
+type MetricsBuilderConfig struct {
+	Metrics MetricsConfig `mapstructure:"metrics"`
+}
+
+func NewDefaultMetricsBuilderConfig() MetricsBuilderConfig {
+	return MetricsBuilderConfig{
+		Metrics: DefaultMetricsConfig(),
+	}
+}
+
+// Deprecated: Use NewDefaultMetricsBuilderConfig.
+func DefaultMetricsBuilderConfig() MetricsBuilderConfig {
+	return NewDefaultMetricsBuilderConfig()
+}
diff --git a/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_config_test.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_config_test.go
new file mode 100644
index 000000000..fdda7b14e
--- /dev/null
+++ b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_config_test.go
@@ -0,0 +1,307 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package metadata
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/confmap"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
+)
+
+func TestMetricsBuilderConfig(t *testing.T) {
+	tests := []struct {
+		name string
+		want MetricsBuilderConfig
+	}{
+		{
+			name: "default",
+			want: NewDefaultMetricsBuilderConfig(),
+		},
+		{
+			name: "all_set",
+			want: MetricsBuilderConfig{
+				Metrics: MetricsConfig{
+					HwEnergy: HwEnergyMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwEnergyMetricAttributeKey{HwEnergyMetricAttributeKeyHwID, HwEnergyMetricAttributeKeyHwName, HwEnergyMetricAttributeKeyPciBdf, HwEnergyMetricAttributeKeyComIntelSubdeviceID, HwEnergyMetricAttributeKeyHwSensorLocation},
+					},
+					HwErrors: HwErrorsMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwErrorsMetricAttributeKey{HwErrorsMetricAttributeKeyHwID, HwErrorsMetricAttributeKeyHwName, HwErrorsMetricAttributeKeyPciBdf, HwErrorsMetricAttributeKeyComIntelSubdeviceID, HwErrorsMetricAttributeKeyHwType, HwErrorsMetricAttributeKeyErrorType, HwErrorsMetricAttributeKeyErrorCategory},
+					},
+					HwFrequency: HwFrequencyMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencyMetricAttributeKey{HwFrequencyMetricAttributeKeyHwID, HwFrequencyMetricAttributeKeyHwName, HwFrequencyMetricAttributeKeyPciBdf, HwFrequencyMetricAttributeKeyComIntelSubdeviceID, HwFrequencyMetricAttributeKeyHwFrequencyDomain, HwFrequencyMetricAttributeKeyAggregation},
+					},
+					HwFrequencyLimit: HwFrequencyLimitMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencyLimitMetricAttributeKey{HwFrequencyLimitMetricAttributeKeyHwID, HwFrequencyLimitMetricAttributeKeyHwName, HwFrequencyLimitMetricAttributeKeyPciBdf, HwFrequencyLimitMetricAttributeKeyComIntelSubdeviceID, HwFrequencyLimitMetricAttributeKeyHwFrequencyDomain, HwFrequencyLimitMetricAttributeKeyHwLimitType},
+					},
+					HwFrequencyRequest: HwFrequencyRequestMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencyRequestMetricAttributeKey{HwFrequencyRequestMetricAttributeKeyHwID, HwFrequencyRequestMetricAttributeKeyHwName, HwFrequencyRequestMetricAttributeKeyPciBdf, HwFrequencyRequestMetricAttributeKeyComIntelSubdeviceID, HwFrequencyRequestMetricAttributeKeyHwFrequencyDomain},
+					},
+					HwFrequencySamples: HwFrequencySamplesMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencySamplesMetricAttributeKey{HwFrequencySamplesMetricAttributeKeyHwID, HwFrequencySamplesMetricAttributeKeyHwName, HwFrequencySamplesMetricAttributeKeyPciBdf, HwFrequencySamplesMetricAttributeKeyComIntelSubdeviceID, HwFrequencySamplesMetricAttributeKeyHwFrequencyDomain, HwFrequencySamplesMetricAttributeKeySampleStatus},
+					},
+					HwFrequencyThrottleStatus: HwFrequencyThrottleStatusMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwFrequencyThrottleStatusMetricAttributeKey{HwFrequencyThrottleStatusMetricAttributeKeyHwID, HwFrequencyThrottleStatusMetricAttributeKeyHwName, HwFrequencyThrottleStatusMetricAttributeKeyPciBdf, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSubdeviceID, HwFrequencyThrottleStatusMetricAttributeKeyHwFrequencyDomain, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSpeedThrottleReason},
+					},
+					HwGpuBandwidthLimit: HwGpuBandwidthLimitMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwGpuBandwidthLimitMetricAttributeKey{HwGpuBandwidthLimitMetricAttributeKeyHwID, HwGpuBandwidthLimitMetricAttributeKeyHwName, HwGpuBandwidthLimitMetricAttributeKeyPciBdf},
+					},
+					HwGpuBandwidthUtilization: HwGpuBandwidthUtilizationMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwGpuBandwidthUtilizationMetricAttributeKey{HwGpuBandwidthUtilizationMetricAttributeKeyHwID, HwGpuBandwidthUtilizationMetricAttributeKeyHwName, HwGpuBandwidthUtilizationMetricAttributeKeyPciBdf},
+					},
+					HwGpuInfo: HwGpuInfoMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwGpuInfoMetricAttributeKey{HwGpuInfoMetricAttributeKeyHwID, HwGpuInfoMetricAttributeKeyHwName, HwGpuInfoMetricAttributeKeyPciBdf, HwGpuInfoMetricAttributeKeyPciVendorID, HwGpuInfoMetricAttributeKeyPciDeviceID, HwGpuInfoMetricAttributeKeyHwModel, HwGpuInfoMetricAttributeKeyHwSerialNumber, HwGpuInfoMetricAttributeKeyHwVendor, HwGpuInfoMetricAttributeKeyHwFirmwareVersion, HwGpuInfoMetricAttributeKeyHwGpuType, HwGpuInfoMetricAttributeKeyComIntelSubdeviceCount, HwGpuInfoMetricAttributeKeyPciLanes, HwGpuInfoMetricAttributeKeyPciLinkGen, HwGpuInfoMetricAttributeKeyHwMemoryDemandPaging, HwGpuInfoMetricAttributeKeyHwMemoryEcc},
+					},
+					HwGpuIo: HwGpuIoMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwGpuIoMetricAttributeKey{HwGpuIoMetricAttributeKeyHwID, HwGpuIoMetricAttributeKeyHwName, HwGpuIoMetricAttributeKeyPciBdf, HwGpuIoMetricAttributeKeyNetworkIoDirection},
+					},
+					HwGpuIoRate: HwGpuIoRateMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwGpuIoRateMetricAttributeKey{HwGpuIoRateMetricAttributeKeyHwID, HwGpuIoRateMetricAttributeKeyHwName, HwGpuIoRateMetricAttributeKeyPciBdf},
+					},
+					HwGpuUtilization: HwGpuUtilizationMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwGpuUtilizationMetricAttributeKey{HwGpuUtilizationMetricAttributeKeyHwID, HwGpuUtilizationMetricAttributeKeyHwName, HwGpuUtilizationMetricAttributeKeyPciBdf, HwGpuUtilizationMetricAttributeKeyComIntelSubdeviceID, HwGpuUtilizationMetricAttributeKeyHwGpuTask},
+					},
+					HwMemoryBandwidthLimit: HwMemoryBandwidthLimitMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryBandwidthLimitMetricAttributeKey{HwMemoryBandwidthLimitMetricAttributeKeyHwID, HwMemoryBandwidthLimitMetricAttributeKeyHwName, HwMemoryBandwidthLimitMetricAttributeKeyPciBdf, HwMemoryBandwidthLimitMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryBandwidthUtilization: HwMemoryBandwidthUtilizationMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwMemoryBandwidthUtilizationMetricAttributeKey{HwMemoryBandwidthUtilizationMetricAttributeKeyHwID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwName, HwMemoryBandwidthUtilizationMetricAttributeKeyPciBdf, HwMemoryBandwidthUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryFree: HwMemoryFreeMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryFreeMetricAttributeKey{HwMemoryFreeMetricAttributeKeyHwID, HwMemoryFreeMetricAttributeKeyHwName, HwMemoryFreeMetricAttributeKeyPciBdf, HwMemoryFreeMetricAttributeKeyComIntelSubdeviceID, HwMemoryFreeMetricAttributeKeyHwMemoryLocation, HwMemoryFreeMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryIo: HwMemoryIoMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryIoMetricAttributeKey{HwMemoryIoMetricAttributeKeyHwID, HwMemoryIoMetricAttributeKeyHwName, HwMemoryIoMetricAttributeKeyPciBdf, HwMemoryIoMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoMetricAttributeKeyHwMemoryLocation, HwMemoryIoMetricAttributeKeyHwMemoryType, HwMemoryIoMetricAttributeKeyNetworkIoDirection},
+					},
+					HwMemoryIoRate: HwMemoryIoRateMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwMemoryIoRateMetricAttributeKey{HwMemoryIoRateMetricAttributeKeyHwID, HwMemoryIoRateMetricAttributeKeyHwName, HwMemoryIoRateMetricAttributeKeyPciBdf, HwMemoryIoRateMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoRateMetricAttributeKeyHwMemoryLocation, HwMemoryIoRateMetricAttributeKeyHwMemoryType},
+					},
+					HwMemorySize: HwMemorySizeMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemorySizeMetricAttributeKey{HwMemorySizeMetricAttributeKeyHwID, HwMemorySizeMetricAttributeKeyHwName, HwMemorySizeMetricAttributeKeyPciBdf, HwMemorySizeMetricAttributeKeyComIntelSubdeviceID, HwMemorySizeMetricAttributeKeyHwMemoryLocation, HwMemorySizeMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryUsage: HwMemoryUsageMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryUsageMetricAttributeKey{HwMemoryUsageMetricAttributeKeyHwID, HwMemoryUsageMetricAttributeKeyHwName, HwMemoryUsageMetricAttributeKeyPciBdf, HwMemoryUsageMetricAttributeKeyComIntelSubdeviceID, HwMemoryUsageMetricAttributeKeyHwMemoryLocation, HwMemoryUsageMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryUtilization: HwMemoryUtilizationMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwMemoryUtilizationMetricAttributeKey{HwMemoryUtilizationMetricAttributeKeyHwID, HwMemoryUtilizationMetricAttributeKeyHwName, HwMemoryUtilizationMetricAttributeKeyPciBdf, HwMemoryUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryUtilizationMetricAttributeKeyHwMemoryType},
+					},
+					HwPower: HwPowerMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwPowerMetricAttributeKey{HwPowerMetricAttributeKeyHwID, HwPowerMetricAttributeKeyHwName, HwPowerMetricAttributeKeyPciBdf, HwPowerMetricAttributeKeyComIntelSubdeviceID, HwPowerMetricAttributeKeyHwSensorLocation},
+					},
+					HwPowerLimit: HwPowerLimitMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwPowerLimitMetricAttributeKey{HwPowerLimitMetricAttributeKeyHwID, HwPowerLimitMetricAttributeKeyHwName, HwPowerLimitMetricAttributeKeyPciBdf, HwPowerLimitMetricAttributeKeyComIntelSubdeviceID, HwPowerLimitMetricAttributeKeyHwSensorLocation, HwPowerLimitMetricAttributeKeyComIntelPowerLimitLevel, HwPowerLimitMetricAttributeKeyComIntelPowerLimitSource},
+					},
+					HwStatus: HwStatusMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwStatusMetricAttributeKey{HwStatusMetricAttributeKeyHwID, HwStatusMetricAttributeKeyHwName, HwStatusMetricAttributeKeyPciBdf, HwStatusMetricAttributeKeyComIntelSubdeviceID, HwStatusMetricAttributeKeyHwState, HwStatusMetricAttributeKeyHwType},
+					},
+					HwTemperature: HwTemperatureMetricConfig{
+						Enabled:             true,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwTemperatureMetricAttributeKey{HwTemperatureMetricAttributeKeyHwID, HwTemperatureMetricAttributeKeyHwName, HwTemperatureMetricAttributeKeyPciBdf, HwTemperatureMetricAttributeKeyComIntelSubdeviceID, HwTemperatureMetricAttributeKeyHwSensorLocation, HwTemperatureMetricAttributeKeyStatistic},
+					},
+				},
+			},
+		},
+		{
+			name: "none_set",
+			want: MetricsBuilderConfig{
+				Metrics: MetricsConfig{
+					HwEnergy: HwEnergyMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwEnergyMetricAttributeKey{HwEnergyMetricAttributeKeyHwID, HwEnergyMetricAttributeKeyHwName, HwEnergyMetricAttributeKeyPciBdf, HwEnergyMetricAttributeKeyComIntelSubdeviceID, HwEnergyMetricAttributeKeyHwSensorLocation},
+					},
+					HwErrors: HwErrorsMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwErrorsMetricAttributeKey{HwErrorsMetricAttributeKeyHwID, HwErrorsMetricAttributeKeyHwName, HwErrorsMetricAttributeKeyPciBdf, HwErrorsMetricAttributeKeyComIntelSubdeviceID, HwErrorsMetricAttributeKeyHwType, HwErrorsMetricAttributeKeyErrorType, HwErrorsMetricAttributeKeyErrorCategory},
+					},
+					HwFrequency: HwFrequencyMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencyMetricAttributeKey{HwFrequencyMetricAttributeKeyHwID, HwFrequencyMetricAttributeKeyHwName, HwFrequencyMetricAttributeKeyPciBdf, HwFrequencyMetricAttributeKeyComIntelSubdeviceID, HwFrequencyMetricAttributeKeyHwFrequencyDomain, HwFrequencyMetricAttributeKeyAggregation},
+					},
+					HwFrequencyLimit: HwFrequencyLimitMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencyLimitMetricAttributeKey{HwFrequencyLimitMetricAttributeKeyHwID, HwFrequencyLimitMetricAttributeKeyHwName, HwFrequencyLimitMetricAttributeKeyPciBdf, HwFrequencyLimitMetricAttributeKeyComIntelSubdeviceID, HwFrequencyLimitMetricAttributeKeyHwFrequencyDomain, HwFrequencyLimitMetricAttributeKeyHwLimitType},
+					},
+					HwFrequencyRequest: HwFrequencyRequestMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencyRequestMetricAttributeKey{HwFrequencyRequestMetricAttributeKeyHwID, HwFrequencyRequestMetricAttributeKeyHwName, HwFrequencyRequestMetricAttributeKeyPciBdf, HwFrequencyRequestMetricAttributeKeyComIntelSubdeviceID, HwFrequencyRequestMetricAttributeKeyHwFrequencyDomain},
+					},
+					HwFrequencySamples: HwFrequencySamplesMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwFrequencySamplesMetricAttributeKey{HwFrequencySamplesMetricAttributeKeyHwID, HwFrequencySamplesMetricAttributeKeyHwName, HwFrequencySamplesMetricAttributeKeyPciBdf, HwFrequencySamplesMetricAttributeKeyComIntelSubdeviceID, HwFrequencySamplesMetricAttributeKeyHwFrequencyDomain, HwFrequencySamplesMetricAttributeKeySampleStatus},
+					},
+					HwFrequencyThrottleStatus: HwFrequencyThrottleStatusMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwFrequencyThrottleStatusMetricAttributeKey{HwFrequencyThrottleStatusMetricAttributeKeyHwID, HwFrequencyThrottleStatusMetricAttributeKeyHwName, HwFrequencyThrottleStatusMetricAttributeKeyPciBdf, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSubdeviceID, HwFrequencyThrottleStatusMetricAttributeKeyHwFrequencyDomain, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSpeedThrottleReason},
+					},
+					HwGpuBandwidthLimit: HwGpuBandwidthLimitMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwGpuBandwidthLimitMetricAttributeKey{HwGpuBandwidthLimitMetricAttributeKeyHwID, HwGpuBandwidthLimitMetricAttributeKeyHwName, HwGpuBandwidthLimitMetricAttributeKeyPciBdf},
+					},
+					HwGpuBandwidthUtilization: HwGpuBandwidthUtilizationMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwGpuBandwidthUtilizationMetricAttributeKey{HwGpuBandwidthUtilizationMetricAttributeKeyHwID, HwGpuBandwidthUtilizationMetricAttributeKeyHwName, HwGpuBandwidthUtilizationMetricAttributeKeyPciBdf},
+					},
+					HwGpuInfo: HwGpuInfoMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwGpuInfoMetricAttributeKey{HwGpuInfoMetricAttributeKeyHwID, HwGpuInfoMetricAttributeKeyHwName, HwGpuInfoMetricAttributeKeyPciBdf, HwGpuInfoMetricAttributeKeyPciVendorID, HwGpuInfoMetricAttributeKeyPciDeviceID, HwGpuInfoMetricAttributeKeyHwModel, HwGpuInfoMetricAttributeKeyHwSerialNumber, HwGpuInfoMetricAttributeKeyHwVendor, HwGpuInfoMetricAttributeKeyHwFirmwareVersion, HwGpuInfoMetricAttributeKeyHwGpuType, HwGpuInfoMetricAttributeKeyComIntelSubdeviceCount, HwGpuInfoMetricAttributeKeyPciLanes, HwGpuInfoMetricAttributeKeyPciLinkGen, HwGpuInfoMetricAttributeKeyHwMemoryDemandPaging, HwGpuInfoMetricAttributeKeyHwMemoryEcc},
+					},
+					HwGpuIo: HwGpuIoMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwGpuIoMetricAttributeKey{HwGpuIoMetricAttributeKeyHwID, HwGpuIoMetricAttributeKeyHwName, HwGpuIoMetricAttributeKeyPciBdf, HwGpuIoMetricAttributeKeyNetworkIoDirection},
+					},
+					HwGpuIoRate: HwGpuIoRateMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwGpuIoRateMetricAttributeKey{HwGpuIoRateMetricAttributeKeyHwID, HwGpuIoRateMetricAttributeKeyHwName, HwGpuIoRateMetricAttributeKeyPciBdf},
+					},
+					HwGpuUtilization: HwGpuUtilizationMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwGpuUtilizationMetricAttributeKey{HwGpuUtilizationMetricAttributeKeyHwID, HwGpuUtilizationMetricAttributeKeyHwName, HwGpuUtilizationMetricAttributeKeyPciBdf, HwGpuUtilizationMetricAttributeKeyComIntelSubdeviceID, HwGpuUtilizationMetricAttributeKeyHwGpuTask},
+					},
+					HwMemoryBandwidthLimit: HwMemoryBandwidthLimitMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryBandwidthLimitMetricAttributeKey{HwMemoryBandwidthLimitMetricAttributeKeyHwID, HwMemoryBandwidthLimitMetricAttributeKeyHwName, HwMemoryBandwidthLimitMetricAttributeKeyPciBdf, HwMemoryBandwidthLimitMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryBandwidthUtilization: HwMemoryBandwidthUtilizationMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwMemoryBandwidthUtilizationMetricAttributeKey{HwMemoryBandwidthUtilizationMetricAttributeKeyHwID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwName, HwMemoryBandwidthUtilizationMetricAttributeKeyPciBdf, HwMemoryBandwidthUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryFree: HwMemoryFreeMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryFreeMetricAttributeKey{HwMemoryFreeMetricAttributeKeyHwID, HwMemoryFreeMetricAttributeKeyHwName, HwMemoryFreeMetricAttributeKeyPciBdf, HwMemoryFreeMetricAttributeKeyComIntelSubdeviceID, HwMemoryFreeMetricAttributeKeyHwMemoryLocation, HwMemoryFreeMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryIo: HwMemoryIoMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryIoMetricAttributeKey{HwMemoryIoMetricAttributeKeyHwID, HwMemoryIoMetricAttributeKeyHwName, HwMemoryIoMetricAttributeKeyPciBdf, HwMemoryIoMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoMetricAttributeKeyHwMemoryLocation, HwMemoryIoMetricAttributeKeyHwMemoryType, HwMemoryIoMetricAttributeKeyNetworkIoDirection},
+					},
+					HwMemoryIoRate: HwMemoryIoRateMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwMemoryIoRateMetricAttributeKey{HwMemoryIoRateMetricAttributeKeyHwID, HwMemoryIoRateMetricAttributeKeyHwName, HwMemoryIoRateMetricAttributeKeyPciBdf, HwMemoryIoRateMetricAttributeKeyComIntelSubdeviceID, HwMemoryIoRateMetricAttributeKeyHwMemoryLocation, HwMemoryIoRateMetricAttributeKeyHwMemoryType},
+					},
+					HwMemorySize: HwMemorySizeMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemorySizeMetricAttributeKey{HwMemorySizeMetricAttributeKeyHwID, HwMemorySizeMetricAttributeKeyHwName, HwMemorySizeMetricAttributeKeyPciBdf, HwMemorySizeMetricAttributeKeyComIntelSubdeviceID, HwMemorySizeMetricAttributeKeyHwMemoryLocation, HwMemorySizeMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryUsage: HwMemoryUsageMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwMemoryUsageMetricAttributeKey{HwMemoryUsageMetricAttributeKeyHwID, HwMemoryUsageMetricAttributeKeyHwName, HwMemoryUsageMetricAttributeKeyPciBdf, HwMemoryUsageMetricAttributeKeyComIntelSubdeviceID, HwMemoryUsageMetricAttributeKeyHwMemoryLocation, HwMemoryUsageMetricAttributeKeyHwMemoryType},
+					},
+					HwMemoryUtilization: HwMemoryUtilizationMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwMemoryUtilizationMetricAttributeKey{HwMemoryUtilizationMetricAttributeKeyHwID, HwMemoryUtilizationMetricAttributeKeyHwName, HwMemoryUtilizationMetricAttributeKeyPciBdf, HwMemoryUtilizationMetricAttributeKeyComIntelSubdeviceID, HwMemoryUtilizationMetricAttributeKeyHwMemoryLocation, HwMemoryUtilizationMetricAttributeKeyHwMemoryType},
+					},
+					HwPower: HwPowerMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwPowerMetricAttributeKey{HwPowerMetricAttributeKeyHwID, HwPowerMetricAttributeKeyHwName, HwPowerMetricAttributeKeyPciBdf, HwPowerMetricAttributeKeyComIntelSubdeviceID, HwPowerMetricAttributeKeyHwSensorLocation},
+					},
+					HwPowerLimit: HwPowerLimitMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwPowerLimitMetricAttributeKey{HwPowerLimitMetricAttributeKeyHwID, HwPowerLimitMetricAttributeKeyHwName, HwPowerLimitMetricAttributeKeyPciBdf, HwPowerLimitMetricAttributeKeyComIntelSubdeviceID, HwPowerLimitMetricAttributeKeyHwSensorLocation, HwPowerLimitMetricAttributeKeyComIntelPowerLimitLevel, HwPowerLimitMetricAttributeKeyComIntelPowerLimitSource},
+					},
+					HwStatus: HwStatusMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategySum,
+						EnabledAttributes:   []HwStatusMetricAttributeKey{HwStatusMetricAttributeKeyHwID, HwStatusMetricAttributeKeyHwName, HwStatusMetricAttributeKeyPciBdf, HwStatusMetricAttributeKeyComIntelSubdeviceID, HwStatusMetricAttributeKeyHwState, HwStatusMetricAttributeKeyHwType},
+					},
+					HwTemperature: HwTemperatureMetricConfig{
+						Enabled:             false,
+						AggregationStrategy: AggregationStrategyAvg,
+						EnabledAttributes:   []HwTemperatureMetricAttributeKey{HwTemperatureMetricAttributeKeyHwID, HwTemperatureMetricAttributeKeyHwName, HwTemperatureMetricAttributeKeyPciBdf, HwTemperatureMetricAttributeKeyComIntelSubdeviceID, HwTemperatureMetricAttributeKeyHwSensorLocation, HwTemperatureMetricAttributeKeyStatistic},
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := loadMetricsBuilderConfig(t, tt.name)
+			diff := cmp.Diff(tt.want, cfg, cmpopts.IgnoreUnexported(HwEnergyMetricConfig{}, HwErrorsMetricConfig{}, HwFrequencyMetricConfig{}, HwFrequencyLimitMetricConfig{}, HwFrequencyRequestMetricConfig{}, HwFrequencySamplesMetricConfig{}, HwFrequencyThrottleStatusMetricConfig{}, HwGpuBandwidthLimitMetricConfig{}, HwGpuBandwidthUtilizationMetricConfig{}, HwGpuInfoMetricConfig{}, HwGpuIoMetricConfig{}, HwGpuIoRateMetricConfig{}, HwGpuUtilizationMetricConfig{}, HwMemoryBandwidthLimitMetricConfig{}, HwMemoryBandwidthUtilizationMetricConfig{}, HwMemoryFreeMetricConfig{}, HwMemoryIoMetricConfig{}, HwMemoryIoRateMetricConfig{}, HwMemorySizeMetricConfig{}, HwMemoryUsageMetricConfig{}, HwMemoryUtilizationMetricConfig{}, HwPowerMetricConfig{}, HwPowerLimitMetricConfig{}, HwStatusMetricConfig{}, HwTemperatureMetricConfig{}))
+			require.Emptyf(t, diff, "Config mismatch (-expected +actual):\n%s", diff)
+		})
+	}
+}
+
+func loadMetricsBuilderConfig(t *testing.T, name string) MetricsBuilderConfig {
+	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
+	require.NoError(t, err)
+	sub, err := cm.Sub(name)
+	require.NoError(t, err)
+	cfg := NewDefaultMetricsBuilderConfig()
+	require.NoError(t, sub.Unmarshal(&cfg, confmap.WithIgnoreUnused()))
+	return cfg
+}
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_logs.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_logs.go
similarity index 100%
rename from xpumd/receiver/sysman/internal/metadata/generated_logs.go
rename to xpumd/receiver/intelxpu/sysman/internal/metadata/generated_logs.go
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_logs_test.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_logs_test.go
similarity index 100%
rename from xpumd/receiver/sysman/internal/metadata/generated_logs_test.go
rename to xpumd/receiver/intelxpu/sysman/internal/metadata/generated_logs_test.go
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_metrics.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_metrics.go
similarity index 51%
rename from xpumd/receiver/sysman/internal/metadata/generated_metrics.go
rename to xpumd/receiver/intelxpu/sysman/internal/metadata/generated_metrics.go
index 6db7ab32d..9697050e1 100644
--- a/xpumd/receiver/sysman/internal/metadata/generated_metrics.go
+++ b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_metrics.go
@@ -3,6 +3,7 @@
 package metadata
 
 import (
+	"slices"
 	"time"
 
 	"go.opentelemetry.io/collector/component"
@@ -12,6 +13,13 @@ import (
 	conventions "go.opentelemetry.io/otel/semconv/v1.38.0"
 )
 
+const (
+	AggregationStrategySum = "sum"
+	AggregationStrategyAvg = "avg"
+	AggregationStrategyMin = "min"
+	AggregationStrategyMax = "max"
+)
+
 // AttributeAggregation specifies the value aggregation attribute.
 type AttributeAggregation int
 
@@ -42,6 +50,32 @@ var MapAttributeAggregation = map[string]AttributeAggregation{
 	"avg": AttributeAggregationAvg,
 }
 
+// AttributeErrorType specifies the value error.type attribute.
+type AttributeErrorType int
+
+const (
+	_ AttributeErrorType = iota
+	AttributeErrorTypeCorrectable
+	AttributeErrorTypeUncorrectable
+)
+
+// String returns the string representation of the AttributeErrorType.
+func (av AttributeErrorType) String() string {
+	switch av {
+	case AttributeErrorTypeCorrectable:
+		return "correctable"
+	case AttributeErrorTypeUncorrectable:
+		return "uncorrectable"
+	}
+	return ""
+}
+
+// MapAttributeErrorType is a helper map of string to AttributeErrorType attribute value.
+var MapAttributeErrorType = map[string]AttributeErrorType{
+	"correctable":   AttributeErrorTypeCorrectable,
+	"uncorrectable": AttributeErrorTypeUncorrectable,
+}
+
 // AttributeHwGpuType specifies the value hw.gpu.type attribute.
 type AttributeHwGpuType int
 
@@ -222,6 +256,9 @@ var MetricsInfo = metricsInfo{
 	HwEnergy: metricInfo{
 		Name: "hw.energy",
 	},
+	HwErrors: metricInfo{
+		Name: "hw.errors",
+	},
 	HwFrequency: metricInfo{
 		Name: "hw.frequency",
 	},
@@ -295,6 +332,7 @@ var MetricsInfo = metricsInfo{
 
 type metricsInfo struct {
 	HwEnergy                     metricInfo
+	HwErrors                     metricInfo
 	HwFrequency                  metricInfo
 	HwFrequencyLimit             metricInfo
 	HwFrequencyRequest           metricInfo
@@ -325,9 +363,10 @@ type metricInfo struct {
 }
 
 type metricHwEnergy struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric       // data buffer for generated metric.
+	config        HwEnergyMetricConfig // metric config provided by user.
+	capacity      int                  // max observed number of data points added to the metric.
+	aggDataPoints []float64            // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.energy metric with initial data.
@@ -339,21 +378,60 @@ func (m *metricHwEnergy) init() {
 	m.data.Sum().SetIsMonotonic(true)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwEnergy) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwSensorLocationAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwEnergyMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwEnergyMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwEnergyMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwEnergyMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwEnergyMetricAttributeKeyHwSensorLocation) {
+		dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -366,13 +444,18 @@ func (m *metricHwEnergy) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwEnergy) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetDoubleValue(m.data.Sum().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwEnergy(cfg MetricConfig) metricHwEnergy {
+func newMetricHwEnergy(cfg HwEnergyMetricConfig) metricHwEnergy {
 	m := metricHwEnergy{config: cfg}
 
 	if cfg.Enabled {
@@ -382,10 +465,120 @@ func newMetricHwEnergy(cfg MetricConfig) metricHwEnergy {
 	return m
 }
 
+type metricHwErrors struct {
+	data          pmetric.Metric       // data buffer for generated metric.
+	config        HwErrorsMetricConfig // metric config provided by user.
+	capacity      int                  // max observed number of data points added to the metric.
+	aggDataPoints []int64              // slice containing number of aggregated datapoints at each index
+}
+
+// init fills hw.errors metric with initial data.
+func (m *metricHwErrors) init() {
+	m.data.SetName("hw.errors")
+	m.data.SetDescription("Number of GPU errors. Correctable `error.type` error metrics are reported only when non-zero.")
+	m.data.SetUnit("{error}")
+	m.data.SetEmptySum()
+	m.data.Sum().SetIsMonotonic(true)
+	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
+	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
+}
+
+func (m *metricHwErrors) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwTypeAttributeValue string, errorTypeAttributeValue string, errorCategoryAttributeValue string) {
+	if !m.config.Enabled {
+		return
+	}
+
+	dp := pmetric.NewNumberDataPoint()
+	dp.SetStartTimestamp(start)
+	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyHwType) {
+		dp.Attributes().PutStr("hw.type", hwTypeAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyErrorType) {
+		dp.Attributes().PutStr("error.type", errorTypeAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwErrorsMetricAttributeKeyErrorCategory) {
+		dp.Attributes().PutStr("error.category", errorCategoryAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
+	dp.SetIntValue(val)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
+}
+
+// updateCapacity saves max length of data point slices that will be used for the slice capacity.
+func (m *metricHwErrors) updateCapacity() {
+	if m.data.Sum().DataPoints().Len() > m.capacity {
+		m.capacity = m.data.Sum().DataPoints().Len()
+	}
+}
+
+// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
+func (m *metricHwErrors) emit(metrics pmetric.MetricSlice) {
+	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
+		m.updateCapacity()
+		m.data.MoveTo(metrics.AppendEmpty())
+		m.init()
+	}
+}
+
+func newMetricHwErrors(cfg HwErrorsMetricConfig) metricHwErrors {
+	m := metricHwErrors{config: cfg}
+
+	if cfg.Enabled {
+		m.data = pmetric.NewMetric()
+		m.init()
+	}
+	return m
+}
+
 type metricHwFrequency struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric          // data buffer for generated metric.
+	config        HwFrequencyMetricConfig // metric config provided by user.
+	capacity      int                     // max observed number of data points added to the metric.
+	aggDataPoints []int64                 // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.frequency metric with initial data.
@@ -395,22 +588,63 @@ func (m *metricHwFrequency) init() {
 	m.data.SetUnit("Hz")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwFrequency) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwFrequencyDomainAttributeValue string, aggregationAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyMetricAttributeKeyHwFrequencyDomain) {
+		dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyMetricAttributeKeyAggregation) {
+		dp.Attributes().PutStr("aggregation", aggregationAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
-	dp.Attributes().PutStr("aggregation", aggregationAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -423,13 +657,18 @@ func (m *metricHwFrequency) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwFrequency) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetIntValue(m.data.Gauge().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwFrequency(cfg MetricConfig) metricHwFrequency {
+func newMetricHwFrequency(cfg HwFrequencyMetricConfig) metricHwFrequency {
 	m := metricHwFrequency{config: cfg}
 
 	if cfg.Enabled {
@@ -440,9 +679,10 @@ func newMetricHwFrequency(cfg MetricConfig) metricHwFrequency {
 }
 
 type metricHwFrequencyLimit struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric               // data buffer for generated metric.
+	config        HwFrequencyLimitMetricConfig // metric config provided by user.
+	capacity      int                          // max observed number of data points added to the metric.
+	aggDataPoints []int64                      // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.frequency.limit metric with initial data.
@@ -452,22 +692,63 @@ func (m *metricHwFrequencyLimit) init() {
 	m.data.SetUnit("Hz")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwFrequencyLimit) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwFrequencyDomainAttributeValue string, hwLimitTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyLimitMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyLimitMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyLimitMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyLimitMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyLimitMetricAttributeKeyHwFrequencyDomain) {
+		dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyLimitMetricAttributeKeyHwLimitType) {
+		dp.Attributes().PutStr("hw.limit_type", hwLimitTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
-	dp.Attributes().PutStr("hw.limit_type", hwLimitTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -480,13 +761,18 @@ func (m *metricHwFrequencyLimit) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwFrequencyLimit) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetIntValue(m.data.Gauge().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwFrequencyLimit(cfg MetricConfig) metricHwFrequencyLimit {
+func newMetricHwFrequencyLimit(cfg HwFrequencyLimitMetricConfig) metricHwFrequencyLimit {
 	m := metricHwFrequencyLimit{config: cfg}
 
 	if cfg.Enabled {
@@ -497,9 +783,10 @@ func newMetricHwFrequencyLimit(cfg MetricConfig) metricHwFrequencyLimit {
 }
 
 type metricHwFrequencyRequest struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                 // data buffer for generated metric.
+	config        HwFrequencyRequestMetricConfig // metric config provided by user.
+	capacity      int                            // max observed number of data points added to the metric.
+	aggDataPoints []int64                        // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.frequency.request metric with initial data.
@@ -509,21 +796,60 @@ func (m *metricHwFrequencyRequest) init() {
 	m.data.SetUnit("Hz")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwFrequencyRequest) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwFrequencyDomainAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyRequestMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyRequestMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyRequestMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyRequestMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyRequestMetricAttributeKeyHwFrequencyDomain) {
+		dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -536,13 +862,18 @@ func (m *metricHwFrequencyRequest) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwFrequencyRequest) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetIntValue(m.data.Gauge().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwFrequencyRequest(cfg MetricConfig) metricHwFrequencyRequest {
+func newMetricHwFrequencyRequest(cfg HwFrequencyRequestMetricConfig) metricHwFrequencyRequest {
 	m := metricHwFrequencyRequest{config: cfg}
 
 	if cfg.Enabled {
@@ -553,9 +884,10 @@ func newMetricHwFrequencyRequest(cfg MetricConfig) metricHwFrequencyRequest {
 }
 
 type metricHwFrequencySamples struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                 // data buffer for generated metric.
+	config        HwFrequencySamplesMetricConfig // metric config provided by user.
+	capacity      int                            // max observed number of data points added to the metric.
+	aggDataPoints []int64                        // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.frequency.samples metric with initial data.
@@ -565,22 +897,63 @@ func (m *metricHwFrequencySamples) init() {
 	m.data.SetUnit("{count}")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwFrequencySamples) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwFrequencyDomainAttributeValue string, sampleStatusAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencySamplesMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencySamplesMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencySamplesMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencySamplesMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencySamplesMetricAttributeKeyHwFrequencyDomain) {
+		dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencySamplesMetricAttributeKeySampleStatus) {
+		dp.Attributes().PutStr("sample.status", sampleStatusAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
-	dp.Attributes().PutStr("sample.status", sampleStatusAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -593,13 +966,18 @@ func (m *metricHwFrequencySamples) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwFrequencySamples) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetIntValue(m.data.Gauge().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwFrequencySamples(cfg MetricConfig) metricHwFrequencySamples {
+func newMetricHwFrequencySamples(cfg HwFrequencySamplesMetricConfig) metricHwFrequencySamples {
 	m := metricHwFrequencySamples{config: cfg}
 
 	if cfg.Enabled {
@@ -610,9 +988,10 @@ func newMetricHwFrequencySamples(cfg MetricConfig) metricHwFrequencySamples {
 }
 
 type metricHwFrequencyThrottleStatus struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                        // data buffer for generated metric.
+	config        HwFrequencyThrottleStatusMetricConfig // metric config provided by user.
+	capacity      int                                   // max observed number of data points added to the metric.
+	aggDataPoints []int64                               // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.frequency.throttle_status metric with initial data.
@@ -624,22 +1003,63 @@ func (m *metricHwFrequencyThrottleStatus) init() {
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwFrequencyThrottleStatus) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwFrequencyDomainAttributeValue string, comIntelSpeedThrottleReasonAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyThrottleStatusMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyThrottleStatusMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyThrottleStatusMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyThrottleStatusMetricAttributeKeyHwFrequencyDomain) {
+		dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwFrequencyThrottleStatusMetricAttributeKeyComIntelSpeedThrottleReason) {
+		dp.Attributes().PutStr("com.intel.speed.throttle_reason", comIntelSpeedThrottleReasonAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.frequency.domain", hwFrequencyDomainAttributeValue)
-	dp.Attributes().PutStr("com.intel.speed.throttle_reason", comIntelSpeedThrottleReasonAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -652,13 +1072,18 @@ func (m *metricHwFrequencyThrottleStatus) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwFrequencyThrottleStatus) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwFrequencyThrottleStatus(cfg MetricConfig) metricHwFrequencyThrottleStatus {
+func newMetricHwFrequencyThrottleStatus(cfg HwFrequencyThrottleStatusMetricConfig) metricHwFrequencyThrottleStatus {
 	m := metricHwFrequencyThrottleStatus{config: cfg}
 
 	if cfg.Enabled {
@@ -669,9 +1094,10 @@ func newMetricHwFrequencyThrottleStatus(cfg MetricConfig) metricHwFrequencyThrot
 }
 
 type metricHwGpuBandwidthLimit struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                  // data buffer for generated metric.
+	config        HwGpuBandwidthLimitMetricConfig // metric config provided by user.
+	capacity      int                             // max observed number of data points added to the metric.
+	aggDataPoints []int64                         // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.gpu.bandwidth.limit metric with initial data.
@@ -683,19 +1109,54 @@ func (m *metricHwGpuBandwidthLimit) init() {
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwGpuBandwidthLimit) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwGpuBandwidthLimitMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuBandwidthLimitMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuBandwidthLimitMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -708,13 +1169,18 @@ func (m *metricHwGpuBandwidthLimit) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwGpuBandwidthLimit) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwGpuBandwidthLimit(cfg MetricConfig) metricHwGpuBandwidthLimit {
+func newMetricHwGpuBandwidthLimit(cfg HwGpuBandwidthLimitMetricConfig) metricHwGpuBandwidthLimit {
 	m := metricHwGpuBandwidthLimit{config: cfg}
 
 	if cfg.Enabled {
@@ -725,9 +1191,10 @@ func newMetricHwGpuBandwidthLimit(cfg MetricConfig) metricHwGpuBandwidthLimit {
 }
 
 type metricHwGpuBandwidthUtilization struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                        // data buffer for generated metric.
+	config        HwGpuBandwidthUtilizationMetricConfig // metric config provided by user.
+	capacity      int                                   // max observed number of data points added to the metric.
+	aggDataPoints []float64                             // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.gpu.bandwidth.utilization metric with initial data.
@@ -737,19 +1204,54 @@ func (m *metricHwGpuBandwidthUtilization) init() {
 	m.data.SetUnit("1")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwGpuBandwidthUtilization) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwGpuBandwidthUtilizationMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuBandwidthUtilizationMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuBandwidthUtilizationMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -762,13 +1264,18 @@ func (m *metricHwGpuBandwidthUtilization) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwGpuBandwidthUtilization) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwGpuBandwidthUtilization(cfg MetricConfig) metricHwGpuBandwidthUtilization {
+func newMetricHwGpuBandwidthUtilization(cfg HwGpuBandwidthUtilizationMetricConfig) metricHwGpuBandwidthUtilization {
 	m := metricHwGpuBandwidthUtilization{config: cfg}
 
 	if cfg.Enabled {
@@ -779,9 +1286,10 @@ func newMetricHwGpuBandwidthUtilization(cfg MetricConfig) metricHwGpuBandwidthUt
 }
 
 type metricHwGpuInfo struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric        // data buffer for generated metric.
+	config        HwGpuInfoMetricConfig // metric config provided by user.
+	capacity      int                   // max observed number of data points added to the metric.
+	aggDataPoints []int64               // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.gpu.info metric with initial data.
@@ -793,31 +1301,90 @@ func (m *metricHwGpuInfo) init() {
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwGpuInfo) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, pciVendorIDAttributeValue string, pciDeviceIDAttributeValue string, hwModelAttributeValue string, hwSerialNumberAttributeValue string, hwVendorAttributeValue string, hwFirmwareVersionAttributeValue string, hwGpuTypeAttributeValue string, comIntelSubdeviceCountAttributeValue int64, pciLanesAttributeValue string, pciLinkGenAttributeValue string, hwMemoryDemandPagingAttributeValue bool, hwMemoryEccAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyPciVendorID) {
+		dp.Attributes().PutStr("pci.vendor_id", pciVendorIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyPciDeviceID) {
+		dp.Attributes().PutStr("pci.device_id", pciDeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwModel) {
+		dp.Attributes().PutStr("hw.model", hwModelAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwSerialNumber) {
+		dp.Attributes().PutStr("hw.serial_number", hwSerialNumberAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwVendor) {
+		dp.Attributes().PutStr("hw.vendor", hwVendorAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwFirmwareVersion) {
+		dp.Attributes().PutStr("hw.firmware_version", hwFirmwareVersionAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwGpuType) {
+		dp.Attributes().PutStr("hw.gpu.type", hwGpuTypeAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyComIntelSubdeviceCount) {
+		dp.Attributes().PutInt("com.intel.subdevice_count", comIntelSubdeviceCountAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyPciLanes) {
+		dp.Attributes().PutStr("pci.lanes", pciLanesAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyPciLinkGen) {
+		dp.Attributes().PutStr("pci.link_gen", pciLinkGenAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwMemoryDemandPaging) {
+		dp.Attributes().PutBool("hw.memory.demand_paging", hwMemoryDemandPagingAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuInfoMetricAttributeKeyHwMemoryEcc) {
+		dp.Attributes().PutStr("hw.memory.ecc", hwMemoryEccAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("pci.vendor_id", pciVendorIDAttributeValue)
-	dp.Attributes().PutStr("pci.device_id", pciDeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.model", hwModelAttributeValue)
-	dp.Attributes().PutStr("hw.serial_number", hwSerialNumberAttributeValue)
-	dp.Attributes().PutStr("hw.vendor", hwVendorAttributeValue)
-	dp.Attributes().PutStr("hw.firmware_version", hwFirmwareVersionAttributeValue)
-	dp.Attributes().PutStr("hw.gpu.type", hwGpuTypeAttributeValue)
-	dp.Attributes().PutInt("com.intel.subdevice_count", comIntelSubdeviceCountAttributeValue)
-	dp.Attributes().PutStr("pci.lanes", pciLanesAttributeValue)
-	dp.Attributes().PutStr("pci.link_gen", pciLinkGenAttributeValue)
-	dp.Attributes().PutBool("hw.memory.demand_paging", hwMemoryDemandPagingAttributeValue)
-	dp.Attributes().PutStr("hw.memory.ecc", hwMemoryEccAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -830,13 +1397,18 @@ func (m *metricHwGpuInfo) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwGpuInfo) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwGpuInfo(cfg MetricConfig) metricHwGpuInfo {
+func newMetricHwGpuInfo(cfg HwGpuInfoMetricConfig) metricHwGpuInfo {
 	m := metricHwGpuInfo{config: cfg}
 
 	if cfg.Enabled {
@@ -847,9 +1419,10 @@ func newMetricHwGpuInfo(cfg MetricConfig) metricHwGpuInfo {
 }
 
 type metricHwGpuIo struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric      // data buffer for generated metric.
+	config        HwGpuIoMetricConfig // metric config provided by user.
+	capacity      int                 // max observed number of data points added to the metric.
+	aggDataPoints []float64           // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.gpu.io metric with initial data.
@@ -861,20 +1434,57 @@ func (m *metricHwGpuIo) init() {
 	m.data.Sum().SetIsMonotonic(true)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwGpuIo) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, networkIoDirectionAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoMetricAttributeKeyNetworkIoDirection) {
+		dp.Attributes().PutStr("network.io.direction", networkIoDirectionAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("network.io.direction", networkIoDirectionAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -887,13 +1497,18 @@ func (m *metricHwGpuIo) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwGpuIo) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetDoubleValue(m.data.Sum().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwGpuIo(cfg MetricConfig) metricHwGpuIo {
+func newMetricHwGpuIo(cfg HwGpuIoMetricConfig) metricHwGpuIo {
 	m := metricHwGpuIo{config: cfg}
 
 	if cfg.Enabled {
@@ -904,9 +1519,10 @@ func newMetricHwGpuIo(cfg MetricConfig) metricHwGpuIo {
 }
 
 type metricHwGpuIoRate struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric          // data buffer for generated metric.
+	config        HwGpuIoRateMetricConfig // metric config provided by user.
+	capacity      int                     // max observed number of data points added to the metric.
+	aggDataPoints []float64               // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.gpu.io.rate metric with initial data.
@@ -916,19 +1532,54 @@ func (m *metricHwGpuIoRate) init() {
 	m.data.SetUnit("By/s")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwGpuIoRate) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoRateMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoRateMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuIoRateMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -941,13 +1592,18 @@ func (m *metricHwGpuIoRate) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwGpuIoRate) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwGpuIoRate(cfg MetricConfig) metricHwGpuIoRate {
+func newMetricHwGpuIoRate(cfg HwGpuIoRateMetricConfig) metricHwGpuIoRate {
 	m := metricHwGpuIoRate{config: cfg}
 
 	if cfg.Enabled {
@@ -958,9 +1614,10 @@ func newMetricHwGpuIoRate(cfg MetricConfig) metricHwGpuIoRate {
 }
 
 type metricHwGpuUtilization struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric               // data buffer for generated metric.
+	config        HwGpuUtilizationMetricConfig // metric config provided by user.
+	capacity      int                          // max observed number of data points added to the metric.
+	aggDataPoints []float64                    // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.gpu.utilization metric with initial data.
@@ -970,21 +1627,60 @@ func (m *metricHwGpuUtilization) init() {
 	m.data.SetUnit("1")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwGpuUtilization) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwGpuTaskAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwGpuUtilizationMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuUtilizationMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuUtilizationMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuUtilizationMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwGpuUtilizationMetricAttributeKeyHwGpuTask) {
+		dp.Attributes().PutStr("hw.gpu.task", hwGpuTaskAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.gpu.task", hwGpuTaskAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -997,13 +1693,18 @@ func (m *metricHwGpuUtilization) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwGpuUtilization) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwGpuUtilization(cfg MetricConfig) metricHwGpuUtilization {
+func newMetricHwGpuUtilization(cfg HwGpuUtilizationMetricConfig) metricHwGpuUtilization {
 	m := metricHwGpuUtilization{config: cfg}
 
 	if cfg.Enabled {
@@ -1014,9 +1715,10 @@ func newMetricHwGpuUtilization(cfg MetricConfig) metricHwGpuUtilization {
 }
 
 type metricHwMemoryBandwidthLimit struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                     // data buffer for generated metric.
+	config        HwMemoryBandwidthLimitMetricConfig // metric config provided by user.
+	capacity      int                                // max observed number of data points added to the metric.
+	aggDataPoints []float64                          // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.bandwidth.limit metric with initial data.
@@ -1028,22 +1730,63 @@ func (m *metricHwMemoryBandwidthLimit) init() {
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryBandwidthLimit) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthLimitMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthLimitMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthLimitMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthLimitMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthLimitMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1056,13 +1799,18 @@ func (m *metricHwMemoryBandwidthLimit) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryBandwidthLimit) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetDoubleValue(m.data.Sum().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryBandwidthLimit(cfg MetricConfig) metricHwMemoryBandwidthLimit {
+func newMetricHwMemoryBandwidthLimit(cfg HwMemoryBandwidthLimitMetricConfig) metricHwMemoryBandwidthLimit {
 	m := metricHwMemoryBandwidthLimit{config: cfg}
 
 	if cfg.Enabled {
@@ -1073,9 +1821,10 @@ func newMetricHwMemoryBandwidthLimit(cfg MetricConfig) metricHwMemoryBandwidthLi
 }
 
 type metricHwMemoryBandwidthUtilization struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                           // data buffer for generated metric.
+	config        HwMemoryBandwidthUtilizationMetricConfig // metric config provided by user.
+	capacity      int                                      // max observed number of data points added to the metric.
+	aggDataPoints []float64                                // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.bandwidth.utilization metric with initial data.
@@ -1085,22 +1834,63 @@ func (m *metricHwMemoryBandwidthUtilization) init() {
 	m.data.SetUnit("1")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryBandwidthUtilization) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthUtilizationMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthUtilizationMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthUtilizationMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthUtilizationMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryBandwidthUtilizationMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1113,13 +1903,18 @@ func (m *metricHwMemoryBandwidthUtilization) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryBandwidthUtilization) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryBandwidthUtilization(cfg MetricConfig) metricHwMemoryBandwidthUtilization {
+func newMetricHwMemoryBandwidthUtilization(cfg HwMemoryBandwidthUtilizationMetricConfig) metricHwMemoryBandwidthUtilization {
 	m := metricHwMemoryBandwidthUtilization{config: cfg}
 
 	if cfg.Enabled {
@@ -1130,36 +1925,78 @@ func newMetricHwMemoryBandwidthUtilization(cfg MetricConfig) metricHwMemoryBandw
 }
 
 type metricHwMemoryFree struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric           // data buffer for generated metric.
+	config        HwMemoryFreeMetricConfig // metric config provided by user.
+	capacity      int                      // max observed number of data points added to the metric.
+	aggDataPoints []int64                  // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.free metric with initial data.
 func (m *metricHwMemoryFree) init() {
 	m.data.SetName("hw.memory.free")
-	m.data.SetDescription("Free memory. Reported only when `hw.memory.size` (and memory usage metrics) are unavailable.")
+	m.data.SetDescription("Free memory. Reported only when `hw.memory.size` (and derived memory usage+ratio metrics) are unavailable.")
 	m.data.SetUnit("By")
 	m.data.SetEmptySum()
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryFree) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryFreeMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryFreeMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryFreeMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryFreeMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryFreeMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryFreeMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1172,13 +2009,18 @@ func (m *metricHwMemoryFree) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryFree) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryFree(cfg MetricConfig) metricHwMemoryFree {
+func newMetricHwMemoryFree(cfg HwMemoryFreeMetricConfig) metricHwMemoryFree {
 	m := metricHwMemoryFree{config: cfg}
 
 	if cfg.Enabled {
@@ -1189,9 +2031,10 @@ func newMetricHwMemoryFree(cfg MetricConfig) metricHwMemoryFree {
 }
 
 type metricHwMemoryIo struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric         // data buffer for generated metric.
+	config        HwMemoryIoMetricConfig // metric config provided by user.
+	capacity      int                    // max observed number of data points added to the metric.
+	aggDataPoints []float64              // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.io metric with initial data.
@@ -1203,23 +2046,66 @@ func (m *metricHwMemoryIo) init() {
 	m.data.Sum().SetIsMonotonic(true)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryIo) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string, networkIoDirectionAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoMetricAttributeKeyNetworkIoDirection) {
+		dp.Attributes().PutStr("network.io.direction", networkIoDirectionAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
-	dp.Attributes().PutStr("network.io.direction", networkIoDirectionAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1232,13 +2118,18 @@ func (m *metricHwMemoryIo) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryIo) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetDoubleValue(m.data.Sum().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryIo(cfg MetricConfig) metricHwMemoryIo {
+func newMetricHwMemoryIo(cfg HwMemoryIoMetricConfig) metricHwMemoryIo {
 	m := metricHwMemoryIo{config: cfg}
 
 	if cfg.Enabled {
@@ -1249,9 +2140,10 @@ func newMetricHwMemoryIo(cfg MetricConfig) metricHwMemoryIo {
 }
 
 type metricHwMemoryIoRate struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric             // data buffer for generated metric.
+	config        HwMemoryIoRateMetricConfig // metric config provided by user.
+	capacity      int                        // max observed number of data points added to the metric.
+	aggDataPoints []float64                  // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.io.rate metric with initial data.
@@ -1261,22 +2153,63 @@ func (m *metricHwMemoryIoRate) init() {
 	m.data.SetUnit("By/s")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryIoRate) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoRateMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoRateMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoRateMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoRateMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoRateMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryIoRateMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1289,13 +2222,18 @@ func (m *metricHwMemoryIoRate) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryIoRate) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryIoRate(cfg MetricConfig) metricHwMemoryIoRate {
+func newMetricHwMemoryIoRate(cfg HwMemoryIoRateMetricConfig) metricHwMemoryIoRate {
 	m := metricHwMemoryIoRate{config: cfg}
 
 	if cfg.Enabled {
@@ -1306,36 +2244,78 @@ func newMetricHwMemoryIoRate(cfg MetricConfig) metricHwMemoryIoRate {
 }
 
 type metricHwMemorySize struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric           // data buffer for generated metric.
+	config        HwMemorySizeMetricConfig // metric config provided by user.
+	capacity      int                      // max observed number of data points added to the metric.
+	aggDataPoints []int64                  // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.size metric with initial data.
 func (m *metricHwMemorySize) init() {
 	m.data.SetName("hw.memory.size")
-	m.data.SetDescription("Physical size of the memory.")
+	m.data.SetDescription("Memory size. If physical memory size info is unavailable, provides max allocatable size.")
 	m.data.SetUnit("By")
 	m.data.SetEmptySum()
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemorySize) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemorySizeMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemorySizeMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemorySizeMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemorySizeMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemorySizeMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemorySizeMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1348,13 +2328,18 @@ func (m *metricHwMemorySize) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemorySize) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemorySize(cfg MetricConfig) metricHwMemorySize {
+func newMetricHwMemorySize(cfg HwMemorySizeMetricConfig) metricHwMemorySize {
 	m := metricHwMemorySize{config: cfg}
 
 	if cfg.Enabled {
@@ -1365,9 +2350,10 @@ func newMetricHwMemorySize(cfg MetricConfig) metricHwMemorySize {
 }
 
 type metricHwMemoryUsage struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric            // data buffer for generated metric.
+	config        HwMemoryUsageMetricConfig // metric config provided by user.
+	capacity      int                       // max observed number of data points added to the metric.
+	aggDataPoints []int64                   // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.usage metric with initial data.
@@ -1379,22 +2365,63 @@ func (m *metricHwMemoryUsage) init() {
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryUsage) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUsageMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUsageMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUsageMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUsageMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUsageMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUsageMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1407,13 +2434,18 @@ func (m *metricHwMemoryUsage) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryUsage) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryUsage(cfg MetricConfig) metricHwMemoryUsage {
+func newMetricHwMemoryUsage(cfg HwMemoryUsageMetricConfig) metricHwMemoryUsage {
 	m := metricHwMemoryUsage{config: cfg}
 
 	if cfg.Enabled {
@@ -1424,9 +2456,10 @@ func newMetricHwMemoryUsage(cfg MetricConfig) metricHwMemoryUsage {
 }
 
 type metricHwMemoryUtilization struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric                  // data buffer for generated metric.
+	config        HwMemoryUtilizationMetricConfig // metric config provided by user.
+	capacity      int                             // max observed number of data points added to the metric.
+	aggDataPoints []float64                       // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.memory.utilization metric with initial data.
@@ -1436,22 +2469,63 @@ func (m *metricHwMemoryUtilization) init() {
 	m.data.SetUnit("1")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwMemoryUtilization) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwMemoryLocationAttributeValue string, hwMemoryTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUtilizationMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUtilizationMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUtilizationMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUtilizationMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUtilizationMetricAttributeKeyHwMemoryLocation) {
+		dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwMemoryUtilizationMetricAttributeKeyHwMemoryType) {
+		dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.memory.location", hwMemoryLocationAttributeValue)
-	dp.Attributes().PutStr("hw.memory.type", hwMemoryTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1464,13 +2538,18 @@ func (m *metricHwMemoryUtilization) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwMemoryUtilization) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwMemoryUtilization(cfg MetricConfig) metricHwMemoryUtilization {
+func newMetricHwMemoryUtilization(cfg HwMemoryUtilizationMetricConfig) metricHwMemoryUtilization {
 	m := metricHwMemoryUtilization{config: cfg}
 
 	if cfg.Enabled {
@@ -1481,9 +2560,10 @@ func newMetricHwMemoryUtilization(cfg MetricConfig) metricHwMemoryUtilization {
 }
 
 type metricHwPower struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric      // data buffer for generated metric.
+	config        HwPowerMetricConfig // metric config provided by user.
+	capacity      int                 // max observed number of data points added to the metric.
+	aggDataPoints []float64           // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.power metric with initial data.
@@ -1493,21 +2573,60 @@ func (m *metricHwPower) init() {
 	m.data.SetUnit("W")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwPower) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwSensorLocationAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwPowerMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerMetricAttributeKeyHwSensorLocation) {
+		dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1520,13 +2639,18 @@ func (m *metricHwPower) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwPower) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwPower(cfg MetricConfig) metricHwPower {
+func newMetricHwPower(cfg HwPowerMetricConfig) metricHwPower {
 	m := metricHwPower{config: cfg}
 
 	if cfg.Enabled {
@@ -1537,9 +2661,10 @@ func newMetricHwPower(cfg MetricConfig) metricHwPower {
 }
 
 type metricHwPowerLimit struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric           // data buffer for generated metric.
+	config        HwPowerLimitMetricConfig // metric config provided by user.
+	capacity      int                      // max observed number of data points added to the metric.
+	aggDataPoints []float64                // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.power.limit metric with initial data.
@@ -1549,23 +2674,66 @@ func (m *metricHwPowerLimit) init() {
 	m.data.SetUnit("W")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwPowerLimit) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwSensorLocationAttributeValue string, comIntelPowerLimitLevelAttributeValue string, comIntelPowerLimitSourceAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyHwSensorLocation) {
+		dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyComIntelPowerLimitLevel) {
+		dp.Attributes().PutStr("com.intel.power.limit.level", comIntelPowerLimitLevelAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwPowerLimitMetricAttributeKeyComIntelPowerLimitSource) {
+		dp.Attributes().PutStr("com.intel.power.limit.source", comIntelPowerLimitSourceAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
-	dp.Attributes().PutStr("com.intel.power.limit.level", comIntelPowerLimitLevelAttributeValue)
-	dp.Attributes().PutStr("com.intel.power.limit.source", comIntelPowerLimitSourceAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1578,13 +2746,18 @@ func (m *metricHwPowerLimit) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwPowerLimit) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwPowerLimit(cfg MetricConfig) metricHwPowerLimit {
+func newMetricHwPowerLimit(cfg HwPowerLimitMetricConfig) metricHwPowerLimit {
 	m := metricHwPowerLimit{config: cfg}
 
 	if cfg.Enabled {
@@ -1595,9 +2768,10 @@ func newMetricHwPowerLimit(cfg MetricConfig) metricHwPowerLimit {
 }
 
 type metricHwStatus struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric       // data buffer for generated metric.
+	config        HwStatusMetricConfig // metric config provided by user.
+	capacity      int                  // max observed number of data points added to the metric.
+	aggDataPoints []int64              // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.status metric with initial data.
@@ -1609,22 +2783,63 @@ func (m *metricHwStatus) init() {
 	m.data.Sum().SetIsMonotonic(false)
 	m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
 	m.data.Sum().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwStatus) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwStateAttributeValue string, hwTypeAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Sum().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwStatusMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwStatusMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwStatusMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwStatusMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwStatusMetricAttributeKeyHwState) {
+		dp.Attributes().PutStr("hw.state", hwStateAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwStatusMetricAttributeKeyHwType) {
+		dp.Attributes().PutStr("hw.type", hwTypeAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Sum().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetIntValue(dpi.IntValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.IntValue() > val {
+					dpi.SetIntValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.IntValue() < val {
+					dpi.SetIntValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetIntValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.state", hwStateAttributeValue)
-	dp.Attributes().PutStr("hw.type", hwTypeAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1637,13 +2852,18 @@ func (m *metricHwStatus) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwStatus) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Sum().DataPoints().At(i).SetIntValue(m.data.Sum().DataPoints().At(i).IntValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwStatus(cfg MetricConfig) metricHwStatus {
+func newMetricHwStatus(cfg HwStatusMetricConfig) metricHwStatus {
 	m := metricHwStatus{config: cfg}
 
 	if cfg.Enabled {
@@ -1654,9 +2874,10 @@ func newMetricHwStatus(cfg MetricConfig) metricHwStatus {
 }
 
 type metricHwTemperature struct {
-	data     pmetric.Metric // data buffer for generated metric.
-	config   MetricConfig   // metric config provided by user.
-	capacity int            // max observed number of data points added to the metric.
+	data          pmetric.Metric            // data buffer for generated metric.
+	config        HwTemperatureMetricConfig // metric config provided by user.
+	capacity      int                       // max observed number of data points added to the metric.
+	aggDataPoints []float64                 // slice containing number of aggregated datapoints at each index
 }
 
 // init fills hw.temperature metric with initial data.
@@ -1666,22 +2887,63 @@ func (m *metricHwTemperature) init() {
 	m.data.SetUnit("Cel")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
+	m.aggDataPoints = m.aggDataPoints[:0]
 }
 
 func (m *metricHwTemperature) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val float64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwSensorLocationAttributeValue string, statisticAttributeValue string) {
 	if !m.config.Enabled {
 		return
 	}
-	dp := m.data.Gauge().DataPoints().AppendEmpty()
+
+	dp := pmetric.NewNumberDataPoint()
 	dp.SetStartTimestamp(start)
 	dp.SetTimestamp(ts)
+	if slices.Contains(m.config.EnabledAttributes, HwTemperatureMetricAttributeKeyHwID) {
+		dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwTemperatureMetricAttributeKeyHwName) {
+		dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwTemperatureMetricAttributeKeyPciBdf) {
+		dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwTemperatureMetricAttributeKeyComIntelSubdeviceID) {
+		dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwTemperatureMetricAttributeKeyHwSensorLocation) {
+		dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
+	}
+	if slices.Contains(m.config.EnabledAttributes, HwTemperatureMetricAttributeKeyStatistic) {
+		dp.Attributes().PutStr("statistic", statisticAttributeValue)
+	}
+
+	var s string
+	dps := m.data.Gauge().DataPoints()
+	for i := 0; i < dps.Len(); i++ {
+		dpi := dps.At(i)
+		if dp.Attributes().Equal(dpi.Attributes()) && dp.StartTimestamp() == dpi.StartTimestamp() && dp.Timestamp() == dpi.Timestamp() {
+			switch s = m.config.AggregationStrategy; s {
+			case AggregationStrategySum, AggregationStrategyAvg:
+				dpi.SetDoubleValue(dpi.DoubleValue() + val)
+				m.aggDataPoints[i] += 1
+				return
+			case AggregationStrategyMin:
+				if dpi.DoubleValue() > val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			case AggregationStrategyMax:
+				if dpi.DoubleValue() < val {
+					dpi.SetDoubleValue(val)
+				}
+				return
+			}
+		}
+	}
+
 	dp.SetDoubleValue(val)
-	dp.Attributes().PutStr("hw.id", hwIDAttributeValue)
-	dp.Attributes().PutStr("hw.name", hwNameAttributeValue)
-	dp.Attributes().PutStr("pci.bdf", pciBdfAttributeValue)
-	dp.Attributes().PutStr("com.intel.subdevice_id", comIntelSubdeviceIDAttributeValue)
-	dp.Attributes().PutStr("hw.sensor_location", hwSensorLocationAttributeValue)
-	dp.Attributes().PutStr("statistic", statisticAttributeValue)
+	m.aggDataPoints = append(m.aggDataPoints, 1)
+	dp.MoveTo(dps.AppendEmpty())
 }
 
 // updateCapacity saves max length of data point slices that will be used for the slice capacity.
@@ -1694,13 +2956,18 @@ func (m *metricHwTemperature) updateCapacity() {
 // emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points.
 func (m *metricHwTemperature) emit(metrics pmetric.MetricSlice) {
 	if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 {
+		if m.config.AggregationStrategy == AggregationStrategyAvg {
+			for i, aggCount := range m.aggDataPoints {
+				m.data.Gauge().DataPoints().At(i).SetDoubleValue(m.data.Gauge().DataPoints().At(i).DoubleValue() / aggCount)
+			}
+		}
 		m.updateCapacity()
 		m.data.MoveTo(metrics.AppendEmpty())
 		m.init()
 	}
 }
 
-func newMetricHwTemperature(cfg MetricConfig) metricHwTemperature {
+func newMetricHwTemperature(cfg HwTemperatureMetricConfig) metricHwTemperature {
 	m := metricHwTemperature{config: cfg}
 
 	if cfg.Enabled {
@@ -1719,6 +2986,7 @@ type MetricsBuilder struct {
 	metricsBuffer                      pmetric.Metrics      // accumulates metrics data before emitting.
 	buildInfo                          component.BuildInfo  // contains version information.
 	metricHwEnergy                     metricHwEnergy
+	metricHwErrors                     metricHwErrors
 	metricHwFrequency                  metricHwFrequency
 	metricHwFrequencyLimit             metricHwFrequencyLimit
 	metricHwFrequencyRequest           metricHwFrequencyRequest
@@ -1768,6 +3036,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings scraper.Settings, opti
 		metricsBuffer:                      pmetric.NewMetrics(),
 		buildInfo:                          settings.BuildInfo,
 		metricHwEnergy:                     newMetricHwEnergy(mbc.Metrics.HwEnergy),
+		metricHwErrors:                     newMetricHwErrors(mbc.Metrics.HwErrors),
 		metricHwFrequency:                  newMetricHwFrequency(mbc.Metrics.HwFrequency),
 		metricHwFrequencyLimit:             newMetricHwFrequencyLimit(mbc.Metrics.HwFrequencyLimit),
 		metricHwFrequencyRequest:           newMetricHwFrequencyRequest(mbc.Metrics.HwFrequencyRequest),
@@ -1858,6 +3127,7 @@ func (mb *MetricsBuilder) EmitForResource(options ...ResourceMetricsOption) {
 	ils.Scope().SetVersion(mb.buildInfo.Version)
 	ils.Metrics().EnsureCapacity(mb.metricsCapacity)
 	mb.metricHwEnergy.emit(ils.Metrics())
+	mb.metricHwErrors.emit(ils.Metrics())
 	mb.metricHwFrequency.emit(ils.Metrics())
 	mb.metricHwFrequencyLimit.emit(ils.Metrics())
 	mb.metricHwFrequencyRequest.emit(ils.Metrics())
@@ -1907,6 +3177,11 @@ func (mb *MetricsBuilder) RecordHwEnergyDataPoint(ts pcommon.Timestamp, val floa
 	mb.metricHwEnergy.recordDataPoint(mb.startTime, ts, val, hwIDAttributeValue, hwNameAttributeValue, pciBdfAttributeValue, comIntelSubdeviceIDAttributeValue, hwSensorLocationAttributeValue)
 }
 
+// RecordHwErrorsDataPoint adds a data point to hw.errors metric.
+func (mb *MetricsBuilder) RecordHwErrorsDataPoint(ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwTypeAttributeValue AttributeHwType, errorTypeAttributeValue AttributeErrorType, errorCategoryAttributeValue string) {
+	mb.metricHwErrors.recordDataPoint(mb.startTime, ts, val, hwIDAttributeValue, hwNameAttributeValue, pciBdfAttributeValue, comIntelSubdeviceIDAttributeValue, hwTypeAttributeValue.String(), errorTypeAttributeValue.String(), errorCategoryAttributeValue)
+}
+
 // RecordHwFrequencyDataPoint adds a data point to hw.frequency metric.
 func (mb *MetricsBuilder) RecordHwFrequencyDataPoint(ts pcommon.Timestamp, val int64, hwIDAttributeValue string, hwNameAttributeValue string, pciBdfAttributeValue string, comIntelSubdeviceIDAttributeValue string, hwFrequencyDomainAttributeValue string, aggregationAttributeValue AttributeAggregation) {
 	mb.metricHwFrequency.recordDataPoint(mb.startTime, ts, val, hwIDAttributeValue, hwNameAttributeValue, pciBdfAttributeValue, comIntelSubdeviceIDAttributeValue, hwFrequencyDomainAttributeValue, aggregationAttributeValue.String())
diff --git a/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_metrics_test.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_metrics_test.go
new file mode 100644
index 000000000..6fe820466
--- /dev/null
+++ b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_metrics_test.go
@@ -0,0 +1,1987 @@
+// Code generated by mdatagen. DO NOT EDIT.
+
+package metadata
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/pmetric"
+	"go.opentelemetry.io/collector/scraper/scrapertest"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest/observer"
+)
+
+type testDataSet int
+
+const (
+	testDataSetDefault testDataSet = iota
+	testDataSetAll
+	testDataSetNone
+	testDataSetReag
+)
+
+func TestMetricsBuilder(t *testing.T) {
+	tests := []struct {
+		name        string
+		metricsSet  testDataSet
+		resAttrsSet testDataSet
+		expectEmpty bool
+	}{
+		{
+			name: "default",
+		},
+		{
+			name:        "all_set",
+			metricsSet:  testDataSetAll,
+			resAttrsSet: testDataSetAll,
+		},
+		{
+			name:        "reaggregate_set",
+			metricsSet:  testDataSetReag,
+			resAttrsSet: testDataSetReag,
+		},
+		{
+			name:        "none_set",
+			metricsSet:  testDataSetNone,
+			resAttrsSet: testDataSetNone,
+			expectEmpty: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			start := pcommon.Timestamp(1_000_000_000)
+			ts := pcommon.Timestamp(1_000_001_000)
+			observedZapCore, observedLogs := observer.New(zap.WarnLevel)
+			settings := scrapertest.NewNopSettings(scrapertest.NopType)
+			settings.Logger = zap.New(observedZapCore)
+			mb := NewMetricsBuilder(loadMetricsBuilderConfig(t, tt.name), settings, WithStartTime(start))
+			aggMap := make(map[string]string) // contains the aggregation strategies for each metric name
+			aggMap["hw.energy"] = mb.metricHwEnergy.config.AggregationStrategy
+			aggMap["hw.errors"] = mb.metricHwErrors.config.AggregationStrategy
+			aggMap["hw.frequency"] = mb.metricHwFrequency.config.AggregationStrategy
+			aggMap["hw.frequency.limit"] = mb.metricHwFrequencyLimit.config.AggregationStrategy
+			aggMap["hw.frequency.request"] = mb.metricHwFrequencyRequest.config.AggregationStrategy
+			aggMap["hw.frequency.samples"] = mb.metricHwFrequencySamples.config.AggregationStrategy
+			aggMap["hw.frequency.throttle_status"] = mb.metricHwFrequencyThrottleStatus.config.AggregationStrategy
+			aggMap["hw.gpu.bandwidth.limit"] = mb.metricHwGpuBandwidthLimit.config.AggregationStrategy
+			aggMap["hw.gpu.bandwidth.utilization"] = mb.metricHwGpuBandwidthUtilization.config.AggregationStrategy
+			aggMap["hw.gpu.info"] = mb.metricHwGpuInfo.config.AggregationStrategy
+			aggMap["hw.gpu.io"] = mb.metricHwGpuIo.config.AggregationStrategy
+			aggMap["hw.gpu.io.rate"] = mb.metricHwGpuIoRate.config.AggregationStrategy
+			aggMap["hw.gpu.utilization"] = mb.metricHwGpuUtilization.config.AggregationStrategy
+			aggMap["hw.memory.bandwidth.limit"] = mb.metricHwMemoryBandwidthLimit.config.AggregationStrategy
+			aggMap["hw.memory.bandwidth.utilization"] = mb.metricHwMemoryBandwidthUtilization.config.AggregationStrategy
+			aggMap["hw.memory.free"] = mb.metricHwMemoryFree.config.AggregationStrategy
+			aggMap["hw.memory.io"] = mb.metricHwMemoryIo.config.AggregationStrategy
+			aggMap["hw.memory.io.rate"] = mb.metricHwMemoryIoRate.config.AggregationStrategy
+			aggMap["hw.memory.size"] = mb.metricHwMemorySize.config.AggregationStrategy
+			aggMap["hw.memory.usage"] = mb.metricHwMemoryUsage.config.AggregationStrategy
+			aggMap["hw.memory.utilization"] = mb.metricHwMemoryUtilization.config.AggregationStrategy
+			aggMap["hw.power"] = mb.metricHwPower.config.AggregationStrategy
+			aggMap["hw.power.limit"] = mb.metricHwPowerLimit.config.AggregationStrategy
+			aggMap["hw.status"] = mb.metricHwStatus.config.AggregationStrategy
+			aggMap["hw.temperature"] = mb.metricHwTemperature.config.AggregationStrategy
+
+			expectedWarnings := 0
+			if tt.metricsSet != testDataSetReag {
+				assert.Equal(t, expectedWarnings, observedLogs.Len())
+			}
+
+			defaultMetricsCount := 0
+			allMetricsCount := 0
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwEnergyDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwEnergyDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.sensor_location-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwErrorsDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", AttributeHwTypeFrequency, AttributeErrorTypeCorrectable, "error.category-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwErrorsDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", AttributeHwTypeGpu, AttributeErrorTypeUncorrectable, "error.category-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwFrequencyDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", AttributeAggregationMin)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwFrequencyDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.frequency.domain-val-2", AttributeAggregationMax)
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwFrequencyLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", "hw.limit_type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwFrequencyLimitDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.frequency.domain-val-2", "hw.limit_type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwFrequencyRequestDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwFrequencyRequestDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.frequency.domain-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwFrequencySamplesDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", AttributeSampleStatusCollected)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwFrequencySamplesDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.frequency.domain-val-2", AttributeSampleStatusDropped)
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwFrequencyThrottleStatusDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", "com.intel.speed.throttle_reason-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwFrequencyThrottleStatusDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.frequency.domain-val-2", "com.intel.speed.throttle_reason-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwGpuBandwidthLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwGpuBandwidthLimitDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwGpuBandwidthUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwGpuBandwidthUtilizationDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwGpuInfoDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "pci.vendor_id-val", "pci.device_id-val", "hw.model-val", "hw.serial_number-val", "hw.vendor-val", "hw.firmware_version-val", AttributeHwGpuTypeDiscrete, 25, "pci.lanes-val", "pci.link_gen-val", false, AttributeHwMemoryEccAvailable)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwGpuInfoDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "pci.vendor_id-val-2", "pci.device_id-val-2", "hw.model-val-2", "hw.serial_number-val-2", "hw.vendor-val-2", "hw.firmware_version-val-2", AttributeHwGpuTypeIntegrated, 26, "pci.lanes-val-2", "pci.link_gen-val-2", true, AttributeHwMemoryEccConfigurable)
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwGpuIoDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", AttributeNetworkIoDirectionReceive)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwGpuIoDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", AttributeNetworkIoDirectionTransmit)
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwGpuIoRateDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwGpuIoRateDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwGpuUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.gpu.task-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwGpuUtilizationDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.gpu.task-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryBandwidthLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryBandwidthLimitDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryBandwidthUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryBandwidthUtilizationDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryFreeDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryFreeDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryIoDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val", AttributeNetworkIoDirectionReceive)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryIoDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2", AttributeNetworkIoDirectionTransmit)
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryIoRateDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryIoRateDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemorySizeDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemorySizeDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryUsageDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryUsageDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwMemoryUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwMemoryUtilizationDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.memory.location-val-2", "hw.memory.type-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwPowerDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwPowerDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.sensor_location-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwPowerLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val", "com.intel.power.limit.level-val", "com.intel.power.limit.source-val")
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwPowerLimitDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.sensor_location-val-2", "com.intel.power.limit.level-val-2", "com.intel.power.limit.source-val-2")
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwStatusDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.state-val", AttributeHwTypeFrequency)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwStatusDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.state-val-2", AttributeHwTypeGpu)
+			}
+
+			defaultMetricsCount++
+			allMetricsCount++
+			mb.RecordHwTemperatureDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val", AttributeStatisticMin)
+			if tt.name == "reaggregate_set" {
+				mb.RecordHwTemperatureDataPoint(ts, 3, "hw.id-val-2", "hw.name-val-2", "pci.bdf-val-2", "com.intel.subdevice_id-val-2", "hw.sensor_location-val-2", AttributeStatisticMax)
+			}
+
+			res := pcommon.NewResource()
+			metrics := mb.Emit(WithResource(res))
+			if tt.name == "reaggregate_set" {
+				assert.Empty(t, mb.metricHwEnergy.aggDataPoints)
+				assert.Empty(t, mb.metricHwErrors.aggDataPoints)
+				assert.Empty(t, mb.metricHwFrequency.aggDataPoints)
+				assert.Empty(t, mb.metricHwFrequencyLimit.aggDataPoints)
+				assert.Empty(t, mb.metricHwFrequencyRequest.aggDataPoints)
+				assert.Empty(t, mb.metricHwFrequencySamples.aggDataPoints)
+				assert.Empty(t, mb.metricHwFrequencyThrottleStatus.aggDataPoints)
+				assert.Empty(t, mb.metricHwGpuBandwidthLimit.aggDataPoints)
+				assert.Empty(t, mb.metricHwGpuBandwidthUtilization.aggDataPoints)
+				assert.Empty(t, mb.metricHwGpuInfo.aggDataPoints)
+				assert.Empty(t, mb.metricHwGpuIo.aggDataPoints)
+				assert.Empty(t, mb.metricHwGpuIoRate.aggDataPoints)
+				assert.Empty(t, mb.metricHwGpuUtilization.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryBandwidthLimit.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryBandwidthUtilization.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryFree.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryIo.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryIoRate.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemorySize.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryUsage.aggDataPoints)
+				assert.Empty(t, mb.metricHwMemoryUtilization.aggDataPoints)
+				assert.Empty(t, mb.metricHwPower.aggDataPoints)
+				assert.Empty(t, mb.metricHwPowerLimit.aggDataPoints)
+				assert.Empty(t, mb.metricHwStatus.aggDataPoints)
+				assert.Empty(t, mb.metricHwTemperature.aggDataPoints)
+			}
+
+			if tt.expectEmpty {
+				assert.Equal(t, 0, metrics.ResourceMetrics().Len())
+				return
+			}
+
+			var allMetricsList []pmetric.Metric
+			totalMetricsCount := 0
+			for ri := 0; ri < metrics.ResourceMetrics().Len(); ri++ {
+				rm := metrics.ResourceMetrics().At(ri)
+				assert.Equal(t, 1, rm.ScopeMetrics().Len())
+				ms := rm.ScopeMetrics().At(0).Metrics()
+				totalMetricsCount += ms.Len()
+				for mi := 0; mi < ms.Len(); mi++ {
+					allMetricsList = append(allMetricsList, ms.At(mi))
+				}
+			}
+			if tt.metricsSet == testDataSetDefault {
+				assert.Equal(t, defaultMetricsCount, totalMetricsCount)
+			}
+			if tt.metricsSet == testDataSetAll {
+				assert.Equal(t, allMetricsCount, totalMetricsCount)
+			}
+			validatedMetrics := make(map[string]bool)
+			for _, mi := range allMetricsList {
+				switch mi.Name() {
+				case "hw.energy":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.energy"], "Found a duplicate in the metrics slice: hw.energy")
+						validatedMetrics["hw.energy"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Energy consumed by the hardware component.", mi.Description())
+						assert.Equal(t, "J", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.energy"], "Found a duplicate in the metrics slice: hw.energy")
+						validatedMetrics["hw.energy"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Energy consumed by the hardware component.", mi.Description())
+						assert.Equal(t, "J", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.energy"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.sensor_location")
+						assert.False(t, ok)
+					}
+				case "hw.errors":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.errors"], "Found a duplicate in the metrics slice: hw.errors")
+						validatedMetrics["hw.errors"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Number of GPU errors. Correctable `error.type` error metrics are reported only when non-zero.", mi.Description())
+						assert.Equal(t, "{error}", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwTypeAttrVal, ok := dp.Attributes().Get("hw.type")
+						assert.True(t, ok)
+						assert.Equal(t, "frequency", hwTypeAttrVal.Str())
+						errorTypeAttrVal, ok := dp.Attributes().Get("error.type")
+						assert.True(t, ok)
+						assert.Equal(t, "correctable", errorTypeAttrVal.Str())
+						errorCategoryAttrVal, ok := dp.Attributes().Get("error.category")
+						assert.True(t, ok)
+						assert.Equal(t, "error.category-val", errorCategoryAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.errors"], "Found a duplicate in the metrics slice: hw.errors")
+						validatedMetrics["hw.errors"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Number of GPU errors. Correctable `error.type` error metrics are reported only when non-zero.", mi.Description())
+						assert.Equal(t, "{error}", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.errors"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.type")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("error.type")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("error.category")
+						assert.False(t, ok)
+					}
+				case "hw.frequency":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.frequency"], "Found a duplicate in the metrics slice: hw.frequency")
+						validatedMetrics["hw.frequency"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Operating frequency of the hardware component.", mi.Description())
+						assert.Equal(t, "Hz", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
+						aggregationAttrVal, ok := dp.Attributes().Get("aggregation")
+						assert.True(t, ok)
+						assert.Equal(t, "min", aggregationAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.frequency"], "Found a duplicate in the metrics slice: hw.frequency")
+						validatedMetrics["hw.frequency"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Operating frequency of the hardware component.", mi.Description())
+						assert.Equal(t, "Hz", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.frequency"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.frequency.domain")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("aggregation")
+						assert.False(t, ok)
+					}
+				case "hw.frequency.limit":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.frequency.limit"], "Found a duplicate in the metrics slice: hw.frequency.limit")
+						validatedMetrics["hw.frequency.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Frequency limit in Hertz.", mi.Description())
+						assert.Equal(t, "Hz", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
+						hwLimitTypeAttrVal, ok := dp.Attributes().Get("hw.limit_type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.limit_type-val", hwLimitTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.frequency.limit"], "Found a duplicate in the metrics slice: hw.frequency.limit")
+						validatedMetrics["hw.frequency.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Frequency limit in Hertz.", mi.Description())
+						assert.Equal(t, "Hz", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.frequency.limit"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.frequency.domain")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.limit_type")
+						assert.False(t, ok)
+					}
+				case "hw.frequency.request":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.frequency.request"], "Found a duplicate in the metrics slice: hw.frequency.request")
+						validatedMetrics["hw.frequency.request"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Requested operating frequency.", mi.Description())
+						assert.Equal(t, "Hz", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.frequency.request"], "Found a duplicate in the metrics slice: hw.frequency.request")
+						validatedMetrics["hw.frequency.request"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Requested operating frequency.", mi.Description())
+						assert.Equal(t, "Hz", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.frequency.request"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.frequency.domain")
+						assert.False(t, ok)
+					}
+				case "hw.frequency.samples":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.frequency.samples"], "Found a duplicate in the metrics slice: hw.frequency.samples")
+						validatedMetrics["hw.frequency.samples"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Number of frequency samples during the last collection interval.", mi.Description())
+						assert.Equal(t, "{count}", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
+						sampleStatusAttrVal, ok := dp.Attributes().Get("sample.status")
+						assert.True(t, ok)
+						assert.Equal(t, "collected", sampleStatusAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.frequency.samples"], "Found a duplicate in the metrics slice: hw.frequency.samples")
+						validatedMetrics["hw.frequency.samples"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Number of frequency samples during the last collection interval.", mi.Description())
+						assert.Equal(t, "{count}", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.frequency.samples"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.frequency.domain")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("sample.status")
+						assert.False(t, ok)
+					}
+				case "hw.frequency.throttle_status":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.frequency.throttle_status"], "Found a duplicate in the metrics slice: hw.frequency.throttle_status")
+						validatedMetrics["hw.frequency.throttle_status"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Hardware component frequency throttle status.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
+						comIntelSpeedThrottleReasonAttrVal, ok := dp.Attributes().Get("com.intel.speed.throttle_reason")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.speed.throttle_reason-val", comIntelSpeedThrottleReasonAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.frequency.throttle_status"], "Found a duplicate in the metrics slice: hw.frequency.throttle_status")
+						validatedMetrics["hw.frequency.throttle_status"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Hardware component frequency throttle status.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.frequency.throttle_status"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.frequency.domain")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.speed.throttle_reason")
+						assert.False(t, ok)
+					}
+				case "hw.gpu.bandwidth.limit":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.gpu.bandwidth.limit"], "Found a duplicate in the metrics slice: hw.gpu.bandwidth.limit")
+						validatedMetrics["hw.gpu.bandwidth.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Maximum (read+write) PCI bandwidth in bytes/sec for the GPU device.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.gpu.bandwidth.limit"], "Found a duplicate in the metrics slice: hw.gpu.bandwidth.limit")
+						validatedMetrics["hw.gpu.bandwidth.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Maximum (read+write) PCI bandwidth in bytes/sec for the GPU device.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.gpu.bandwidth.limit"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+					}
+				case "hw.gpu.bandwidth.utilization":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.gpu.bandwidth.utilization"], "Found a duplicate in the metrics slice: hw.gpu.bandwidth.utilization")
+						validatedMetrics["hw.gpu.bandwidth.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "GPU device (read+write) PCI bandwidth utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.gpu.bandwidth.utilization"], "Found a duplicate in the metrics slice: hw.gpu.bandwidth.utilization")
+						validatedMetrics["hw.gpu.bandwidth.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "GPU device (read+write) PCI bandwidth utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.gpu.bandwidth.utilization"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+					}
+				case "hw.gpu.info":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.gpu.info"], "Found a duplicate in the metrics slice: hw.gpu.info")
+						validatedMetrics["hw.gpu.info"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Information about the GPU device.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						pciVendorIDAttrVal, ok := dp.Attributes().Get("pci.vendor_id")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.vendor_id-val", pciVendorIDAttrVal.Str())
+						pciDeviceIDAttrVal, ok := dp.Attributes().Get("pci.device_id")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.device_id-val", pciDeviceIDAttrVal.Str())
+						hwModelAttrVal, ok := dp.Attributes().Get("hw.model")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.model-val", hwModelAttrVal.Str())
+						hwSerialNumberAttrVal, ok := dp.Attributes().Get("hw.serial_number")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.serial_number-val", hwSerialNumberAttrVal.Str())
+						hwVendorAttrVal, ok := dp.Attributes().Get("hw.vendor")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.vendor-val", hwVendorAttrVal.Str())
+						hwFirmwareVersionAttrVal, ok := dp.Attributes().Get("hw.firmware_version")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.firmware_version-val", hwFirmwareVersionAttrVal.Str())
+						hwGpuTypeAttrVal, ok := dp.Attributes().Get("hw.gpu.type")
+						assert.True(t, ok)
+						assert.Equal(t, "discrete", hwGpuTypeAttrVal.Str())
+						comIntelSubdeviceCountAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_count")
+						assert.True(t, ok)
+						assert.EqualValues(t, 25, comIntelSubdeviceCountAttrVal.Int())
+						pciLanesAttrVal, ok := dp.Attributes().Get("pci.lanes")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.lanes-val", pciLanesAttrVal.Str())
+						pciLinkGenAttrVal, ok := dp.Attributes().Get("pci.link_gen")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.link_gen-val", pciLinkGenAttrVal.Str())
+						hwMemoryDemandPagingAttrVal, ok := dp.Attributes().Get("hw.memory.demand_paging")
+						assert.True(t, ok)
+						assert.False(t, hwMemoryDemandPagingAttrVal.Bool())
+						hwMemoryEccAttrVal, ok := dp.Attributes().Get("hw.memory.ecc")
+						assert.True(t, ok)
+						assert.Equal(t, "available", hwMemoryEccAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.gpu.info"], "Found a duplicate in the metrics slice: hw.gpu.info")
+						validatedMetrics["hw.gpu.info"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Information about the GPU device.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.gpu.info"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.vendor_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.device_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.model")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.serial_number")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.vendor")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.firmware_version")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.gpu.type")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_count")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.lanes")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.link_gen")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.demand_paging")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.ecc")
+						assert.False(t, ok)
+					}
+				case "hw.gpu.io":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.gpu.io"], "Found a duplicate in the metrics slice: hw.gpu.io")
+						validatedMetrics["hw.gpu.io"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Bytes received / transmitted over PCI bus by the GPU device.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						networkIoDirectionAttrVal, ok := dp.Attributes().Get("network.io.direction")
+						assert.True(t, ok)
+						assert.Equal(t, "receive", networkIoDirectionAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.gpu.io"], "Found a duplicate in the metrics slice: hw.gpu.io")
+						validatedMetrics["hw.gpu.io"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Bytes received / transmitted over PCI bus by the GPU device.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.gpu.io"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("network.io.direction")
+						assert.False(t, ok)
+					}
+				case "hw.gpu.io.rate":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.gpu.io.rate"], "Found a duplicate in the metrics slice: hw.gpu.io.rate")
+						validatedMetrics["hw.gpu.io.rate"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Current (read+write) PCI bandwidth usage in bytes/sec for the GPU device.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.gpu.io.rate"], "Found a duplicate in the metrics slice: hw.gpu.io.rate")
+						validatedMetrics["hw.gpu.io.rate"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Current (read+write) PCI bandwidth usage in bytes/sec for the GPU device.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.gpu.io.rate"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+					}
+				case "hw.gpu.utilization":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.gpu.utilization"], "Found a duplicate in the metrics slice: hw.gpu.utilization")
+						validatedMetrics["hw.gpu.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "GPU engine / task pipeline utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwGpuTaskAttrVal, ok := dp.Attributes().Get("hw.gpu.task")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.gpu.task-val", hwGpuTaskAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.gpu.utilization"], "Found a duplicate in the metrics slice: hw.gpu.utilization")
+						validatedMetrics["hw.gpu.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "GPU engine / task pipeline utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.gpu.utilization"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.gpu.task")
+						assert.False(t, ok)
+					}
+				case "hw.memory.bandwidth.limit":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.bandwidth.limit"], "Found a duplicate in the metrics slice: hw.memory.bandwidth.limit")
+						validatedMetrics["hw.memory.bandwidth.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Maximum total memory (read+write) bandwidth in bytes/sec.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.bandwidth.limit"], "Found a duplicate in the metrics slice: hw.memory.bandwidth.limit")
+						validatedMetrics["hw.memory.bandwidth.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Maximum total memory (read+write) bandwidth in bytes/sec.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.memory.bandwidth.limit"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.memory.bandwidth.utilization":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.bandwidth.utilization"], "Found a duplicate in the metrics slice: hw.memory.bandwidth.utilization")
+						validatedMetrics["hw.memory.bandwidth.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Memory bandwidth (read+write) utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.bandwidth.utilization"], "Found a duplicate in the metrics slice: hw.memory.bandwidth.utilization")
+						validatedMetrics["hw.memory.bandwidth.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Memory bandwidth (read+write) utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.memory.bandwidth.utilization"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.memory.free":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.free"], "Found a duplicate in the metrics slice: hw.memory.free")
+						validatedMetrics["hw.memory.free"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Free memory. Reported only when `hw.memory.size` (and derived memory usage+ratio metrics) are unavailable.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.free"], "Found a duplicate in the metrics slice: hw.memory.free")
+						validatedMetrics["hw.memory.free"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Free memory. Reported only when `hw.memory.size` (and derived memory usage+ratio metrics) are unavailable.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.memory.free"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.memory.io":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.io"], "Found a duplicate in the metrics slice: hw.memory.io")
+						validatedMetrics["hw.memory.io"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Bytes read from / written to memory.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+						networkIoDirectionAttrVal, ok := dp.Attributes().Get("network.io.direction")
+						assert.True(t, ok)
+						assert.Equal(t, "receive", networkIoDirectionAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.io"], "Found a duplicate in the metrics slice: hw.memory.io")
+						validatedMetrics["hw.memory.io"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Bytes read from / written to memory.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.True(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.memory.io"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("network.io.direction")
+						assert.False(t, ok)
+					}
+				case "hw.memory.io.rate":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.io.rate"], "Found a duplicate in the metrics slice: hw.memory.io.rate")
+						validatedMetrics["hw.memory.io.rate"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Current memory bandwidth (read+write) usage in bytes/sec.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.io.rate"], "Found a duplicate in the metrics slice: hw.memory.io.rate")
+						validatedMetrics["hw.memory.io.rate"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Current memory bandwidth (read+write) usage in bytes/sec.", mi.Description())
+						assert.Equal(t, "By/s", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.memory.io.rate"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.memory.size":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.size"], "Found a duplicate in the metrics slice: hw.memory.size")
+						validatedMetrics["hw.memory.size"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Memory size. If physical memory size info is unavailable, provides max allocatable size.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.size"], "Found a duplicate in the metrics slice: hw.memory.size")
+						validatedMetrics["hw.memory.size"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Memory size. If physical memory size info is unavailable, provides max allocatable size.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.memory.size"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.memory.usage":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.usage"], "Found a duplicate in the metrics slice: hw.memory.usage")
+						validatedMetrics["hw.memory.usage"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Memory used.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.usage"], "Found a duplicate in the metrics slice: hw.memory.usage")
+						validatedMetrics["hw.memory.usage"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Memory used.", mi.Description())
+						assert.Equal(t, "By", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.memory.usage"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.memory.utilization":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.memory.utilization"], "Found a duplicate in the metrics slice: hw.memory.utilization")
+						validatedMetrics["hw.memory.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Memory utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
+						hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.memory.utilization"], "Found a duplicate in the metrics slice: hw.memory.utilization")
+						validatedMetrics["hw.memory.utilization"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Memory utilization ratio.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.memory.utilization"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.memory.type")
+						assert.False(t, ok)
+					}
+				case "hw.power":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.power"], "Found a duplicate in the metrics slice: hw.power")
+						validatedMetrics["hw.power"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Instantaneous power usage of the hardware component.", mi.Description())
+						assert.Equal(t, "W", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.power"], "Found a duplicate in the metrics slice: hw.power")
+						validatedMetrics["hw.power"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Instantaneous power usage of the hardware component.", mi.Description())
+						assert.Equal(t, "W", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.power"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.sensor_location")
+						assert.False(t, ok)
+					}
+				case "hw.power.limit":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.power.limit"], "Found a duplicate in the metrics slice: hw.power.limit")
+						validatedMetrics["hw.power.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Power usage limit for the hardware component.", mi.Description())
+						assert.Equal(t, "W", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
+						comIntelPowerLimitLevelAttrVal, ok := dp.Attributes().Get("com.intel.power.limit.level")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.power.limit.level-val", comIntelPowerLimitLevelAttrVal.Str())
+						comIntelPowerLimitSourceAttrVal, ok := dp.Attributes().Get("com.intel.power.limit.source")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.power.limit.source-val", comIntelPowerLimitSourceAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.power.limit"], "Found a duplicate in the metrics slice: hw.power.limit")
+						validatedMetrics["hw.power.limit"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Power usage limit for the hardware component.", mi.Description())
+						assert.Equal(t, "W", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.power.limit"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.sensor_location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.power.limit.level")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.power.limit.source")
+						assert.False(t, ok)
+					}
+				case "hw.status":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.status"], "Found a duplicate in the metrics slice: hw.status")
+						validatedMetrics["hw.status"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Known hardware component states. Problem state reporting starts after issue becomes known / active for the first time (to greatly reduce number of state metrics). Unknown state is reported only if state was known before.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						assert.Equal(t, int64(1), dp.IntValue())
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwStateAttrVal, ok := dp.Attributes().Get("hw.state")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.state-val", hwStateAttrVal.Str())
+						hwTypeAttrVal, ok := dp.Attributes().Get("hw.type")
+						assert.True(t, ok)
+						assert.Equal(t, "frequency", hwTypeAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.status"], "Found a duplicate in the metrics slice: hw.status")
+						validatedMetrics["hw.status"] = true
+						assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
+						assert.Equal(t, 1, mi.Sum().DataPoints().Len())
+						assert.Equal(t, "Known hardware component states. Problem state reporting starts after issue becomes known / active for the first time (to greatly reduce number of state metrics). Unknown state is reported only if state was known before.", mi.Description())
+						assert.Equal(t, "1", mi.Unit())
+						assert.False(t, mi.Sum().IsMonotonic())
+						assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
+						dp := mi.Sum().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
+						switch aggMap["hw.status"] {
+						case "sum":
+							assert.Equal(t, int64(4), dp.IntValue())
+						case "avg":
+							assert.Equal(t, int64(2), dp.IntValue())
+						case "min":
+							assert.Equal(t, int64(1), dp.IntValue())
+						case "max":
+							assert.Equal(t, int64(3), dp.IntValue())
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.state")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.type")
+						assert.False(t, ok)
+					}
+				case "hw.temperature":
+					if tt.name != "reaggregate_set" {
+						assert.False(t, validatedMetrics["hw.temperature"], "Found a duplicate in the metrics slice: hw.temperature")
+						validatedMetrics["hw.temperature"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Temperature of the hardware component in degrees Celsius.", mi.Description())
+						assert.Equal(t, "Cel", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
+						hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
+						pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
+						assert.True(t, ok)
+						assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
+						comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
+						assert.True(t, ok)
+						assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
+						hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
+						assert.True(t, ok)
+						assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
+						statisticAttrVal, ok := dp.Attributes().Get("statistic")
+						assert.True(t, ok)
+						assert.Equal(t, "min", statisticAttrVal.Str())
+					} else {
+						assert.False(t, validatedMetrics["hw.temperature"], "Found a duplicate in the metrics slice: hw.temperature")
+						validatedMetrics["hw.temperature"] = true
+						assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
+						assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
+						assert.Equal(t, "Temperature of the hardware component in degrees Celsius.", mi.Description())
+						assert.Equal(t, "Cel", mi.Unit())
+						dp := mi.Gauge().DataPoints().At(0)
+						assert.Equal(t, start, dp.StartTimestamp())
+						assert.Equal(t, ts, dp.Timestamp())
+						assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
+						switch aggMap["hw.temperature"] {
+						case "sum":
+							assert.InDelta(t, float64(4), dp.DoubleValue(), 0.01)
+						case "avg":
+							assert.InDelta(t, float64(2), dp.DoubleValue(), 0.01)
+						case "min":
+							assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
+						case "max":
+							assert.InDelta(t, float64(3), dp.DoubleValue(), 0.01)
+						}
+						_, ok := dp.Attributes().Get("hw.id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.name")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("pci.bdf")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("com.intel.subdevice_id")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("hw.sensor_location")
+						assert.False(t, ok)
+						_, ok = dp.Attributes().Get("statistic")
+						assert.False(t, ok)
+					}
+				}
+			}
+		})
+	}
+}
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_status.go b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_status.go
similarity index 60%
rename from xpumd/receiver/sysman/internal/metadata/generated_status.go
rename to xpumd/receiver/intelxpu/sysman/internal/metadata/generated_status.go
index cf7a7e41b..e38860235 100644
--- a/xpumd/receiver/sysman/internal/metadata/generated_status.go
+++ b/xpumd/receiver/intelxpu/sysman/internal/metadata/generated_status.go
@@ -1,5 +1,7 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
+// Package metadata contains the autogenerated telemetry and
+// build information for the scraper/sysman component.
 package metadata
 
 import (
@@ -8,7 +10,7 @@ import (
 
 var (
 	Type      = component.MustNewType("sysman")
-	ScopeName = "github.com/intel/xpumanager/xpumd/receiver/sysman"
+	ScopeName = "github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman"
 )
 
 const (
diff --git a/xpumd/receiver/intelxpu/sysman/internal/metadata/testdata/config.yaml b/xpumd/receiver/intelxpu/sysman/internal/metadata/testdata/config.yaml
new file mode 100644
index 000000000..75839a682
--- /dev/null
+++ b/xpumd/receiver/intelxpu/sysman/internal/metadata/testdata/config.yaml
@@ -0,0 +1,232 @@
+default:
+all_set:
+  metrics:
+    hw.energy:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location"]
+    hw.errors:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.type","error.type","error.category"]
+    hw.frequency:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","aggregation"]
+    hw.frequency.limit:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","hw.limit_type"]
+    hw.frequency.request:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain"]
+    hw.frequency.samples:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","sample.status"]
+    hw.frequency.throttle_status:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","com.intel.speed.throttle_reason"]
+    hw.gpu.bandwidth.limit:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf"]
+    hw.gpu.bandwidth.utilization:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf"]
+    hw.gpu.info:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","pci.vendor_id","pci.device_id","hw.model","hw.serial_number","hw.vendor","hw.firmware_version","hw.gpu.type","com.intel.subdevice_count","pci.lanes","pci.link_gen","hw.memory.demand_paging","hw.memory.ecc"]
+    hw.gpu.io:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","network.io.direction"]
+    hw.gpu.io.rate:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf"]
+    hw.gpu.utilization:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.gpu.task"]
+    hw.memory.bandwidth.limit:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.bandwidth.utilization:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.free:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.io:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type","network.io.direction"]
+    hw.memory.io.rate:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.size:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.usage:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.utilization:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.power:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location"]
+    hw.power.limit:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location","com.intel.power.limit.level","com.intel.power.limit.source"]
+    hw.status:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.state","hw.type"]
+    hw.temperature:
+      enabled: true
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location","statistic"]
+reaggregate_set:
+  metrics:
+    hw.energy:
+      enabled: true
+      attributes: []
+    hw.errors:
+      enabled: true
+      attributes: []
+    hw.frequency:
+      enabled: true
+      attributes: []
+    hw.frequency.limit:
+      enabled: true
+      attributes: []
+    hw.frequency.request:
+      enabled: true
+      attributes: []
+    hw.frequency.samples:
+      enabled: true
+      attributes: []
+    hw.frequency.throttle_status:
+      enabled: true
+      attributes: []
+    hw.gpu.bandwidth.limit:
+      enabled: true
+      attributes: []
+    hw.gpu.bandwidth.utilization:
+      enabled: true
+      attributes: []
+    hw.gpu.info:
+      enabled: true
+      attributes: []
+    hw.gpu.io:
+      enabled: true
+      attributes: []
+    hw.gpu.io.rate:
+      enabled: true
+      attributes: []
+    hw.gpu.utilization:
+      enabled: true
+      attributes: []
+    hw.memory.bandwidth.limit:
+      enabled: true
+      attributes: []
+    hw.memory.bandwidth.utilization:
+      enabled: true
+      attributes: []
+    hw.memory.free:
+      enabled: true
+      attributes: []
+    hw.memory.io:
+      enabled: true
+      attributes: []
+    hw.memory.io.rate:
+      enabled: true
+      attributes: []
+    hw.memory.size:
+      enabled: true
+      attributes: []
+    hw.memory.usage:
+      enabled: true
+      attributes: []
+    hw.memory.utilization:
+      enabled: true
+      attributes: []
+    hw.power:
+      enabled: true
+      attributes: []
+    hw.power.limit:
+      enabled: true
+      attributes: []
+    hw.status:
+      enabled: true
+      attributes: []
+    hw.temperature:
+      enabled: true
+      attributes: []
+none_set:
+  metrics:
+    hw.energy:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location"]
+    hw.errors:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.type","error.type","error.category"]
+    hw.frequency:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","aggregation"]
+    hw.frequency.limit:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","hw.limit_type"]
+    hw.frequency.request:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain"]
+    hw.frequency.samples:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","sample.status"]
+    hw.frequency.throttle_status:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.frequency.domain","com.intel.speed.throttle_reason"]
+    hw.gpu.bandwidth.limit:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf"]
+    hw.gpu.bandwidth.utilization:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf"]
+    hw.gpu.info:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","pci.vendor_id","pci.device_id","hw.model","hw.serial_number","hw.vendor","hw.firmware_version","hw.gpu.type","com.intel.subdevice_count","pci.lanes","pci.link_gen","hw.memory.demand_paging","hw.memory.ecc"]
+    hw.gpu.io:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","network.io.direction"]
+    hw.gpu.io.rate:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf"]
+    hw.gpu.utilization:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.gpu.task"]
+    hw.memory.bandwidth.limit:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.bandwidth.utilization:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.free:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.io:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type","network.io.direction"]
+    hw.memory.io.rate:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.size:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.usage:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.memory.utilization:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.memory.location","hw.memory.type"]
+    hw.power:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location"]
+    hw.power.limit:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location","com.intel.power.limit.level","com.intel.power.limit.source"]
+    hw.status:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.state","hw.type"]
+    hw.temperature:
+      enabled: false
+      attributes: ["hw.id","hw.name","pci.bdf","com.intel.subdevice_id","hw.sensor_location","statistic"]
diff --git a/xpumd/receiver/sysman/memory.go b/xpumd/receiver/intelxpu/sysman/memory.go
similarity index 91%
rename from xpumd/receiver/sysman/memory.go
rename to xpumd/receiver/intelxpu/sysman/memory.go
index 5b965f14e..3458c14cf 100644
--- a/xpumd/receiver/sysman/memory.go
+++ b/xpumd/receiver/intelxpu/sysman/memory.go
@@ -13,7 +13,7 @@ import (
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 func init() {
@@ -71,6 +71,10 @@ func newMemory(name string, mem *l0sysman.Memory, device *device) (*memory, erro
 	if err != nil {
 		return nil, fmt.Errorf("memory GetProperties() failed: %w", err)
 	}
+	state, err := mem.GetState()
+	if err != nil {
+		return nil, fmt.Errorf("memory GetState() failed: %w", err)
+	}
 
 	m := &memory{
 		Memory: mem,
@@ -90,6 +94,14 @@ func newMemory(name string, mem *l0sysman.Memory, device *device) (*memory, erro
 		},
 	}
 
+	if props.PhysicalSize == 0 {
+		if state.Size > 0 {
+			device.logger.Infow("Memory size unavailable => allocatable size used as fallback", "attributes", m.attributes)
+		} else {
+			device.logger.Infow("Memory size unavailable => free memory metric replaces usage / ratio ones", "attributes", m.attributes)
+		}
+	}
+
 	// initial / previous counter value
 	if counter, err := mem.GetBandwidth(); err != nil {
 		device.logger.Infow("Memory GetBandwidth() failed: no BW metrics available", zap.Error(err), "attributes", m.attributes)
@@ -112,8 +124,12 @@ func (m *memory) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 		return
 	}
 
-	if m.attributes.physicalSize > 0 {
-		mb.RecordHwMemorySizeDataPoint(ts, m.attributes.physicalSize,
+	size := m.attributes.physicalSize
+	if size == 0 {
+		size = int64(state.Size)
+	}
+	if size > 0 {
+		mb.RecordHwMemorySizeDataPoint(ts, size,
 			m.attributes.hwID,
 			m.attributes.hwName,
 			m.attributes.pciBDF,
@@ -122,7 +138,7 @@ func (m *memory) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 			m.attributes.memoryType,
 		)
 
-		usage := m.attributes.physicalSize - int64(state.Free)
+		usage := size - int64(state.Free)
 		mb.RecordHwMemoryUsageDataPoint(ts, usage,
 			m.attributes.hwID,
 			m.attributes.hwName,
@@ -132,7 +148,7 @@ func (m *memory) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 			m.attributes.memoryType,
 		)
 
-		ratio := float64(usage) / float64(m.attributes.physicalSize)
+		ratio := float64(usage) / float64(size)
 		mb.RecordHwMemoryUtilizationDataPoint(ts, ratio,
 			m.attributes.hwID,
 			m.attributes.hwName,
diff --git a/xpumd/receiver/sysman/metadata.yaml b/xpumd/receiver/intelxpu/sysman/metadata.yaml
similarity index 94%
rename from xpumd/receiver/sysman/metadata.yaml
rename to xpumd/receiver/intelxpu/sysman/metadata.yaml
index 477870728..2cafec115 100644
--- a/xpumd/receiver/sysman/metadata.yaml
+++ b/xpumd/receiver/intelxpu/sysman/metadata.yaml
@@ -35,6 +35,15 @@ attributes:
   com.intel.subdevice_id:
     description: Sub-device ID of the hardware component.
     type: string
+  error.category:
+    description: Error category.
+    type: string
+  error.type:
+    description: Error type.
+    type: string
+    enum:
+      - correctable
+      - uncorrectable
   hw.firmware_version:
     description: Firmware version of the hardware component. Comma-separated list of `<id>:<name>:<subdevice_id>:<version>`, where `<version>` is URL-encoded.
     type: string
@@ -145,6 +154,16 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.sensor_location]
+  hw.errors:
+    enabled: true
+    description: Number of GPU errors. Correctable `error.type` error metrics are reported only when non-zero.
+    stability: development
+    unit: "{error}"
+    sum:
+      value_type: int
+      monotonic: true
+      aggregation_temporality: cumulative
+    attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.type, error.type, error.category]
   hw.frequency:
     enabled: true
     description: Operating frequency of the hardware component.
@@ -262,7 +281,7 @@ metrics:
     attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]
   hw.memory.free:
     enabled: true
-    description: Free memory. Reported only when `hw.memory.size` (and memory usage metrics) are unavailable.
+    description: Free memory. Reported only when `hw.memory.size` (and derived memory usage+ratio metrics) are unavailable.
     stability: development
     unit: "By"
     sum:
@@ -291,7 +310,7 @@ metrics:
     attributes: [hw.id, hw.name, pci.bdf, com.intel.subdevice_id, hw.memory.location, hw.memory.type]
   hw.memory.size:
     enabled: true
-    description: Physical size of the memory.
+    description: Memory size. If physical memory size info is unavailable, provides max allocatable size.
     stability: development
     unit: "By"
     sum:
diff --git a/xpumd/receiver/sysman/power.go b/xpumd/receiver/intelxpu/sysman/power.go
similarity index 83%
rename from xpumd/receiver/sysman/power.go
rename to xpumd/receiver/intelxpu/sysman/power.go
index 5fd2bc1d1..40e6e3ae8 100644
--- a/xpumd/receiver/sysman/power.go
+++ b/xpumd/receiver/intelxpu/sysman/power.go
@@ -13,7 +13,7 @@ import (
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 func init() {
@@ -22,9 +22,9 @@ func init() {
 
 type power struct {
 	*l0sysman.Power
-	logger  *zap.SugaredLogger
-	attribs powerAttribs
-	state   powerState
+	logger     *zap.SugaredLogger
+	attributes powerAttributes
+	state      powerState
 }
 
 // powerState holds the dynamic runtime state of the power instance.
@@ -32,7 +32,7 @@ type powerState struct {
 	hasLimits bool
 	counter   *l0sysman.PowerEnergyCounter
 }
-type powerAttribs struct {
+type powerAttributes struct {
 	hwID           string
 	hwName         string
 	pciBDF         string
@@ -83,7 +83,7 @@ func newPower(name string, pwr *l0sysman.Power, device *device) (*power, error)
 	p := &power{
 		Power:  pwr,
 		logger: device.logger,
-		attribs: powerAttribs{
+		attributes: powerAttributes{
 			hwID:           device.attributes.hwID,
 			hwName:         name,
 			pciBDF:         device.attributes.pciBDF,
@@ -97,7 +97,7 @@ func newPower(name string, pwr *l0sysman.Power, device *device) (*power, error)
 	}
 
 	if _, err = pwr.GetLimitsExt(); err != nil {
-		device.logger.Infow("Power GetLimitsExt() failed: power limits not available", zap.Error(err), "attributes", p.attribs)
+		device.logger.Infow("Power GetLimitsExt() failed: power limits not available", zap.Error(err), "attributes", p.attributes)
 		p.state.hasLimits = false
 	}
 
@@ -116,7 +116,7 @@ func (power *power) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 
 	counter, err := power.GetEnergyCounter()
 	if err != nil {
-		power.logger.Errorw("Power GetEnergyCounter() failed: power metrics disabled", zap.Error(err), "attributes", power.attribs)
+		power.logger.Errorw("Power GetEnergyCounter() failed: power metrics disabled", zap.Error(err), "attributes", power.attributes)
 		power.state.counter = nil
 		return
 	}
@@ -127,11 +127,11 @@ func (power *power) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 	mb.RecordHwEnergyDataPoint(
 		ts,
 		float64(counter.Energy)/1e6, // uJ -> J
-		power.attribs.hwID,
-		power.attribs.hwName,
-		power.attribs.pciBDF,
-		power.attribs.subdeviceId,
-		power.attribs.sensorLocation,
+		power.attributes.hwID,
+		power.attributes.hwName,
+		power.attributes.pciBDF,
+		power.attributes.subdeviceId,
+		power.attributes.sensorLocation,
 	)
 
 	// TODO: Sysman spec states neither timestamp nor counter bits,
@@ -146,11 +146,11 @@ func (power *power) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 	watts := float64(ediff) / float64(tdiff)
 	mb.RecordHwPowerDataPoint(
 		ts, watts,
-		power.attribs.hwID,
-		power.attribs.hwName,
-		power.attribs.pciBDF,
-		power.attribs.subdeviceId,
-		power.attribs.sensorLocation,
+		power.attributes.hwID,
+		power.attributes.hwName,
+		power.attributes.pciBDF,
+		power.attributes.subdeviceId,
+		power.attributes.sensorLocation,
 	)
 
 	// log only once
@@ -161,7 +161,7 @@ func (power *power) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 	// TODO: find HW supporting this / test it
 	limits, err := power.GetLimitsExt()
 	if err != nil {
-		power.logger.Errorw("Power GetLimitsExt() failed: power limit metrics disabled", zap.Error(err), "attributes", power.attribs)
+		power.logger.Errorw("Power GetLimitsExt() failed: power limit metrics disabled", zap.Error(err), "attributes", power.attributes)
 		power.state.hasLimits = false
 		return
 	}
@@ -175,11 +175,11 @@ func (power *power) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 		mb.RecordHwPowerLimitDataPoint(
 			ts,
 			float64(limit.Limit)*1e3, // mW -> W
-			power.attribs.hwID,
-			power.attribs.hwName,
-			power.attribs.pciBDF,
-			power.attribs.subdeviceId,
-			power.attribs.sensorLocation,
+			power.attributes.hwID,
+			power.attributes.hwName,
+			power.attributes.pciBDF,
+			power.attributes.subdeviceId,
+			power.attributes.sensorLocation,
 			strings.ToLower(limit.Level.String()),
 			strings.ToLower(limit.Source.String()),
 		)
@@ -187,7 +187,7 @@ func (power *power) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
 	}
 
 	if count == 0 {
-		power.logger.Infow("Power GetLimitsExt(): no suitable power limits", "all", len(limits), "attributes", power.attribs)
+		power.logger.Infow("Power GetLimitsExt(): no suitable power limits", "all", len(limits), "attributes", power.attributes)
 		power.state.hasLimits = false
 	}
 }
diff --git a/xpumd/receiver/intelxpu/sysman/ras.go b/xpumd/receiver/intelxpu/sysman/ras.go
new file mode 100644
index 000000000..4fda0637e
--- /dev/null
+++ b/xpumd/receiver/intelxpu/sysman/ras.go
@@ -0,0 +1,133 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package sysman
+
+import (
+	"fmt"
+	"math"
+	"strings"
+
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.uber.org/zap"
+
+	l0sysman "github.com/intel/level-zero-go/sysman"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
+)
+
+func init() {
+	registerSubsystem("errorsets", enumErrorSets)
+}
+
+type errorSet struct {
+	*l0sysman.Ras
+	logger     *zap.SugaredLogger
+	attributes errorSetAttributes
+	state      errorSetState
+}
+
+type errorSetState struct {
+	disabled bool
+}
+
+type errorSetAttributes struct {
+	hwID        string
+	hwName      string
+	pciBDF      string
+	subdeviceId string
+	errorType   metadata.AttributeErrorType
+}
+
+func enumErrorSets(d *device) []instanceScraper {
+	items, err := d.EnumRasErrorSets()
+	if err != nil {
+		d.logger.Errorw("Failed to enumerate RAS error sets", zap.Error(err))
+		return nil
+	}
+	scrapers := make([]instanceScraper, 0, len(items))
+	for i, item := range items {
+		name := fmt.Sprintf("errorset-%d", i+1)
+		p, err := newErrorSet(name, item, d)
+		if err != nil {
+			d.logger.Errorw("Sysman RAS error set metrics not available", "index", i+1, zap.Error(err))
+			continue
+		}
+		scrapers = append(scrapers, p)
+	}
+
+	d.logger.Infow("Sysman RAS error sets", "created", len(scrapers), "enumerated", len(items))
+	return scrapers
+}
+
+func newErrorSet(name string, ras *l0sysman.Ras, device *device) (*errorSet, error) {
+	props, err := ras.GetProperties()
+	if err != nil {
+		return nil, fmt.Errorf("RAS GetProperties() failed: %w", err)
+	}
+
+	if states, err := ras.GetStateExp(); err != nil {
+		return nil, fmt.Errorf("RAS GetStateExp() failed: %w", err)
+	} else if len(states) < 1 {
+		return nil, fmt.Errorf("no RAS error counters available")
+	}
+
+	var errType metadata.AttributeErrorType
+	switch props.Type {
+	case l0sysman.RAS_ERROR_TYPE_CORRECTABLE:
+		errType = metadata.AttributeErrorTypeCorrectable
+	case l0sysman.RAS_ERROR_TYPE_UNCORRECTABLE:
+		errType = metadata.AttributeErrorTypeUncorrectable
+	default:
+		return nil, fmt.Errorf("unsupported RAS error type: %v", props.Type)
+	}
+
+	p := &errorSet{
+		Ras:    ras,
+		logger: device.logger,
+		attributes: errorSetAttributes{
+			hwID:        device.attributes.hwID,
+			hwName:      name,
+			pciBDF:      device.attributes.pciBDF,
+			subdeviceId: subDeviceIdString(props.OnSubdevice, props.SubdeviceId),
+			errorType:   errType,
+		},
+	}
+
+	return p, nil
+}
+
+func (es *errorSet) scrape(mb *metadata.MetricsBuilder, ts pcommon.Timestamp) {
+	if es.state.disabled {
+		return
+	}
+
+	states, err := es.GetStateExp()
+	if err != nil {
+		es.logger.Errorw("RAS GetStateExp() failed: error metrics disabled", zap.Error(err), "attributes", es.attributes)
+		es.state.disabled = true
+		return
+	}
+
+	// https://oneapi-src.github.io/level-zero-spec/level-zero/latest/sysman/api.html#zes-ras-error-category-exp-t
+	for _, state := range states {
+		// Report zero values only for uncorrectable error metrics.
+		if state.ErrorCounter == 0 && es.attributes.errorType != metadata.AttributeErrorTypeUncorrectable {
+			continue
+		}
+		// value is uint64, but OTel builder does not support uint64 metric type
+		value := state.ErrorCounter % (math.MaxInt64 + 1)
+		mb.RecordHwErrorsDataPoint(ts, int64(value),
+			es.attributes.hwID,
+			es.attributes.hwName,
+			es.attributes.pciBDF,
+			es.attributes.subdeviceId,
+			metadata.AttributeHwTypeGpu,
+			es.attributes.errorType,
+			strings.ToLower(state.Category.String()),
+		)
+	}
+}
+
+func (es *errorSet) pollAggregatedMetrics() {}
diff --git a/xpumd/receiver/sysman/scraper.go b/xpumd/receiver/intelxpu/sysman/scraper.go
similarity index 92%
rename from xpumd/receiver/sysman/scraper.go
rename to xpumd/receiver/intelxpu/sysman/scraper.go
index b82bfc08a..ceff4e76c 100644
--- a/xpumd/receiver/sysman/scraper.go
+++ b/xpumd/receiver/intelxpu/sysman/scraper.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
@@ -29,7 +29,7 @@ type sysmanMetricsScraper struct {
 }
 
 func newSysmanMetricsScraper(_ context.Context, settings scraper.Settings, cfg *Config, devices *deviceRegistry) (*sysmanMetricsScraper, error) {
-	logger := settings.Logger.WithOptions(zap.IncreaseLevel(cfg.LogLevel)).Sugar()
+	logger := settings.Logger.Sugar()
 
 	// Warn about potentially config issues.
 	// Cannot do in Config.Validate() as logger is not available there.
diff --git a/xpumd/receiver/sysman/sysman.go b/xpumd/receiver/intelxpu/sysman/sysman.go
similarity index 87%
rename from xpumd/receiver/sysman/sysman.go
rename to xpumd/receiver/intelxpu/sysman/sysman.go
index 3bedce40b..afa203a22 100644
--- a/xpumd/receiver/sysman/sysman.go
+++ b/xpumd/receiver/intelxpu/sysman/sysman.go
@@ -13,7 +13,7 @@ import (
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 const (
@@ -56,14 +56,17 @@ type sysmanProvider struct {
 // receive the cached result.
 func (p *sysmanProvider) get(logger *zap.SugaredLogger, cfg *Config) (*deviceRegistry, error) {
 	p.once.Do(func() {
+		logger.Debug("Sysman init...")
 		if err := l0sysman.Init(0); err != nil {
 			p.err = fmt.Errorf("failed to initialize L0 Sysman API (likely a Level-Zero driver / device access issue): %w", err)
 			return
 		}
+		logger.Debug("Sysman drivers/devices/metrics enumeration starting")
 		p.devices, p.err = newDeviceRegistry(logger, cfg.aggregatedMetricsBufferSize)
 		if p.err != nil {
 			p.err = fmt.Errorf("failed to initialize device registry: %w", p.err)
 		}
+		logger.Debug("Sysman drivers/devices/metrics enumeration completed")
 	})
 	return p.devices, p.err
 }
diff --git a/xpumd/receiver/sysman/temperature.go b/xpumd/receiver/intelxpu/sysman/temperature.go
similarity index 97%
rename from xpumd/receiver/sysman/temperature.go
rename to xpumd/receiver/intelxpu/sysman/temperature.go
index 59ba0d05c..013b35193 100644
--- a/xpumd/receiver/sysman/temperature.go
+++ b/xpumd/receiver/intelxpu/sysman/temperature.go
@@ -13,7 +13,7 @@ import (
 	"go.uber.org/zap"
 
 	l0sysman "github.com/intel/level-zero-go/sysman"
-	"github.com/intel/xpumanager/xpumd/receiver/sysman/internal/metadata"
+	"github.com/intel/xpumanager/xpumd/receiver/intelxpu/sysman/internal/metadata"
 )
 
 func init() {
diff --git a/xpumd/receiver/internal/level-zero-go/sysman/sysman_static_test.go b/xpumd/receiver/internal/level-zero-go/sysman/sysman_static_test.go
deleted file mode 100644
index 16a7aa0c1..000000000
--- a/xpumd/receiver/internal/level-zero-go/sysman/sysman_static_test.go
+++ /dev/null
@@ -1,2342 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright (C) 2026 Intel Corporation
-
-package sysman
-
-import (
-	"testing"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/intel/level-zero-go/core"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// Driver config paths (relative to the sysman/ package directory, i.e. go test CWD).
-const (
-	driverConfigDefault   = "testdata/default.yaml"
-	driverConfigDriverGet = "testdata/error_driver_get.yaml"
-	driverConfigDriver    = "testdata/error_driver.yaml"
-	driverConfigDevice    = "testdata/error_device.yaml"
-	driverConfigComponent = "testdata/error_component.yaml"
-)
-
-type fixedStringProperty interface {
-	core.StringProperty64 | core.StringProperty256
-}
-
-func stringProperty[T fixedStringProperty](value string) T {
-	var prop T
-	switch p := any(&prop).(type) {
-	case *core.StringProperty64:
-		copy(p[:], value)
-	case *core.StringProperty256:
-		copy(p[:], value)
-	default:
-		panic("unsupported string property type")
-	}
-	return prop
-}
-
-// loadDriverConfig reloads the stub with the given driver config file.
-func loadDriverConfig(t *testing.T, path string) {
-	t.Helper()
-	require.NoError(t, stubReload(path))
-}
-
-// getDriver returns drivers[idx] from the currently-loaded stub state.
-func getDriver(t *testing.T, idx int) *Driver {
-	t.Helper()
-	drivers, err := DriverGet()
-	require.NoError(t, err)
-	require.Greater(t, len(drivers), idx, "driver index out of range")
-	return drivers[idx]
-}
-
-// getDevice returns drivers[drvIdx].devices[idx] from the currently-loaded stub state.
-func getDevice(t *testing.T, drvIdx, idx int) *Device {
-	t.Helper()
-	drv := getDriver(t, drvIdx)
-	devices, err := drv.DeviceGet()
-	require.NoError(t, err)
-	require.Greater(t, len(devices), idx, "device index out of range")
-	return devices[idx]
-}
-
-// getComponent is a generic helper that enumerates components on a device and returns
-// the component at the given index.
-func getComponent[C any](t *testing.T, drvIdx, devIdx, idx int, enum func(*Device) ([]*C, error)) *C {
-	t.Helper()
-	dev := getDevice(t, drvIdx, devIdx)
-	items, err := enum(dev)
-	require.NoError(t, err)
-	require.Greater(t, len(items), idx, "component index out of range")
-	return items[idx]
-}
-
-func getEngine(t *testing.T, drvIdx, devIdx, idx int) *Engine {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumEngineGroups)
-}
-
-func getFabricPort(t *testing.T, drvIdx, devIdx, idx int) *FabricPort {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFabricPorts)
-}
-
-func getFan(t *testing.T, drvIdx, devIdx, idx int) *Fan {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFans)
-}
-
-func getFirmware(t *testing.T, drvIdx, devIdx, idx int) *Firmware {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFirmwares)
-}
-
-func getFrequency(t *testing.T, drvIdx, devIdx, idx int) *Frequency {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumFrequencyDomains)
-}
-
-func getLed(t *testing.T, drvIdx, devIdx, idx int) *Led {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumLeds)
-}
-
-func getMemory(t *testing.T, drvIdx, devIdx, idx int) *Memory {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumMemoryModules)
-}
-
-func getOcDomain(t *testing.T, drvIdx, devIdx, idx int) *Overclock {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumOverclockDomains)
-}
-
-func getPerf(t *testing.T, drvIdx, devIdx, idx int) *Performance {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumPerformanceFactorDomains)
-}
-
-func getPower(t *testing.T, drvIdx, devIdx, idx int) *Power {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumPowerDomains)
-}
-
-func getPsu(t *testing.T, drvIdx, devIdx, idx int) *Psu {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumPsus)
-}
-
-func getRas(t *testing.T, drvIdx, devIdx, idx int) *Ras {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumRasErrorSets)
-}
-
-func getScheduler(t *testing.T, drvIdx, devIdx, idx int) *Scheduler {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumSchedulers)
-}
-
-func getStandby(t *testing.T, drvIdx, devIdx, idx int) *Standby {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumStandbyDomains)
-}
-
-func getTemperature(t *testing.T, drvIdx, devIdx, idx int) *Temperature {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumTemperatureSensors)
-}
-
-func getDiagnostic(t *testing.T, drvIdx, devIdx, idx int) *Diagnostics {
-	t.Helper()
-	return getComponent(t, drvIdx, devIdx, idx, (*Device).EnumDiagnosticTestSuites)
-}
-
-// ------------------------------------------------------------------
-// Init
-// ------------------------------------------------------------------
-
-func TestInit(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDriverGet)
-		err := Init(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_UNINITIALIZED)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := Init(0)
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Driver
-// ------------------------------------------------------------------
-
-func TestDriverGet(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDriverGet)
-		_, err := DriverGet()
-		require.ErrorIs(t, err, core.RESULT_ERROR_UNINITIALIZED)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		drivers, err := DriverGet()
-		require.NoError(t, err)
-		require.Len(t, drivers, 2)
-	})
-}
-
-func TestDriverGetExtensionProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDriver)
-		// DriverGet silently swallows GetExtensionProperties errors, so call directly.
-		drv := getDriver(t, 0)
-		_, err := drv.GetExtensionProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		drv := getDriver(t, 0)
-		exts, err := drv.GetExtensionProperties()
-		require.NoError(t, err)
-		assert.Equal(t, []DriverExtensionProperties{
-			{Name: stringProperty[core.StringProperty256]("ZES_extension_foo"), Version: 1},
-			{Name: stringProperty[core.StringProperty256]("ZES_extension_bar"), Version: 2},
-		}, exts)
-	})
-}
-
-func TestDriverDeviceGet(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDriver)
-		drv := getDriver(t, 0)
-		_, err := drv.DeviceGet()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		drv := getDriver(t, 0)
-		devices, err := drv.DeviceGet()
-		require.NoError(t, err)
-		require.Len(t, devices, 1)
-	})
-}
-
-func TestDriverEventListen(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDriver)
-		drv := getDriver(t, 0)
-		_, _, err := drv.EventListen(time.Second, nil)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		drv := getDriver(t, 0)
-		dev := getDevice(t, 0, 0)
-		numEvents, events, err := drv.EventListen(0, []*Device{dev})
-		require.NoError(t, err)
-		assert.Equal(t, uint32(1), numEvents)
-		assert.Equal(t, EventTypeFlags(EVENT_TYPE_FLAG_DEVICE_DETACH), events[0])
-	})
-}
-
-func TestDriverEventListenEx(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDriver)
-		drv := getDriver(t, 0)
-		_, _, err := drv.EventListenEx(time.Second, nil)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INSUFFICIENT_PERMISSIONS)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		drv := getDriver(t, 0)
-		dev := getDevice(t, 0, 0)
-		numEvents, events, err := drv.EventListenEx(0, []*Device{dev})
-		require.NoError(t, err)
-		assert.Equal(t, uint32(1), numEvents)
-		assert.Equal(t, EventTypeFlags(EVENT_TYPE_FLAG_DEVICE_DETACH), events[0])
-	})
-}
-
-func TestDeviceGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDevice(t, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, DeviceBaseProperties{
-			Core: core.DeviceProperties{
-				Type:                     core.DEVICE_TYPE_GPU,
-				VendorId:                 32902,
-				DeviceId:                 3029,
-				Flags:                    core.DevicePropertyFlags(core.DEVICE_PROPERTY_FLAG_INTEGRATED),
-				SubdeviceId:              1,
-				CoreClockRate:            1600,
-				MaxMemAllocSize:          17179869184,
-				MaxHardwareContexts:      256,
-				MaxCommandQueuePriority:  2,
-				NumThreadsPerEU:          8,
-				PhysicalEUSimdWidth:      16,
-				NumEUsPerSubslice:        16,
-				NumSubslicesPerSlice:     8,
-				NumSlices:                2,
-				TimerResolution:          100,
-				TimestampValidBits:       36,
-				KernelTimestampValidBits: 32,
-				Uuid: core.DeviceUuid{
-					Id: uuid.MustParse("12345678-1234-5678-9abc-def000000000"),
-				},
-				Name: stringProperty[core.StringProperty256]("ACME Data Center GPU"),
-			},
-			NumSubdevices: 2,
-			SerialNumber:  stringProperty[core.StringProperty64]("SN-0001"),
-			BoardNumber:   stringProperty[core.StringProperty64]("BOARD-0001"),
-			BrandName:     stringProperty[core.StringProperty64]("ACME"),
-			ModelName:     stringProperty[core.StringProperty64]("Stub GPU 1234"),
-			VendorName:    stringProperty[core.StringProperty64]("ACME Corporation"),
-			DriverVersion: stringProperty[core.StringProperty64]("1.2.3"),
-		}, props.DeviceBaseProperties)
-
-	})
-
-	t.Run("SuccessWithExtProps", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDevice(t, 1, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, DeviceExtProperties{
-			Uuid: Uuid{
-				Id: uuid.MustParse("abcdef01-2345-6789-abcd-ef0000000000"),
-			},
-			Type:  DEVICE_TYPE_GPU,
-			Flags: 1,
-		}, props.DeviceExtProperties)
-	})
-}
-
-func TestDeviceGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getDevice(t, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, DeviceState{
-			Reset:    0,
-			Repaired: REPAIR_STATUS_NOT_PERFORMED,
-		}, state)
-	})
-}
-
-func TestDeviceReset(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		err := getDevice(t, 0, 0).Reset(false)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getDevice(t, 0, 0).Reset(false)
-		require.NoError(t, err)
-	})
-}
-
-func TestDeviceResetExt(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		err := getDevice(t, 0, 0).ResetExt(nil)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getDevice(t, 0, 0).ResetExt(nil)
-		require.NoError(t, err)
-	})
-}
-
-func TestDeviceProcessesGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).ProcessesGetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		procs, err := getDevice(t, 0, 0).ProcessesGetState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, []ProcessState{
-			{
-				ProcessId:  1234,
-				MemSize:    1073741824,
-				SharedSize: 268435456,
-				Engines:    7,
-			},
-			{
-				ProcessId:  5678,
-				MemSize:    536870912,
-				SharedSize: 134217728,
-				Engines:    2,
-			},
-		}, procs)
-	})
-}
-
-func TestDeviceEventRegister(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		err := getDevice(t, 0, 0).EventRegister(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getDevice(t, 0, 0).EventRegister(0)
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Device.Pci
-// ------------------------------------------------------------------
-
-func TestDevicePciGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).PciGetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDevice(t, 0, 0).PciGetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PciProperties{
-			PciBaseProperties: PciBaseProperties{
-				Address: PciAddress{Domain: 1, Bus: 5},
-				MaxSpeed: PciSpeed{
-					Gen:          4,
-					Width:        16,
-					MaxBandwidth: 256000000000,
-				},
-				HaveBandwidthCounters: 1,
-				HavePacketCounters:    1,
-				HaveReplayCounters:    1,
-			},
-		}, props)
-		assert.Nil(t, props.LinkSpeedDowngrade)
-	})
-
-	t.Run("SuccessWithExt", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDevice(t, 1, 0).PciGetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PciProperties{
-			PciBaseProperties: PciBaseProperties{
-				Address: PciAddress{Domain: 1, Bus: 2, Device: 3, Function: 4},
-				MaxSpeed: PciSpeed{
-					Gen:          5,
-					Width:        16,
-					MaxBandwidth: 512000000000,
-				},
-				HaveBandwidthCounters: 1,
-				HaveReplayCounters:    1,
-			},
-			LinkSpeedDowngrade: &PciLinkSpeedDowngradeExtProperties{
-				PciLinkSpeedUpdateCapable: 1,
-				MaxPciGenSupported:        5,
-			},
-		}, props)
-	})
-}
-
-func TestDevicePciGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).PciGetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getDevice(t, 0, 0).PciGetState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PciState{
-			PciBaseState: PciBaseState{
-				Status:          PCI_LINK_STATUS_QUALITY_ISSUES,
-				QualityIssues:   PciLinkQualIssueFlags(PCI_LINK_QUAL_ISSUE_FLAG_REPLAYS | PCI_LINK_QUAL_ISSUE_FLAG_SPEED),
-				StabilityIssues: PciLinkStabIssueFlags(PCI_LINK_STAB_ISSUE_FLAG_RETRAINING),
-				Speed: PciSpeed{
-					Gen:          3,
-					Width:        8,
-					MaxBandwidth: 126000000000,
-				},
-			},
-		}, state)
-		assert.Nil(t, state.LinkSpeedDowngrade)
-	})
-
-	t.Run("SuccessWithExt", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getDevice(t, 1, 0).PciGetState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PciState{
-			PciBaseState: PciBaseState{
-				Status:        PCI_LINK_STATUS_QUALITY_ISSUES,
-				QualityIssues: PciLinkQualIssueFlags(PCI_LINK_QUAL_ISSUE_FLAG_SPEED),
-				Speed: PciSpeed{
-					Gen:          3,
-					Width:        8,
-					MaxBandwidth: 126000000000,
-				},
-			},
-			LinkSpeedDowngrade: &PciLinkSpeedDowngradeExtState{
-				PciLinkSpeedDowngradeStatus: 1,
-			},
-		}, state)
-	})
-}
-
-func TestDevicePciLinkSpeedUpdateExt(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).PciLinkSpeedUpdateExt(true)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		action, err := getDevice(t, 1, 0).PciLinkSpeedUpdateExt(true)
-		require.NoError(t, err)
-		assert.Equal(t, DEVICE_ACTION_WARM_CARD_RESET, action)
-	})
-}
-
-func TestDevicePciGetBars(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).PciGetBars()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		bars, err := getDevice(t, 0, 0).PciGetBars()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, []PciBarProperties{
-			{Type: PCI_BAR_TYPE_MMIO, Index: 0, Base: 0x80000000, Size: 16777216},
-			{Type: PCI_BAR_TYPE_MEM, Index: 2, Base: 0x100000000, Size: 268435456},
-		}, bars)
-	})
-}
-
-func TestDevicePciGetStats(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).PciGetStats()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		stats, err := getDevice(t, 0, 0).PciGetStats()
-		require.NoError(t, err)
-		assert.Equal(t, PciStats{
-			Timestamp:     999999,
-			ReplayCounter: 77,
-			PacketCounter: 88,
-			RxCounter:     1000000,
-			TxCounter:     2000000,
-			Speed: PciSpeed{
-				Gen:          3,
-				Width:        8,
-				MaxBandwidth: 126000000000,
-			},
-		}, stats)
-	})
-}
-
-// ------------------------------------------------------------------
-// Device overclock helpers (no component handle needed)
-// ------------------------------------------------------------------
-
-func TestDeviceSetOverclockWaiver(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		err := getDevice(t, 0, 0).SetOverclockWaiver()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getDevice(t, 0, 0).SetOverclockWaiver()
-		require.NoError(t, err)
-	})
-}
-
-func TestDeviceGetOverclockDomains(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).GetOverclockDomains()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		mask, err := getDevice(t, 0, 0).GetOverclockDomains()
-		require.NoError(t, err)
-		assert.Equal(t, OverclockDomains(OVERCLOCK_DOMAIN_CARD|OVERCLOCK_DOMAIN_PACKAGE), mask, "mask")
-	})
-}
-
-func TestDeviceGetOverclockControls(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).GetOverclockControls(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		mask, err := getDevice(t, 0, 0).GetOverclockControls(0)
-		require.NoError(t, err)
-		assert.Equal(t, OverclockControls(OVERCLOCK_CONTROL_VF|OVERCLOCK_CONTROL_FREQ_OFFSET|OVERCLOCK_CONTROL_VMAX_OFFSET), mask, "mask")
-	})
-}
-
-func TestDeviceResetOverclockSettings(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		err := getDevice(t, 0, 0).ResetOverclockSettings(false)
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getDevice(t, 0, 0).ResetOverclockSettings(false)
-		require.NoError(t, err)
-	})
-}
-
-func TestDeviceReadOverclockState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).ReadOverclockState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getDevice(t, 0, 0).ReadOverclockState()
-		require.NoError(t, err)
-		assert.Equal(t, OverclockState{
-			Mode:          OVERCLOCK_MODE_MODE_ON,
-			WaiverSetting: true,
-			State:         false,
-			PendingAction: PENDING_ACTION_PENDING_NONE,
-			PendingReset:  false,
-		}, state)
-	})
-}
-
-func TestDeviceEccAvailable(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EccAvailable()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		available, err := getDevice(t, 0, 0).EccAvailable()
-		require.NoError(t, err)
-		assert.True(t, available, "EccAvailable")
-	})
-}
-
-func TestDeviceEccConfigurable(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EccConfigurable()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		configurable, err := getDevice(t, 0, 0).EccConfigurable()
-		require.NoError(t, err)
-		assert.True(t, configurable, "EccConfigurable")
-	})
-}
-
-func TestDeviceGetEccState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).GetEccState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDevice(t, 0, 0).GetEccState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, EccProperties{
-			DeviceEccProperties: DeviceEccProperties{
-				CurrentState:  DEVICE_ECC_STATE_ENABLED,
-				PendingState:  DEVICE_ECC_STATE_ENABLED,
-				PendingAction: DEVICE_ACTION_NONE,
-			},
-		}, props)
-	})
-	t.Run("SuccessWithExtProps", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDevice(t, 1, 0).GetEccState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, EccProperties{
-			DeviceEccProperties: DeviceEccProperties{},
-			ExtendedProperties: &DeviceEccDefaultPropertiesExt{
-				DefaultState: DEVICE_ECC_STATE_ENABLED,
-			},
-		}, props)
-	})
-}
-
-func TestDeviceSetEccState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).SetEccState(DeviceEccDesc{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getDevice(t, 0, 0).SetEccState(DeviceEccDesc{})
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, DeviceEccProperties{
-			CurrentState: DEVICE_ECC_STATE_ENABLED,
-			PendingState: DEVICE_ECC_STATE_ENABLED,
-		}, state)
-	})
-}
-
-// ------------------------------------------------------------------
-// Device enum methods
-// ------------------------------------------------------------------
-
-func TestDeviceEnumEngineGroups(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumEngineGroups()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		engines, err := getDevice(t, 0, 0).EnumEngineGroups()
-		require.NoError(t, err)
-		require.Len(t, engines, 3)
-	})
-}
-
-func TestDeviceEnumFrequencyDomains(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumFrequencyDomains()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		freqs, err := getDevice(t, 0, 0).EnumFrequencyDomains()
-		require.NoError(t, err)
-		require.Len(t, freqs, 2)
-	})
-}
-
-func TestDeviceEnumMemoryModules(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumMemoryModules()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		mems, err := getDevice(t, 0, 0).EnumMemoryModules()
-		require.NoError(t, err)
-		require.Len(t, mems, 2)
-	})
-}
-
-func TestDeviceEnumPowerDomains(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumPowerDomains()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		powers, err := getDevice(t, 0, 0).EnumPowerDomains()
-		require.NoError(t, err)
-		require.Len(t, powers, 2)
-	})
-}
-
-func TestDeviceEnumSchedulers(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumSchedulers()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		scheds, err := getDevice(t, 0, 0).EnumSchedulers()
-		require.NoError(t, err)
-		require.Len(t, scheds, 2)
-	})
-}
-
-func TestDeviceEnumTemperatureSensors(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumTemperatureSensors()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		temps, err := getDevice(t, 0, 0).EnumTemperatureSensors()
-		require.NoError(t, err)
-		require.Len(t, temps, 3)
-	})
-}
-
-func TestDeviceEnumFabricPorts(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumFabricPorts()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		ports, err := getDevice(t, 0, 0).EnumFabricPorts()
-		require.NoError(t, err)
-		require.Len(t, ports, 2)
-	})
-}
-
-func TestDeviceEnumFans(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumFans()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		fans, err := getDevice(t, 0, 0).EnumFans()
-		require.NoError(t, err)
-		require.Len(t, fans, 2)
-	})
-}
-
-func TestDeviceEnumFirmwares(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumFirmwares()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		fws, err := getDevice(t, 0, 0).EnumFirmwares()
-		require.NoError(t, err)
-		require.Len(t, fws, 2)
-	})
-}
-
-func TestDeviceEnumLeds(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumLeds()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		leds, err := getDevice(t, 0, 0).EnumLeds()
-		require.NoError(t, err)
-		require.Len(t, leds, 2)
-	})
-}
-
-func TestDeviceEnumOverclockDomains(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumOverclockDomains()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		ocs, err := getDevice(t, 0, 0).EnumOverclockDomains()
-		require.NoError(t, err)
-		require.Len(t, ocs, 1)
-	})
-}
-
-func TestDeviceEnumPerformanceFactorDomains(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumPerformanceFactorDomains()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		perfs, err := getDevice(t, 0, 0).EnumPerformanceFactorDomains()
-		require.NoError(t, err)
-		require.Len(t, perfs, 2)
-	})
-}
-
-func TestDeviceEnumPsus(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumPsus()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		psus, err := getDevice(t, 0, 0).EnumPsus()
-		require.NoError(t, err)
-		require.Len(t, psus, 2)
-	})
-}
-
-func TestDeviceEnumRasErrorSets(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumRasErrorSets()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		ras, err := getDevice(t, 0, 0).EnumRasErrorSets()
-		require.NoError(t, err)
-		require.Len(t, ras, 2)
-	})
-}
-
-func TestDeviceEnumStandbyDomains(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumStandbyDomains()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		standbys, err := getDevice(t, 0, 0).EnumStandbyDomains()
-		require.NoError(t, err)
-		require.Len(t, standbys, 1)
-	})
-}
-
-func TestDeviceEnumDiagnosticTestSuites(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDevice)
-		_, err := getDevice(t, 0, 0).EnumDiagnosticTestSuites()
-		require.ErrorIs(t, err, core.RESULT_ERROR_INVALID_ARGUMENT)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		diags, err := getDevice(t, 0, 0).EnumDiagnosticTestSuites()
-		require.NoError(t, err)
-		require.Len(t, diags, 2)
-	})
-}
-
-func TestDeviceFabricPortGetMultiPortThroughput(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		// Pass nil (count=0) to avoid the CGo restriction on Go pointer slices.
-		_, err := getDevice(t, 0, 0).FabricPortGetMultiPortThroughput(nil)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		// Pass nil (count=0) to avoid the CGo restriction on Go pointer slices.
-		results, err := getDevice(t, 0, 0).FabricPortGetMultiPortThroughput(nil)
-		require.NoError(t, err)
-		require.Empty(t, results)
-	})
-}
-
-// ------------------------------------------------------------------
-// Engine
-// ------------------------------------------------------------------
-
-func TestEngineGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getEngine(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getEngine(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, EngineBaseProperties{
-			Type: ENGINE_GROUP_ALL,
-		}, props.EngineBaseProperties)
-	})
-	t.Run("SuccessWithExtProps", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getEngine(t, 1, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, EngineProperties{
-			EngineBaseProperties: EngineBaseProperties{
-				Type: ENGINE_GROUP_ALL,
-			},
-			ExtendedProperties: &EngineExtProperties{
-				CountOfVirtualFunctionInstance: 4,
-			},
-		}, props)
-	})
-}
-
-func TestEngineGetActivity(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getEngine(t, 0, 0, 0).GetActivity()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		stats, err := getEngine(t, 0, 0, 0).GetActivity()
-		require.NoError(t, err)
-		assert.Equal(t, EngineStats{
-			ActiveTime: 12345678,
-			Timestamp:  87654321,
-		}, stats)
-	})
-}
-
-func TestEngineGetActivityExt(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getEngine(t, 0, 0, 0).GetActivityExt()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		stats, err := getEngine(t, 0, 0, 0).GetActivityExt()
-		require.NoError(t, err)
-		require.Empty(t, stats)
-	})
-}
-
-// ------------------------------------------------------------------
-// Frequency
-// ------------------------------------------------------------------
-
-func TestFrequencyGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFrequency(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getFrequency(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FreqProperties{
-			Type:                     FREQ_DOMAIN_GPU,
-			OnSubdevice:              1,
-			SubdeviceId:              1,
-			CanControl:               1,
-			IsThrottleEventSupported: 1,
-			Min:                      300.0,
-			Max:                      1600.0,
-		}, props)
-	})
-}
-
-func TestFrequencyGetAvailableClocks(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFrequency(t, 0, 0, 0).GetAvailableClocks()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		clocks, err := getFrequency(t, 0, 0, 0).GetAvailableClocks()
-		require.NoError(t, err)
-		require.Len(t, clocks, 3)
-		assert.Equal(t, 300.0, clocks[0], "clocks[0]")
-		assert.Equal(t, 900.0, clocks[1], "clocks[1]")
-		assert.Equal(t, 1600.0, clocks[2], "clocks[2]")
-	})
-}
-
-func TestFrequencyGetRange(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFrequency(t, 0, 0, 0).GetRange()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		rng, err := getFrequency(t, 0, 0, 0).GetRange()
-		require.NoError(t, err)
-		assert.Equal(t, FreqRange{Min: 300.0, Max: 1600.0}, rng)
-	})
-}
-
-func TestFrequencySetRange(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getFrequency(t, 0, 0, 0).SetRange(&FreqRange{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getFrequency(t, 0, 0, 0).SetRange(&FreqRange{})
-		require.NoError(t, err)
-	})
-}
-
-func TestFrequencyGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFrequency(t, 0, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getFrequency(t, 0, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.Equal(t, FreqState{
-			CurrentVoltage: 0.85,
-			Request:        1400.0,
-			Tdp:            1600.0,
-			Efficient:      300.0,
-			Actual:         1200.0,
-			ThrottleReasons: FreqThrottleReasonFlags(
-				FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT | FREQ_THROTTLE_REASON_FLAG_SW_RANGE,
-			),
-		}, state)
-	})
-}
-
-func TestFrequencyGetThrottleTime(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFrequency(t, 0, 0, 0).GetThrottleTime()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		tt, err := getFrequency(t, 0, 0, 0).GetThrottleTime()
-		require.NoError(t, err)
-		assert.Equal(t, FreqThrottleTime{
-			ThrottleTime: 5000,
-			Timestamp:    100000,
-		}, tt)
-	})
-}
-
-// ------------------------------------------------------------------
-// Memory
-// ------------------------------------------------------------------
-
-func TestMemoryGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getMemory(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getMemory(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, MemProperties{
-			Type:         MEM_TYPE_HBM,
-			OnSubdevice:  1,
-			SubdeviceId:  1,
-			Location:     MEM_LOC_DEVICE,
-			PhysicalSize: 17179869184,
-			BusWidth:     128,
-			NumChannels:  8,
-		}, props)
-	})
-}
-
-func TestMemoryGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getMemory(t, 0, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getMemory(t, 0, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.Equal(t, MemState{
-			Health: MEM_HEALTH_OK,
-			Free:   8589934592,
-			Size:   17179869184,
-		}, state)
-	})
-}
-
-func TestMemoryGetBandwidth(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getMemory(t, 0, 0, 0).GetBandwidth()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		bw, err := getMemory(t, 0, 0, 0).GetBandwidth()
-		require.NoError(t, err)
-		assert.Equal(t, MemBandwidth{
-			ReadCounter:  1073741824,
-			WriteCounter: 536870912,
-			MaxBandwidth: 512000000000,
-			Timestamp:    123456789,
-		}, bw)
-	})
-}
-
-// ------------------------------------------------------------------
-// Power
-// ------------------------------------------------------------------
-
-func TestPowerGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPower(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getPower(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PowerBaseProperties{
-			OnSubdevice:                1,
-			SubdeviceId:                1,
-			CanControl:                 1,
-			IsEnergyThresholdSupported: 1,
-			DefaultLimit:               200000,
-			MinLimit:                   100000,
-			MaxLimit:                   300000,
-		}, props.PowerBaseProperties)
-	})
-	t.Run("SuccessWithExtProps", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getPower(t, 1, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PowerProperties{
-			PowerBaseProperties: PowerBaseProperties{
-				OnSubdevice:                1,
-				SubdeviceId:                1,
-				CanControl:                 1,
-				IsEnergyThresholdSupported: 1,
-				DefaultLimit:               150000,
-				MinLimit:                   90000,
-				MaxLimit:                   225000,
-			},
-			ExtendedProperties: &PowerExtProperties{
-				Domain: POWER_DOMAIN_PACKAGE,
-				DefaultLimit: &PowerLimitExtDesc{
-					Level:               POWER_LEVEL_SUSTAINED,
-					Source:              POWER_SOURCE_ANY,
-					LimitUnit:           LIMIT_UNIT_UNKNOWN,
-					EnabledStateLocked:  1,
-					Enabled:             1,
-					IntervalValueLocked: 1,
-					Interval:            250,
-					LimitValueLocked:    1,
-					Limit:               150000,
-				},
-			},
-		}, props)
-	})
-}
-
-func TestPowerGetEnergyCounter(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPower(t, 0, 0, 0).GetEnergyCounter()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		ec, err := getPower(t, 0, 0, 0).GetEnergyCounter()
-		require.NoError(t, err)
-		assert.Equal(t, PowerEnergyCounter{
-			Energy:    5000000,
-			Timestamp: 123456789,
-		}, ec)
-	})
-}
-
-func TestPowerGetEnergyThreshold(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPower(t, 0, 0, 0).GetEnergyThreshold()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		et, err := getPower(t, 0, 0, 0).GetEnergyThreshold()
-		require.NoError(t, err)
-		assert.Equal(t, EnergyThreshold{
-			Enable:    1,
-			Threshold: 10.5,
-			ProcessId: 4321,
-		}, et)
-	})
-}
-
-func TestPowerSetEnergyThreshold(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getPower(t, 0, 0, 0).SetEnergyThreshold(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getPower(t, 0, 0, 0).SetEnergyThreshold(0)
-		require.NoError(t, err)
-	})
-}
-
-func TestPowerGetLimitsExt(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPower(t, 0, 0, 0).GetLimitsExt()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		limits, err := getPower(t, 0, 0, 0).GetLimitsExt()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, []PowerLimitExtDesc{
-			{
-				Level:               POWER_LEVEL_SUSTAINED,
-				Source:              POWER_SOURCE_ANY,
-				LimitUnit:           LIMIT_UNIT_UNKNOWN,
-				EnabledStateLocked:  0,
-				Enabled:             1,
-				IntervalValueLocked: 0,
-				Interval:            1000,
-				LimitValueLocked:    0,
-				Limit:               200000,
-			},
-			{
-				Level:               POWER_LEVEL_BURST,
-				Source:              POWER_SOURCE_ANY,
-				LimitUnit:           LIMIT_UNIT_UNKNOWN,
-				EnabledStateLocked:  0,
-				Enabled:             1,
-				IntervalValueLocked: 0,
-				Interval:            0,
-				LimitValueLocked:    0,
-				Limit:               250000,
-			},
-		}, limits)
-	})
-}
-
-func TestPowerSetLimitsExt(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getPower(t, 0, 0, 0).SetLimitsExt(nil)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getPower(t, 0, 0, 0).SetLimitsExt(nil)
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Scheduler
-// ------------------------------------------------------------------
-
-func TestSchedulerGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getScheduler(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, SchedProperties{
-			OnSubdevice:    0,
-			SubdeviceId:    0,
-			CanControl:     1,
-			SupportedModes: 7,
-			Engines:        7,
-		}, props)
-	})
-}
-
-func TestSchedulerGetCurrentMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).GetCurrentMode()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		mode, err := getScheduler(t, 0, 0, 0).GetCurrentMode()
-		require.NoError(t, err)
-		assert.Equal(t, SCHED_MODE_TIMESLICE, mode, "CurrentMode")
-	})
-}
-
-func TestSchedulerGetTimeoutModeProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).GetTimeoutModeProperties(false)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getScheduler(t, 0, 0, 0).GetTimeoutModeProperties(false)
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, SchedTimeoutProperties{
-			WatchdogTimeout: 5000000,
-		}, props)
-	})
-}
-
-func TestSchedulerGetTimesliceModeProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).GetTimesliceModeProperties(false)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getScheduler(t, 0, 0, 0).GetTimesliceModeProperties(false)
-		require.NoError(t, err)
-		assert.Equal(t, SchedTimesliceProperties{
-			Interval:     2000,
-			YieldTimeout: 500,
-		}, props)
-	})
-}
-
-func TestSchedulerSetTimeoutMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).SetTimeoutMode(&SchedTimeoutProperties{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		needReload, err := getScheduler(t, 0, 0, 0).SetTimeoutMode(&SchedTimeoutProperties{})
-		require.NoError(t, err)
-		assert.Equal(t, false, needReload, "needReload")
-	})
-}
-
-func TestSchedulerSetTimesliceMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).SetTimesliceMode(&SchedTimesliceProperties{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		needReload, err := getScheduler(t, 0, 0, 0).SetTimesliceMode(&SchedTimesliceProperties{})
-		require.NoError(t, err)
-		assert.Equal(t, false, needReload, "needReload")
-	})
-}
-
-func TestSchedulerSetExclusiveMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getScheduler(t, 0, 0, 0).SetExclusiveMode()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		needReload, err := getScheduler(t, 0, 0, 0).SetExclusiveMode()
-		require.NoError(t, err)
-		assert.Equal(t, false, needReload, "needReload")
-	})
-}
-
-// ------------------------------------------------------------------
-// Temperature
-// ------------------------------------------------------------------
-
-func TestTemperatureGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getTemperature(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getTemperature(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, TempProperties{
-			OnSubdevice:             1,
-			SubdeviceId:             1,
-			Type:                    TEMP_SENSORS_GLOBAL,
-			MaxTemperature:          110.0,
-			IsCriticalTempSupported: 1,
-			IsThreshold1Supported:   1,
-			IsThreshold2Supported:   1,
-		}, props)
-	})
-}
-
-func TestTemperatureGetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getTemperature(t, 0, 0, 0).GetConfig()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		cfg, err := getTemperature(t, 0, 0, 0).GetConfig()
-		require.NoError(t, err)
-		assert.Equal(t, TempConfig{
-			EnableCritical: 1,
-			Threshold1: TempThreshold{
-				EnableLowToHigh: 1,
-				EnableHighToLow: 1,
-				Threshold:       90.0,
-			},
-			Threshold2: TempThreshold{
-				EnableLowToHigh: 1,
-				EnableHighToLow: 1,
-				Threshold:       100.0,
-			},
-		}, cfg)
-	})
-}
-
-func TestTemperatureSetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getTemperature(t, 0, 0, 0).SetConfig(&TempConfig{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getTemperature(t, 0, 0, 0).SetConfig(&TempConfig{})
-		require.NoError(t, err)
-	})
-}
-
-func TestTemperatureGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getTemperature(t, 0, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		temp, err := getTemperature(t, 0, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.Equal(t, 48.0, temp, "Value")
-	})
-}
-
-// ------------------------------------------------------------------
-// FabricPort
-// ------------------------------------------------------------------
-
-func TestFabricPortGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFabricPort(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getFabricPort(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FabricPortProperties{
-			Model:       stringProperty[core.StringProperty256]("Xe-Link"),
-			OnSubdevice: 1,
-			SubdeviceId: 1,
-			PortId: FabricPortId{
-				FabricId:   10,
-				AttachId:   20,
-				PortNumber: 3,
-			},
-			MaxRxSpeed: FabricPortSpeed{BitRate: 53125000000, Width: 4},
-			MaxTxSpeed: FabricPortSpeed{BitRate: 50000000000, Width: 4},
-		}, props)
-	})
-}
-
-func TestFabricPortGetLinkType(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFabricPort(t, 0, 0, 0).GetLinkType()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		link, err := getFabricPort(t, 0, 0, 0).GetLinkType()
-		require.NoError(t, err)
-		assert.Equal(t, FabricLinkType{
-			Desc: stringProperty[core.StringProperty256]("Xe-Link"),
-		}, link)
-	})
-}
-
-func TestFabricPortGetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFabricPort(t, 0, 0, 0).GetConfig()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		cfg, err := getFabricPort(t, 0, 0, 0).GetConfig()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FabricPortConfig{
-			Enabled:   1,
-			Beaconing: 1,
-		}, cfg)
-	})
-}
-
-func TestFabricPortSetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getFabricPort(t, 0, 0, 0).SetConfig(&FabricPortConfig{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getFabricPort(t, 0, 0, 0).SetConfig(&FabricPortConfig{})
-		require.NoError(t, err)
-	})
-}
-
-func TestFabricPortGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFabricPort(t, 0, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getFabricPort(t, 0, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FabricPortState{
-			Status: FABRIC_PORT_STATUS_DEGRADED,
-			QualityIssues: FabricPortQualIssueFlags(
-				FABRIC_PORT_QUAL_ISSUE_FLAG_LINK_ERRORS | FABRIC_PORT_QUAL_ISSUE_FLAG_SPEED,
-			),
-			FailureReasons: FabricPortFailureFlags(
-				FABRIC_PORT_FAILURE_FLAG_FAILED | FABRIC_PORT_FAILURE_FLAG_FLAPPING,
-			),
-			RemotePortId: FabricPortId{
-				FabricId:   11,
-				AttachId:   21,
-				PortNumber: 4,
-			},
-			RxSpeed: FabricPortSpeed{BitRate: 49000000000, Width: 4},
-			TxSpeed: FabricPortSpeed{BitRate: 47000000000, Width: 4},
-		}, state)
-	})
-}
-
-func TestFabricPortGetThroughput(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFabricPort(t, 0, 0, 0).GetThroughput()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		tp, err := getFabricPort(t, 0, 0, 0).GetThroughput()
-		require.NoError(t, err)
-		assert.Equal(t, FabricPortThroughput{
-			Timestamp: 777777,
-			RxCounter: 111111,
-			TxCounter: 222222,
-		}, tp)
-	})
-}
-
-func TestFabricPortGetFabricErrorCounters(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFabricPort(t, 0, 0, 0).GetFabricErrorCounters()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		counters, err := getFabricPort(t, 0, 0, 0).GetFabricErrorCounters()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FabricPortErrorCounters{
-			LinkFailureCount: 5,
-			FwCommErrorCount: 6,
-			FwErrorCount:     7,
-			LinkDegradeCount: 8,
-		}, counters)
-	})
-}
-
-// ------------------------------------------------------------------
-// Fan
-// ------------------------------------------------------------------
-
-func TestFanGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFan(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getFan(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FanProperties{
-			OnSubdevice:    1,
-			SubdeviceId:    1,
-			CanControl:     1,
-			SupportedModes: 7,
-			SupportedUnits: 3,
-			MaxRPM:         3000,
-			MaxPoints:      16,
-		}, props)
-	})
-}
-
-func TestFanGetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFan(t, 0, 0, 0).GetConfig()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		cfg, err := getFan(t, 0, 0, 0).GetConfig()
-		require.NoError(t, err)
-		assert.Equal(t, FanConfig{
-			Mode: FAN_SPEED_MODE_FIXED,
-			SpeedFixed: FanSpeed{
-				Speed: 1500,
-				Units: FAN_SPEED_UNITS_RPM,
-			},
-		}, cfg)
-	})
-}
-
-func TestFanSetDefaultMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getFan(t, 0, 0, 0).SetDefaultMode()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getFan(t, 0, 0, 0).SetDefaultMode()
-		require.NoError(t, err)
-	})
-}
-
-func TestFanSetFixedSpeedMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getFan(t, 0, 0, 0).SetFixedSpeedMode(FanSpeed{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getFan(t, 0, 0, 0).SetFixedSpeedMode(FanSpeed{})
-		require.NoError(t, err)
-	})
-}
-
-func TestFanSetSpeedTableMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getFan(t, 0, 0, 0).SetSpeedTableMode(&FanSpeedTable{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getFan(t, 0, 0, 0).SetSpeedTableMode(&FanSpeedTable{})
-		require.NoError(t, err)
-	})
-}
-
-func TestFanGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFan(t, 0, 0, 0).GetState(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		speed, err := getFan(t, 0, 0, 0).GetState(0) // units=0 → RPM
-		require.NoError(t, err)
-		assert.Equal(t, int32(1500), speed, "SpeedRPM")
-	})
-}
-
-// ------------------------------------------------------------------
-// Firmware
-// ------------------------------------------------------------------
-
-func TestFirmwareGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFirmware(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getFirmware(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, FirmwareProperties{
-			OnSubdevice: 0,
-			SubdeviceId: 0,
-			CanControl:  1,
-			Name:        stringProperty[core.StringProperty64]("GFX"),
-			Version:     stringProperty[core.StringProperty64]("1.2.3.4"),
-		}, props)
-	})
-}
-
-func TestFirmwareFlash(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getFirmware(t, 0, 0, 0).Flash([]byte{0x00})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getFirmware(t, 0, 0, 0).Flash([]byte{0x00})
-		require.NoError(t, err)
-	})
-}
-
-func TestFirmwareGetFlashProgress(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFirmware(t, 0, 0, 0).GetFlashProgress()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		progress, err := getFirmware(t, 0, 0, 0).GetFlashProgress()
-		require.NoError(t, err)
-		assert.Equal(t, uint32(100), progress, "progress")
-	})
-}
-
-func TestFirmwareGetConsoleLogs(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getFirmware(t, 0, 0, 0).GetConsoleLogs()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		logs, err := getFirmware(t, 0, 0, 0).GetConsoleLogs()
-		require.NoError(t, err)
-		assert.Equal(t, "test log\x00", logs, "logs")
-	})
-}
-
-// ------------------------------------------------------------------
-// Led
-// ------------------------------------------------------------------
-
-func TestLedGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getLed(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getLed(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, LedProperties{
-			OnSubdevice: 0,
-			SubdeviceId: 0,
-			CanControl:  1,
-			HaveRGB:     1,
-		}, props)
-	})
-}
-
-func TestLedGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getLed(t, 0, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getLed(t, 0, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.Equal(t, LedState{
-			IsOn: 1,
-			Color: LedColor{
-				Red:   1.0,
-				Green: 0.5,
-			},
-		}, state)
-	})
-}
-
-func TestLedSetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getLed(t, 0, 0, 0).SetState(false)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getLed(t, 0, 0, 0).SetState(false)
-		require.NoError(t, err)
-	})
-}
-
-func TestLedSetColor(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getLed(t, 0, 0, 0).SetColor(LedColor{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getLed(t, 0, 0, 0).SetColor(LedColor{})
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Overclock
-// ------------------------------------------------------------------
-
-func TestOverclockGetDomainProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).GetDomainProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getOcDomain(t, 0, 0, 0).GetDomainProperties()
-		require.NoError(t, err)
-		assert.Equal(t, OverclockProperties{
-			DomainType:        OVERCLOCK_DOMAIN_CARD,
-			AvailableControls: 3,
-			VFProgramType:     VF_PROGRAM_TYPE_VF_ARBITRARY,
-			NumberOfVFPoints:  16,
-		}, props)
-	})
-}
-
-func TestOverclockGetDomainVFProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).GetDomainVFProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getOcDomain(t, 0, 0, 0).GetDomainVFProperties()
-		require.NoError(t, err)
-		assert.Equal(t, VfProperty{
-			MinFreq:  300.0,
-			MaxFreq:  1600.0,
-			StepFreq: 25.0,
-			MinVolt:  700.0,
-			MaxVolt:  1200.0,
-			StepVolt: 10.0,
-		}, props)
-	})
-}
-
-func TestOverclockGetDomainControlProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).GetDomainControlProperties(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getOcDomain(t, 0, 0, 0).GetDomainControlProperties(0)
-		require.NoError(t, err)
-		assert.Equal(t, ControlProperty{
-			MinValue:     100.0,
-			MaxValue:     2000.0,
-			StepValue:    50.0,
-			RefValue:     900.0,
-			DefaultValue: 1100.0,
-		}, props)
-	})
-}
-
-func TestOverclockGetControlCurrentValue(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).GetControlCurrentValue(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		val, err := getOcDomain(t, 0, 0, 0).GetControlCurrentValue(0)
-		require.NoError(t, err)
-		assert.Equal(t, 1200.0, val, "value")
-	})
-}
-
-func TestOverclockGetControlPendingValue(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).GetControlPendingValue(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		val, err := getOcDomain(t, 0, 0, 0).GetControlPendingValue(0)
-		require.NoError(t, err)
-		assert.Equal(t, 1100.0, val, "value")
-	})
-}
-
-func TestOverclockSetControlUserValue(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).SetControlUserValue(0, 0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		action, err := getOcDomain(t, 0, 0, 0).SetControlUserValue(0, 0)
-		require.NoError(t, err)
-		assert.Equal(t, PENDING_ACTION_PENDING_NONE, action, "action")
-	})
-}
-
-func TestOverclockGetControlState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, _, err := getOcDomain(t, 0, 0, 0).GetControlState(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, action, err := getOcDomain(t, 0, 0, 0).GetControlState(0)
-		require.NoError(t, err)
-		assert.Equal(t, CONTROL_STATE_STATE_ACTIVE, state, "state")
-		assert.Equal(t, PENDING_ACTION_PENDING_NONE, action, "action")
-	})
-}
-
-func TestOverclockGetVFPointValues(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getOcDomain(t, 0, 0, 0).GetVFPointValues(0, 0, 0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		val, err := getOcDomain(t, 0, 0, 0).GetVFPointValues(0, 0, 0)
-		require.NoError(t, err)
-		assert.Equal(t, uint32(42), val, "value")
-	})
-}
-
-func TestOverclockSetVFPointValues(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getOcDomain(t, 0, 0, 0).SetVFPointValues(0, 0, 0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getOcDomain(t, 0, 0, 0).SetVFPointValues(0, 0, 0)
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Performance
-// ------------------------------------------------------------------
-
-func TestPerformanceGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPerf(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getPerf(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PerfProperties{
-			OnSubdevice: 0,
-			SubdeviceId: 0,
-			Engines:     7,
-		}, props)
-	})
-}
-
-func TestPerformanceGetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPerf(t, 0, 0, 0).GetConfig()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		factor, err := getPerf(t, 0, 0, 0).GetConfig()
-		require.NoError(t, err)
-		assert.Equal(t, 1.0, factor, "Factor")
-	})
-}
-
-func TestPerformanceSetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getPerf(t, 0, 0, 0).SetConfig(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getPerf(t, 0, 0, 0).SetConfig(0)
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Psu
-// ------------------------------------------------------------------
-
-func TestPsuGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPsu(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getPsu(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, PsuProperties{
-			OnSubdevice: 0,
-			SubdeviceId: 0,
-			HaveFan:     1,
-			AmpLimit:    30,
-		}, props)
-	})
-}
-
-func TestPsuGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getPsu(t, 0, 0, 0).GetState()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getPsu(t, 0, 0, 0).GetState()
-		require.NoError(t, err)
-		assert.Equal(t, PsuState{
-			VoltStatus:  PSU_VOLTAGE_STATUS_NORMAL,
-			FanFailed:   0,
-			Temperature: 45,
-			Current:     10,
-		}, state)
-	})
-}
-
-// ------------------------------------------------------------------
-// Ras
-// ------------------------------------------------------------------
-
-func TestRasGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getRas(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getRas(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, RasProperties{
-			Type:        RAS_ERROR_TYPE_CORRECTABLE,
-			OnSubdevice: 1,
-			SubdeviceId: 1,
-		}, props)
-	})
-}
-
-func TestRasGetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getRas(t, 0, 0, 0).GetConfig()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		cfg, err := getRas(t, 0, 0, 0).GetConfig()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, RasConfig{
-			TotalThreshold: 100,
-			DetailedThresholds: RasState{Category: [7]uint64{
-				10, 11, 12, 13, 14, 15, 16,
-			}},
-		}, cfg)
-	})
-}
-
-func TestRasSetConfig(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getRas(t, 0, 0, 0).SetConfig(&RasConfig{})
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getRas(t, 0, 0, 0).SetConfig(&RasConfig{})
-		require.NoError(t, err)
-	})
-}
-
-func TestRasGetState(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getRas(t, 0, 0, 0).GetState(false)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		state, err := getRas(t, 0, 0, 0).GetState(false)
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, RasState{
-			Category: [7]uint64{5, 6, 7, 8, 9, 10, 11},
-		}, state)
-	})
-}
-
-// ------------------------------------------------------------------
-// Standby
-// ------------------------------------------------------------------
-
-func TestStandbyGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getStandby(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getStandby(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, StandbyProperties{
-			Type:        STANDBY_TYPE_GLOBAL,
-			OnSubdevice: 0,
-			SubdeviceId: 0,
-		}, props)
-	})
-}
-
-func TestStandbyGetMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getStandby(t, 0, 0, 0).GetMode()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		mode, err := getStandby(t, 0, 0, 0).GetMode()
-		require.NoError(t, err)
-		assert.Equal(t, STANDBY_PROMO_MODE_DEFAULT, mode, "Mode")
-	})
-}
-
-func TestStandbySetMode(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		err := getStandby(t, 0, 0, 0).SetMode(0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		err := getStandby(t, 0, 0, 0).SetMode(0)
-		require.NoError(t, err)
-	})
-}
-
-// ------------------------------------------------------------------
-// Diagnostics
-// ------------------------------------------------------------------
-
-func TestDiagnosticsGetProperties(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getDiagnostic(t, 0, 0, 0).GetProperties()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		props, err := getDiagnostic(t, 0, 0, 0).GetProperties()
-		require.NoError(t, err)
-		assert.EqualExportedValues(t, DiagProperties{
-			OnSubdevice: 0,
-			SubdeviceId: 0,
-			Name:        stringProperty[core.StringProperty64]("GPU"),
-			HaveTests:   0,
-		}, props)
-	})
-}
-
-func TestDiagnosticsGetTests(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getDiagnostic(t, 0, 0, 0).GetTests()
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		tests, err := getDiagnostic(t, 0, 0, 0).GetTests()
-		require.NoError(t, err)
-		require.Empty(t, tests)
-	})
-}
-
-func TestDiagnosticsRunTests(t *testing.T) {
-	t.Run("Error", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigComponent)
-		_, err := getDiagnostic(t, 0, 0, 0).RunTests(0, 0)
-		require.ErrorIs(t, err, core.RESULT_ERROR_NOT_AVAILABLE)
-	})
-	t.Run("Success", func(t *testing.T) {
-		loadDriverConfig(t, driverConfigDefault)
-		results, err := getDiagnostic(t, 0, 0, 0).RunTests(0, 0)
-		require.NoError(t, err)
-		require.Len(t, results, 1)
-		assert.Equal(t, DIAG_RESULT_NO_ERRORS, results[0], "results[0]")
-	})
-}
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_config.go b/xpumd/receiver/sysman/internal/metadata/generated_config.go
deleted file mode 100644
index 3ef9e4854..000000000
--- a/xpumd/receiver/sysman/internal/metadata/generated_config.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Code generated by mdatagen. DO NOT EDIT.
-
-package metadata
-
-import (
-	"go.opentelemetry.io/collector/confmap"
-)
-
-// MetricConfig provides common config for a particular metric.
-type MetricConfig struct {
-	Enabled          bool `mapstructure:"enabled"`
-	enabledSetByUser bool
-}
-
-func (ms *MetricConfig) Unmarshal(parser *confmap.Conf) error {
-	if parser == nil {
-		return nil
-	}
-
-	err := parser.Unmarshal(ms)
-	if err != nil {
-		return err
-	}
-
-	ms.enabledSetByUser = parser.IsSet("enabled")
-	return nil
-}
-
-// MetricsConfig provides config for sysman metrics.
-type MetricsConfig struct {
-	HwEnergy                     MetricConfig `mapstructure:"hw.energy"`
-	HwFrequency                  MetricConfig `mapstructure:"hw.frequency"`
-	HwFrequencyLimit             MetricConfig `mapstructure:"hw.frequency.limit"`
-	HwFrequencyRequest           MetricConfig `mapstructure:"hw.frequency.request"`
-	HwFrequencySamples           MetricConfig `mapstructure:"hw.frequency.samples"`
-	HwFrequencyThrottleStatus    MetricConfig `mapstructure:"hw.frequency.throttle_status"`
-	HwGpuBandwidthLimit          MetricConfig `mapstructure:"hw.gpu.bandwidth.limit"`
-	HwGpuBandwidthUtilization    MetricConfig `mapstructure:"hw.gpu.bandwidth.utilization"`
-	HwGpuInfo                    MetricConfig `mapstructure:"hw.gpu.info"`
-	HwGpuIo                      MetricConfig `mapstructure:"hw.gpu.io"`
-	HwGpuIoRate                  MetricConfig `mapstructure:"hw.gpu.io.rate"`
-	HwGpuUtilization             MetricConfig `mapstructure:"hw.gpu.utilization"`
-	HwMemoryBandwidthLimit       MetricConfig `mapstructure:"hw.memory.bandwidth.limit"`
-	HwMemoryBandwidthUtilization MetricConfig `mapstructure:"hw.memory.bandwidth.utilization"`
-	HwMemoryFree                 MetricConfig `mapstructure:"hw.memory.free"`
-	HwMemoryIo                   MetricConfig `mapstructure:"hw.memory.io"`
-	HwMemoryIoRate               MetricConfig `mapstructure:"hw.memory.io.rate"`
-	HwMemorySize                 MetricConfig `mapstructure:"hw.memory.size"`
-	HwMemoryUsage                MetricConfig `mapstructure:"hw.memory.usage"`
-	HwMemoryUtilization          MetricConfig `mapstructure:"hw.memory.utilization"`
-	HwPower                      MetricConfig `mapstructure:"hw.power"`
-	HwPowerLimit                 MetricConfig `mapstructure:"hw.power.limit"`
-	HwStatus                     MetricConfig `mapstructure:"hw.status"`
-	HwTemperature                MetricConfig `mapstructure:"hw.temperature"`
-}
-
-func DefaultMetricsConfig() MetricsConfig {
-	return MetricsConfig{
-		HwEnergy: MetricConfig{
-			Enabled: true,
-		},
-		HwFrequency: MetricConfig{
-			Enabled: true,
-		},
-		HwFrequencyLimit: MetricConfig{
-			Enabled: true,
-		},
-		HwFrequencyRequest: MetricConfig{
-			Enabled: true,
-		},
-		HwFrequencySamples: MetricConfig{
-			Enabled: true,
-		},
-		HwFrequencyThrottleStatus: MetricConfig{
-			Enabled: true,
-		},
-		HwGpuBandwidthLimit: MetricConfig{
-			Enabled: true,
-		},
-		HwGpuBandwidthUtilization: MetricConfig{
-			Enabled: true,
-		},
-		HwGpuInfo: MetricConfig{
-			Enabled: true,
-		},
-		HwGpuIo: MetricConfig{
-			Enabled: true,
-		},
-		HwGpuIoRate: MetricConfig{
-			Enabled: true,
-		},
-		HwGpuUtilization: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryBandwidthLimit: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryBandwidthUtilization: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryFree: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryIo: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryIoRate: MetricConfig{
-			Enabled: true,
-		},
-		HwMemorySize: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryUsage: MetricConfig{
-			Enabled: true,
-		},
-		HwMemoryUtilization: MetricConfig{
-			Enabled: true,
-		},
-		HwPower: MetricConfig{
-			Enabled: true,
-		},
-		HwPowerLimit: MetricConfig{
-			Enabled: true,
-		},
-		HwStatus: MetricConfig{
-			Enabled: true,
-		},
-		HwTemperature: MetricConfig{
-			Enabled: true,
-		},
-	}
-}
-
-// MetricsBuilderConfig is a configuration for sysman metrics builder.
-type MetricsBuilderConfig struct {
-	Metrics MetricsConfig `mapstructure:"metrics"`
-}
-
-func DefaultMetricsBuilderConfig() MetricsBuilderConfig {
-	return MetricsBuilderConfig{
-		Metrics: DefaultMetricsConfig(),
-	}
-}
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_config_test.go b/xpumd/receiver/sysman/internal/metadata/generated_config_test.go
deleted file mode 100644
index 06c69403d..000000000
--- a/xpumd/receiver/sysman/internal/metadata/generated_config_test.go
+++ /dev/null
@@ -1,202 +0,0 @@
-// Code generated by mdatagen. DO NOT EDIT.
-
-package metadata
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/stretchr/testify/require"
-
-	"go.opentelemetry.io/collector/confmap"
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-)
-
-func TestMetricsBuilderConfig(t *testing.T) {
-	tests := []struct {
-		name string
-		want MetricsBuilderConfig
-	}{
-		{
-			name: "default",
-			want: DefaultMetricsBuilderConfig(),
-		},
-		{
-			name: "all_set",
-			want: MetricsBuilderConfig{
-				Metrics: MetricsConfig{
-					HwEnergy: MetricConfig{
-						Enabled: true,
-					},
-					HwFrequency: MetricConfig{
-						Enabled: true,
-					},
-					HwFrequencyLimit: MetricConfig{
-						Enabled: true,
-					},
-					HwFrequencyRequest: MetricConfig{
-						Enabled: true,
-					},
-					HwFrequencySamples: MetricConfig{
-						Enabled: true,
-					},
-					HwFrequencyThrottleStatus: MetricConfig{
-						Enabled: true,
-					},
-					HwGpuBandwidthLimit: MetricConfig{
-						Enabled: true,
-					},
-					HwGpuBandwidthUtilization: MetricConfig{
-						Enabled: true,
-					},
-					HwGpuInfo: MetricConfig{
-						Enabled: true,
-					},
-					HwGpuIo: MetricConfig{
-						Enabled: true,
-					},
-					HwGpuIoRate: MetricConfig{
-						Enabled: true,
-					},
-					HwGpuUtilization: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryBandwidthLimit: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryBandwidthUtilization: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryFree: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryIo: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryIoRate: MetricConfig{
-						Enabled: true,
-					},
-					HwMemorySize: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryUsage: MetricConfig{
-						Enabled: true,
-					},
-					HwMemoryUtilization: MetricConfig{
-						Enabled: true,
-					},
-					HwPower: MetricConfig{
-						Enabled: true,
-					},
-					HwPowerLimit: MetricConfig{
-						Enabled: true,
-					},
-					HwStatus: MetricConfig{
-						Enabled: true,
-					},
-					HwTemperature: MetricConfig{
-						Enabled: true,
-					},
-				},
-			},
-		},
-		{
-			name: "none_set",
-			want: MetricsBuilderConfig{
-				Metrics: MetricsConfig{
-					HwEnergy: MetricConfig{
-						Enabled: false,
-					},
-					HwFrequency: MetricConfig{
-						Enabled: false,
-					},
-					HwFrequencyLimit: MetricConfig{
-						Enabled: false,
-					},
-					HwFrequencyRequest: MetricConfig{
-						Enabled: false,
-					},
-					HwFrequencySamples: MetricConfig{
-						Enabled: false,
-					},
-					HwFrequencyThrottleStatus: MetricConfig{
-						Enabled: false,
-					},
-					HwGpuBandwidthLimit: MetricConfig{
-						Enabled: false,
-					},
-					HwGpuBandwidthUtilization: MetricConfig{
-						Enabled: false,
-					},
-					HwGpuInfo: MetricConfig{
-						Enabled: false,
-					},
-					HwGpuIo: MetricConfig{
-						Enabled: false,
-					},
-					HwGpuIoRate: MetricConfig{
-						Enabled: false,
-					},
-					HwGpuUtilization: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryBandwidthLimit: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryBandwidthUtilization: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryFree: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryIo: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryIoRate: MetricConfig{
-						Enabled: false,
-					},
-					HwMemorySize: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryUsage: MetricConfig{
-						Enabled: false,
-					},
-					HwMemoryUtilization: MetricConfig{
-						Enabled: false,
-					},
-					HwPower: MetricConfig{
-						Enabled: false,
-					},
-					HwPowerLimit: MetricConfig{
-						Enabled: false,
-					},
-					HwStatus: MetricConfig{
-						Enabled: false,
-					},
-					HwTemperature: MetricConfig{
-						Enabled: false,
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg := loadMetricsBuilderConfig(t, tt.name)
-			diff := cmp.Diff(tt.want, cfg, cmpopts.IgnoreUnexported(MetricConfig{}))
-			require.Emptyf(t, diff, "Config mismatch (-expected +actual):\n%s", diff)
-		})
-	}
-}
-
-func loadMetricsBuilderConfig(t *testing.T, name string) MetricsBuilderConfig {
-	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
-	require.NoError(t, err)
-	sub, err := cm.Sub(name)
-	require.NoError(t, err)
-	cfg := DefaultMetricsBuilderConfig()
-	require.NoError(t, sub.Unmarshal(&cfg, confmap.WithIgnoreUnused()))
-	return cfg
-}
diff --git a/xpumd/receiver/sysman/internal/metadata/generated_metrics_test.go b/xpumd/receiver/sysman/internal/metadata/generated_metrics_test.go
deleted file mode 100644
index e00ee39c6..000000000
--- a/xpumd/receiver/sysman/internal/metadata/generated_metrics_test.go
+++ /dev/null
@@ -1,919 +0,0 @@
-// Code generated by mdatagen. DO NOT EDIT.
-
-package metadata
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"go.opentelemetry.io/collector/pdata/pcommon"
-	"go.opentelemetry.io/collector/pdata/pmetric"
-	"go.opentelemetry.io/collector/scraper/scrapertest"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest/observer"
-)
-
-type testDataSet int
-
-const (
-	testDataSetDefault testDataSet = iota
-	testDataSetAll
-	testDataSetNone
-)
-
-func TestMetricsBuilder(t *testing.T) {
-	tests := []struct {
-		name        string
-		metricsSet  testDataSet
-		resAttrsSet testDataSet
-		expectEmpty bool
-	}{
-		{
-			name: "default",
-		},
-		{
-			name:        "all_set",
-			metricsSet:  testDataSetAll,
-			resAttrsSet: testDataSetAll,
-		},
-		{
-			name:        "none_set",
-			metricsSet:  testDataSetNone,
-			resAttrsSet: testDataSetNone,
-			expectEmpty: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			start := pcommon.Timestamp(1_000_000_000)
-			ts := pcommon.Timestamp(1_000_001_000)
-			observedZapCore, observedLogs := observer.New(zap.WarnLevel)
-			settings := scrapertest.NewNopSettings(scrapertest.NopType)
-			settings.Logger = zap.New(observedZapCore)
-			mb := NewMetricsBuilder(loadMetricsBuilderConfig(t, tt.name), settings, WithStartTime(start))
-
-			expectedWarnings := 0
-			assert.Equal(t, expectedWarnings, observedLogs.Len())
-
-			defaultMetricsCount := 0
-			allMetricsCount := 0
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwEnergyDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwFrequencyDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", AttributeAggregationMin)
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwFrequencyLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", "hw.limit_type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwFrequencyRequestDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwFrequencySamplesDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", AttributeSampleStatusCollected)
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwFrequencyThrottleStatusDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.frequency.domain-val", "com.intel.speed.throttle_reason-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwGpuBandwidthLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwGpuBandwidthUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwGpuInfoDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "pci.vendor_id-val", "pci.device_id-val", "hw.model-val", "hw.serial_number-val", "hw.vendor-val", "hw.firmware_version-val", AttributeHwGpuTypeDiscrete, 25, "pci.lanes-val", "pci.link_gen-val", false, AttributeHwMemoryEccAvailable)
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwGpuIoDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", AttributeNetworkIoDirectionReceive)
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwGpuIoRateDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwGpuUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.gpu.task-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryBandwidthLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryBandwidthUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryFreeDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryIoDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val", AttributeNetworkIoDirectionReceive)
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryIoRateDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemorySizeDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryUsageDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwMemoryUtilizationDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.memory.location-val", "hw.memory.type-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwPowerDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwPowerLimitDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val", "com.intel.power.limit.level-val", "com.intel.power.limit.source-val")
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwStatusDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.state-val", AttributeHwTypeFrequency)
-
-			defaultMetricsCount++
-			allMetricsCount++
-			mb.RecordHwTemperatureDataPoint(ts, 1, "hw.id-val", "hw.name-val", "pci.bdf-val", "com.intel.subdevice_id-val", "hw.sensor_location-val", AttributeStatisticMin)
-
-			res := pcommon.NewResource()
-			metrics := mb.Emit(WithResource(res))
-
-			if tt.expectEmpty {
-				assert.Equal(t, 0, metrics.ResourceMetrics().Len())
-				return
-			}
-
-			var allMetricsList []pmetric.Metric
-			totalMetricsCount := 0
-			for ri := 0; ri < metrics.ResourceMetrics().Len(); ri++ {
-				rm := metrics.ResourceMetrics().At(ri)
-				assert.Equal(t, 1, rm.ScopeMetrics().Len())
-				ms := rm.ScopeMetrics().At(0).Metrics()
-				totalMetricsCount += ms.Len()
-				for mi := 0; mi < ms.Len(); mi++ {
-					allMetricsList = append(allMetricsList, ms.At(mi))
-				}
-			}
-			if tt.metricsSet == testDataSetDefault {
-				assert.Equal(t, defaultMetricsCount, totalMetricsCount)
-			}
-			if tt.metricsSet == testDataSetAll {
-				assert.Equal(t, allMetricsCount, totalMetricsCount)
-			}
-			validatedMetrics := make(map[string]bool)
-			for _, mi := range allMetricsList {
-				switch mi.Name() {
-				case "hw.energy":
-					assert.False(t, validatedMetrics["hw.energy"], "Found a duplicate in the metrics slice: hw.energy")
-					validatedMetrics["hw.energy"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Energy consumed by the hardware component.", mi.Description())
-					assert.Equal(t, "J", mi.Unit())
-					assert.True(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
-				case "hw.frequency":
-					assert.False(t, validatedMetrics["hw.frequency"], "Found a duplicate in the metrics slice: hw.frequency")
-					validatedMetrics["hw.frequency"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Operating frequency of the hardware component.", mi.Description())
-					assert.Equal(t, "Hz", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
-					aggregationAttrVal, ok := dp.Attributes().Get("aggregation")
-					assert.True(t, ok)
-					assert.Equal(t, "min", aggregationAttrVal.Str())
-				case "hw.frequency.limit":
-					assert.False(t, validatedMetrics["hw.frequency.limit"], "Found a duplicate in the metrics slice: hw.frequency.limit")
-					validatedMetrics["hw.frequency.limit"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Frequency limit in Hertz.", mi.Description())
-					assert.Equal(t, "Hz", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
-					hwLimitTypeAttrVal, ok := dp.Attributes().Get("hw.limit_type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.limit_type-val", hwLimitTypeAttrVal.Str())
-				case "hw.frequency.request":
-					assert.False(t, validatedMetrics["hw.frequency.request"], "Found a duplicate in the metrics slice: hw.frequency.request")
-					validatedMetrics["hw.frequency.request"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Requested operating frequency.", mi.Description())
-					assert.Equal(t, "Hz", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
-				case "hw.frequency.samples":
-					assert.False(t, validatedMetrics["hw.frequency.samples"], "Found a duplicate in the metrics slice: hw.frequency.samples")
-					validatedMetrics["hw.frequency.samples"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Number of frequency samples during the last collection interval.", mi.Description())
-					assert.Equal(t, "{count}", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
-					sampleStatusAttrVal, ok := dp.Attributes().Get("sample.status")
-					assert.True(t, ok)
-					assert.Equal(t, "collected", sampleStatusAttrVal.Str())
-				case "hw.frequency.throttle_status":
-					assert.False(t, validatedMetrics["hw.frequency.throttle_status"], "Found a duplicate in the metrics slice: hw.frequency.throttle_status")
-					validatedMetrics["hw.frequency.throttle_status"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Hardware component frequency throttle status.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwFrequencyDomainAttrVal, ok := dp.Attributes().Get("hw.frequency.domain")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.frequency.domain-val", hwFrequencyDomainAttrVal.Str())
-					comIntelSpeedThrottleReasonAttrVal, ok := dp.Attributes().Get("com.intel.speed.throttle_reason")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.speed.throttle_reason-val", comIntelSpeedThrottleReasonAttrVal.Str())
-				case "hw.gpu.bandwidth.limit":
-					assert.False(t, validatedMetrics["hw.gpu.bandwidth.limit"], "Found a duplicate in the metrics slice: hw.gpu.bandwidth.limit")
-					validatedMetrics["hw.gpu.bandwidth.limit"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Maximum (read+write) PCI bandwidth in bytes/sec for the GPU device.", mi.Description())
-					assert.Equal(t, "By/s", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-				case "hw.gpu.bandwidth.utilization":
-					assert.False(t, validatedMetrics["hw.gpu.bandwidth.utilization"], "Found a duplicate in the metrics slice: hw.gpu.bandwidth.utilization")
-					validatedMetrics["hw.gpu.bandwidth.utilization"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "GPU device (read+write) PCI bandwidth utilization ratio.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-				case "hw.gpu.info":
-					assert.False(t, validatedMetrics["hw.gpu.info"], "Found a duplicate in the metrics slice: hw.gpu.info")
-					validatedMetrics["hw.gpu.info"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Information about the GPU device.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					pciVendorIDAttrVal, ok := dp.Attributes().Get("pci.vendor_id")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.vendor_id-val", pciVendorIDAttrVal.Str())
-					pciDeviceIDAttrVal, ok := dp.Attributes().Get("pci.device_id")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.device_id-val", pciDeviceIDAttrVal.Str())
-					hwModelAttrVal, ok := dp.Attributes().Get("hw.model")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.model-val", hwModelAttrVal.Str())
-					hwSerialNumberAttrVal, ok := dp.Attributes().Get("hw.serial_number")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.serial_number-val", hwSerialNumberAttrVal.Str())
-					hwVendorAttrVal, ok := dp.Attributes().Get("hw.vendor")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.vendor-val", hwVendorAttrVal.Str())
-					hwFirmwareVersionAttrVal, ok := dp.Attributes().Get("hw.firmware_version")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.firmware_version-val", hwFirmwareVersionAttrVal.Str())
-					hwGpuTypeAttrVal, ok := dp.Attributes().Get("hw.gpu.type")
-					assert.True(t, ok)
-					assert.Equal(t, "discrete", hwGpuTypeAttrVal.Str())
-					comIntelSubdeviceCountAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_count")
-					assert.True(t, ok)
-					assert.EqualValues(t, 25, comIntelSubdeviceCountAttrVal.Int())
-					pciLanesAttrVal, ok := dp.Attributes().Get("pci.lanes")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.lanes-val", pciLanesAttrVal.Str())
-					pciLinkGenAttrVal, ok := dp.Attributes().Get("pci.link_gen")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.link_gen-val", pciLinkGenAttrVal.Str())
-					hwMemoryDemandPagingAttrVal, ok := dp.Attributes().Get("hw.memory.demand_paging")
-					assert.True(t, ok)
-					assert.False(t, hwMemoryDemandPagingAttrVal.Bool())
-					hwMemoryEccAttrVal, ok := dp.Attributes().Get("hw.memory.ecc")
-					assert.True(t, ok)
-					assert.Equal(t, "available", hwMemoryEccAttrVal.Str())
-				case "hw.gpu.io":
-					assert.False(t, validatedMetrics["hw.gpu.io"], "Found a duplicate in the metrics slice: hw.gpu.io")
-					validatedMetrics["hw.gpu.io"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Bytes received / transmitted over PCI bus by the GPU device.", mi.Description())
-					assert.Equal(t, "By", mi.Unit())
-					assert.True(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					networkIoDirectionAttrVal, ok := dp.Attributes().Get("network.io.direction")
-					assert.True(t, ok)
-					assert.Equal(t, "receive", networkIoDirectionAttrVal.Str())
-				case "hw.gpu.io.rate":
-					assert.False(t, validatedMetrics["hw.gpu.io.rate"], "Found a duplicate in the metrics slice: hw.gpu.io.rate")
-					validatedMetrics["hw.gpu.io.rate"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Current (read+write) PCI bandwidth usage in bytes/sec for the GPU device.", mi.Description())
-					assert.Equal(t, "By/s", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-				case "hw.gpu.utilization":
-					assert.False(t, validatedMetrics["hw.gpu.utilization"], "Found a duplicate in the metrics slice: hw.gpu.utilization")
-					validatedMetrics["hw.gpu.utilization"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "GPU engine / task pipeline utilization ratio.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwGpuTaskAttrVal, ok := dp.Attributes().Get("hw.gpu.task")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.gpu.task-val", hwGpuTaskAttrVal.Str())
-				case "hw.memory.bandwidth.limit":
-					assert.False(t, validatedMetrics["hw.memory.bandwidth.limit"], "Found a duplicate in the metrics slice: hw.memory.bandwidth.limit")
-					validatedMetrics["hw.memory.bandwidth.limit"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Maximum total memory (read+write) bandwidth in bytes/sec.", mi.Description())
-					assert.Equal(t, "By/s", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.memory.bandwidth.utilization":
-					assert.False(t, validatedMetrics["hw.memory.bandwidth.utilization"], "Found a duplicate in the metrics slice: hw.memory.bandwidth.utilization")
-					validatedMetrics["hw.memory.bandwidth.utilization"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Memory bandwidth (read+write) utilization ratio.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.memory.free":
-					assert.False(t, validatedMetrics["hw.memory.free"], "Found a duplicate in the metrics slice: hw.memory.free")
-					validatedMetrics["hw.memory.free"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Free memory. Reported only when `hw.memory.size` (and memory usage metrics) are unavailable.", mi.Description())
-					assert.Equal(t, "By", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.memory.io":
-					assert.False(t, validatedMetrics["hw.memory.io"], "Found a duplicate in the metrics slice: hw.memory.io")
-					validatedMetrics["hw.memory.io"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Bytes read from / written to memory.", mi.Description())
-					assert.Equal(t, "By", mi.Unit())
-					assert.True(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-					networkIoDirectionAttrVal, ok := dp.Attributes().Get("network.io.direction")
-					assert.True(t, ok)
-					assert.Equal(t, "receive", networkIoDirectionAttrVal.Str())
-				case "hw.memory.io.rate":
-					assert.False(t, validatedMetrics["hw.memory.io.rate"], "Found a duplicate in the metrics slice: hw.memory.io.rate")
-					validatedMetrics["hw.memory.io.rate"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Current memory bandwidth (read+write) usage in bytes/sec.", mi.Description())
-					assert.Equal(t, "By/s", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.memory.size":
-					assert.False(t, validatedMetrics["hw.memory.size"], "Found a duplicate in the metrics slice: hw.memory.size")
-					validatedMetrics["hw.memory.size"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Physical size of the memory.", mi.Description())
-					assert.Equal(t, "By", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.memory.usage":
-					assert.False(t, validatedMetrics["hw.memory.usage"], "Found a duplicate in the metrics slice: hw.memory.usage")
-					validatedMetrics["hw.memory.usage"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Memory used.", mi.Description())
-					assert.Equal(t, "By", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.memory.utilization":
-					assert.False(t, validatedMetrics["hw.memory.utilization"], "Found a duplicate in the metrics slice: hw.memory.utilization")
-					validatedMetrics["hw.memory.utilization"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Memory utilization ratio.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwMemoryLocationAttrVal, ok := dp.Attributes().Get("hw.memory.location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.location-val", hwMemoryLocationAttrVal.Str())
-					hwMemoryTypeAttrVal, ok := dp.Attributes().Get("hw.memory.type")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.memory.type-val", hwMemoryTypeAttrVal.Str())
-				case "hw.power":
-					assert.False(t, validatedMetrics["hw.power"], "Found a duplicate in the metrics slice: hw.power")
-					validatedMetrics["hw.power"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Instantaneous power usage of the hardware component.", mi.Description())
-					assert.Equal(t, "W", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
-				case "hw.power.limit":
-					assert.False(t, validatedMetrics["hw.power.limit"], "Found a duplicate in the metrics slice: hw.power.limit")
-					validatedMetrics["hw.power.limit"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Power usage limit for the hardware component.", mi.Description())
-					assert.Equal(t, "W", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
-					comIntelPowerLimitLevelAttrVal, ok := dp.Attributes().Get("com.intel.power.limit.level")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.power.limit.level-val", comIntelPowerLimitLevelAttrVal.Str())
-					comIntelPowerLimitSourceAttrVal, ok := dp.Attributes().Get("com.intel.power.limit.source")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.power.limit.source-val", comIntelPowerLimitSourceAttrVal.Str())
-				case "hw.status":
-					assert.False(t, validatedMetrics["hw.status"], "Found a duplicate in the metrics slice: hw.status")
-					validatedMetrics["hw.status"] = true
-					assert.Equal(t, pmetric.MetricTypeSum, mi.Type())
-					assert.Equal(t, 1, mi.Sum().DataPoints().Len())
-					assert.Equal(t, "Known hardware component states. Problem state reporting starts after issue becomes known / active for the first time (to greatly reduce number of state metrics). Unknown state is reported only if state was known before.", mi.Description())
-					assert.Equal(t, "1", mi.Unit())
-					assert.False(t, mi.Sum().IsMonotonic())
-					assert.Equal(t, pmetric.AggregationTemporalityCumulative, mi.Sum().AggregationTemporality())
-					dp := mi.Sum().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType())
-					assert.Equal(t, int64(1), dp.IntValue())
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwStateAttrVal, ok := dp.Attributes().Get("hw.state")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.state-val", hwStateAttrVal.Str())
-					hwTypeAttrVal, ok := dp.Attributes().Get("hw.type")
-					assert.True(t, ok)
-					assert.Equal(t, "frequency", hwTypeAttrVal.Str())
-				case "hw.temperature":
-					assert.False(t, validatedMetrics["hw.temperature"], "Found a duplicate in the metrics slice: hw.temperature")
-					validatedMetrics["hw.temperature"] = true
-					assert.Equal(t, pmetric.MetricTypeGauge, mi.Type())
-					assert.Equal(t, 1, mi.Gauge().DataPoints().Len())
-					assert.Equal(t, "Temperature of the hardware component in degrees Celsius.", mi.Description())
-					assert.Equal(t, "Cel", mi.Unit())
-					dp := mi.Gauge().DataPoints().At(0)
-					assert.Equal(t, start, dp.StartTimestamp())
-					assert.Equal(t, ts, dp.Timestamp())
-					assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType())
-					assert.InDelta(t, float64(1), dp.DoubleValue(), 0.01)
-					hwIDAttrVal, ok := dp.Attributes().Get("hw.id")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.id-val", hwIDAttrVal.Str())
-					hwNameAttrVal, ok := dp.Attributes().Get("hw.name")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.name-val", hwNameAttrVal.Str())
-					pciBdfAttrVal, ok := dp.Attributes().Get("pci.bdf")
-					assert.True(t, ok)
-					assert.Equal(t, "pci.bdf-val", pciBdfAttrVal.Str())
-					comIntelSubdeviceIDAttrVal, ok := dp.Attributes().Get("com.intel.subdevice_id")
-					assert.True(t, ok)
-					assert.Equal(t, "com.intel.subdevice_id-val", comIntelSubdeviceIDAttrVal.Str())
-					hwSensorLocationAttrVal, ok := dp.Attributes().Get("hw.sensor_location")
-					assert.True(t, ok)
-					assert.Equal(t, "hw.sensor_location-val", hwSensorLocationAttrVal.Str())
-					statisticAttrVal, ok := dp.Attributes().Get("statistic")
-					assert.True(t, ok)
-					assert.Equal(t, "min", statisticAttrVal.Str())
-				}
-			}
-		})
-	}
-}
diff --git a/xpumd/receiver/sysman/internal/metadata/testdata/config.yaml b/xpumd/receiver/sysman/internal/metadata/testdata/config.yaml
deleted file mode 100644
index e87cadd0d..000000000
--- a/xpumd/receiver/sysman/internal/metadata/testdata/config.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-default:
-all_set:
-  metrics:
-    hw.energy:
-      enabled: true
-    hw.frequency:
-      enabled: true
-    hw.frequency.limit:
-      enabled: true
-    hw.frequency.request:
-      enabled: true
-    hw.frequency.samples:
-      enabled: true
-    hw.frequency.throttle_status:
-      enabled: true
-    hw.gpu.bandwidth.limit:
-      enabled: true
-    hw.gpu.bandwidth.utilization:
-      enabled: true
-    hw.gpu.info:
-      enabled: true
-    hw.gpu.io:
-      enabled: true
-    hw.gpu.io.rate:
-      enabled: true
-    hw.gpu.utilization:
-      enabled: true
-    hw.memory.bandwidth.limit:
-      enabled: true
-    hw.memory.bandwidth.utilization:
-      enabled: true
-    hw.memory.free:
-      enabled: true
-    hw.memory.io:
-      enabled: true
-    hw.memory.io.rate:
-      enabled: true
-    hw.memory.size:
-      enabled: true
-    hw.memory.usage:
-      enabled: true
-    hw.memory.utilization:
-      enabled: true
-    hw.power:
-      enabled: true
-    hw.power.limit:
-      enabled: true
-    hw.status:
-      enabled: true
-    hw.temperature:
-      enabled: true
-none_set:
-  metrics:
-    hw.energy:
-      enabled: false
-    hw.frequency:
-      enabled: false
-    hw.frequency.limit:
-      enabled: false
-    hw.frequency.request:
-      enabled: false
-    hw.frequency.samples:
-      enabled: false
-    hw.frequency.throttle_status:
-      enabled: false
-    hw.gpu.bandwidth.limit:
-      enabled: false
-    hw.gpu.bandwidth.utilization:
-      enabled: false
-    hw.gpu.info:
-      enabled: false
-    hw.gpu.io:
-      enabled: false
-    hw.gpu.io.rate:
-      enabled: false
-    hw.gpu.utilization:
-      enabled: false
-    hw.memory.bandwidth.limit:
-      enabled: false
-    hw.memory.bandwidth.utilization:
-      enabled: false
-    hw.memory.free:
-      enabled: false
-    hw.memory.io:
-      enabled: false
-    hw.memory.io.rate:
-      enabled: false
-    hw.memory.size:
-      enabled: false
-    hw.memory.usage:
-      enabled: false
-    hw.memory.utilization:
-      enabled: false
-    hw.power:
-      enabled: false
-    hw.power.limit:
-      enabled: false
-    hw.status:
-      enabled: false
-    hw.temperature:
-      enabled: false
diff --git a/xpumd/scripts/README.md b/xpumd/scripts/README.md
new file mode 100644
index 000000000..cf405b9ed
--- /dev/null
+++ b/xpumd/scripts/README.md
@@ -0,0 +1,12 @@
+# Helper scripts
+
+* [generate.sh](generate.sh) -- generate OTel code/docs + Helm docs/schema
+* [generate-tools.sh](generate-tools.sh) -- Generate `tools` package content (to help with Go deps)
+* [install-protoc.sh](install-protoc.sh) -- Check for / install protobuf compiler
+* [make-dockerized.sh](make-dockerized.sh) -- Create build container & build [Makefile](../Makefile) targets within that
+* [run-integration-tests.sh](run-integration-tests.sh) -- Run integration tests with Go
+* [trivy-warmup.sh](trivy-warmup.sh) -- Warm up gomod cache for the license scan
+
+# Script data files
+
+`make-dockerized.sh` uses [checksum files](../level-zero-go/level-zero/) under L0 Go bindings.
diff --git a/xpumd/scripts/copy-files-and-package-info.sh b/xpumd/scripts/copy-files-and-package-info.sh
new file mode 100755
index 000000000..0a69914a4
--- /dev/null
+++ b/xpumd/scripts/copy-files-and-package-info.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+#
+# Copyright (C) 2026 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+set -euxo pipefail
+
+if [ $# -lt 2 ]; then
+    cat >&2 << EOF
+Usage: $0 <OUT_DIR> <file> [<file> ...]"
+
+Purposed to run in the context of a Docker build only.
+EOF
+    exit 1
+fi
+
+OUT="$1"
+shift
+
+# Copy files, preserving their absolute path
+for f in "$@"; do
+    install -D "$f" "$OUT/$f"
+done
+
+# (L)GPL compliance: source archives and copyright notices
+mkdir -p "$OUT/sources"
+
+# Discover DEB packages that own the copied files. Fail on any unowned file.
+PKGS=$(realpath "$@" | xargs dpkg -S | sed 's/:.*//' | sort -u)
+
+# Copy copyright/license info, and sources for packages not flagged as non-(L)GPL.
+for pkg in $PKGS; do
+    case "$pkg" in
+        # intel-igc-core-2 ships a NOTICES.txt instead of a copyright file
+        intel-igc-core-2)
+            install -Dt "$OUT/usr/share/doc/$pkg" \
+                    /usr/local/lib/igc2/NOTICES.txt
+            ;;
+        # libze1 (github release deb) currently ships no /usr/share/doc
+        # (MIT-licensed but no file to copy), tolerate missing copyright file
+        libze1)
+            install -Dt "$OUT/usr/share/doc/$pkg" \
+                    /usr/share/doc/$pkg/copyright 2>/dev/null || true
+            ;;
+        # Non-(L)GPL packages: copyright notice only
+        libigdgmm12|libze-intel-gpu1|libcyaml1|libyaml-0-2)
+            install -Dt "$OUT/usr/share/doc/$pkg" \
+                    /usr/share/doc/$pkg/copyright
+            ;;
+        # Default: treat as (L)GPL, download source archive and copy copyright
+        *)
+            ( cd "$OUT/sources" && apt-get source --download-only "$pkg" )
+            install -Dt "$OUT/usr/share/doc/$pkg" \
+                    /usr/share/doc/$pkg/copyright
+            ;;
+    esac
+done
+
+# Copy common license headers.
+install -Dt "$OUT/usr/share/common-licenses/" \
+        /usr/share/common-licenses/*
+
+# Copy OS identity for scanners to detect the origin (and e.g. select the right CVE database).
+install -D /etc/os-release "$OUT/etc/os-release"
+install -D /etc/debian_version "$OUT/etc/debian_version"
+
+# Construct a dpkg database for scanners
+STATUS="$OUT/var/lib/dpkg/status"
+mkdir -p "$(dirname "$STATUS")"
+
+for pkg in $PKGS; do
+    dpkg-query -s "$pkg" >> "$STATUS"
+    echo >> "$STATUS"
+done
diff --git a/xpumd/scripts/generate-tools.sh b/xpumd/scripts/generate-tools.sh
new file mode 100755
index 000000000..2dea2fb4a
--- /dev/null
+++ b/xpumd/scripts/generate-tools.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -e
+#
+# Copyright (C) 2026 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+# Generates tools.go from the tool directives in go.mod.
+
+set -o pipefail
+
+OUTPUT="tools.go"
+
+# Extract tool packages from go.mod.
+packages=$(go mod edit -json "go.mod" | jq -r '.Tool[] | "_ \"" + .Path + "\""')
+
+cat > "$OUTPUT" << EOF
+//go:build tools
+// The "tools" build tag is never set, it is there to exclude the file from normal builds and linting
+
+// Code generated by scripts/generate-tools.sh. DO NOT EDIT.
+
+package tools
+
+import (
+    $packages
+)
+EOF
+
+gofmt -w "$OUTPUT"
+go mod tidy
+
+echo "Generated $OUTPUT and ran go mod tidy."
diff --git a/xpumd/scripts/install-protoc.sh b/xpumd/scripts/install-protoc.sh
index c09cf0fb6..e829aee99 100755
--- a/xpumd/scripts/install-protoc.sh
+++ b/xpumd/scripts/install-protoc.sh
@@ -7,11 +7,15 @@
 
 set -o pipefail
 
-PB_VERSION=${PB_VERSION-33.4}
 PB_REL="https://github.com/protocolbuffers/protobuf/releases"
 
+PB_VERSION="${PB_VERSION-35.0}"
+ZIP_FILE="protoc-$PB_VERSION-linux-x86_64.zip"
+CHECKSUM="${CHECKSUM-a45cda0989c17dd950db55f6fbe1e5814c50fda08e87aa422980ac1f89dddbbc}"
+
 # We operate under the tools go module
-cd tools
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+cd "$SCRIPT_DIR/../tools"
 BIN_DIR=$(realpath bin)
 
 if [ -x "$BIN_DIR/protoc" ]; then
@@ -21,11 +25,17 @@ fi
 if [ "$INSTALLED_PROTOC_VERSION" == "$PB_VERSION" ]; then
     echo "found protoc version $INSTALLED_PROTOC_VERSION installed in $BIN_DIR"
 else
-    curl -LO "$PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip"
-
-    unzip -o "protoc-$PB_VERSION-linux-x86_64.zip"
-
-    rm -f "protoc-$PB_VERSION-linux-x86_64.zip"
+    curl -LO "$PB_REL/download/v$PB_VERSION/$ZIP_FILE"
+    if ! echo "$CHECKSUM $ZIP_FILE" | sha256sum --check -; then
+	echo "--- Checksum ERROR, expected: ---"
+	echo "$CHECKSUM  $ZIP_FILE"
+	echo "--- Got: ---"
+	sha256sum "$ZIP_FILE"
+	exit 1
+    fi
+
+    unzip -o "$ZIP_FILE"
+    rm -f "$ZIP_FILE"
     rm -f readme.txt
 fi
 
diff --git a/xpumd/scripts/make-dockerized.sh b/xpumd/scripts/make-dockerized.sh
index 678b12505..8a95a7c90 100755
--- a/xpumd/scripts/make-dockerized.sh
+++ b/xpumd/scripts/make-dockerized.sh
@@ -10,42 +10,56 @@
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
+# checksum file for L0 loader DEB packages
+CHECKSUMS=checksums-loader.txt
+
 LEVEL_ZERO_VERSION_DEFAULT=$(sed -n 's/^ARG LEVEL_ZERO_VERSION=//p' "${SCRIPT_DIR}/../Dockerfile")
 LEVEL_ZERO_VERSION=${LEVEL_ZERO_VERSION:-"${LEVEL_ZERO_VERSION_DEFAULT}"}
 L0_BASE_URL="https://github.com/oneapi-src/level-zero/releases/download"
 
 IMAGE_TAG="xpumd-builder:latest"
 
-docker build -t "${IMAGE_TAG}" - <<EOF
+docker build -t "${IMAGE_TAG}" -f - "${SCRIPT_DIR}/../level-zero-go/level-zero" <<EOF
 FROM golang:1.26
 # Pre-create /go/pkg with wide permissions to allow "docker run" below (with non-root user)
 # to write to it (the mount (-v) in docker run would otherwise create it with 755)
 RUN mkdir -p /go/pkg && chmod 777 /go/pkg
 
+COPY $CHECKSUMS .
+
 # Unzip needed for installing protoc, doxygen for generating Go bindings
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        unzip doxygen libyaml-dev libcyaml-dev && \
-    curl -LO ${L0_BASE_URL}/v${LEVEL_ZERO_VERSION}/level-zero_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb \
-         -LO ${L0_BASE_URL}/v${LEVEL_ZERO_VERSION}/level-zero-devel_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
+        unzip doxygen libyaml-dev libcyaml-dev jq clang-format && \
+    curl -LO ${L0_BASE_URL}/v${LEVEL_ZERO_VERSION}/libze1_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb \
+         -LO ${L0_BASE_URL}/v${LEVEL_ZERO_VERSION}/libze-dev_${LEVEL_ZERO_VERSION}+u24.04_amd64.deb && \
+    if ! sha256sum --check $CHECKSUMS ; then \
+	echo "--- Expected ($CHECKSUMS): ---"; \
+	cat "$CHECKSUMS"; \
+	echo "--- Got: ---"; \
+	sha256sum *.deb; \
+	echo "=> ERROR"; \
+	exit 1; \
+    fi; \
     dpkg -i ./*.deb && \
     rm -f ./*.deb && rm -rf /var/lib/apt/lists/*
 EOF
 
 if [ "$(ps -p 1 -o comm=)" = "systemd" ]; then
-    USER_FLAG="--user $(id -u):$(id -g)"
+    USER="$(id -u):$(id -g)"
 else
     echo "Probably running inside a container, running container as root"
+    USER="0"
 fi
 
 GOMODCACHE=$(go env GOMODCACHE 2>/dev/null || true)
 GOMODCACHE_MOUNT=()
-if [ -n "${GOMODCACHE}" -a -d "${GOMODCACHE}" ]; then
+if [ -n "${GOMODCACHE}" ] && [ -d "${GOMODCACHE}" ]; then
     echo "Mounting GOMODCACHE from host: ${GOMODCACHE}"
     GOMODCACHE_MOUNT=(-v "${GOMODCACHE}:/go/pkg/mod")
 fi
 
 docker run --rm \
-    ${USER_FLAG} \
+    --user "${USER}" \
     "${GOMODCACHE_MOUNT[@]}" \
     -e HOME=/go \
     -v "${SCRIPT_DIR}/../..:/go/src" \
diff --git a/xpumd/scripts/run-integration-tests.sh b/xpumd/scripts/run-integration-tests.sh
new file mode 100755
index 000000000..12d1d59bf
--- /dev/null
+++ b/xpumd/scripts/run-integration-tests.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Copyright (C) 2026 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+
+TIMEOUT=${TIMEOUT:-10m}
+
+exec go -C "${SCRIPT_DIR}/../test/integration" test -count=1 -v \
+    -timeout "${TIMEOUT}" ./k8s -args "$@"
diff --git a/xpumd/scripts/trivy-warmup.sh b/xpumd/scripts/trivy-warmup.sh
index 1875668d5..ee78a6897 100755
--- a/xpumd/scripts/trivy-warmup.sh
+++ b/xpumd/scripts/trivy-warmup.sh
@@ -8,7 +8,7 @@ set -o pipefail
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
-OTEL_VERSION=0.151.0
+OTEL_VERSION=0.153.0
 
 cd "$SCRIPT_DIR/.."
 sed "s/@OTEL_VERSION@/${OTEL_VERSION}/g" builder-config.yaml.in > builder-config.yaml
diff --git a/xpumd/test/integration/go.mod b/xpumd/test/integration/go.mod
new file mode 100644
index 000000000..bbe066f8b
--- /dev/null
+++ b/xpumd/test/integration/go.mod
@@ -0,0 +1,151 @@
+module github.com/intel/xpumanager/xpumd/test/integration
+
+go 1.26.0
+
+require (
+	github.com/docker/docker v28.5.2+incompatible
+	github.com/prometheus/client_model v0.6.2
+	github.com/prometheus/common v0.67.5
+	helm.sh/helm/v4 v4.1.4
+	k8s.io/api v0.35.5
+	k8s.io/apimachinery v0.35.5
+	k8s.io/cli-runtime v0.35.5
+	k8s.io/client-go v0.35.5
+	sigs.k8s.io/kind v0.31.0
+)
+
+require (
+	al.essio.dev/pkg/shellescape v1.5.1 // indirect
+	dario.cat/mergo v1.0.1 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
+	github.com/MakeNowJust/heredoc v1.0.0 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
+	github.com/Masterminds/squirrel v1.5.4 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/chai2010/gettext-go v1.0.2 // indirect
+	github.com/cloudflare/circl v1.6.3 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/go-connections v0.7.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
+	github.com/extism/go-sdk v1.7.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fluxcd/cli-utils v0.37.2-flux.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-errors/errors v1.5.1 // indirect
+	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/gofrs/flock v0.13.0 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
+	github.com/gosuri/uitable v0.0.4 // indirect
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/miekg/dns v1.1.62 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/spdystream v0.5.1 // indirect
+	github.com/moby/sys/atomicwriter v0.1.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
+	github.com/morikuni/aec v1.1.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/rubenv/sql-migrate v1.8.1 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
+	github.com/spf13/cobra v1.10.2 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
+	github.com/tetratelabs/wazero v1.11.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
+	go.opentelemetry.io/otel v1.43.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
+	go.opentelemetry.io/otel/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/trace v1.43.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.49.0 // indirect
+	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/oauth2 v0.36.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/term v0.41.0 // indirect
+	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gotest.tools/v3 v3.5.1 // indirect
+	k8s.io/apiextensions-apiserver v0.35.1 // indirect
+	k8s.io/apiserver v0.35.1 // indirect
+	k8s.io/component-base v0.35.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
+	k8s.io/kubectl v0.35.1 // indirect
+	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
+	oras.land/oras-go/v2 v2.6.0 // indirect
+	sigs.k8s.io/controller-runtime v0.23.1 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	sigs.k8s.io/kustomize/api v0.21.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
+)
diff --git a/xpumd/test/integration/go.sum b/xpumd/test/integration/go.sum
new file mode 100644
index 000000000..82e636377
--- /dev/null
+++ b/xpumd/test/integration/go.sum
@@ -0,0 +1,444 @@
+al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
+al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
+github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
+github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
+github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
+github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
+github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
+github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
+github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
+github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
+github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
+github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70=
+github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
+github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk=
+github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA=
+github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
+github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
+github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=
+github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
+github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
+github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
+github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=
+github.com/docker/go-connections v0.7.0/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q=
+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
+github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
+github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a h1:UwSIFv5g5lIvbGgtf3tVwC7Ky9rmMFBp0RMs+6f6YqE=
+github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q=
+github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
+github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
+github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
+github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
+github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
+github.com/extism/go-sdk v1.7.1 h1:lWJos6uY+tRFdlIHR+SJjwFDApY7OypS/2nMhiVQ9Sw=
+github.com/extism/go-sdk v1.7.1/go.mod h1:IT+Xdg5AZM9hVtpFUA+uZCJMge/hbvshl8bwzLtFyKA=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/fluxcd/cli-utils v0.37.2-flux.1 h1:tQ588ghtRN+E+kHq415FddfqA9v4brn/1WWgrP6rQR0=
+github.com/fluxcd/cli-utils v0.37.2-flux.1/go.mod h1:LcWSu1NYET8d8U7O326RhEm5JkQXCMK6ITu4G1CT02c=
+github.com/foxcpp/go-mockdns v1.2.0 h1:omK3OrHRD1IWJz1FuFBCFquhXslXoF17OvBS6JPzZF0=
+github.com/foxcpp/go-mockdns v1.2.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
+github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
+github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
+github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
+github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
+github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
+github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
+github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
+github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
+github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
+github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
+github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
+github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
+github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw=
+github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU=
+github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4=
+github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca h1:T54Ema1DU8ngI+aef9ZhAhNGQhcRTrWxVeG07F+c/Rw=
+github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=
+github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
+github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
+github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y=
+github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
+github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
+github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
+github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
+github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
+github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
+github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
+github.com/morikuni/aec v1.1.0 h1:vBBl0pUnvi/Je71dsRrhMBtreIqNMYErSAbEeb8jrXQ=
+github.com/morikuni/aec v1.1.0/go.mod h1:xDRgiq/iw5l+zkao76YTKzKttOp2cwPEne25HDkJnBw=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
+github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
+github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q=
+github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
+github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
+github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
+github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
+github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
+github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
+github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
+github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
+github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U=
+github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc=
+github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ=
+github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
+github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rubenv/sql-migrate v1.8.1 h1:EPNwCvjAowHI3TnZ+4fQu3a915OpnQoPAjTXCGOy2U0=
+github.com/rubenv/sql-migrate v1.8.1/go.mod h1:BTIKBORjzyxZDS6dzoiw6eAFYJ1iNlGAtjn4LGeVjS8=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
+github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 h1:ZF+QBjOI+tILZjBaFj3HgFonKXUcwgJ4djLb6i42S3Q=
+github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834/go.mod h1:m9ymHTgNSEjuxvw8E7WWe4Pl4hZQHXONY8wE6dMLaRk=
+github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA=
+github.com/tetratelabs/wazero v1.11.0/go.mod h1:eV28rsN8Q+xwjogd7f4/Pp4xFxO7uOGbLcD/LzB1wiU=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
+github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/contrib/bridges/prometheus v0.65.0 h1:I/7S/yWobR3QHFLqHsJ8QOndoiFsj1VgHpQiq43KlUI=
+go.opentelemetry.io/contrib/bridges/prometheus v0.65.0/go.mod h1:jPF6gn3y1E+nozCAEQj3c6NZ8KY+tvAgSVfvoOJUFac=
+go.opentelemetry.io/contrib/exporters/autoexport v0.65.0 h1:2gApdml7SznX9szEKFjKjM4qGcGSvAybYLBY319XG3g=
+go.opentelemetry.io/contrib/exporters/autoexport v0.65.0/go.mod h1:0QqAGlbHXhmPYACG3n5hNzO5DnEqqtg4VcK5pr22RI0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
+go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
+go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 h1:ZVg+kCXxd9LtAaQNKBxAvJ5NpMf7LpvEr4MIZqb0TMQ=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0/go.mod h1:hh0tMeZ75CCXrHd9OXRYxTlCAdxcXioWHFIpYw2rZu8=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 h1:djrxvDxAe44mJUrKataUbOhCKhR3F8QCyWucO16hTQs=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0/go.mod h1:dt3nxpQEiSoKvfTVxp3TUg5fHPLhKtbcnN3Z1I1ePD0=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0 h1:NOyNnS19BF2SUDApbOKbDtWZ0IK7b8FJ2uAGdIWOGb0=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0/go.mod h1:VL6EgVikRLcJa9ftukrHu/ZkkhFBSo1lzvdBC9CF1ss=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.40.0 h1:9y5sHvAxWzft1WQ4BwqcvA+IFVUJ1Ya75mSAUnFEVwE=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.40.0/go.mod h1:eQqT90eR3X5Dbs1g9YSM30RavwLF725Ris5/XSXWvqE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 h1:DvJDOPmSWQHWywQS6lKL+pb8s3gBLOZUtw4N+mavW1I=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0/go.mod h1:EtekO9DEJb4/jRyN4v4Qjc2yA7AtfCBuz2FynRUWTXs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
+go.opentelemetry.io/otel/exporters/prometheus v0.62.0 h1:krvC4JMfIOVdEuNPTtQ0ZjCiXrybhv+uOHMfHRmnvVo=
+go.opentelemetry.io/otel/exporters/prometheus v0.62.0/go.mod h1:fgOE6FM/swEnsVQCqCnbOfRV4tOnWPg7bVeo4izBuhQ=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.16.0 h1:ivlbaajBWJqhcCPniDqDJmRwj4lc6sRT+dCAVKNmxlQ=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.16.0/go.mod h1:u/G56dEKDDwXNCVLsbSrllB2o8pbtFLUC4HpR66r2dc=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.40.0 h1:ZrPRak/kS4xI3AVXy8F7pipuDXmDsrO8Lg+yQjBLjw0=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.40.0/go.mod h1:3y6kQCWztq6hyW8Z9YxQDDm0Je9AJoFar2G0yDcmhRk=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0 h1:MzfofMZN8ulNqobCmCAVbqVL5syHw+eB2qPRkCMA/fQ=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0/go.mod h1:E73G9UFtKRXrxhBsHtG00TB5WxX57lpsQzogDkqBTz8=
+go.opentelemetry.io/otel/log v0.16.0 h1:DeuBPqCi6pQwtCK0pO4fvMB5eBq6sNxEnuTs88pjsN4=
+go.opentelemetry.io/otel/log v0.16.0/go.mod h1:rWsmqNVTLIA8UnwYVOItjyEZDbKIkMxdQunsIhpUMes=
+go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
+go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
+go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
+go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
+go.opentelemetry.io/otel/sdk/log v0.16.0 h1:e/b4bdlQwC5fnGtG3dlXUrNOnP7c8YLVSpSfEBIkTnI=
+go.opentelemetry.io/otel/sdk/log v0.16.0/go.mod h1:JKfP3T6ycy7QEuv3Hj8oKDy7KItrEkus8XJE6EoSzw4=
+go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
+go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
+go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
+go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
+go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
+go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
+golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
+golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
+golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
+golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
+golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
+golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
+golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
+golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
+golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
+golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
+golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
+google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
+google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo=
+gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
+helm.sh/helm/v4 v4.1.4 h1:zwTrNkalG4f7SYigRSdQnYrTj0QEz1qzetzAlYoDVSo=
+helm.sh/helm/v4 v4.1.4/go.mod h1:5dSo8rRgn3OTkDAc/k0Ipw5/Q+BlqKIKZwa0XwSiINI=
+k8s.io/api v0.35.5 h1:BrFeUDGY/LBtlA1R5RoxhlYRHs76RnQBc6xbm/y7hsQ=
+k8s.io/api v0.35.5/go.mod h1:xWkFhMnoPZdTAQh95Rlw3zZpUUNVlFHcuESUYd06BWM=
+k8s.io/apiextensions-apiserver v0.35.1 h1:p5vvALkknlOcAqARwjS20kJffgzHqwyQRM8vHLwgU7w=
+k8s.io/apiextensions-apiserver v0.35.1/go.mod h1:2CN4fe1GZ3HMe4wBr25qXyJnJyZaquy4nNlNmb3R7AQ=
+k8s.io/apimachinery v0.35.5 h1:lbjjjUfVeVqFbiOpyhqZHc8DhiYkWOxSNij7lHx2U8Y=
+k8s.io/apimachinery v0.35.5/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
+k8s.io/apiserver v0.35.1 h1:potxdhhTL4i6AYAa2QCwtlhtB1eCdWQFvJV6fXgJzxs=
+k8s.io/apiserver v0.35.1/go.mod h1:BiL6Dd3A2I/0lBnteXfWmCFobHM39vt5+hJQd7Lbpi4=
+k8s.io/cli-runtime v0.35.5 h1:zyeQFN1+2lr4/rksBWUyeVCA/pZUHrrDs3RYGrO4Wuw=
+k8s.io/cli-runtime v0.35.5/go.mod h1:TJnEEtxrk8C4AkFwhbH6mrTy6iPo/PM3NkrNU9RWGy4=
+k8s.io/client-go v0.35.5 h1:wUrgqVSmFRw75bgSHY7X0G/hZM/QYpV0Hg7SYYOYpFk=
+k8s.io/client-go v0.35.5/go.mod h1:Z0mDcAJsX1Y7RQfuQlJipiRtqf8Mhk2VDu1/JvRqdGo=
+k8s.io/component-base v0.35.1 h1:XgvpRf4srp037QWfGBLFsYMUQJkE5yMa94UsJU7pmcE=
+k8s.io/component-base v0.35.1/go.mod h1:HI/6jXlwkiOL5zL9bqA3en1Ygv60F03oEpnuU1G56Bs=
+k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
+k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
+k8s.io/kubectl v0.35.1 h1:zP3Er8C5i1dcAFUMh9Eva0kVvZHptXIn/+8NtRWMxwg=
+k8s.io/kubectl v0.35.1/go.mod h1:cQ2uAPs5IO/kx8R5s5J3Ihv3VCYwrx0obCXum0CvnXo=
+k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
+k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
+oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
+sigs.k8s.io/controller-runtime v0.23.1 h1:TjJSM80Nf43Mg21+RCy3J70aj/W6KyvDtOlpKf+PupE=
+sigs.k8s.io/controller-runtime v0.23.1/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
+sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
+sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/kind v0.31.0 h1:UcT4nzm+YM7YEbqiAKECk+b6dsvc/HRZZu9U0FolL1g=
+sigs.k8s.io/kind v0.31.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
+sigs.k8s.io/kustomize/api v0.21.1 h1:lzqbzvz2CSvsjIUZUBNFKtIMsEw7hVLJp0JeSIVmuJs=
+sigs.k8s.io/kustomize/api v0.21.1/go.mod h1:f3wkKByTrgpgltLgySCntrYoq5d3q7aaxveSagwTlwI=
+sigs.k8s.io/kustomize/kyaml v0.21.1 h1:IVlbmhC076nf6foyL6Taw4BkrLuEsXUXNpsE+ScX7fI=
+sigs.k8s.io/kustomize/kyaml v0.21.1/go.mod h1:hmxADesM3yUN2vbA5z1/YTBnzLJ1dajdqpQonwBL1FQ=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 h1:2WOzJpHUBVrrkDjU4KBT8n5LDcj824eX0I5UKcgeRUs=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
diff --git a/xpumd/test/integration/k8s/helm.go b/xpumd/test/integration/k8s/helm.go
new file mode 100644
index 000000000..91480fdc8
--- /dev/null
+++ b/xpumd/test/integration/k8s/helm.go
@@ -0,0 +1,136 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package k8s
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"helm.sh/helm/v4/pkg/action"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/loader"
+	"helm.sh/helm/v4/pkg/kube"
+	"helm.sh/helm/v4/pkg/storage/driver"
+	"helm.sh/helm/v4/pkg/strvals"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+)
+
+const helmInstallTimeout = 3 * time.Minute
+
+type helmClient struct {
+	namespace       string
+	releaseName     string
+	repoRoot        string
+	valuesPath      string
+	kubeconfigPath  string
+	kubeContext     string
+	imageRepository string
+	imageTag        string
+	imagePullPolicy string
+}
+
+// newHelmClient creates a helmClient capturing the test-specific fields and the
+// current suite infrastructure settings (image, kubeconfig, etc.).
+func newHelmClient(namespace, releaseName, valuesPath string) helmClient {
+	return helmClient{
+		namespace:       namespace,
+		releaseName:     releaseName,
+		valuesPath:      valuesPath,
+		repoRoot:        suite.repoRoot,
+		kubeconfigPath:  suite.kubeconfigPath,
+		kubeContext:     suite.kubeContext,
+		imageRepository: suite.imageRepository,
+		imageTag:        suite.imageTag,
+		imagePullPolicy: suite.imagePullPolicy,
+	}
+}
+
+func (h helmClient) upgrade(t *testing.T) {
+	t.Helper()
+
+	cfg, err := h.actionCfg()
+	if err != nil {
+		t.Fatalf("failed to create helm action config: %v", err)
+	}
+	vals, err := h.mergeValues()
+	if err != nil {
+		t.Fatalf("failed to merge helm values: %v", err)
+	}
+	chrt, err := loader.Load(filepath.Join(h.repoRoot, "charts", "xpumd"))
+	if err != nil {
+		t.Fatalf("failed to load chart: %v", err)
+	}
+
+	install := action.NewInstall(cfg)
+	install.ReleaseName = h.releaseName
+	install.Namespace = h.namespace
+	install.CreateNamespace = true
+	install.WaitStrategy = kube.StatusWatcherStrategy
+	install.Timeout = helmInstallTimeout
+	install.TakeOwnership = true
+	if _, err := install.RunWithContext(context.Background(), chrt, vals); err != nil {
+		if !errors.Is(err, driver.ErrReleaseExists) {
+			t.Fatalf("helm install failed: %v", err)
+		}
+		upgrade := action.NewUpgrade(cfg)
+		upgrade.WaitStrategy = kube.StatusWatcherStrategy
+		upgrade.Timeout = helmInstallTimeout
+		if _, err := upgrade.Run(h.releaseName, chrt, vals); err != nil {
+			t.Fatalf("helm upgrade failed: %v", err)
+		}
+	}
+}
+
+func (h helmClient) uninstall() error {
+	cfg, err := h.actionCfg()
+	if err != nil {
+		return fmt.Errorf("failed to create helm action config: %w", err)
+	}
+	uninstall := action.NewUninstall(cfg)
+	uninstall.WaitStrategy = kube.HookOnlyStrategy
+	if _, err := uninstall.Run(h.releaseName); err != nil {
+		return fmt.Errorf("helm uninstall failed: %w", err)
+	}
+	return nil
+}
+
+func (h helmClient) actionCfg() (*action.Configuration, error) {
+	kubeconfig := h.kubeconfigPath
+	kubecontext := h.kubeContext
+	namespace := h.namespace
+	f := genericclioptions.NewConfigFlags(true)
+	f.KubeConfig = &kubeconfig
+	f.Context = &kubecontext
+	f.Namespace = &namespace
+
+	cfg := new(action.Configuration)
+	if err := cfg.Init(f, h.namespace, ""); err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
+
+func (h helmClient) mergeValues() (map[string]interface{}, error) {
+	vals, err := common.ReadValuesFile(h.valuesPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read values file: %w", err)
+	}
+	for _, overrides := range []string{
+		fmt.Sprintf("image.repository=%s", h.imageRepository),
+		fmt.Sprintf("image.tag=%s", h.imageTag),
+		fmt.Sprintf("image.pullPolicy=%s", h.imagePullPolicy),
+	} {
+		// ParseStringInto preserves values as strings (e.g. not convert numeric image tags like "20260521" to numbers)
+		if err := strvals.ParseIntoString(overrides, vals); err != nil {
+			return nil, fmt.Errorf("failed to parse overrides: %w", err)
+		}
+	}
+	return vals, nil
+}
diff --git a/xpumd/test/integration/k8s/infra.go b/xpumd/test/integration/k8s/infra.go
new file mode 100644
index 000000000..bd8d19ecd
--- /dev/null
+++ b/xpumd/test/integration/k8s/infra.go
@@ -0,0 +1,104 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package k8s
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/docker/docker/client"
+	"sigs.k8s.io/kind/pkg/cluster"
+	"sigs.k8s.io/kind/pkg/cluster/nodeutils"
+)
+
+// kindCluster wraps a Kind cluster.Provider scoped to a single cluster.
+type kindCluster struct {
+	provider *cluster.Provider
+	name     string
+}
+
+func newKindCluster(name string) *kindCluster {
+	return &kindCluster{provider: cluster.NewProvider(), name: name}
+}
+
+func (k *kindCluster) create() error {
+	return k.provider.Create(k.name)
+}
+
+func (k *kindCluster) writeKubeconfig() (string, error) {
+	kubeconfig, err := k.provider.KubeConfig(k.name, false)
+	if err != nil {
+		return "", fmt.Errorf("failed to get kind kubeconfig: %w", err)
+	}
+	f, err := os.CreateTemp("", "kind-kubeconfig-*")
+	if err != nil {
+		return "", fmt.Errorf("failed to create temp kubeconfig file: %w", err)
+	}
+	_, wErr := f.WriteString(kubeconfig)
+	if cErr := f.Close(); wErr != nil || cErr != nil {
+		if rErr := os.Remove(f.Name()); rErr != nil {
+			fmt.Fprintf(os.Stderr, "failed to remove temp kubeconfig file: %v\n", rErr)
+		}
+		if wErr != nil {
+			return "", fmt.Errorf("failed to write kubeconfig: %w", wErr)
+		}
+		return "", fmt.Errorf("failed to close kubeconfig file: %w", cErr)
+	}
+	return f.Name(), nil
+}
+
+// loadImage streams the test image from the local Docker daemon directly into
+// each kind node via the containerd image import API.
+func (k *kindCluster) loadImage() error {
+	imageRef := fmt.Sprintf("%s:%s", suite.imageRepository, suite.imageTag)
+
+	dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+	if err != nil {
+		return fmt.Errorf("failed to create docker client: %w", err)
+	}
+	defer dockerClient.Close() //nolint: errcheck // docker client is "read-only" in this context
+
+	stream, err := dockerClient.ImageSave(context.Background(), []string{imageRef})
+	if err != nil {
+		return fmt.Errorf("failed to save docker image %s: %w", imageRef, err)
+	}
+	defer stream.Close() //nolint: errcheck // stream is closed after spooling
+
+	tmp, err := os.CreateTemp("", "xpumd-kind-image-*.tar")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file for container image: %w", err)
+	}
+	defer func() {
+		tmp.Close() //nolint: errcheck // read-only after spool
+		if err := os.Remove(tmp.Name()); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to remove temp container image file %s: %v\n", tmp.Name(), err)
+		}
+	}()
+
+	if _, err := io.Copy(tmp, stream); err != nil {
+		return fmt.Errorf("failed to spool image to temp file: %w", err)
+	}
+
+	nodes, err := k.provider.ListNodes(k.name)
+	if err != nil {
+		return fmt.Errorf("failed to list kind nodes: %w", err)
+	}
+	for _, node := range nodes {
+		if _, err := tmp.Seek(0, io.SeekStart); err != nil {
+			return fmt.Errorf("failed to rewind image temp file for node %s: %w", node, err)
+		}
+		if err := nodeutils.LoadImageArchive(node, tmp); err != nil {
+			return fmt.Errorf("failed to load image into node %s: %w", node, err)
+		}
+	}
+	return nil
+}
+
+func (k *kindCluster) delete() error {
+	return k.provider.Delete(k.name, "")
+}
diff --git a/xpumd/test/integration/k8s/kubernetes.go b/xpumd/test/integration/k8s/kubernetes.go
new file mode 100644
index 000000000..145c684da
--- /dev/null
+++ b/xpumd/test/integration/k8s/kubernetes.go
@@ -0,0 +1,260 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package k8s
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/portforward"
+	"k8s.io/client-go/tools/remotecommand"
+	clientspdy "k8s.io/client-go/transport/spdy"
+)
+
+const (
+	portForwardRetryTimeout     = 30 * time.Second
+	portForwardReadinessTimeout = 5 * time.Second
+)
+
+type k8sClient struct {
+	*kubernetes.Clientset
+	restConfig *rest.Config
+	namespace  string
+}
+
+func newK8sClient(kubeconfig, kubecontext string) (k8sClient, error) {
+	empty := ""
+	f := genericclioptions.NewConfigFlags(true)
+	f.KubeConfig = &kubeconfig
+	f.Context = &kubecontext
+	f.Namespace = &empty
+
+	restConfig, err := f.ToRESTConfig()
+	if err != nil {
+		return k8sClient{}, fmt.Errorf("failed to get kubernetes REST config: %w", err)
+	}
+	clientset, err := kubernetes.NewForConfig(restConfig)
+	if err != nil {
+		return k8sClient{}, fmt.Errorf("failed to create kubernetes client: %w", err)
+	}
+	return k8sClient{Clientset: clientset, restConfig: restConfig}, nil
+}
+
+func (kc k8sClient) withNamespace(namespace string) k8sClient {
+	kc.namespace = namespace
+	return kc
+}
+
+type portForwarder struct {
+	stopChan chan struct{}
+	port     uint16
+}
+
+func (p *portForwarder) endpoint() string {
+	return fmt.Sprintf("localhost:%d", p.port)
+}
+
+func (p *portForwarder) stop() {
+	select {
+	case <-p.stopChan:
+	default:
+		close(p.stopChan)
+	}
+}
+
+func (kc k8sClient) createNamespace() error {
+	_, err := kc.CoreV1().Namespaces().Create(context.Background(), &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{Name: kc.namespace},
+	}, metav1.CreateOptions{})
+	if apierrors.IsAlreadyExists(err) {
+		return nil
+	}
+	return err
+}
+
+func (kc k8sClient) deleteNamespace() error {
+	err := kc.CoreV1().Namespaces().Delete(context.Background(), kc.namespace, metav1.DeleteOptions{})
+	if apierrors.IsNotFound(err) {
+		return nil
+	}
+	return err
+}
+
+// getDaemonSetPodNames returns the names of all pods owned by a DaemonSet.
+func (kc k8sClient) getDaemonSetPodNames(name string) ([]string, error) {
+	ds, err := kc.AppsV1().DaemonSets(kc.namespace).Get(context.Background(), name, metav1.GetOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to get daemonset %s/%s: %w", kc.namespace, name, err)
+	}
+	selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector)
+	if err != nil {
+		return nil, fmt.Errorf("daemonset %s/%s has invalid selector: %w", kc.namespace, name, err)
+	}
+	pods, err := kc.CoreV1().Pods(kc.namespace).List(context.Background(), metav1.ListOptions{
+		LabelSelector: selector.String(),
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(pods.Items) == 0 {
+		return nil, fmt.Errorf("no pods found for daemonset %s/%s", kc.namespace, name)
+	}
+	names := make([]string, len(pods.Items))
+	for i, pod := range pods.Items {
+		names[i] = pod.Name
+	}
+	return names, nil
+}
+
+// waitForRollout waits for a DaemonSet to have at least one desired pod and all desired pods ready.
+func (kc k8sClient) waitForRollout(name string, timeout time.Duration) error {
+	deadline := time.Now().Add(timeout)
+	for {
+		ds, err := kc.AppsV1().DaemonSets(kc.namespace).Get(context.Background(), name, metav1.GetOptions{})
+		if err != nil {
+			return err
+		}
+		if ds.Status.ObservedGeneration >= ds.Generation &&
+			ds.Status.DesiredNumberScheduled > 0 &&
+			ds.Status.NumberReady >= ds.Status.DesiredNumberScheduled {
+			return nil
+		}
+		if time.Now().After(deadline) {
+			return fmt.Errorf("timed out after %v waiting for daemonset %q rollout", timeout, name)
+		}
+		time.Sleep(time.Second)
+	}
+}
+
+func (kc k8sClient) createConfigMap(name string, data map[string]string) error {
+	cm := &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: kc.namespace,
+		},
+		Data: data,
+	}
+	_, err := kc.CoreV1().ConfigMaps(kc.namespace).Create(context.Background(), cm, metav1.CreateOptions{})
+	return err
+}
+
+// copyFile copies a file to a container by execing "cat >" in it, and piping
+// local file content to it (mimics "kubectl cp" but without using tar).
+func (kc k8sClient) copyFile(t *testing.T, pod, container, localPath, remotePath string) {
+	t.Helper()
+
+	data, err := os.ReadFile(localPath)
+	if err != nil {
+		t.Fatalf("failed to read %q file to copy: %v", localPath, err)
+	}
+
+	req := kc.CoreV1().RESTClient().Post().
+		Namespace(kc.namespace).
+		Resource("pods").
+		Name(pod).
+		SubResource("exec").
+		VersionedParams(&corev1.PodExecOptions{
+			Container: container,
+			Command:   []string{"sh", "-c", "cat > " + remotePath},
+			Stdin:     true,
+			Stdout:    false,
+			Stderr:    true,
+		}, scheme.ParameterCodec)
+
+	executor, err := remotecommand.NewSPDYExecutor(kc.restConfig, http.MethodPost, req.URL())
+	if err != nil {
+		t.Fatalf("execing shell+cat in pod %q failed: %v", pod, err)
+	}
+
+	var stderr bytes.Buffer
+	if err := executor.StreamWithContext(context.Background(), remotecommand.StreamOptions{
+		Stdin:  bytes.NewReader(data),
+		Stderr: &stderr,
+	}); err != nil {
+		t.Fatalf("failed to copy %q to %s/%s:%s: %v (stderr: %q)", localPath, pod, container, remotePath, err, stderr.String())
+	}
+}
+
+// forwardPort imitates kubectl forward, sets up a port-forward to the given
+// pod/port, and returns the local endpoint to connect to.
+func (kc k8sClient) forwardPort(t *testing.T, pod string, remotePort int) *portForwarder {
+	t.Helper()
+
+	deadline := time.Now().Add(portForwardRetryTimeout)
+	for {
+		pf, err := kc.forwardPortOnce(pod, remotePort)
+		if err == nil {
+			return pf
+		}
+		t.Logf("port-forward to pod %s port %d failed (retrying): %v", pod, remotePort, err)
+		if time.Now().After(deadline) {
+			t.Fatalf("timed out after %v waiting for port-forward to pod %s port %d: %v", portForwardRetryTimeout, pod, remotePort, err)
+		}
+		time.Sleep(time.Second)
+	}
+}
+
+func (kc k8sClient) forwardPortOnce(pod string, remotePort int) (*portForwarder, error) {
+	req := kc.CoreV1().RESTClient().Post().
+		Namespace(kc.namespace).
+		Resource("pods").
+		Name(pod).
+		SubResource("portforward")
+
+	transport, upgrader, err := clientspdy.RoundTripperFor(kc.restConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create spdy round tripper: %w", err)
+	}
+	stopChan := make(chan struct{})
+	readyChan := make(chan struct{})
+	errChan := make(chan error, 1)
+
+	dialer := clientspdy.NewDialer(upgrader, &http.Client{Transport: transport}, http.MethodPost, req.URL())
+	fw, err := portforward.New(dialer, []string{fmt.Sprintf("0:%d", remotePort)}, stopChan, readyChan, io.Discard, io.Discard)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create port-forwarder: %w", err)
+	}
+
+	go func() {
+		errChan <- fw.ForwardPorts()
+	}()
+
+	select {
+	case <-readyChan:
+		ports, err := fw.GetPorts()
+		if err != nil {
+			close(stopChan)
+			return nil, fmt.Errorf("failed to get forwarded ports: %w", err)
+		}
+		if len(ports) == 0 {
+			close(stopChan)
+			return nil, fmt.Errorf("no forwarded ports reported")
+		}
+		return &portForwarder{stopChan: stopChan, port: ports[0].Local}, nil
+	case err := <-errChan:
+		close(stopChan)
+		if err == nil {
+			return nil, fmt.Errorf("port-forward stopped before becoming ready")
+		}
+		return nil, fmt.Errorf("failed to start port-forward: %w", err)
+	case <-time.After(portForwardReadinessTimeout):
+		close(stopChan)
+		return nil, fmt.Errorf("timed out after %v waiting for port-forward readiness", portForwardReadinessTimeout)
+	}
+}
diff --git a/xpumd/test/integration/k8s/metrics.go b/xpumd/test/integration/k8s/metrics.go
new file mode 100644
index 000000000..e11e6a48c
--- /dev/null
+++ b/xpumd/test/integration/k8s/metrics.go
@@ -0,0 +1,177 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package k8s
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"maps"
+	"math"
+	"net/http"
+	"slices"
+	"strings"
+	"testing"
+	"time"
+
+	dto "github.com/prometheus/client_model/go"
+	"github.com/prometheus/common/expfmt"
+	"github.com/prometheus/common/model"
+)
+
+const (
+	metricPollInterval = 500 * time.Millisecond
+	metricFetchTimeout = 5 * time.Second
+)
+
+// labels is a Prometheus label set. Use with() to derive new sets without
+// mutating the original.
+type labels map[string]string
+
+// with returns a new labels set that combines the original with the given extra entries.
+func (l labels) with(extra labels) labels {
+	result := maps.Clone(l)
+	maps.Copy(result, extra)
+	return result
+}
+
+func (l labels) String() string {
+	keys := slices.Sorted(maps.Keys(l))
+	parts := make([]string, len(keys))
+	for i, k := range keys {
+		parts[i] = fmt.Sprintf("%s=%q", k, l[k])
+	}
+	return strings.Join(parts, ", ")
+}
+
+// metricAssertion describes a single expected Prometheus metric.
+type metricAssertion struct {
+	name   string
+	labels labels
+	value  float64
+	// skip the value check, used for metrics whose value varies with timing
+	skipValue bool
+}
+
+// assert is a test helper that looks up the metric and reports any errors.
+func (a *metricAssertion) assert(t *testing.T, families map[string]*dto.MetricFamily) {
+	t.Helper()
+	if _, err := a.findMetric(families); err != nil {
+		t.Error(err)
+	}
+}
+
+// findMetric looks up the metric by name and labels and checks the value
+// (unless skipValue is set).
+func (a *metricAssertion) findMetric(families map[string]*dto.MetricFamily) (*dto.Metric, error) {
+	family := families[a.name]
+	if family == nil {
+		return nil, fmt.Errorf("metric %q not found", a.name)
+	}
+
+	for _, metric := range family.Metric {
+		if !labelsMatch(metric.GetLabel(), a.labels) {
+			continue
+		}
+		v := metricValue(metric)
+		if !a.skipValue && !floatAlmostEqual(v, a.value) {
+			return nil, fmt.Errorf("unexpected value %v (expected %v) for metric %s{%s}", v, a.value, a.name, a.labels)
+		}
+		return metric, nil
+	}
+
+	var sb strings.Builder
+	fmt.Fprintf(&sb, "metric %s{%s} not found, %d candidate(s):",
+		a.name, a.labels, len(family.Metric))
+	for _, m := range family.Metric {
+		fmt.Fprintf(&sb, "\n  {%s}", labelPairsToLabels(m.GetLabel()))
+	}
+	return nil, fmt.Errorf("%s", sb.String())
+}
+
+// waitForMetric polls the metrics endpoint until the given assertion passes.
+// Returns all the metrics for further assertions.
+func waitForMetric(t *testing.T, endpoint string, wantMetric metricAssertion, timeout time.Duration) map[string]*dto.MetricFamily {
+	t.Helper()
+
+	var lastErr error
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		families, err := fetchMetrics(endpoint)
+		if err == nil {
+			_, lastErr = wantMetric.findMetric(families)
+			if lastErr == nil {
+				return families
+			}
+		} else {
+			lastErr = err
+		}
+		time.Sleep(metricPollInterval)
+	}
+
+	t.Fatalf("timed out after %v waiting for metric: %v", timeout, lastErr)
+	return nil
+}
+
+func fetchMetrics(endpoint string) (map[string]*dto.MetricFamily, error) {
+	client := http.Client{Timeout: metricFetchTimeout}
+	resp, err := client.Get(fmt.Sprintf("http://%s/metrics", endpoint))
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close() //nolint:errcheck // read-only, best-effort cleanup
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("HTTP GET for '%s' failed: status %s", endpoint, resp.Status)
+	}
+
+	parser := expfmt.NewTextParser(model.LegacyValidation)
+	return parser.TextToMetricFamilies(bytes.NewReader(body))
+}
+
+func labelsMatch(pairs []*dto.LabelPair, want labels) bool {
+	got := labelPairsToLabels(pairs)
+	for key, value := range want {
+		if got[key] != value {
+			return false
+		}
+	}
+	return true
+}
+
+func labelPairsToLabels(pairs []*dto.LabelPair) labels {
+	l := make(labels, len(pairs))
+	for _, p := range pairs {
+		l[p.GetName()] = p.GetValue()
+	}
+	return l
+}
+
+func metricValue(metric *dto.Metric) float64 {
+	switch {
+	case metric.GetGauge() != nil:
+		return metric.GetGauge().GetValue()
+	case metric.GetCounter() != nil:
+		return metric.GetCounter().GetValue()
+	case metric.GetUntyped() != nil:
+		return metric.GetUntyped().GetValue()
+	default:
+		return math.NaN()
+	}
+}
+
+func floatAlmostEqual(got, want float64) bool {
+	if math.IsNaN(got) || math.IsNaN(want) {
+		return false
+	}
+	diff := math.Abs(got - want)
+	scale := math.Max(1, math.Abs(want))
+	return diff <= 1e-9*scale
+}
diff --git a/xpumd/test/integration/k8s/suite.go b/xpumd/test/integration/k8s/suite.go
new file mode 100644
index 000000000..6134764eb
--- /dev/null
+++ b/xpumd/test/integration/k8s/suite.go
@@ -0,0 +1,189 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package k8s
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing"
+	"time"
+)
+
+const (
+	defaultTimeout          = 3 * time.Minute
+	servicePort             = 8080
+	stubDriverConfigMapName = "level-zero-stub-driver-config"
+	defaultImageRepo        = "registry.local/xpumd"
+	defaultImageTag         = "latest"
+	defaultKindCluster      = "xpumd-integration-test"
+	defaultReleaseName      = "xpumd-integration-test"
+)
+
+var (
+	useExistingCluster = flag.Bool("use-existing-cluster", false, "Use the current kubectl context instead of creating a kind cluster")
+	kindClusterName    = flag.String("kind-cluster-name", defaultKindCluster, "Kind cluster name to create (ignored with --use-existing-cluster)")
+	kindLoadImage      = flag.Bool("kind-load-image", false, "Load the image into the kind cluster, requires that image is available on the host docker, sets pull policy to Never (ignored with --use-existing-cluster)")
+	imageRepository    = flag.String("image-repository", defaultImageRepo, "Container image repository to deploy")
+	imageTag           = flag.String("image-tag", defaultImageTag, "Container image tag to deploy")
+	imagePullPolicy    = flag.String("image-pull-policy", "", "Container image pull policy override")
+	kubeContext        = flag.String("kube-context", "", "kubectl/helm context to use (for --use-existing-cluster)")
+
+	suite suiteConfig
+)
+
+type suiteConfig struct {
+	repoRoot        string
+	testdataDir     string
+	kindClusterName string
+	imageRepository string
+	imageTag        string
+	imagePullPolicy string
+	kubeContext     string
+	kubeconfigPath  string // path to kubeconfig for tmp kind cluster, unused with existing cluster
+
+	k8s *k8sClient
+}
+
+func newSuiteConfig() (suiteConfig, error) {
+	_, currentFile, _, ok := runtime.Caller(0)
+	if !ok {
+		return suiteConfig{}, errors.New("failed to determine repo root")
+	}
+	repoRoot := filepath.Clean(filepath.Join(filepath.Dir(currentFile), "..", "..", ".."))
+	fmt.Printf("Using xpumd source tree root directory: %s\n", repoRoot)
+
+	pullPolicy := *imagePullPolicy
+	if pullPolicy == "" {
+		if *kindLoadImage && !*useExistingCluster {
+			pullPolicy = "Never"
+		} else {
+			pullPolicy = "IfNotPresent"
+		}
+	}
+
+	return suiteConfig{
+		repoRoot:        repoRoot,
+		testdataDir:     filepath.Join(repoRoot, "test", "integration", "k8s", "testdata"),
+		kindClusterName: *kindClusterName,
+		imageRepository: *imageRepository,
+		imageTag:        *imageTag,
+		imagePullPolicy: pullPolicy,
+		kubeContext:     *kubeContext,
+	}, nil
+}
+
+// testConfig holds test-case-specific settings that vary per test run.
+type testConfig struct {
+	namespace            string
+	releaseName          string
+	stubDriverConfigPath string
+
+	// Cached data populated in setup()
+	cleanupFuncs []func(*testing.T)
+	helm         helmClient
+	k8sClient    k8sClient
+	podName      string
+}
+
+func newTestConfig(testdataDir, valuesFile, stubDriverConfigFile string) testConfig {
+	ns := fmt.Sprintf("xpumd-integration-test-%d", time.Now().UnixNano())
+	return testConfig{
+		namespace:            ns,
+		releaseName:          defaultReleaseName,
+		stubDriverConfigPath: filepath.Join(testdataDir, stubDriverConfigFile),
+		helm:                 newHelmClient(ns, defaultReleaseName, filepath.Join(testdataDir, valuesFile)),
+	}
+}
+
+func (tc *testConfig) addCleanup(fn func(*testing.T)) {
+	tc.cleanupFuncs = append(tc.cleanupFuncs, fn)
+}
+
+func (tc *testConfig) setup(t *testing.T) {
+	t.Helper()
+
+	kc, err := suite.k8sClient(tc.namespace)
+	if err != nil {
+		t.Fatalf("failed to initialize kubernetes client: %v", err)
+	}
+	tc.k8sClient = kc
+
+	if err := tc.k8sClient.createNamespace(); err != nil {
+		t.Fatalf("failed to create namespace: %v", err)
+	}
+	tc.addCleanup(func(t *testing.T) {
+		if err := tc.k8sClient.deleteNamespace(); err != nil {
+			t.Errorf("failed to delete namespace: %v", err)
+		}
+	})
+
+	tc.createStubDriverConfig(t)
+	tc.helm.upgrade(t)
+	tc.addCleanup(func(t *testing.T) {
+		if err := tc.helm.uninstall(); err != nil {
+			t.Errorf("failed to delete helm release: %v", err)
+		}
+	})
+
+	if err := tc.k8sClient.waitForRollout(tc.releaseName, defaultTimeout); err != nil {
+		t.Fatalf("wait for xpumd rollout: %v", err)
+	}
+	podNames, err := tc.k8sClient.getDaemonSetPodNames(tc.releaseName)
+	if err != nil {
+		t.Fatalf("get xpumd pod name: %v", err)
+	}
+	tc.podName = podNames[0]
+}
+
+func (tc *testConfig) createStubDriverConfig(t *testing.T) {
+	t.Helper()
+
+	data, err := os.ReadFile(tc.stubDriverConfigPath)
+	if err != nil {
+		t.Fatalf("failed to read stub driver config: %v", err)
+	}
+	if err := tc.k8sClient.createConfigMap(stubDriverConfigMapName, map[string]string{"stub.yaml": string(data)}); err != nil {
+		t.Fatalf("failed to create stub driver config map: %v", err)
+	}
+}
+
+func (tc *testConfig) cleanup(t *testing.T) {
+	for i := len(tc.cleanupFuncs) - 1; i >= 0; i-- {
+		tc.cleanupFuncs[i](t)
+	}
+}
+
+// updateStubDriverConfig updates the stub driver config in the pod under test.
+// It utilizes the config-writer sidecar to update the config file in-place (in
+// the shared emptyDir volume). ConfigMap is not used because the stub driver's
+// inotify watcher does not catch those, plus, the config map update to be
+// reflected in the pod's filesystem may take quite some time.
+func (tc testConfig) updateStubDriverConfig(t *testing.T, updatedPath string) {
+	t.Helper()
+	const stubConfigPath = "/etc/level-zero-stub/stub.yaml"
+	tc.k8sClient.copyFile(t, tc.podName, "stub-driver-config-writer", updatedPath, stubConfigPath)
+}
+
+// forwardPort opens a port-forward tunnel to the xpumd pod.
+func (tc testConfig) forwardPort(t *testing.T, remotePort int) *portForwarder {
+	t.Helper()
+	return tc.k8sClient.forwardPort(t, tc.podName, remotePort)
+}
+
+func (s *suiteConfig) k8sClient(namespace string) (k8sClient, error) {
+	if s.k8s == nil {
+		kc, err := newK8sClient(s.kubeconfigPath, s.kubeContext)
+		if err != nil {
+			return k8sClient{}, fmt.Errorf("failed to initialize kubernetes client: %w", err)
+		}
+		s.k8s = &kc
+	}
+	return s.k8s.withNamespace(namespace), nil
+}
diff --git a/xpumd/test/integration/k8s/testdata/stub-driver-config-2.yaml b/xpumd/test/integration/k8s/testdata/stub-driver-config-2.yaml
new file mode 100644
index 000000000..c5cbb158e
--- /dev/null
+++ b/xpumd/test/integration/k8s/testdata/stub-driver-config-2.yaml
@@ -0,0 +1,137 @@
+# SPDX-License-Identifier: MIT
+
+Drivers:
+  - ExtensionProperties:
+      - Name: "ZES_extension_power_limits"
+        Version: 65536
+    Devices:
+      - Properties:
+          Core:
+            Type: 1       # ZE_DEVICE_TYPE_GPU
+            VendorId: 0x8086
+            DeviceId: 0x0bd5
+            Uuid:
+              Id: "12345678-0000-0000-0000-000000000000"
+          NumSubdevices: 2
+          ModelName: "Super 3000"
+          VendorName: "ACME Inc."
+          SerialNumber: "SN-0001"
+          Flags: 1  # ZES_DEVICE_PROPERTY_FLAG_INTEGRATED
+
+        PCI:
+          Properties:
+            Address:
+              Domain: 0
+              Bus: 5
+              Device: 0
+              Function: 0
+            MaxSpeed:
+              Gen: 4
+              Width: 16
+              MaxBandwidth: 0
+            HaveBandwidthCounters: true
+          Stats:
+            RxCounter: 3000000
+            TxCounter: 6000000
+
+        Firmwares:
+          - Properties:
+              OnSubdevice: false
+              SubdeviceId: 0
+              CanControl: true
+              Name: "GFX"
+              Version: "1.2.3.4"
+
+        ECC:
+          Available: true
+          Configurable: true
+          State:
+            CurrentState: 1  # ZES_DEVICE_ECC_STATE_ENABLED
+            PendingState: 1
+            PendingAction: 0
+
+        FrequencyDomains:
+          - Properties:
+              Type: 0  # ZES_FREQ_DOMAIN_GPU
+              OnSubdevice: false
+              SubdeviceId: 0
+              CanControl: true
+              Min: 300
+              Max: 1600
+            Range:
+              Min: 200
+              Max: 1200
+            State:
+              Request: 1000
+              Tdp: 1600
+              Efficient: 300
+              Actual: 800
+              ThrottleReasons: 1  # ZES_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP
+
+        MemoryModules:
+          - Properties:
+              Type: 0  # ZES_MEM_TYPE_HBM
+              OnSubdevice: false
+              SubdeviceId: 0
+              Location: 1  # ZES_MEM_LOC_DEVICE
+              PhysicalSize: 17179869184
+            State:
+              Health: 2  # ZES_MEM_HEALTH_DEGRADED
+              Free: 4294967296
+              Size: 17179869184
+            Bandwidth:
+              ReadCounter: 2147483648
+              WriteCounter: 1073741824
+              MaxBandwidth: 512000000000
+              Timestamp: 123456789
+
+        PowerDomains:
+          - Properties:
+              OnSubdevice: false
+              SubdeviceId: 0
+              CanControl: true
+              IsEnergyThresholdSupported: true
+              ExtendedProperties:
+                Domain: 2  # ZES_POWER_DOMAIN_PACKAGE
+                DefaultLimit:
+                  Enabled: true
+                  Limit: 150000
+            EnergyCounter:
+              Energy: 10000000
+              Timestamp: 123456789
+            Limits:
+              - Level: 1  # ZES_POWER_LEVEL_SUSTAINED
+                Source: 0
+                LimitUnit: 0
+                EnabledStateLocked: false
+                Enabled: true
+                IntervalValueLocked: false
+                Interval: 1000
+                LimitValueLocked: false
+                Limit: 200000
+
+        TemperatureSensors:
+          - Properties:
+              Type: 0  # ZES_TEMP_SENSORS_GLOBAL
+              OnSubdevice: false
+              SubdeviceId: 0
+              MaxTemperature: 110.0
+              IsThreshold1Supported: true
+              IsThreshold2Supported: true
+            Temperature: 75.0
+          - Properties:
+              Type: 1  # ZES_TEMP_SENSORS_GPU
+              OnSubdevice: false
+              SubdeviceId: 0
+              MaxTemperature: 110.0
+              IsThreshold1Supported: true
+              IsThreshold2Supported: true
+            Temperature: 110.0  # above 105 °C default threshold → warning
+          - Properties:
+              Type: 2  # ZES_TEMP_SENSORS_MEMORY
+              OnSubdevice: false
+              SubdeviceId: 0
+              MaxTemperature: 100.0
+              IsThreshold1Supported: true
+              IsThreshold2Supported: true
+            Temperature: 90.0  # above 85 °C threshold → warning
diff --git a/xpumd/test/integration/k8s/testdata/stub-driver-config.yaml b/xpumd/test/integration/k8s/testdata/stub-driver-config.yaml
new file mode 100644
index 000000000..7b2d52112
--- /dev/null
+++ b/xpumd/test/integration/k8s/testdata/stub-driver-config.yaml
@@ -0,0 +1,137 @@
+# SPDX-License-Identifier: MIT
+
+Drivers:
+  - ExtensionProperties:
+      - Name: "ZES_extension_power_limits"
+        Version: 65536
+    Devices:
+      - Properties:
+          Core:
+            Type: 1       # ZE_DEVICE_TYPE_GPU
+            VendorId: 0x8086
+            DeviceId: 0x0bd5
+            Uuid:
+              Id: "12345678-0000-0000-0000-000000000000"
+          NumSubdevices: 2
+          ModelName: "Super 3000"
+          VendorName: "ACME Inc."
+          SerialNumber: "SN-0001"
+          Flags: 1  # ZES_DEVICE_PROPERTY_FLAG_INTEGRATED
+
+        PCI:
+          Properties:
+            Address:
+              Domain: 0
+              Bus: 5
+              Device: 0
+              Function: 0
+            MaxSpeed:
+              Gen: 4
+              Width: 16
+              MaxBandwidth: 0
+            HaveBandwidthCounters: true
+          Stats:
+            RxCounter: 1000000
+            TxCounter: 2000000
+
+        Firmwares:
+          - Properties:
+              OnSubdevice: false
+              SubdeviceId: 0
+              CanControl: true
+              Name: "GFX"
+              Version: "1.2.3.4"
+
+        ECC:
+          Available: true
+          Configurable: true
+          State:
+            CurrentState: 2  # ZES_DEVICE_ECC_STATE_DISABLED
+            PendingState: 2
+            PendingAction: 0
+
+        FrequencyDomains:
+          - Properties:
+              Type: 0  # ZES_FREQ_DOMAIN_GPU
+              OnSubdevice: false
+              SubdeviceId: 0
+              CanControl: true
+              Min: 300
+              Max: 1600
+            Range:
+              Min: 300
+              Max: 1600
+            State:
+              Request: 1400
+              Tdp: 1600
+              Efficient: 300
+              Actual: 1200
+              ThrottleReasons: 0
+
+        MemoryModules:
+          - Properties:
+              Type: 0  # ZES_MEM_TYPE_HBM
+              OnSubdevice: false
+              SubdeviceId: 0
+              Location: 1  # ZES_MEM_LOC_DEVICE
+              PhysicalSize: 17179869184
+            State:
+              Health: 1  # ZES_MEM_HEALTH_OK
+              Free: 8589934592
+              Size: 17179869184
+            Bandwidth:
+              ReadCounter: 1073741824
+              WriteCounter: 536870912
+              MaxBandwidth: 512000000000
+              Timestamp: 123456789
+
+        PowerDomains:
+          - Properties:
+              OnSubdevice: false
+              SubdeviceId: 0
+              CanControl: true
+              IsEnergyThresholdSupported: true
+              ExtendedProperties:
+                Domain: 2  # ZES_POWER_DOMAIN_PACKAGE
+                DefaultLimit:
+                  Enabled: true
+                  Limit: 150000
+            EnergyCounter:
+              Energy: 5000000
+              Timestamp: 123456789
+            Limits:
+              - Level: 1  # ZES_POWER_LEVEL_SUSTAINED
+                Source: 0
+                LimitUnit: 0
+                EnabledStateLocked: false
+                Enabled: true
+                IntervalValueLocked: false
+                Interval: 1000
+                LimitValueLocked: false
+                Limit: 200000
+
+        TemperatureSensors:
+          - Properties:
+              Type: 0  # ZES_TEMP_SENSORS_GLOBAL
+              OnSubdevice: false
+              SubdeviceId: 0
+              MaxTemperature: 110.0
+              IsThreshold1Supported: true
+              IsThreshold2Supported: true
+            Temperature: 48.0
+          - Properties:
+              Type: 1  # ZES_TEMP_SENSORS_GPU
+              OnSubdevice: false
+              SubdeviceId: 0
+              MaxTemperature: 110.0
+              IsThreshold1Supported: true
+              IsThreshold2Supported: true
+            Temperature: 48.0
+          - Properties:
+              Type: 2  # ZES_TEMP_SENSORS_MEMORY
+              OnSubdevice: false
+              SubdeviceId: 0
+              MaxTemperature: 100.0
+              IsThreshold1Supported: true
+              IsThreshold2Supported: true
+            Temperature: 48.0
diff --git a/xpumd/test/integration/k8s/testdata/values.yaml b/xpumd/test/integration/k8s/testdata/values.yaml
new file mode 100644
index 000000000..14eb50e2e
--- /dev/null
+++ b/xpumd/test/integration/k8s/testdata/values.yaml
@@ -0,0 +1,54 @@
+gpuAccess: none
+
+service:
+  create: true
+
+config:
+  receivers:
+    intelxpu:
+      collection_interval: 2s
+      initial_delay: 0s
+      sampling_interval: 1s
+  service:
+    pipelines:
+      metrics:
+        exporters: [prometheus]
+
+extraEnv:
+  - name: LD_LIBRARY_PATH
+    value: /usr/local/lib/xpumd/level-zero-stub
+  - name: SYSMAN_STUB_CONFIG
+    value: /etc/level-zero-stub/stub.yaml
+
+# Native sidecar for handling the stub driver configuration:
+#   1. Copies the initial stub config from the ConfigMap into the emptyDir
+#   2. Sleeps indefinitely so the test can stream an updated config into it
+#   3. Startup probe ensures the main container starts only after the config is in place
+initContainers:
+  - name: stub-driver-config-writer
+    image: busybox:1.37.0
+    restartPolicy: Always
+    command: ["sh", "-c", "cp /etc/level-zero-stub-cm/stub.yaml /etc/level-zero-stub/stub.yaml && sleep inf"]
+    volumeMounts:
+      - name: stub-driver-config-cm
+        mountPath: /etc/level-zero-stub-cm
+        readOnly: true
+      - name: stub-driver-config
+        mountPath: /etc/level-zero-stub
+    startupProbe:
+      exec:
+        command: ["test", "-f", "/etc/level-zero-stub/stub.yaml"]
+      initialDelaySeconds: 1
+      periodSeconds: 1
+
+extraVolumeMounts:
+  - name: stub-driver-config
+    mountPath: /etc/level-zero-stub
+    readOnly: true
+
+extraVolumes:
+  - name: stub-driver-config
+    emptyDir: {}
+  - name: stub-driver-config-cm
+    configMap:
+      name: level-zero-stub-driver-config
diff --git a/xpumd/test/integration/k8s/xpumd_test.go b/xpumd/test/integration/k8s/xpumd_test.go
new file mode 100644
index 000000000..51f5b763e
--- /dev/null
+++ b/xpumd/test/integration/k8s/xpumd_test.go
@@ -0,0 +1,331 @@
+//
+// Copyright (C) 2026 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+package k8s
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+)
+
+func TestMain(m *testing.M) {
+	os.Exit(runMain(m))
+}
+
+func runMain(m *testing.M) (exitCode int) {
+	flag.Parse()
+
+	var err error
+	suite, err = newSuiteConfig()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to initialize test suite config: %v\n", err)
+		return 1
+	}
+
+	// Run in an existing cluster
+	if *useExistingCluster {
+		return m.Run()
+	}
+
+	// Setup and teardown a temporary kind cluster for the test suite
+	kind := newKindCluster(suite.kindClusterName)
+	fmt.Printf("Creating kind cluster %q\n", suite.kindClusterName)
+	if err := kind.create(); err != nil {
+		fmt.Fprintf(os.Stderr, "failed to create kind cluster: %v\n", err)
+		return 1
+	}
+	defer func() {
+		if err := kind.delete(); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to delete kind cluster: %v\n", err)
+			if exitCode == 0 {
+				exitCode = 1
+			}
+		}
+	}()
+
+	kubeconfigFile, err := kind.writeKubeconfig()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to write kind kubeconfig: %v\n", err)
+		return 1
+	}
+	defer func() {
+		if err := os.Remove(kubeconfigFile); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to remove kubeconfig file: %v\n", err)
+		}
+	}()
+
+	suite.kubeconfigPath = kubeconfigFile
+	fmt.Printf("Kind cluster %q ready (kubeconfig: %s)\n", suite.kindClusterName, kubeconfigFile)
+
+	if *kindLoadImage {
+		if err := kind.loadImage(); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to load image into kind: %v\n", err)
+			return 1
+		}
+	}
+
+	return m.Run()
+}
+
+func TestMetrics(t *testing.T) {
+	const (
+		stubDriverConfig  = "stub-driver-config.yaml"
+		stubDriverConfig2 = "stub-driver-config-2.yaml"
+	)
+
+	tc := newTestConfig(suite.testdataDir, "values.yaml", stubDriverConfig)
+
+	t.Cleanup(func() { tc.cleanup(t) })
+	tc.setup(t)
+
+	tunnel := tc.forwardPort(t, servicePort)
+	t.Cleanup(tunnel.stop)
+	endpoint := tunnel.endpoint()
+
+	hwID := "12345678-0000-0000-0000-000000000000"
+
+	pciLabels := labels{"pci_bdf": "0000:05:00.0", "hw_id": hwID}
+	devLabels := pciLabels.with(labels{"com_intel_subdevice_id": ""})
+	freqLabels := devLabels.with(labels{
+		"hw_frequency_domain": "gpu",
+		"hw_name":             "freq-1",
+	})
+	memLabels := devLabels.with(labels{
+		"hw_memory_location": "device",
+		"hw_memory_type":     "hbm",
+		"hw_name":            "mem-1",
+	})
+	gpuIOLabels := devLabels.with(labels{"hw_name": "gpu-1-pci"})
+	tempStatusLabels := pciLabels.with(labels{"hw_type": "temperature"})
+
+	// baseAssertions covers metrics whose values are identical across all stub
+	// driver configs used in this test.
+	baseAssertions := []metricAssertion{
+		{
+			name:  "hw_gpu_info",
+			value: 1,
+			labels: pciLabels.with(labels{
+				"com_intel_subdevice_count": "2",
+				"hw_firmware_version":       "0:gfx::1.2.3.4",
+				"hw_gpu_type":               "integrated",
+				"hw_memory_demand_paging":   "false",
+				"hw_memory_ecc":             "configurable",
+				"hw_model":                  "Super 3000",
+				"hw_name":                   "gpu-1",
+				"hw_serial_number":          "SN-0001",
+				"hw_vendor":                 "ACME Inc.",
+				"pci_device_id":             "0bd5",
+				"pci_lanes":                 "16",
+				"pci_link_gen":              "4",
+				"pci_vendor_id":             "8086",
+			}),
+		},
+		{name: "hw_memory_size_bytes", value: 17179869184, labels: memLabels},
+	}
+
+	t.Run("InitialValues", func(t *testing.T) {
+		// hw_frequency_hertz requires at least one aggregation sample; wait until it appears.
+		families := waitForMetric(t, endpoint, metricAssertion{name: "hw_frequency_hertz", skipValue: true}, 30*time.Second)
+
+		for _, a := range append(baseAssertions, []metricAssertion{
+			// hw.energy metrics
+			{name: "hw_energy_joules_total", value: 5,
+				labels: devLabels.with(labels{
+					"hw_name":            "power-1",
+					"hw_sensor_location": "package",
+				})},
+
+			// hw.frequency metrics
+			{name: "hw_frequency_hertz", value: 1200000000,
+				labels: freqLabels.with(labels{"aggregation": "avg"})},
+			{name: "hw_frequency_hertz", value: 1200000000,
+				labels: freqLabels.with(labels{"aggregation": "max"})},
+			{name: "hw_frequency_hertz", value: 1200000000,
+				labels: freqLabels.with(labels{"aggregation": "min"})},
+
+			{name: "hw_frequency_limit_hertz", value: 1600000000,
+				labels: freqLabels.with(labels{"hw_limit_type": "max"})},
+			{name: "hw_frequency_limit_hertz", value: 300000000,
+				labels: freqLabels.with(labels{"hw_limit_type": "min"})},
+
+			{name: "hw_frequency_request_hertz", value: 1400000000, labels: freqLabels},
+
+			{name: "hw_frequency_samples", skipValue: true,
+				labels: freqLabels.with(labels{"sample_status": "collected"})},
+			{name: "hw_frequency_samples", value: 0,
+				labels: freqLabels.with(labels{"sample_status": "dropped"})},
+
+			// hw.status — no throttling or degraded state yet in the initial config
+			{name: "hw_status", value: 1, labels: devLabels.with(labels{
+				"hw_name": "freq-1", "hw_state": "ok", "hw_type": "frequency",
+			})},
+			{name: "hw_status", value: 1, labels: devLabels.with(labels{
+				"hw_name": "mem-1", "hw_state": "ok", "hw_type": "memory",
+			})},
+
+			// hw.status — ECC disabled in initial config
+			{name: "hw_status", value: 1, labels: devLabels.with(labels{
+				"hw_name": "gpu-1", "hw_state": "ecc_disabled", "hw_type": "gpu",
+			})},
+
+			// hw.gpu.io metrics
+			{name: "hw_gpu_io_bytes_total", value: 1000000,
+				labels: gpuIOLabels.with(labels{"network_io_direction": "receive"})},
+			{name: "hw_gpu_io_bytes_total", value: 2000000,
+				labels: gpuIOLabels.with(labels{"network_io_direction": "transmit"})},
+
+			// hw.memory metrics
+			{name: "hw_memory_io_bytes_total", value: 1073741824,
+				labels: memLabels.with(labels{"network_io_direction": "receive"})},
+			{name: "hw_memory_io_bytes_total", value: 536870912,
+				labels: memLabels.with(labels{"network_io_direction": "transmit"})},
+
+			{name: "hw_memory_usage_bytes", value: 8589934592, labels: memLabels},
+
+			// hw.temperature metrics
+			{name: "hw_temperature_celsius", value: 48,
+				labels: devLabels.with(labels{
+					"hw_name":            "temp-1",
+					"hw_sensor_location": "global",
+					"statistic":          "max",
+				})},
+			{name: "hw_temperature_celsius", value: 48,
+				labels: devLabels.with(labels{
+					"hw_name":            "temp-2",
+					"hw_sensor_location": "gpu",
+					"statistic":          "max",
+				})},
+			{name: "hw_temperature_celsius", value: 48,
+				labels: devLabels.with(labels{
+					"hw_name":            "temp-3",
+					"hw_sensor_location": "memory",
+					"statistic":          "max",
+				})},
+
+			// hw.status — temperature ok in initial config
+			{name: "hw_status", value: 1, labels: tempStatusLabels.with(labels{
+				"hw_name": "temp-2", "hw_sensor_location": "gpu", "hw_state": "ok",
+			})},
+			{name: "hw_status", value: 1, labels: tempStatusLabels.with(labels{
+				"hw_name": "temp-3", "hw_sensor_location": "memory", "hw_state": "ok",
+			})},
+		}...) {
+			a.assert(t, families)
+		}
+	})
+
+	// The stub driver's inotify watcher is triggered by a direct file write (IN_CLOSE_WRITE)
+	// to the emptyDir volume. The helper streams stub.yaml directly into the sidecar,
+	// so the reload is near-instant.
+	t.Run("UpdatedValues", func(t *testing.T) {
+		tc.updateStubDriverConfig(t, filepath.Join(suite.testdataDir, stubDriverConfig2))
+
+		// Temperature is the sentinel: poll until the stub has reloaded.
+		updatedTemp := metricAssertion{
+			name:  "hw_temperature_celsius",
+			value: 75,
+			labels: devLabels.with(labels{
+				"hw_name":            "temp-1",
+				"hw_sensor_location": "global",
+				"statistic":          "max",
+			}),
+		}
+		families := waitForMetric(t, endpoint, updatedTemp, 30*time.Second)
+
+		for _, a := range append(baseAssertions, []metricAssertion{
+			updatedTemp,
+
+			{name: "hw_energy_joules_total", value: 10,
+				labels: devLabels.with(labels{
+					"hw_name":            "power-1",
+					"hw_sensor_location": "package",
+				})},
+
+			{name: "hw_frequency_hertz", value: 800000000,
+				labels: freqLabels.with(labels{"aggregation": "avg"})},
+			{name: "hw_frequency_hertz", value: 800000000,
+				labels: freqLabels.with(labels{"aggregation": "max"})},
+			{name: "hw_frequency_hertz", value: 800000000,
+				labels: freqLabels.with(labels{"aggregation": "min"})},
+
+			{name: "hw_frequency_limit_hertz", value: 1200000000,
+				labels: freqLabels.with(labels{"hw_limit_type": "max"})},
+			{name: "hw_frequency_limit_hertz", value: 200000000,
+				labels: freqLabels.with(labels{"hw_limit_type": "min"})},
+
+			{name: "hw_frequency_request_hertz", value: 1000000000, labels: freqLabels},
+
+			{name: "hw_frequency_samples", skipValue: true,
+				labels: freqLabels.with(labels{"sample_status": "collected"})},
+
+			// hw.status — frequency throttled by power cap; memory degraded; ECC enabled
+			{name: "hw_status", value: 1, labels: devLabels.with(labels{
+				"hw_name": "freq-1", "hw_state": "throttled", "hw_type": "frequency",
+			})},
+			{name: "hw_status", value: 0, labels: devLabels.with(labels{
+				"hw_name": "freq-1", "hw_state": "ok", "hw_type": "frequency",
+			})},
+			{name: "hw_status", value: 1, labels: devLabels.with(labels{
+				"hw_name": "mem-1", "hw_state": "degraded", "hw_type": "memory",
+			})},
+			{name: "hw_status", value: 0, labels: devLabels.with(labels{
+				"hw_name": "mem-1", "hw_state": "ok", "hw_type": "memory",
+			})},
+			{name: "hw_status", value: 1, labels: devLabels.with(labels{
+				"hw_name": "gpu-1", "hw_state": "ecc_enabled", "hw_type": "gpu",
+			})},
+			{name: "hw_status", value: 0, labels: devLabels.with(labels{
+				"hw_name": "gpu-1", "hw_state": "ecc_disabled", "hw_type": "gpu",
+			})},
+
+			// hw.gpu.io metrics
+			{name: "hw_gpu_io_bytes_total", value: 3000000,
+				labels: gpuIOLabels.with(labels{"network_io_direction": "receive"})},
+			{name: "hw_gpu_io_bytes_total", value: 6000000,
+				labels: gpuIOLabels.with(labels{"network_io_direction": "transmit"})},
+
+			{name: "hw_memory_io_bytes_total", value: 2147483648,
+				labels: memLabels.with(labels{"network_io_direction": "receive"})},
+			{name: "hw_memory_io_bytes_total", value: 1073741824,
+				labels: memLabels.with(labels{"network_io_direction": "transmit"})},
+
+			{name: "hw_memory_usage_bytes", value: 12884901888, labels: memLabels},
+
+			// hw.temperature — GPU above 105 °C threshold, memory above 85 °C threshold
+			{name: "hw_temperature_celsius", value: 110,
+				labels: devLabels.with(labels{
+					"hw_name":            "temp-2",
+					"hw_sensor_location": "gpu",
+					"statistic":          "max",
+				})},
+			{name: "hw_temperature_celsius", value: 90,
+				labels: devLabels.with(labels{
+					"hw_name":            "temp-3",
+					"hw_sensor_location": "memory",
+					"statistic":          "max",
+				})},
+
+			// hw.status — temperature warning for both GPU and memory
+			{name: "hw_status", value: 1, labels: tempStatusLabels.with(labels{
+				"hw_name": "temp-2", "hw_sensor_location": "gpu", "hw_state": "warning",
+			})},
+			{name: "hw_status", value: 0, labels: tempStatusLabels.with(labels{
+				"hw_name": "temp-2", "hw_sensor_location": "gpu", "hw_state": "ok",
+			})},
+			{name: "hw_status", value: 1, labels: tempStatusLabels.with(labels{
+				"hw_name": "temp-3", "hw_sensor_location": "memory", "hw_state": "warning",
+			})},
+			{name: "hw_status", value: 0, labels: tempStatusLabels.with(labels{
+				"hw_name": "temp-3", "hw_sensor_location": "memory", "hw_state": "ok",
+			})},
+		}...) {
+			a.assert(t, families)
+		}
+	})
+}
diff --git a/xpumd/tools/doc.go b/xpumd/tools/doc.go
index 1d99ebaf7..9291e7876 100644
--- a/xpumd/tools/doc.go
+++ b/xpumd/tools/doc.go
@@ -4,4 +4,6 @@
 // SPDX-License-Identifier: MIT
 
 // Package tools contains tools for building the project.
+//
+//go:generate ../scripts/generate-tools.sh
 package tools
diff --git a/xpumd/tools/go.mod b/xpumd/tools/go.mod
index a93f6ebf7..b8894358e 100644
--- a/xpumd/tools/go.mod
+++ b/xpumd/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/intel/xpumanager/xpumd/tools
 
-go 1.26
+go 1.26.0
 
 tool (
 	github.com/golangci/golangci-lint/v2/cmd/golangci-lint
@@ -13,10 +13,23 @@ tool (
 	google.golang.org/protobuf/cmd/protoc-gen-go
 )
 
+require (
+	github.com/golangci/golangci-lint/v2 v2.12.2
+	github.com/google/go-licenses/v2 v2.0.1
+	github.com/losisin/helm-values-schema-json/v2 v2.5.0
+	github.com/norwoodj/helm-docs v1.14.2
+	go.opentelemetry.io/collector/cmd/builder v0.153.0
+	go.opentelemetry.io/collector/cmd/mdatagen v0.153.0
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2
+	google.golang.org/protobuf v1.36.11
+)
+
 require (
 	4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
 	4d63.com/gochecknoglobals v0.2.2 // indirect
+	charm.land/lipgloss/v2 v2.0.3 // indirect
 	codeberg.org/chavacava/garif v0.2.0 // indirect
+	codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
 	dario.cat/mergo v1.0.1 // indirect
 	dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
 	dev.gaijin.team/go/golib v0.6.0 // indirect
@@ -28,57 +41,60 @@ require (
 	github.com/Antonboom/nilnil v1.1.1 // indirect
 	github.com/Antonboom/testifylint v1.6.4 // indirect
 	github.com/BurntSushi/toml v1.6.0 // indirect
+	github.com/ClickHouse/clickhouse-go-linter v1.2.0 // indirect
 	github.com/Djarvur/go-err113 v0.1.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/Masterminds/semver/v3 v3.5.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
-	github.com/MirrexOne/unqueryvet v1.3.0 // indirect
+	github.com/MirrexOne/unqueryvet v1.5.4 // indirect
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
-	github.com/alecthomas/chroma/v2 v2.20.0 // indirect
+	github.com/alecthomas/chroma/v2 v2.24.1 // indirect
 	github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
 	github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
-	github.com/alexkohler/prealloc v1.0.0 // indirect
+	github.com/alexkohler/prealloc v1.1.0 // indirect
 	github.com/alfatraining/structtag v1.0.0 // indirect
 	github.com/alingse/asasalint v0.0.11 // indirect
 	github.com/alingse/nilnesserr v0.2.0 // indirect
-	github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
-	github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
-	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/ashanbrown/forbidigo/v2 v2.3.1 // indirect
+	github.com/ashanbrown/makezero/v2 v2.2.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.3 // indirect
 	github.com/blizzy78/varnamelen v0.8.0 // indirect
 	github.com/bombsimon/wsl/v4 v4.7.0 // indirect
-	github.com/bombsimon/wsl/v5 v5.3.0 // indirect
+	github.com/bombsimon/wsl/v5 v5.8.0 // indirect
 	github.com/breml/bidichk v0.3.3 // indirect
 	github.com/breml/errchkjson v0.4.1 // indirect
-	github.com/butuzov/ireturn v0.4.0 // indirect
+	github.com/butuzov/ireturn v0.4.1 // indirect
 	github.com/butuzov/mirror v1.3.0 // indirect
 	github.com/catenacyber/perfsprint v0.10.1 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/charithe/durationcheck v0.0.11 // indirect
-	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
-	github.com/charmbracelet/lipgloss v1.1.0 // indirect
-	github.com/charmbracelet/x/ansi v0.8.0 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/charmbracelet/colorprofile v0.4.3 // indirect
+	github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318 // indirect
+	github.com/charmbracelet/x/ansi v0.11.7 // indirect
+	github.com/charmbracelet/x/term v0.2.2 // indirect
+	github.com/charmbracelet/x/termios v0.1.1 // indirect
+	github.com/charmbracelet/x/windows v0.2.2 // indirect
 	github.com/ckaznocha/intrange v0.3.1 // indirect
+	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/curioswitch/go-reassign v0.3.0 // indirect
 	github.com/daixiang0/gci v0.13.7 // indirect
 	github.com/dave/dst v0.27.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/denis-tingaikin/go-header v0.5.0 // indirect
-	github.com/dlclark/regexp2 v1.11.5 // indirect
+	github.com/dlclark/regexp2 v1.12.0 // indirect
 	github.com/ettle/strcase v0.2.0 // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/color v1.19.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/firefart/nonamedreturns v1.0.6 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.10.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.2 // indirect
 	github.com/fzipp/gocyclo v0.6.0 // indirect
-	github.com/ghostiam/protogetter v0.3.17 // indirect
-	github.com/go-critic/go-critic v0.14.2 // indirect
+	github.com/ghostiam/protogetter v0.3.20 // indirect
+	github.com/go-critic/go-critic v0.14.3 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-toolsmith/astcast v1.1.0 // indirect
 	github.com/go-toolsmith/astcopy v1.1.0 // indirect
@@ -90,22 +106,21 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
 	github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/godoc-lint/godoc-lint v0.10.2 // indirect
+	github.com/godoc-lint/godoc-lint v0.11.2 // indirect
 	github.com/gofrs/flock v0.13.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golangci/asciicheck v0.5.0 // indirect
-	github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
+	github.com/golangci/dupl v0.0.0-20260401084720-c99c5cf5c202 // indirect
 	github.com/golangci/go-printf-func-name v0.1.1 // indirect
 	github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
-	github.com/golangci/golangci-lint/v2 v2.7.2 // indirect
-	github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
-	github.com/golangci/misspell v0.7.0 // indirect
+	github.com/golangci/golines v0.15.0 // indirect
+	github.com/golangci/misspell v0.8.0 // indirect
 	github.com/golangci/plugin-module-register v0.1.2 // indirect
 	github.com/golangci/revgrep v0.8.0 // indirect
+	github.com/golangci/rowserrcheck v0.0.0-20260419091836-c5f79b8a11ba // indirect
 	github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
 	github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/go-licenses/v2 v2.0.1 // indirect
 	github.com/google/licenseclassifier/v2 v2.0.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gordonklaus/ineffassign v0.2.0 // indirect
@@ -120,13 +135,12 @@ require (
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jgautheron/goconst v1.8.2 // indirect
-	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
+	github.com/jgautheron/goconst v1.10.0 // indirect
 	github.com/jjti/go-spancheck v0.6.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julz/importas v0.2.0 // indirect
 	github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
-	github.com/kisielk/errcheck v1.9.0 // indirect
+	github.com/kisielk/errcheck v1.10.0 // indirect
 	github.com/kkHAIKE/contextcheck v1.1.6 // indirect
 	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/knadh/koanf/parsers/yaml v1.1.0 // indirect
@@ -141,24 +155,24 @@ require (
 	github.com/kunwardeep/paralleltest v1.0.15 // indirect
 	github.com/lasiar/canonicalheader v1.1.2 // indirect
 	github.com/ldez/exptostd v0.4.5 // indirect
-	github.com/ldez/gomoddirectives v0.7.1 // indirect
+	github.com/ldez/gomoddirectives v0.8.0 // indirect
 	github.com/ldez/grignotin v0.10.1 // indirect
+	github.com/ldez/structtags v0.6.1 // indirect
 	github.com/ldez/tagliatelle v0.7.2 // indirect
 	github.com/ldez/usetesting v0.5.0 // indirect
 	github.com/leonklingele/grouper v1.1.2 // indirect
-	github.com/losisin/helm-values-schema-json/v2 v2.3.1 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
 	github.com/macabu/inamedparam v0.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
-	github.com/manuelarte/funcorder v0.5.0 // indirect
+	github.com/manuelarte/funcorder v0.6.0 // indirect
 	github.com/maratori/testableexamples v1.0.1 // indirect
 	github.com/maratori/testpackage v1.1.2 // indirect
 	github.com/matoous/godox v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mgechev/revive v1.13.0 // indirect
+	github.com/mattn/go-runewidth v0.0.23 // indirect
+	github.com/mgechev/revive v1.15.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -166,18 +180,16 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/moricho/tparallel v0.3.2 // indirect
-	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nakabonne/nestif v0.3.1 // indirect
 	github.com/nishanths/exhaustive v0.12.0 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect
-	github.com/norwoodj/helm-docs v1.14.2 // indirect
-	github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
+	github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
 	github.com/otiai10/copy v1.14.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.3.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/polyfloyd/go-errorlint v1.8.0 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.66.1 // indirect
@@ -191,18 +203,19 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/ryancurrah/gomodguard v1.4.1 // indirect
-	github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
+	github.com/ryancurrah/gomodguard/v2 v2.1.3 // indirect
+	github.com/ryanrolds/sqlclosecheck v0.6.0 // indirect
 	github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
 	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
 	github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
-	github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 // indirect
+	github.com/securego/gosec/v2 v2.26.1 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sirupsen/logrus v1.9.4 // indirect
 	github.com/sivchari/containedctx v1.0.3 // indirect
-	github.com/sonatard/noctx v0.4.0 // indirect
-	github.com/sourcegraph/go-diff v0.7.0 // indirect
+	github.com/sonatard/noctx v0.5.1 // indirect
+	github.com/sourcegraph/go-diff v0.8.0 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/cobra v1.10.2 // indirect
@@ -214,15 +227,15 @@ require (
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/tetafro/godot v1.5.4 // indirect
-	github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
+	github.com/tetafro/godot v1.5.6 // indirect
+	github.com/timakin/bodyclose v0.0.0-20260129054331-73d1f95b84b4 // indirect
 	github.com/timonwong/loggercheck v0.11.0 // indirect
 	github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
 	github.com/ultraware/funlen v0.2.0 // indirect
 	github.com/ultraware/whitespace v0.2.0 // indirect
-	github.com/uudashr/gocognit v1.2.0 // indirect
-	github.com/uudashr/iface v1.4.1 // indirect
+	github.com/uudashr/gocognit v1.2.1 // indirect
+	github.com/uudashr/iface v1.4.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xen0n/gosmopolitan v1.3.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
@@ -231,41 +244,37 @@ require (
 	github.com/ykadowak/zerologlint v0.1.5 // indirect
 	gitlab.com/bosi/decorder v0.4.2 // indirect
 	go-simpler.org/musttag v0.14.0 // indirect
-	go-simpler.org/sloglint v0.11.1 // indirect
-	go.augendre.info/arangolint v0.3.1 // indirect
+	go-simpler.org/sloglint v0.12.0 // indirect
+	go.augendre.info/arangolint v0.4.0 // indirect
 	go.augendre.info/fatcontext v0.9.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector/cmd/builder v0.150.0 // indirect
-	go.opentelemetry.io/collector/cmd/mdatagen v0.150.0 // indirect
-	go.opentelemetry.io/collector/component v1.56.0 // indirect
-	go.opentelemetry.io/collector/confmap v1.56.0 // indirect
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.56.0 // indirect
-	go.opentelemetry.io/collector/featuregate v1.56.0 // indirect
-	go.opentelemetry.io/collector/filter v0.150.0 // indirect
-	go.opentelemetry.io/collector/pdata v1.56.0 // indirect
+	go.opentelemetry.io/collector/component v1.59.0 // indirect
+	go.opentelemetry.io/collector/confmap v1.59.0 // indirect
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.59.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.59.0 // indirect
+	go.opentelemetry.io/collector/filter v0.153.0 // indirect
+	go.opentelemetry.io/collector/internal/schemagen v0.153.0 // indirect
+	go.opentelemetry.io/collector/pdata v1.59.0 // indirect
 	go.opentelemetry.io/otel v1.43.0 // indirect
 	go.opentelemetry.io/otel/metric v1.43.0 // indirect
 	go.opentelemetry.io/otel/trace v1.43.0 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.1 // indirect
+	go.uber.org/zap v1.28.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
-	golang.org/x/mod v0.34.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/crypto v0.51.0 // indirect
+	golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
+	golang.org/x/mod v0.36.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	golang.org/x/tools v0.43.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+	golang.org/x/tools v0.45.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
-	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	helm.sh/helm/v3 v3.20.2 // indirect
-	honnef.co/go/tools v0.6.1 // indirect
+	honnef.co/go/tools v0.7.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	mvdan.cc/gofumpt v0.9.2 // indirect
 	mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
diff --git a/xpumd/tools/go.sum b/xpumd/tools/go.sum
index f76d26e6e..39bf44e3a 100644
--- a/xpumd/tools/go.sum
+++ b/xpumd/tools/go.sum
@@ -2,9 +2,13 @@
 4d63.com/gocheckcompilerdirectives v1.3.0/go.mod h1:ofsJ4zx2QAuIP/NO/NAh1ig6R1Fb18/GI7RVMwz7kAY=
 4d63.com/gochecknoglobals v0.2.2 h1:H1vdnwnMaZdQW/N+NrkT1SZMTBmcwHe9Vq8lJcYYTtU=
 4d63.com/gochecknoglobals v0.2.2/go.mod h1:lLxwTQjL5eIesRbvnzIP3jZtG140FnTdz+AlMa+ogt0=
+charm.land/lipgloss/v2 v2.0.3 h1:yM2zJ4Cf5Y51b7RHIwioil4ApI/aypFXXVHSwlM6RzU=
+charm.land/lipgloss/v2 v2.0.3/go.mod h1:7myLU9iG/3xluAWzpY/fSxYYHCgoKTie7laxk6ATwXA=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 codeberg.org/chavacava/garif v0.2.0 h1:F0tVjhYbuOCnvNcU3YSpO6b3Waw6Bimy4K0mM8y6MfY=
 codeberg.org/chavacava/garif v0.2.0/go.mod h1:P2BPbVbT4QcvLZrORc2T29szK3xEOlnl0GiPTJmEqBQ=
+codeberg.org/polyfloyd/go-errorlint v1.9.0 h1:VkdEEmA1VBpH6ecQoMR4LdphVI3fA4RrCh2an7YmodI=
+codeberg.org/polyfloyd/go-errorlint v1.9.0/go.mod h1:GPRRu2LzVijNn4YkrZYJfatQIdS+TrcK8rL5Xs24qw8=
 dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dev.gaijin.team/go/exhaustruct/v4 v4.0.0 h1:873r7aNneqoBB3IaFIzhvt2RFYTuHgmMjoKfwODoI1Y=
@@ -28,42 +32,42 @@ github.com/Antonboom/testifylint v1.6.4/go.mod h1:YO33FROXX2OoUfwjz8g+gUxQXio5i9
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/ClickHouse/clickhouse-go-linter v1.2.0 h1:zbm174up3hTKjp0wKZVnTzRiG7tSF5XZF0FJG/MuCBI=
+github.com/ClickHouse/clickhouse-go-linter v1.2.0/go.mod h1:pLorS7ffPTfuUV9M0SJgfHA/h/WQPQUk2FWG9x74cQ4=
 github.com/Djarvur/go-err113 v0.1.1 h1:eHfopDqXRwAi+YmCUas75ZE0+hoBHJ2GQNLYRSxao4g=
 github.com/Djarvur/go-err113 v0.1.1/go.mod h1:IaWJdYFLg76t2ihfflPZnM1LIQszWOsFDh2hhhAVF6k=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
-github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
+github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
 github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
-github.com/MirrexOne/unqueryvet v1.3.0 h1:5slWSomgqpYU4zFuZ3NNOfOUxVPlXFDBPAVasZOGlAY=
-github.com/MirrexOne/unqueryvet v1.3.0/go.mod h1:IWwCwMQlSWjAIteW0t+28Q5vouyktfujzYznSIWiuOg=
+github.com/MirrexOne/unqueryvet v1.5.4 h1:38QOxShO7JmMWT+eCdDMbcUgGCOeJphVkzzRgyLJgsQ=
+github.com/MirrexOne/unqueryvet v1.5.4/go.mod h1:fs9Zq6eh1LRIhsDIsxf9PONVUjYdFHdtkHIgZdJnyPU=
 github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsuj3piCMx4=
 github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.20.0 h1:sfIHpxPyR07/Oylvmcai3X/exDlE8+FA820NTz+9sGw=
-github.com/alecthomas/chroma/v2 v2.20.0/go.mod h1:e7tViK0xh/Nf4BYHl00ycY6rV7b8iXBksI9E359yNmA=
+github.com/alecthomas/chroma/v2 v2.24.1 h1:m5ffpfZbIb++k8AqFEKy9uVgY12xIQtBsQlc6DfZJQM=
+github.com/alecthomas/chroma/v2 v2.24.1/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI=
 github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsrxJb4Aq31NLkU=
 github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E=
-github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
-github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
+github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alexkohler/nakedret/v2 v2.0.6 h1:ME3Qef1/KIKr3kWX3nti3hhgNxw6aqN5pZmQiFSsuzQ=
 github.com/alexkohler/nakedret/v2 v2.0.6/go.mod h1:l3RKju/IzOMQHmsEvXwkqMDzHHvurNQfAgE1eVmT40Q=
-github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
-github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
+github.com/alexkohler/prealloc v1.1.0 h1:cKGRBqlXw5iyQGLYhrXrDlcHxugXpTq4tQ5c91wkf8M=
+github.com/alexkohler/prealloc v1.1.0/go.mod h1:fT39Jge3bQrfA7nPMDngUfvUbQGQeJyGQnR+913SCig=
 github.com/alfatraining/structtag v1.0.0 h1:2qmcUqNcCoyVJ0up879K614L9PazjBSFruTB0GOFjCc=
 github.com/alfatraining/structtag v1.0.0/go.mod h1:p3Xi5SwzTi+Ryj64DqjLWz7XurHxbGsq6y3ubePJPus=
 github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
 github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
 github.com/alingse/nilnesserr v0.2.0 h1:raLem5KG7EFVb4UIDAXgrv3N2JIaffeKNtcEXkEWd/w=
 github.com/alingse/nilnesserr v0.2.0/go.mod h1:1xJPrXonEtX7wyTq8Dytns5P2hNzoWymVUIaKm4HNFg=
-github.com/ashanbrown/forbidigo/v2 v2.3.0 h1:OZZDOchCgsX5gvToVtEBoV2UWbFfI6RKQTir2UZzSxo=
-github.com/ashanbrown/forbidigo/v2 v2.3.0/go.mod h1:5p6VmsG5/1xx3E785W9fouMxIOkvY2rRV9nMdWadd6c=
-github.com/ashanbrown/makezero/v2 v2.1.0 h1:snuKYMbqosNokUKm+R6/+vOPs8yVAi46La7Ck6QYSaE=
-github.com/ashanbrown/makezero/v2 v2.1.0/go.mod h1:aEGT/9q3S8DHeE57C88z2a6xydvgx8J5hgXIGWgo0MY=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/ashanbrown/forbidigo/v2 v2.3.1 h1:KAZijvQ7zeIBKbhikT4jCm0TLYXC4u78bTiLh/8JROI=
+github.com/ashanbrown/forbidigo/v2 v2.3.1/go.mod h1:2QDkLTzU6TV937eFROamXrW92M3paehdae4HCDCOZCM=
+github.com/ashanbrown/makezero/v2 v2.2.1 h1:A7uU8dgB1PA9aelTxHMfHIQ8Qev8AB3JLxJUBUsejqM=
+github.com/ashanbrown/makezero/v2 v2.2.1/go.mod h1:aEGT/9q3S8DHeE57C88z2a6xydvgx8J5hgXIGWgo0MY=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5w=
@@ -72,14 +76,14 @@ github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ
 github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
 github.com/bombsimon/wsl/v4 v4.7.0 h1:1Ilm9JBPRczjyUs6hvOPKvd7VL1Q++PL8M0SXBDf+jQ=
 github.com/bombsimon/wsl/v4 v4.7.0/go.mod h1:uV/+6BkffuzSAVYD+yGyld1AChO7/EuLrCF/8xTiapg=
-github.com/bombsimon/wsl/v5 v5.3.0 h1:nZWREJFL6U3vgW/B1lfDOigl+tEF6qgs6dGGbFeR0UM=
-github.com/bombsimon/wsl/v5 v5.3.0/go.mod h1:Gp8lD04z27wm3FANIUPZycXp+8huVsn0oxc+n4qfV9I=
+github.com/bombsimon/wsl/v5 v5.8.0 h1:JTkyfs4yl8SPejrCF2GdABXE+mO1WvM7iUYzRWlsxDs=
+github.com/bombsimon/wsl/v5 v5.8.0/go.mod h1:AbOLsulgkqP4ZnitHf9gwPtCOGlrzkk0jb0uNxRSY0o=
 github.com/breml/bidichk v0.3.3 h1:WSM67ztRusf1sMoqH6/c4OBCUlRVTKq+CbSeo0R17sE=
 github.com/breml/bidichk v0.3.3/go.mod h1:ISbsut8OnjB367j5NseXEGGgO/th206dVa427kR8YTE=
 github.com/breml/errchkjson v0.4.1 h1:keFSS8D7A2T0haP9kzZTi7o26r7kE3vymjZNeNDRDwg=
 github.com/breml/errchkjson v0.4.1/go.mod h1:a23OvR6Qvcl7DG/Z4o0el6BRAjKnaReoPQFciAl9U3s=
-github.com/butuzov/ireturn v0.4.0 h1:+s76bF/PfeKEdbG8b54aCocxXmi0wvYdOVsWxVO7n8E=
-github.com/butuzov/ireturn v0.4.0/go.mod h1:ghI0FrCmap8pDWZwfPisFD1vEc56VKH4NpQUxDHta70=
+github.com/butuzov/ireturn v0.4.1 h1:vWb3NO4t77iku/sjCQ/2pHTQeOmxEhjIriJqRLg1Y+I=
+github.com/butuzov/ireturn v0.4.1/go.mod h1:q+DXKzTDV5guNuXLnIab9fKXizTn2miZHLhxH7V/GB4=
 github.com/butuzov/mirror v1.3.0 h1:HdWCXzmwlQHdVhwvsfBb2Au0r3HyINry3bDWLYXiKoc=
 github.com/butuzov/mirror v1.3.0/go.mod h1:AEij0Z8YMALaq4yQj9CPPVYOyJQyiexpQEQgihajRfI=
 github.com/catenacyber/perfsprint v0.10.1 h1:u7Riei30bk46XsG8nknMhKLXG9BcXz3+3tl/WpKm0PQ=
@@ -91,19 +95,25 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charithe/durationcheck v0.0.11 h1:g1/EX1eIiKS57NTWsYtHDZ/APfeXKhye1DidBcABctk=
 github.com/charithe/durationcheck v0.0.11/go.mod h1:x5iZaixRNl8ctbM+3B2RrPG5t856TxRyVQEnbIEM2X4=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
-github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
-github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
-github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
-github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
-github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
+github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318 h1:OqDqxQZliC7C8adA7KjelW3OjtAxREfeHkNcd66wpeI=
+github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318/go.mod h1:Y6kE2GzHfkyQQVCSL9r2hwokSrIlHGzZG+71+wDYSZI=
+github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
+github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
+github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
+github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
+github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
+github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
+github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
+github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
 github.com/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs=
 github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
+github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
+github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/curioswitch/go-reassign v0.3.0 h1:dh3kpQHuADL3cobV/sSGETA8DOv457dwl+fbBAhrQPs=
@@ -120,16 +130,16 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8=
 github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY=
-github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
-github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8=
+github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q=
 github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
+github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
@@ -138,16 +148,16 @@ github.com/firefart/nonamedreturns v1.0.6 h1:vmiBcKV/3EqKY3ZiPxCINmpS431OcE1S47A
 github.com/firefart/nonamedreturns v1.0.6/go.mod h1:R8NisJnSIpvPWheCq0mNRXJok6D8h7fagJTF8EMEwCo=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
-github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
+github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
+github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=
+github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
 github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
-github.com/ghostiam/protogetter v0.3.17 h1:sjGPErP9o7i2Ym+z3LsQzBdLCNaqbYy2iJQPxGXg04Q=
-github.com/ghostiam/protogetter v0.3.17/go.mod h1:AivIX1eKA/TcUmzZdzbl+Tb8tjIe8FcyG6JFyemQAH4=
-github.com/go-critic/go-critic v0.14.2 h1:PMvP5f+LdR8p6B29npvChUXbD1vrNlKDf60NJtgMBOo=
-github.com/go-critic/go-critic v0.14.2/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ=
+github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1f+MzD0=
+github.com/ghostiam/protogetter v0.3.20/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI=
+github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog=
+github.com/go-critic/go-critic v0.14.3/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
@@ -181,8 +191,8 @@ github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUW
 github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/godoc-lint/godoc-lint v0.10.2 h1:dksNgK+zebnVlj4Fx83CRnCmPO0qRat/9xfFsir1nfg=
-github.com/godoc-lint/godoc-lint v0.10.2/go.mod h1:KleLcHu/CGSvkjUH2RvZyoK1MBC7pDQg4NxMYLcBBsw=
+github.com/godoc-lint/godoc-lint v0.11.2 h1:Bp0FkJWoSdNsBikdNgIcgtaoo+xz6I/Y9s5WSBQUeeM=
+github.com/godoc-lint/godoc-lint v0.11.2/go.mod h1:iVpGdL1JCikNH2gGeAn3Hh+AgN5Gx/I/cxV+91L41jo=
 github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
 github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -201,22 +211,24 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golangci/asciicheck v0.5.0 h1:jczN/BorERZwK8oiFBOGvlGPknhvq0bjnysTj4nUfo0=
 github.com/golangci/asciicheck v0.5.0/go.mod h1:5RMNAInbNFw2krqN6ibBxN/zfRFa9S6tA1nPdM0l8qQ=
-github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 h1:WUvBfQL6EW/40l6OmeSBYQJNSif4O11+bmWEz+C7FYw=
-github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32/go.mod h1:NUw9Zr2Sy7+HxzdjIULge71wI6yEg1lWQr7Evcu8K0E=
+github.com/golangci/dupl v0.0.0-20260401084720-c99c5cf5c202 h1:CbTB8KpqnViI6lIXxp03Oclc4VFHi3K4BWC1TacsZ+A=
+github.com/golangci/dupl v0.0.0-20260401084720-c99c5cf5c202/go.mod h1:NUw9Zr2Sy7+HxzdjIULge71wI6yEg1lWQr7Evcu8K0E=
 github.com/golangci/go-printf-func-name v0.1.1 h1:hIYTFJqAGp1iwoIfsNTpoq1xZAarogrvjO9AfiW3B4U=
 github.com/golangci/go-printf-func-name v0.1.1/go.mod h1:Es64MpWEZbh0UBtTAICOZiB+miW53w/K9Or/4QogJss=
 github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE=
 github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY=
-github.com/golangci/golangci-lint/v2 v2.7.2 h1:AhBC+YeEueec4AGlIbvPym5C70Thx0JykIqXbdIXWx0=
-github.com/golangci/golangci-lint/v2 v2.7.2/go.mod h1:pDijleoBu7e8sejMqyZ3L5n6geqe+cVvOAz2QImqqVc=
-github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 h1:AkK+w9FZBXlU/xUmBtSJN1+tAI4FIvy5WtnUnY8e4p8=
-github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95/go.mod h1:k9mmcyWKSTMcPPvQUCfRWWQ9VHJ1U9Dc0R7kaXAgtnQ=
-github.com/golangci/misspell v0.7.0 h1:4GOHr/T1lTW0hhR4tgaaV1WS/lJ+ncvYCoFKmqJsj0c=
-github.com/golangci/misspell v0.7.0/go.mod h1:WZyyI2P3hxPY2UVHs3cS8YcllAeyfquQcKfdeE9AFVg=
+github.com/golangci/golangci-lint/v2 v2.12.2 h1:7+d1uY0bq1MU2UV3R5pW5Q7QWdcoq4naMRXM+gsJKrs=
+github.com/golangci/golangci-lint/v2 v2.12.2/go.mod h1:opqHHuIcTG2R+4akzWMd4o1BnD9/1LcjICWOujr91U8=
+github.com/golangci/golines v0.15.0 h1:Qnph25g8Y1c5fdo1X7GaRDGgnMHgnxh4Gk4VfPTtRx0=
+github.com/golangci/golines v0.15.0/go.mod h1:AZjXd23tbHMpowhtnGlj9KCNsysj72aeZVVHnVcZx10=
+github.com/golangci/misspell v0.8.0 h1:qvxQhiE2/5z+BVRo1kwYA8yGz+lOlu5Jfvtx2b04Jbg=
+github.com/golangci/misspell v0.8.0/go.mod h1:WZyyI2P3hxPY2UVHs3cS8YcllAeyfquQcKfdeE9AFVg=
 github.com/golangci/plugin-module-register v0.1.2 h1:e5WM6PO6NIAEcij3B053CohVp3HIYbzSuP53UAYgOpg=
 github.com/golangci/plugin-module-register v0.1.2/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw=
 github.com/golangci/revgrep v0.8.0 h1:EZBctwbVd0aMeRnNUsFogoyayvKHyxlV3CdUA46FX2s=
 github.com/golangci/revgrep v0.8.0/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k=
+github.com/golangci/rowserrcheck v0.0.0-20260419091836-c5f79b8a11ba h1:lqtcnSMDuuJdu/LrKWi5RJzpSNLOJXYe/nzQutTI5kg=
+github.com/golangci/rowserrcheck v0.0.0-20260419091836-c5f79b8a11ba/go.mod h1:sCBNcpRmhJCtbFGz49+IM3ETTFf7QdJ30AeYCd43NKk=
 github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e h1:ai0EfmVYE2bRA5htgAG9r7s3tHsfjIhN98WshBTJ9jM=
 github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e/go.mod h1:Vrn4B5oR9qRwM+f54koyeH3yzphlecwERs0el27Fr/s=
 github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e h1:gD6P7NEo7Eqtt0ssnqSJNNndxe69DOQ24A5h7+i3KpM=
@@ -241,8 +253,8 @@ github.com/google/licenseclassifier/v2 v2.0.0 h1:1Y57HHILNf4m0ABuMVb6xk4vAJYEUO0
 github.com/google/licenseclassifier/v2 v2.0.0/go.mod h1:cOjbdH0kyC9R22sdQbYsFkto4NGCAc+ZSwbeThazEtM=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
 github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 h1:EEHtgt9IwisQ2AZ4pIsMjahcegHh6rmhqxzIRQIyepY=
-github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -277,10 +289,8 @@ github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jgautheron/goconst v1.8.2 h1:y0XF7X8CikZ93fSNT6WBTb/NElBu9IjaY7CCYQrCMX4=
-github.com/jgautheron/goconst v1.8.2/go.mod h1:A0oxgBCHy55NQn6sYpO7UdnA9p+h7cPtoOZUmvNIako=
-github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs=
-github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c=
+github.com/jgautheron/goconst v1.10.0 h1:Ptt+OoE4NaEWKhLrWrrN3IpZdGLiqaf7WLnEX/iv4Jw=
+github.com/jgautheron/goconst v1.10.0/go.mod h1:0p+wv1lFOiUr0IlNNT1nrm6+8DB8u2sU6KHGzFRXHDc=
 github.com/jjti/go-spancheck v0.6.5 h1:lmi7pKxa37oKYIMScialXUK6hP3iY5F1gu+mLBPgYB8=
 github.com/jjti/go-spancheck v0.6.5/go.mod h1:aEogkeatBrbYsyW6y5TgDfihCulDYciL1B7rG2vSsrU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -289,8 +299,8 @@ github.com/julz/importas v0.2.0 h1:y+MJN/UdL63QbFJHws9BVC5RpA2iq0kpjrFajTGivjQ=
 github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY=
 github.com/karamaru-alpha/copyloopvar v1.2.2 h1:yfNQvP9YaGQR7VaWLYcfZUlRP2eo2vhExWKxD/fP6q0=
 github.com/karamaru-alpha/copyloopvar v1.2.2/go.mod h1:oY4rGZqZ879JkJMtX3RRkcXRkmUvH0x35ykgaKgsgJY=
-github.com/kisielk/errcheck v1.9.0 h1:9xt1zI9EBfcYBvdU1nVrzMzzUPUtPKs9bVSIM3TAb3M=
-github.com/kisielk/errcheck v1.9.0/go.mod h1:kQxWMMVZgIkDq7U8xtG/n2juOjbLgZtedi0D+/VL/i8=
+github.com/kisielk/errcheck v1.10.0 h1:Lvs/YAHP24YKg08LA8oDw2z9fJVme090RAXd90S+rrw=
+github.com/kisielk/errcheck v1.10.0/go.mod h1:kQxWMMVZgIkDq7U8xtG/n2juOjbLgZtedi0D+/VL/i8=
 github.com/kkHAIKE/contextcheck v1.1.6 h1:7HIyRcnyzxL9Lz06NGhiKvenXq7Zw6Q0UQu/ttjfJCE=
 github.com/kkHAIKE/contextcheck v1.1.6/go.mod h1:3dDbMRNBFaq8HFXWC1JyvDSPm43CmE6IuHam8Wr0rkg=
 github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
@@ -326,28 +336,30 @@ github.com/lasiar/canonicalheader v1.1.2 h1:vZ5uqwvDbyJCnMhmFYimgMZnJMjwljN5VGY0
 github.com/lasiar/canonicalheader v1.1.2/go.mod h1:qJCeLFS0G/QlLQ506T+Fk/fWMa2VmBUiEI2cuMK4djI=
 github.com/ldez/exptostd v0.4.5 h1:kv2ZGUVI6VwRfp/+bcQ6Nbx0ghFWcGIKInkG/oFn1aQ=
 github.com/ldez/exptostd v0.4.5/go.mod h1:QRjHRMXJrCTIm9WxVNH6VW7oN7KrGSht69bIRwvdFsM=
-github.com/ldez/gomoddirectives v0.7.1 h1:FaULkvUIG36hj6chpwa+FdCNGZBsD7/fO+p7CCsM6pE=
-github.com/ldez/gomoddirectives v0.7.1/go.mod h1:auDNtakWJR1rC+YX7ar+HmveqXATBAyEK1KYpsIRW/8=
+github.com/ldez/gomoddirectives v0.8.0 h1:JqIuTtgvFC2RdH1s357vrE23WJF2cpDCPFgA/TWDGpk=
+github.com/ldez/gomoddirectives v0.8.0/go.mod h1:jutzamvZR4XYJLr0d5Honycp4Gy6GEg2mS9+2YX3F1Q=
 github.com/ldez/grignotin v0.10.1 h1:keYi9rYsgbvqAZGI1liek5c+jv9UUjbvdj3Tbn5fn4o=
 github.com/ldez/grignotin v0.10.1/go.mod h1:UlDbXFCARrXbWGNGP3S5vsysNXAPhnSuBufpTEbwOas=
+github.com/ldez/structtags v0.6.1 h1:bUooFLbXx41tW8SvkfwfFkkjPYvFFs59AAMgVg6DUBk=
+github.com/ldez/structtags v0.6.1/go.mod h1:YDxVSgDy/MON6ariaxLF2X09bh19qL7MtGBN5MrvbdY=
 github.com/ldez/tagliatelle v0.7.2 h1:KuOlL70/fu9paxuxbeqlicJnCspCRjH0x8FW+NfgYUk=
 github.com/ldez/tagliatelle v0.7.2/go.mod h1:PtGgm163ZplJfZMZ2sf5nhUT170rSuPgBimoyYtdaSI=
 github.com/ldez/usetesting v0.5.0 h1:3/QtzZObBKLy1F4F8jLuKJiKBjjVFi1IavpoWbmqLwc=
 github.com/ldez/usetesting v0.5.0/go.mod h1:Spnb4Qppf8JTuRgblLrEWb7IE6rDmUpGvxY3iRrzvDQ=
 github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY=
 github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA=
-github.com/losisin/helm-values-schema-json/v2 v2.3.1 h1:JZDV9GGWh+jjTn3QboI9sO1Kz+JJZqYRjlQyNbODCjM=
-github.com/losisin/helm-values-schema-json/v2 v2.3.1/go.mod h1:uuEUxFkxBifM+LeFlWG8BFxAJYozgspSDMlilM2BsSg=
-github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/losisin/helm-values-schema-json/v2 v2.5.0 h1:6EznqoZ+OUxPHICE1yn9c8d3VGrJigA/LJP+2gka2vk=
+github.com/losisin/helm-values-schema-json/v2 v2.5.0/go.mod h1:Q+RxTfGnKgSV5HWB5VlHI4A1vaxdTKKMf7Sr6d1N6aM=
+github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
+github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/macabu/inamedparam v0.2.0 h1:VyPYpOc10nkhI2qeNUdh3Zket4fcZjEWe35poddBCpE=
 github.com/macabu/inamedparam v0.2.0/go.mod h1:+Pee9/YfGe5LJ62pYXqB89lJ+0k5bsR8Wgz/C0Zlq3U=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/manuelarte/embeddedstructfieldcheck v0.4.0 h1:3mAIyaGRtjK6EO9E73JlXLtiy7ha80b2ZVGyacxgfww=
 github.com/manuelarte/embeddedstructfieldcheck v0.4.0/go.mod h1:z8dFSyXqp+fC6NLDSljRJeNQJJDWnY7RoWFzV3PC6UM=
-github.com/manuelarte/funcorder v0.5.0 h1:llMuHXXbg7tD0i/LNw8vGnkDTHFpTnWqKPI85Rknc+8=
-github.com/manuelarte/funcorder v0.5.0/go.mod h1:Yt3CiUQthSBMBxjShjdXMexmzpP8YGvGLjrxJNkO2hA=
+github.com/manuelarte/funcorder v0.6.0 h1:0hBngc4fa1IgNiI65A7sFGkMvoMCc878RjqB5V7rWP0=
+github.com/manuelarte/funcorder v0.6.0/go.mod h1:id3NDhXdQBmeqXH7eVC6Z89xS6JxvZ8kF9xUxpArU/g=
 github.com/maratori/testableexamples v1.0.1 h1:HfOQXs+XgfeRBJ+Wz0XfH+FHnoY9TVqL6Fcevpzy4q8=
 github.com/maratori/testableexamples v1.0.1/go.mod h1:XE2F/nQs7B9N08JgyRmdGjYVGqxWwClLPCGSQhXQSrQ=
 github.com/maratori/testpackage v1.1.2 h1:ffDSh+AgqluCLMXhM19f/cpvQAKygKAJXFl9aUjmbqs=
@@ -360,10 +372,10 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mgechev/revive v1.13.0 h1:yFbEVliCVKRXY8UgwEO7EOYNopvjb1BFbmYqm9hZjBM=
-github.com/mgechev/revive v1.13.0/go.mod h1:efJfeBVCX2JUumNQ7dtOLDja+QKj9mYGgEZA7rt5u+0=
+github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
+github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mgechev/revive v1.15.0 h1:vJ0HzSBzfNyPbHKolgiFjHxLek9KUijhqh42yGoqZ8Q=
+github.com/mgechev/revive v1.15.0/go.mod h1:LlAKO3QQe9OJ0pVZzI2GPa8CbXGZ/9lNpCGvK4T/a8A=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -380,8 +392,8 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI=
 github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U=
-github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U=
@@ -392,12 +404,12 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm
 github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
 github.com/norwoodj/helm-docs v1.14.2 h1:Ew3bCq1hZqMnnTopkk66Uy2mGwu/jAclAx+3JAVp1To=
 github.com/norwoodj/helm-docs v1.14.2/go.mod h1:qdo76rorOkPDme8nsV5e0JBAYrs56kzvZMYW83k1kgc=
-github.com/nunnatsa/ginkgolinter v0.21.2 h1:khzWfm2/Br8ZemX8QM1pl72LwM+rMeW6VUbQ4rzh0Po=
-github.com/nunnatsa/ginkgolinter v0.21.2/go.mod h1:GItSI5fw7mCGLPmkvGYrr1kEetZe7B593jcyOpyabsY=
-github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
-github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
-github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
-github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
+github.com/nunnatsa/ginkgolinter v0.23.0 h1:x3o4DGYOWbBMP/VdNQKgSj+25aJKx2Pe6lHr8gBcgf8=
+github.com/nunnatsa/ginkgolinter v0.23.0/go.mod h1:9qN1+0akwXEccwV1CAcCDfcoBlWXHB+ML9884pL4SZ4=
+github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps=
+github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
+github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
+github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
 github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
 github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
 github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
@@ -407,17 +419,13 @@ github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT9
 github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
 github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
+github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/polyfloyd/go-errorlint v1.8.0 h1:DL4RestQqRLr8U4LygLw8g2DX6RN1eBJOpa2mzsrl1Q=
-github.com/polyfloyd/go-errorlint v1.8.0/go.mod h1:G2W0Q5roxbLCt0ZQbdoxQxXktTjwNyDbEaj3n7jvl4s=
-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
 github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -439,7 +447,6 @@ github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4l
 github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ=
 github.com/raeperd/recvcheck v0.2.0 h1:GnU+NsbiCqdC2XX5+vMZzP+jAJC5fht7rcVTAhX74UI=
 github.com/raeperd/recvcheck v0.2.0/go.mod h1:n04eYkwIR0JbgD73wT8wL4JjPC3wm0nFtzBnWNocnYU=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -447,8 +454,10 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryancurrah/gomodguard v1.4.1 h1:eWC8eUMNZ/wM/PWuZBv7JxxqT5fiIKSIyTvjb7Elr+g=
 github.com/ryancurrah/gomodguard v1.4.1/go.mod h1:qnMJwV1hX9m+YJseXEBhd2s90+1Xn6x9dLz11ualI1I=
-github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU=
-github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ=
+github.com/ryancurrah/gomodguard/v2 v2.1.3 h1:E7sz3PJwE9Ba1reVxSpF6XLCPJZ74Kfw/LabTNM4GIA=
+github.com/ryancurrah/gomodguard/v2 v2.1.3/go.mod h1:CQicdLGatWMxLX53JzoBjYlsNZhHbmLv2AVa0s2aivU=
+github.com/ryanrolds/sqlclosecheck v0.6.0 h1:pEyL9okISdg1F1SEpJNlrEotkTGerv5BMk7U4AG0eVg=
+github.com/ryanrolds/sqlclosecheck v0.6.0/go.mod h1:xyX16hsDaCMXHrMJ3JMzGf5OpDfHTOTTQrT7HOFUmeU=
 github.com/sanposhiho/wastedassign/v2 v2.1.0 h1:crurBF7fJKIORrV85u9UUpePDYGWnwvv3+A96WvwXT0=
 github.com/sanposhiho/wastedassign/v2 v2.1.0/go.mod h1:+oSmSC+9bQ+VUAxA66nBb0Z7N8CK7mscKTDYC6aIek4=
 github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
@@ -457,23 +466,21 @@ github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tM
 github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ=
 github.com/sashamelentyev/usestdlibvars v1.29.0 h1:8J0MoRrw4/NAXtjQqTHrbW9NN+3iMf7Knkq057v4XOQ=
 github.com/sashamelentyev/usestdlibvars v1.29.0/go.mod h1:8PpnjHMk5VdeWlVb4wCdrB8PNbLqZ3wBZTZWkrpZZL8=
-github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 h1:rZg6IGn0ySYZwCX8LHwZoYm03JhG/cVAJJ3O+u3Vclo=
-github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7/go.mod h1:9sr22NZO5Kfh7unW/xZxkGYTmj2484/fCiE54gw7UTY=
+github.com/securego/gosec/v2 v2.26.1 h1:gdkttGhQFVehqRJ8grKH4DrpqM/QlPKNHBnl8QgcEC4=
+github.com/securego/gosec/v2 v2.26.1/go.mod h1:57UW4p0uoP3kxoTkhoo3axLdVAi+OWrLg/Ax/kdqtPE=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
-github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
+github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
 github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE=
 github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4=
-github.com/sonatard/noctx v0.4.0 h1:7MC/5Gg4SQ4lhLYR6mvOP6mQVSxCrdyiExo7atBs27o=
-github.com/sonatard/noctx v0.4.0/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
-github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0=
-github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
+github.com/sonatard/noctx v0.5.1 h1:wklWg9c9ZYugOAk7qG4yP4PBrlQsmSLPTvW1K4PRQMs=
+github.com/sonatard/noctx v0.5.1/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
+github.com/sourcegraph/go-diff v0.8.0 h1:ipIyu4cTsLbIrln4l0qtHA3r0a7gyK4ntKjtQytHhvY=
+github.com/sourcegraph/go-diff v0.8.0/go.mod h1:hWlcO7Al+UZStZAP8rBumHpCK5ZHQ5BXsMls8p4+F5E=
 github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
@@ -500,7 +507,6 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -512,10 +518,10 @@ github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA
 github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0=
 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag=
 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY=
-github.com/tetafro/godot v1.5.4 h1:u1ww+gqpRLiIA16yF2PV1CV1n/X3zhyezbNXC3E14Sg=
-github.com/tetafro/godot v1.5.4/go.mod h1:eOkMrVQurDui411nBY2FA05EYH01r14LuWY/NrVDVcU=
-github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk=
-github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
+github.com/tetafro/godot v1.5.6 h1:IEkrFCwXaYHlOn4mGzGS3F3dkP6m9t0jpwqBFPIkKiA=
+github.com/tetafro/godot v1.5.6/go.mod h1:eOkMrVQurDui411nBY2FA05EYH01r14LuWY/NrVDVcU=
+github.com/timakin/bodyclose v0.0.0-20260129054331-73d1f95b84b4 h1:SiHe5XLTn9sFWJ5pBwJ5FN/4j34q9ZlOAD//kMoMYp0=
+github.com/timakin/bodyclose v0.0.0-20260129054331-73d1f95b84b4/go.mod h1:sDHLK7rb/59v/ZxZ7KtymgcoxuUMxjXq8gtu9VMOK8M=
 github.com/timonwong/loggercheck v0.11.0 h1:jdaMpYBl+Uq9mWPXv1r8jc5fC3gyXx4/WGwTnnNKn4M=
 github.com/timonwong/loggercheck v0.11.0/go.mod h1:HEAWU8djynujaAVX7QI65Myb8qgfcZ1uKbdpg3ZzKl8=
 github.com/tomarrell/wrapcheck/v2 v2.12.0 h1:H/qQ1aNWz/eeIhxKAFvkfIA+N7YDvq6TWVFL27Of9is=
@@ -526,10 +532,10 @@ github.com/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLk
 github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA=
 github.com/ultraware/whitespace v0.2.0 h1:TYowo2m9Nfj1baEQBjuHzvMRbp19i+RCcRYrSWoFa+g=
 github.com/ultraware/whitespace v0.2.0/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8=
-github.com/uudashr/gocognit v1.2.0 h1:3BU9aMr1xbhPlvJLSydKwdLN3tEUUrzPSSM8S4hDYRA=
-github.com/uudashr/gocognit v1.2.0/go.mod h1:k/DdKPI6XBZO1q7HgoV2juESI2/Ofj9AcHPZhBBdrTU=
-github.com/uudashr/iface v1.4.1 h1:J16Xl1wyNX9ofhpHmQ9h9gk5rnv2A6lX/2+APLTo0zU=
-github.com/uudashr/iface v1.4.1/go.mod h1:pbeBPlbuU2qkNDn0mmfrxP2X+wjPMIQAy+r1MBXSXtg=
+github.com/uudashr/gocognit v1.2.1 h1:CSJynt5txTnORn/DkhiB4mZjwPuifyASC8/6Q0I/QS4=
+github.com/uudashr/gocognit v1.2.1/go.mod h1:acaubQc6xYlXFEMb9nWX2dYBzJ/bIjEkc1zzvyIZg5Q=
+github.com/uudashr/iface v1.4.2 h1:06Vq5RKVYThBsj0Bnw4oasMjD1r+7CE/bcKOA8dVSvg=
+github.com/uudashr/iface v1.4.2/go.mod h1:pbeBPlbuU2qkNDn0mmfrxP2X+wjPMIQAy+r1MBXSXtg=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xen0n/gosmopolitan v1.3.0 h1:zAZI1zefvo7gcpbCOrPSHJZJYA9ZgLfJqtKzZ5pHqQM=
@@ -545,7 +551,6 @@ github.com/ykadowak/zerologlint v0.1.5/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gitlab.com/bosi/decorder v0.4.2 h1:qbQaV3zgwnBZ4zPMhGLW4KZe7A7NwxEhJx39R3shffo=
@@ -554,34 +559,36 @@ go-simpler.org/assert v0.9.0 h1:PfpmcSvL7yAnWyChSjOz6Sp6m9j5lyK8Ok9pEL31YkQ=
 go-simpler.org/assert v0.9.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28=
 go-simpler.org/musttag v0.14.0 h1:XGySZATqQYSEV3/YTy+iX+aofbZZllJaqwFWs+RTtSo=
 go-simpler.org/musttag v0.14.0/go.mod h1:uP8EymctQjJ4Z1kUnjX0u2l60WfUdQxCwSNKzE1JEOE=
-go-simpler.org/sloglint v0.11.1 h1:xRbPepLT/MHPTCA6TS/wNfZrDzkGvCCqUv4Bdwc3H7s=
-go-simpler.org/sloglint v0.11.1/go.mod h1:2PowwiCOK8mjiF+0KGifVOT8ZsCNiFzvfyJeJOIt8MQ=
-go.augendre.info/arangolint v0.3.1 h1:n2E6p8f+zfXSFLa2e2WqFPp4bfvcuRdd50y6cT65pSo=
-go.augendre.info/arangolint v0.3.1/go.mod h1:6ZKzEzIZuBQwoSvlKT+qpUfIbBfFCE5gbAoTg0/117g=
+go-simpler.org/sloglint v0.12.0 h1:UzWDlLWNE5FLqsvyq3tWYHuQMbqrervOhT8qPl4Mmw4=
+go-simpler.org/sloglint v0.12.0/go.mod h1:jBjjC2bm8rYrs88oTRlFX497kWjJsyZWYoNaXkGRI6I=
+go.augendre.info/arangolint v0.4.0 h1:xSCZjRoS93nXazBSg5d0OGCi9APPLNMmmLrC995tR50=
+go.augendre.info/arangolint v0.4.0/go.mod h1:l+f/b4plABuFISuKnTGD4RioXiCCgghv2xqst/xOvAA=
 go.augendre.info/fatcontext v0.9.0 h1:Gt5jGD4Zcj8CDMVzjOJITlSb9cEch54hjRRlN3qDojE=
 go.augendre.info/fatcontext v0.9.0/go.mod h1:L94brOAT1OOUNue6ph/2HnwxoNlds9aXDF2FcUntbNw=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/collector/cmd/builder v0.150.0 h1:y0hMAWqvVBkSFLlmrIWHIt9tcgxL0AlkOwBT3ximy7s=
-go.opentelemetry.io/collector/cmd/builder v0.150.0/go.mod h1:ElmxpyeQW5fQSZAG5WnLfsKustgglJcI1SPlJRjLQxg=
-go.opentelemetry.io/collector/cmd/mdatagen v0.150.0 h1:kBO3lFASd54COAuU8M6ZZLeTfUE3h+o7uXThLTC9WWw=
-go.opentelemetry.io/collector/cmd/mdatagen v0.150.0/go.mod h1:GdTd7Kt9yKEhA23bFedCPlWimQas+pTYSEsNAopTd9w=
-go.opentelemetry.io/collector/component v1.56.0 h1:fOCs36Dxg95w2RQCVI2i5IsHc5IbZ99vmbipK9FM7pQ=
-go.opentelemetry.io/collector/component v1.56.0/go.mod h1:MkAjcSc2T0BiYf/uARZdTlfnxBB9BwmvY6v08D+qeY4=
-go.opentelemetry.io/collector/confmap v1.56.0 h1:YjLll5L77Z3up94t/pdOMaH35kwd28EtjBORewfIjmA=
-go.opentelemetry.io/collector/confmap v1.56.0/go.mod h1:iprN8aL/euBXig6bpLZSZqi+8CZIgE9/Pm6y3qb1QWY=
-go.opentelemetry.io/collector/confmap/provider/fileprovider v1.56.0 h1:7FIaMPNrTfSkyFrlUHrTEIuJP6j3pKUj3ULJ44DgUDk=
-go.opentelemetry.io/collector/confmap/provider/fileprovider v1.56.0/go.mod h1:5r9PR6rZTwknT/XyPWq0RPPbIOvRzw6rWxyxYhUJvmY=
-go.opentelemetry.io/collector/featuregate v1.56.0 h1:NjcbOZkdCSXddAJmFLdO+pv1gmAgrU6sC5PBga2KlKI=
-go.opentelemetry.io/collector/featuregate v1.56.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
-go.opentelemetry.io/collector/filter v0.150.0 h1:37gbAL1u7bCHGOKn7J4e12zCPnB5faj+XOj52ngS5Sc=
-go.opentelemetry.io/collector/filter v0.150.0/go.mod h1:/bqhkcErvJym5iLjkGWasZ2TYh4Yh5U0He0A6WI/CK0=
-go.opentelemetry.io/collector/internal/testutil v0.150.0 h1:J4PLQGPfbLVaL5eI1aMc0m0TMixV9wzBhNhoHU00J0I=
-go.opentelemetry.io/collector/internal/testutil v0.150.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
-go.opentelemetry.io/collector/pdata v1.56.0 h1:W+QAfN2Iz8SNss1T5JNzRWFnw+7oP1vXBQH9ZuOJkXY=
-go.opentelemetry.io/collector/pdata v1.56.0/go.mod h1:usR9utboXufbD1rp1oJy+3smQXXpZ+CsI3WN7QsiOs0=
+go.opentelemetry.io/collector/cmd/builder v0.153.0 h1:5d8/u55wxeoF6GW+Mt3Na3WCZiSHhmWx35tFVS5T4h8=
+go.opentelemetry.io/collector/cmd/builder v0.153.0/go.mod h1:CVbuNiRlvlKwnMZVg+HhQIJPXG6XlF+FijrEItGk4QI=
+go.opentelemetry.io/collector/cmd/mdatagen v0.153.0 h1:n6/jMd675Lk5Qn56XUZowDLbdyoO+yK2VJ2yyRGvABc=
+go.opentelemetry.io/collector/cmd/mdatagen v0.153.0/go.mod h1:qF2cB+cwHkzk2/QXuWB95O7me4EKF3Q6f/VLGLKx2wA=
+go.opentelemetry.io/collector/component v1.59.0 h1:WtulkwzsdAOM/LE0cH/IiudUgiyb2ueVDDeEh5HsXzo=
+go.opentelemetry.io/collector/component v1.59.0/go.mod h1:5eQCM0tS6qbG2XJ6Bt67kgCxuhCbg4csVv6SywyHZ6w=
+go.opentelemetry.io/collector/confmap v1.59.0 h1:asxEEiWwNuGfmTVSctYArOTF8jcxYpS4NmPtvvFhNNI=
+go.opentelemetry.io/collector/confmap v1.59.0/go.mod h1:X5SjFINrF0cb0hcM8PwnW2z+0L/pHA1H1yPPtm2j0tY=
+go.opentelemetry.io/collector/confmap/provider/fileprovider v1.59.0 h1:PpHozFpMPeBVAy8pTXF7EdE1WIXC31L/yRNZHMpZLVw=
+go.opentelemetry.io/collector/confmap/provider/fileprovider v1.59.0/go.mod h1:bJY7BL+fL4jEGVS6JBLViueb3BczlVi86PA47lKeu84=
+go.opentelemetry.io/collector/featuregate v1.59.0 h1:pu70/9eWRjAjzGnr3VmqwY+k6fmU3esLp15AqxfBBz0=
+go.opentelemetry.io/collector/featuregate v1.59.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU=
+go.opentelemetry.io/collector/filter v0.153.0 h1:/2H9EnGjiABK9uYFn3FxxuwtKTc/GZ+51c5BDktSMTw=
+go.opentelemetry.io/collector/filter v0.153.0/go.mod h1:J1ozq94PnCzSW/Sj+jPjgrWnQwt6fyifdvfF2h8NdzE=
+go.opentelemetry.io/collector/internal/schemagen v0.153.0 h1:keRNAnLKdPHR6WvdqEmg/ZfnuqIFAp3zD6cOy54v9sE=
+go.opentelemetry.io/collector/internal/schemagen v0.153.0/go.mod h1:ggjJC9FFzKktJ75kzSzRLRMi143E6DTfvpw2C1gqsZY=
+go.opentelemetry.io/collector/internal/testutil v0.153.0 h1:GJEaPLohao+7wtm08yGf73RGi1rpIHvqzxOb7Xn8sP0=
+go.opentelemetry.io/collector/internal/testutil v0.153.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE=
+go.opentelemetry.io/collector/pdata v1.59.0 h1:lO1IcaO9+HUVdFh+RATCUG3oTP+uCZzsE7HJ0MjmzRc=
+go.opentelemetry.io/collector/pdata v1.59.0/go.mod h1:AH6M14C6qhesnUpcvigkvFMiX9KtdSWQENMBNyNhe7I=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
 go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
@@ -594,14 +601,12 @@ go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.3.0 h1:R
 go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.3.0/go.mod h1:I89cynRj8y+383o7tEQVg2SVA6SRgDVIouWPUVXjx0U=
 go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.3.0 h1:CQvJSldHRUN6Z8jsUeYv8J0lXRvygALXIzsmAeCcZE0=
 go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.3.0/go.mod h1:xSQ+mEfJe/GjK1LXEyVOoSI1N9JV9ZI923X5kup43W4=
-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
-go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
+go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
 go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
 go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -610,31 +615,26 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
+golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
+golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
+golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
+golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
 golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
-golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 h1:HDjDiATsGqvuqvkDvgJjD1IgPrVekcSXVVE21JwvzGE=
-golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:4Mzdyp/6jzw9auFDJ3OMF5qksa7UvPnzKqTVGcb04ms=
+golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 h1:qWFG1Dj7TBjOjOvhEOkmyGPVoquqUKnIU0lEVLp8xyk=
+golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358/go.mod h1:4Mzdyp/6jzw9auFDJ3OMF5qksa7UvPnzKqTVGcb04ms=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
-golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
+golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -646,15 +646,11 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -665,8 +661,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -676,38 +670,27 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -718,14 +701,11 @@ golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWc
 golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU=
 golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
-golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
-golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
+golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
+golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
 golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
 golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
 golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
@@ -746,10 +726,10 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0 h1:6Al3kEFFP9VJhRz3DID6quisgPnTeZVr4lep9kkxdPA=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0/go.mod h1:QLvsjh0OIR0TYBeiu2bkWGTJBUNQ64st52iWj/yA93I=
+google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
+google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -776,8 +756,8 @@ helm.sh/helm/v3 v3.20.2 h1:binM4rvPx5DcNsa1sIt7UZi55lRbu3pZUFmQkSoRh48=
 helm.sh/helm/v3 v3.20.2/go.mod h1:Fl1kBaWCpkUrM6IYXPjQ3bdZQfFrogKArqptvueZ6Ww=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI=
-honnef.co/go/tools v0.6.1/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=
+honnef.co/go/tools v0.7.0 h1:w6WUp1VbkqPEgLz4rkBzH/CSU6HkoqNLp6GstyTx3lU=
+honnef.co/go/tools v0.7.0/go.mod h1:pm29oPxeP3P82ISxZDgIYeOaf9ta6Pi0EWvCFoLG2vc=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4=
diff --git a/xpumd/tools/tools.go b/xpumd/tools/tools.go
new file mode 100644
index 000000000..f0b358a77
--- /dev/null
+++ b/xpumd/tools/tools.go
@@ -0,0 +1,18 @@
+//go:build tools
+
+// The "tools" build tag is never set, it is there to exclude the file from normal builds and linting
+
+// Code generated by scripts/generate-tools.sh. DO NOT EDIT.
+
+package tools
+
+import (
+	_ "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
+	_ "github.com/google/go-licenses/v2"
+	_ "github.com/losisin/helm-values-schema-json/v2"
+	_ "github.com/norwoodj/helm-docs/cmd/helm-docs"
+	_ "go.opentelemetry.io/collector/cmd/builder"
+	_ "go.opentelemetry.io/collector/cmd/mdatagen"
+	_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
+	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
+)