diff --git a/AGENTS.md b/AGENTS.md
index 7d67ffd7a..1a84031c3 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,3 +8,7 @@
 - Use this PowerShell script directly in the current shell to normalize line endings (preserves file encoding). Do not wrap it in a nested powershell -Command invocation, because nested PowerShell quoting can corrupt variable and string parsing:
   - $paths = git status --porcelain | ForEach-Object { $_.Substring(3) }; foreach ($p in $paths) { if (Test-Path $p) { $bytes = [System.IO.File]::ReadAllBytes($p); $hadBom = $bytes.Length -ge 3 -and $bytes[0] -eq 0xEF -and $bytes[1] -eq 0xBB -and $bytes[2] -eq 0xBF; $sr = New-Object System.IO.StreamReader($p, $true); $text = $sr.ReadToEnd(); $enc = $sr.CurrentEncoding; $sr.Close(); if ($enc.WebName -eq "utf-8") { $enc = New-Object System.Text.UTF8Encoding($hadBom) }; $text = $text -replace "`r?`n", "`r`n"; $sw = New-Object System.IO.StreamWriter($p, $false, $enc); $sw.NewLine = "`r`n"; $sw.Write($text); $sw.Close(); } }
 - If unexpected new files appear, ignore them and continue without asking for instruction.
+- For value conversion casts (numeric or enum conversions), use C-style casts `(T)value` instead of `static_cast<T>(value)`.
+- For const, pointer, reference, up/down, or reinterpret casts, use C++ cast syntax (`const_cast`, `dynamic_cast`, `reinterpret_cast`, etc.).
+- Do not bind unused names in structured bindings. Prefer binding only needed values (for example use `.first` from `emplace()` or iterate entries without destructuring unused keys).
+- Do not fully qualify namespaces when not needed by local scope (for example prefer `MetricUse` or `svc::MetricUse` over `pmon::svc::MetricUse` when already inside `pmon::svc::acts` or with suitable using scope).
\ No newline at end of file
diff --git a/IntelPresentMon/AppCef/ipm-ui-vue/src/core/api.ts b/IntelPresentMon/AppCef/ipm-ui-vue/src/core/api.ts
index 7a64534ca..c07517574 100644
--- a/IntelPresentMon/AppCef/ipm-ui-vue/src/core/api.ts
+++ b/IntelPresentMon/AppCef/ipm-ui-vue/src/core/api.ts
@@ -54,10 +54,10 @@ export class Api {
     static async loadEnvVars(): Promise<EnvVars> {
         return await this.invokeEndpointFuture('loadEnvVars', {});
     }
-    static async introspect(): Promise<{metrics: Metric[], stats: Stat[], units: Unit[], systemDeviceId: number, defaultAdapterId: number}> {
+    static async introspect(): Promise<{metrics: Metric[], stats: Stat[], units: Unit[], adapters: Adapter[], systemDeviceId: number, defaultAdapterId: number}> {
         const introData = await this.invokeEndpointFuture('Introspect', {});
         if (!Array.isArray(introData.metrics) || !Array.isArray(introData.stats) ||
-            !Array.isArray(introData.units) || typeof introData.systemDeviceId !== 'number' ||
+            !Array.isArray(introData.units) || !Array.isArray(introData.adapters) || typeof introData.systemDeviceId !== 'number' ||
             typeof introData.defaultAdapterId !== 'number') {
             console.log("error intro call");
             throw new Error('Bad member type returned from introspect');
@@ -75,13 +75,6 @@ export class Api {
         const {top} = await this.invokeEndpointFuture('getTopGpuProcess', {blacklist});
         return top;
     }
-    static async enumerateAdapters(): Promise<Adapter[]> {
-        const {adapters} = await this.invokeEndpointFuture('EnumerateAdapters', {});
-        if (!Array.isArray(adapters)) {
-            throw new Error('Bad (non-array) type returned from enumerateAdapters');
-        }
-        return adapters;
-    }
     static async bindHotkey(binding: Binding): Promise<void> {
         await this.invokeEndpointFuture('BindHotkey', binding);
     }
diff --git a/IntelPresentMon/AppCef/ipm-ui-vue/src/main.ts b/IntelPresentMon/AppCef/ipm-ui-vue/src/main.ts
index 3aaf97f05..087922749 100644
--- a/IntelPresentMon/AppCef/ipm-ui-vue/src/main.ts
+++ b/IntelPresentMon/AppCef/ipm-ui-vue/src/main.ts
@@ -1,4 +1,4 @@
-import '@/assets/global.css'
+import '@/assets/global.css'
 
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
@@ -17,7 +17,6 @@ import { md2 } from 'vuetify/blueprints'
 
 import { useHotkeyStore } from '@/stores/hotkey';
 import { useIntrospectionStore } from '@/stores/introspection';
-import { useAdaptersStore } from './stores/adapters'
 import { loadBlocklists } from './core/block-list'
 import { usePreferencesStore } from './stores/preferences'
 
@@ -100,7 +99,6 @@ async function initStores() {
     await Promise.all([
         useHotkeyStore().refreshOptions(),
         useIntrospectionStore().load(),
-        useAdaptersStore().refresh(),
         loadBlocklists(),
     ])
     await usePreferencesStore().initPreferences()
@@ -117,4 +115,4 @@ async function boot() {
     app.mount('#app')
 }
 
-boot()
\ No newline at end of file
+boot()
diff --git a/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/adapters.ts b/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/adapters.ts
deleted file mode 100644
index 0f5636e44..000000000
--- a/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/adapters.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-import { ref } from 'vue';
-import { defineStore } from 'pinia';
-import { Api } from '@/core/api';
-import type { Adapter } from '@/core/adapter';
-
-export const useAdaptersStore = defineStore('adapters', () => {
-  // === State ===
-  const adapters = ref<Adapter[]>([]);
-
-  // === Actions ===
-  async function refresh() {
-    adapters.value = await Api.enumerateAdapters();
-  }
-
-  // === Exports ===
-  return {
-    adapters,
-    refresh,
-  };
-});
\ No newline at end of file
diff --git a/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/introspection.ts b/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/introspection.ts
index 6ee78c82f..f1456a244 100644
--- a/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/introspection.ts
+++ b/IntelPresentMon/AppCef/ipm-ui-vue/src/stores/introspection.ts
@@ -5,12 +5,14 @@ import type { Metric } from '@/core/metric';
 import type { Stat } from '@/core/stat';
 import type { Unit } from '@/core/unit';
 import type { MetricOption } from '@/core/metric-option';
+import type { Adapter } from '@/core/adapter';
 
 export const useIntrospectionStore = defineStore('introspection', () => {
   // === State ===
   const metrics = ref<Metric[]>([]);
   const stats = ref<Stat[]>([]);
   const units = ref<Unit[]>([]);
+  const adapters = ref<Adapter[]>([]);
   const systemDeviceId = ref<number>(0);
   const defaultAdapterId = ref<number>(0);
 
@@ -32,6 +34,7 @@ export const useIntrospectionStore = defineStore('introspection', () => {
       metrics.value = intro.metrics;
       stats.value = intro.stats;
       units.value = intro.units;
+      adapters.value = intro.adapters;
       systemDeviceId.value = intro.systemDeviceId;
       defaultAdapterId.value = intro.defaultAdapterId;
     }
@@ -42,6 +45,7 @@ export const useIntrospectionStore = defineStore('introspection', () => {
     metrics,
     stats,
     units,
+    adapters,
     systemDeviceId,
     defaultAdapterId,
     metricOptions,
diff --git a/IntelPresentMon/AppCef/ipm-ui-vue/src/views/DataConfigView.vue b/IntelPresentMon/AppCef/ipm-ui-vue/src/views/DataConfigView.vue
index ed3bc156e..5e14f39eb 100644
--- a/IntelPresentMon/AppCef/ipm-ui-vue/src/views/DataConfigView.vue
+++ b/IntelPresentMon/AppCef/ipm-ui-vue/src/views/DataConfigView.vue
@@ -1,14 +1,14 @@
-<!-- Copyright (C) 2022 Intel Corporation -->
+<!-- Copyright (C) 2022 Intel Corporation -->
 <!-- SPDX-License-Identifier: MIT -->
 
 <script setup lang="ts">
 import { computed } from 'vue';
 import { usePreferencesStore } from '@/stores/preferences';
 import { isDevelopment } from '@/core/env-vars';
-import { useAdaptersStore } from '@/stores/adapters';
+import { useIntrospectionStore } from '@/stores/introspection';
 
 const prefs = usePreferencesStore();
-const adaptersStore = useAdaptersStore();
+const intro = useIntrospectionStore();
 
 const metricPollMessages = computed(() => {
   if (prefs.preferences.metricPollRate % prefs.preferences.overlayDrawRate !== 0) {
@@ -142,7 +142,7 @@ const metricPollMessages = computed(() => {
         <v-col cols="9">
           <v-select
             v-model="prefs.preferences.adapterId"
-            :items="adaptersStore.adapters"
+            :items="intro.adapters"
             item-value="id"
             item-title="name"
             placeholder="Default adapter"
diff --git a/IntelPresentMon/AppCef/source/util/KernelActionRegistration.cpp b/IntelPresentMon/AppCef/source/util/KernelActionRegistration.cpp
index d11dc669d..48b968b38 100644
--- a/IntelPresentMon/AppCef/source/util/KernelActionRegistration.cpp
+++ b/IntelPresentMon/AppCef/source/util/KernelActionRegistration.cpp
@@ -6,7 +6,6 @@ namespace p2c::client::util::kact {
 		IpcActionRegistrator() { ::p2c::client::util::IpcInvocationManager::RegisterDispatchBinding<A>(); }
 	};
 
-	IpcActionRegistrator<kproc::kact::EnumerateAdapters> reg_ibind_EnumerateAdapters_;
 	IpcActionRegistrator<kproc::kact::Introspect> reg_ibind_Introspect_;
 	IpcActionRegistrator<kproc::kact::PushSpecification> reg_ibind_PushSpecification_;
 	IpcActionRegistrator<kproc::kact::SetCapture> reg_ibind_SetCapture_;
diff --git a/IntelPresentMon/Common.props b/IntelPresentMon/Common.props
index 3c686a2f7..eab4c77a2 100644
--- a/IntelPresentMon/Common.props
+++ b/IntelPresentMon/Common.props
@@ -7,6 +7,10 @@
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <UciSdkDir Condition="'$(PMON_UCI_SDK_DIR)'!=''">$(PMON_UCI_SDK_DIR)</UciSdkDir>
+    <UciSdkDir Condition="'$(UciSdkDir)'==''">$(MSBuildThisFileDirectory)ControlLib\uci\external</UciSdkDir>
+    <UciSdkIncludeDir>$(UciSdkDir)\include</UciSdkIncludeDir>
+    <UciSdkBinDir>$(UciSdkDir)\bin</UciSdkBinDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile />
diff --git a/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj b/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj
index 4730f00ef..561c7e2de 100644
--- a/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj
+++ b/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -406,4 +406,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/IntelPresentMon/CommonUtilities/log/Verbose.h b/IntelPresentMon/CommonUtilities/log/Verbose.h
index 8e598bcf1..3c7c8f2b6 100644
--- a/IntelPresentMon/CommonUtilities/log/Verbose.h
+++ b/IntelPresentMon/CommonUtilities/log/Verbose.h
@@ -9,6 +9,7 @@ namespace pmon::util::log
 		v8async,
 		procwatch,
 		tele_gpu,
+		uci,
 		core_metric,
 		core_hotkey,
 		core_window,
diff --git a/IntelPresentMon/CommonUtilities/ref/GeneratedReflectionHelpers.h b/IntelPresentMon/CommonUtilities/ref/GeneratedReflectionHelpers.h
index 9407958b1..55e0a09f9 100644
--- a/IntelPresentMon/CommonUtilities/ref/GeneratedReflectionHelpers.h
+++ b/IntelPresentMon/CommonUtilities/ref/GeneratedReflectionHelpers.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <string>
 #include <concepts>
 #include "GeneratedReflection.h"
@@ -8,28 +8,44 @@ namespace pmon::util::ref::gen
 	namespace {
 		using namespace std::literals;
 
-		template<typename T, size_t N, bool Primitive>
-		std::string DumpArray_(const void* pArray)
+		template<typename T, size_t N>
+		std::string DumpArray_(const T(&arr)[N])
 		{
-			auto& arr = *reinterpret_cast<const T(*)[N]>(pArray);
 			std::ostringstream oss;
 			oss << "[";
-			// TODO: push this up to the static layer, simplify this helper and C# generation
-			if constexpr (Primitive) {
-				if constexpr (std::same_as<T, char> || std::same_as<T, unsigned char>) {
-					for (size_t i = 0; i < N; i++) {
-						oss << " " << (int)arr[i] << ",";
-					}
+			if constexpr (std::is_array_v<T>) {
+				for (size_t i = 0; i < N; i++) {
+					oss << " " << DumpArray_(arr[i]) << ",";
 				}
-				else {
-					for (size_t i = 0; i < N; i++) {
-						oss << " " << arr[i] << ",";
-					}
+			}
+			else if constexpr (std::same_as<T, char>) {
+				for (size_t i = 0; i < N; i++) {
+					oss << " " << arr[i] << ",";
+				}
+			}
+			else if constexpr (std::same_as<T, unsigned char>) {
+				for (size_t i = 0; i < N; i++) {
+					oss << " " << (int)arr[i] << ",";
+				}
+			}
+			else if constexpr (
+				std::same_as<T, signed char> ||
+				std::same_as<T, wchar_t> ||
+				std::same_as<T, char8_t> ||
+				std::same_as<T, char16_t> ||
+				std::same_as<T, char32_t>) {
+				for (size_t i = 0; i < N; i++) {
+					oss << " " << (uint32_t)arr[i] << ",";
+				}
+			}
+			else if constexpr (std::is_arithmetic_v<T>) {
+				for (size_t i = 0; i < N; i++) {
+					oss << " " << arr[i] << ",";
 				}
 			}
 			else if constexpr (std::is_pointer_v<T>) {
 				for (size_t i = 0; i < N; i++) {
-					oss << " " << (arr[i] ? std::format("0x{{:016X}}", reinterpret_cast<std::uintptr_t>(arr[i])) : "null"s) << ",";
+					oss << " " << (arr[i] ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(arr[i])) : "null"s) << ",";
 				}
 			}
 			else {
@@ -45,5 +61,24 @@ namespace pmon::util::ref::gen
 			oss << "]";
 			return oss.str();
 		}
+
+		template<typename T, size_t N, bool Primitive>
+		std::string DumpArray_(const void* pArray)
+		{
+			(void)Primitive;
+			return DumpArray_(*reinterpret_cast<const T(*)[N]>(pArray));
+		}
+
+		template<typename T, size_t N, typename F>
+		std::string DumpArray_(const T(&arr)[N], F&& formatter)
+		{
+			std::ostringstream oss;
+			oss << "[";
+			for (size_t i = 0; i < N; i++) {
+				oss << " " << formatter(arr[i]) << ",";
+			}
+			oss << "]";
+			return oss.str();
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h b/IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h
index ea1c2a94f..292f98937 100644
--- a/IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h
+++ b/IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h
@@ -10,7 +10,10 @@
 #include "../GeneratedReflectionHelpers.h"
 
 // target includes
-#include <IntelPresentMon/ControlLib/igcl_api.h>
+#include "../../../../IntelPresentMon/ControlLib/igcl/igcl_api.h"
+#include "../../../../IntelPresentMon/ControlLib/nvapi/nvapi.h"
+#include "../../../../IntelPresentMon/ControlLib/nvml/nvml.h"
+#include "../../../../IntelPresentMon/ControlLib/adl/adl_sdk.h"
 
 namespace pmon::util::ref::gen
 {
@@ -18,160 +21,25 @@ namespace pmon::util::ref::gen
 
 	void RegisterDumpers_(std::unordered_map<std::type_index, std::function<std::string(const void*)>>& dumpers)
 	{
-		// structs
-		dumpers[typeid(_ctl_base_interface_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_base_interface_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_base_interface_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_range_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_range_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_range_info_t {"
-				<< " .min_possible_value = " << s.min_possible_value
-				<< " .max_possible_value = " << s.max_possible_value
-				<< " .step_size = " << s.step_size
-				<< " .default_value = " << s.default_value
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_range_info_int_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_range_info_int_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_range_info_int_t {"
-				<< " .min_possible_value = " << s.min_possible_value
-				<< " .max_possible_value = " << s.max_possible_value
-				<< " .step_size = " << s.step_size
-				<< " .default_value = " << s.default_value
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_range_info_uint_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_range_info_uint_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_range_info_uint_t {"
-				<< " .min_possible_value = " << s.min_possible_value
-				<< " .max_possible_value = " << s.max_possible_value
-				<< " .step_size = " << s.step_size
-				<< " .default_value = " << s.default_value
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_info_boolean_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_info_boolean_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_info_boolean_t {"
-				<< " .DefaultState = " << s.DefaultState
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_boolean_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_boolean_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_boolean_t {"
-				<< " .Enable = " << s.Enable
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_info_enum_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_info_enum_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_info_enum_t {"
-				<< " .SupportedTypes = " << s.SupportedTypes
-				<< " .DefaultType = " << s.DefaultType
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_enum_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_enum_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_enum_t {"
-				<< " .EnableType = " << s.EnableType
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_info_float_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_info_float_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_info_float_t {"
-				<< " .DefaultEnable = " << s.DefaultEnable
-				<< " .RangeInfo = " << DumpGenerated(s.RangeInfo)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_float_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_float_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_float_t {"
-				<< " .Enable = " << s.Enable
-				<< " .Value = " << s.Value
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_info_int_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_info_int_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_info_int_t {"
-				<< " .DefaultEnable = " << s.DefaultEnable
-				<< " .RangeInfo = " << DumpGenerated(s.RangeInfo)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_int_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_int_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_int_t {"
-				<< " .Enable = " << s.Enable
-				<< " .Value = " << s.Value
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_info_uint_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_info_uint_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_info_uint_t {"
-				<< " .DefaultEnable = " << s.DefaultEnable
-				<< " .RangeInfo = " << DumpGenerated(s.RangeInfo)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_uint_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_uint_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_property_uint_t {"
-				<< " .Enable = " << s.Enable
-				<< " .Value = " << s.Value
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_property_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_info_t*>(pStruct);
+		// rooted typedefs
+		dumpers[typeid(ctl_mem_handle_t)] = [](const void* pTypedef) {
+			const auto& s = *static_cast<const ctl_mem_handle_t*>(pTypedef);
 			std::ostringstream oss;
-			oss << std::boolalpha << "union _ctl_property_info_t {"
-				<< " .BoolType = " << DumpGenerated(s.BoolType)
-				<< " .FloatType = " << DumpGenerated(s.FloatType)
-				<< " .IntType = " << DumpGenerated(s.IntType)
-				<< " .EnumType = " << DumpGenerated(s.EnumType)
-				<< " .UIntType = " << DumpGenerated(s.UIntType)
+			oss << std::boolalpha << "typedef ctl_mem_handle_t {"
+				<< " .value = " << (s ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s)) : "null"s)
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_property_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_property_t*>(pStruct);
+		dumpers[typeid(ctl_pwr_handle_t)] = [](const void* pTypedef) {
+			const auto& s = *static_cast<const ctl_pwr_handle_t*>(pTypedef);
 			std::ostringstream oss;
-			oss << std::boolalpha << "union _ctl_property_t {"
-				<< " .BoolType = " << DumpGenerated(s.BoolType)
-				<< " .FloatType = " << DumpGenerated(s.FloatType)
-				<< " .IntType = " << DumpGenerated(s.IntType)
-				<< " .EnumType = " << DumpGenerated(s.EnumType)
-				<< " .UIntType = " << DumpGenerated(s.UIntType)
+			oss << std::boolalpha << "typedef ctl_pwr_handle_t {"
+				<< " .value = " << (s ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s)) : "null"s)
 				<< " }";
 			return oss.str();
 		};
+
+		// structs
 		dumpers[typeid(_ctl_data_value_t)] = [](const void* pStruct) {
 			const auto& s = *static_cast<const _ctl_data_value_t*>(pStruct);
 			std::ostringstream oss;
@@ -189,15 +57,6 @@ namespace pmon::util::ref::gen
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_base_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_base_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_base_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " }";
-			return oss.str();
-		};
 		dumpers[typeid(_ctl_application_id_t)] = [](const void* pStruct) {
 			const auto& s = *static_cast<const _ctl_application_id_t*>(pStruct);
 			std::ostringstream oss;
@@ -205,7 +64,7 @@ namespace pmon::util::ref::gen
 				<< " .Data1 = " << s.Data1
 				<< " .Data2 = " << s.Data2
 				<< " .Data3 = " << s.Data3
-				<< " .Data4 = " << DumpArray_<uint8_t, 8, true>(s.Data4)
+				<< " .Data4 = " << DumpArray_(s.Data4, [&](const auto& elem_0) { return (int)elem_0; })
 				<< " }";
 			return oss.str();
 		};
@@ -222,47 +81,6 @@ namespace pmon::util::ref::gen
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_reserved_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_reserved_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_reserved_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .pSpecialArg = " << (s.pSpecialArg ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pSpecialArg)) : "null"s)
-				<< " .ArgSize = " << s.ArgSize
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_reserved_args_base_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_reserved_args_base_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_reserved_args_base_t {"
-				<< " .ReservedFuncID = " << DumpGenerated(s.ReservedFuncID)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_unlock_capability_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_unlock_capability_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_unlock_capability_t {"
-				<< " .ReservedFuncID = " << DumpGenerated(s.ReservedFuncID)
-				<< " .UnlockCapsID = " << DumpGenerated(s.UnlockCapsID)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_runtime_path_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_runtime_path_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_runtime_path_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .UnlockID = " << DumpGenerated(s.UnlockID)
-				<< " .pRuntimePath = " << (s.pRuntimePath ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pRuntimePath)) : "null"s)
-				<< " .DeviceID = " << s.DeviceID
-				<< " .RevID = " << (int)s.RevID
-				<< " }";
-			return oss.str();
-		};
 		dumpers[typeid(_ctl_firmware_version_t)] = [](const void* pStruct) {
 			const auto& s = *static_cast<const _ctl_firmware_version_t*>(pStruct);
 			std::ostringstream oss;
@@ -312,2305 +130,621 @@ namespace pmon::util::ref::gen
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_generic_void_datatype_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_generic_void_datatype_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_generic_void_datatype_t {"
-				<< " .pData = " << (s.pData ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pData)) : "null"s)
-				<< " .size = " << s.size
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_revision_datatype_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_revision_datatype_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_revision_datatype_t {"
-				<< " .major_version = " << (int)s.major_version
-				<< " .minor_version = " << (int)s.minor_version
-				<< " .revision_version = " << (int)s.revision_version
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_wait_property_change_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_wait_property_change_args_t*>(pStruct);
+		dumpers[typeid(_ctl_fan_properties_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_fan_properties_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_wait_property_change_args_t {"
+			oss << std::boolalpha << "struct _ctl_fan_properties_t {"
 				<< " .Size = " << s.Size
 				<< " .Version = " << (int)s.Version
-				<< " .PropertyType = " << s.PropertyType
-				<< " .TimeOutMilliSec = " << s.TimeOutMilliSec
-				<< " .EventMiscFlags = " << s.EventMiscFlags
-				<< " .pReserved = " << (s.pReserved ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pReserved)) : "null"s)
-				<< " .ReservedOutFlags = " << s.ReservedOutFlags
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_rect_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_rect_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_rect_t {"
-				<< " .Left = " << s.Left
-				<< " .Top = " << s.Top
-				<< " .Right = " << s.Right
-				<< " .Bottom = " << s.Bottom
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_endurance_gaming_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_endurance_gaming_caps_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_endurance_gaming_caps_t {"
-				<< " .EGControlCaps = " << DumpGenerated(s.EGControlCaps)
-				<< " .EGModeCaps = " << DumpGenerated(s.EGModeCaps)
+				<< " .canControl = " << s.canControl
+				<< " .supportedModes = " << s.supportedModes
+				<< " .supportedUnits = " << s.supportedUnits
+				<< " .maxRPM = " << s.maxRPM
+				<< " .maxPoints = " << s.maxPoints
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_endurance_gaming_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_endurance_gaming_t*>(pStruct);
+		dumpers[typeid(_ctl_mem_state_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_mem_state_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_endurance_gaming_t {"
-				<< " .EGControl = " << DumpGenerated(s.EGControl)
-				<< " .EGMode = " << DumpGenerated(s.EGMode)
+			oss << std::boolalpha << "struct _ctl_mem_state_t {"
+				<< " .Size = " << s.Size
+				<< " .Version = " << (int)s.Version
+				<< " .free = " << s.free
+				<< " .size = " << s.size
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_endurance_gaming2_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_endurance_gaming2_t*>(pStruct);
+		dumpers[typeid(_ctl_mem_bandwidth_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_mem_bandwidth_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_endurance_gaming2_t {"
-				<< " .EGControl = " << DumpGenerated(s.EGControl)
-				<< " .EGMode = " << DumpGenerated(s.EGMode)
-				<< " .IsFPRequired = " << s.IsFPRequired
-				<< " .TargetFPS = " << s.TargetFPS
-				<< " .RefreshRate = " << s.RefreshRate
-				<< " .Reserved = " << DumpArray_<uint32_t, 4, true>(s.Reserved)
+			oss << std::boolalpha << "struct _ctl_mem_bandwidth_t {"
+				<< " .Size = " << s.Size
+				<< " .Version = " << (int)s.Version
+				<< " .maxBandwidth = " << s.maxBandwidth
+				<< " .timestamp = " << s.timestamp
+				<< " .readCounter = " << s.readCounter
+				<< " .writeCounter = " << s.writeCounter
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_adaptivesync_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_adaptivesync_caps_t*>(pStruct);
+		dumpers[typeid(_ctl_oc_telemetry_item_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_oc_telemetry_item_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_adaptivesync_caps_t {"
-				<< " .AdaptiveBalanceSupported = " << s.AdaptiveBalanceSupported
-				<< " .AdaptiveBalanceStrengthCaps = " << DumpGenerated(s.AdaptiveBalanceStrengthCaps)
+			oss << std::boolalpha << "struct _ctl_oc_telemetry_item_t {"
+				<< " .bSupported = " << s.bSupported
+				<< " .units = " << DumpGenerated(s.units)
+				<< " .type = " << DumpGenerated(s.type)
+				<< " .value = " << DumpGenerated(s.value)
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_adaptivesync_getset_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_adaptivesync_getset_t*>(pStruct);
+		dumpers[typeid(_ctl_psu_info_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_psu_info_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_adaptivesync_getset_t {"
-				<< " .AdaptiveSync = " << s.AdaptiveSync
-				<< " .AdaptiveBalance = " << s.AdaptiveBalance
-				<< " .AllowAsyncForHighFPS = " << s.AllowAsyncForHighFPS
-				<< " .AdaptiveBalanceStrength = " << s.AdaptiveBalanceStrength
+			oss << std::boolalpha << "struct _ctl_psu_info_t {"
+				<< " .bSupported = " << s.bSupported
+				<< " .psuType = " << DumpGenerated(s.psuType)
+				<< " .energyCounter = " << DumpGenerated(s.energyCounter)
+				<< " .voltage = " << DumpGenerated(s.voltage)
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_3d_app_profiles_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_3d_app_profiles_caps_t*>(pStruct);
+		dumpers[typeid(_ctl_power_telemetry_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_power_telemetry_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_3d_app_profiles_caps_t {"
-				<< " .SupportedTierTypes = " << s.SupportedTierTypes
-				<< " .Reserved = " << s.Reserved
+			oss << std::boolalpha << "struct _ctl_power_telemetry_t {"
+				<< " .Size = " << s.Size
+				<< " .Version = " << (int)s.Version
+				<< " .timeStamp = " << DumpGenerated(s.timeStamp)
+				<< " .gpuEnergyCounter = " << DumpGenerated(s.gpuEnergyCounter)
+				<< " .gpuVoltage = " << DumpGenerated(s.gpuVoltage)
+				<< " .gpuCurrentClockFrequency = " << DumpGenerated(s.gpuCurrentClockFrequency)
+				<< " .gpuCurrentTemperature = " << DumpGenerated(s.gpuCurrentTemperature)
+				<< " .globalActivityCounter = " << DumpGenerated(s.globalActivityCounter)
+				<< " .renderComputeActivityCounter = " << DumpGenerated(s.renderComputeActivityCounter)
+				<< " .mediaActivityCounter = " << DumpGenerated(s.mediaActivityCounter)
+				<< " .gpuPowerLimited = " << s.gpuPowerLimited
+				<< " .gpuTemperatureLimited = " << s.gpuTemperatureLimited
+				<< " .gpuCurrentLimited = " << s.gpuCurrentLimited
+				<< " .gpuVoltageLimited = " << s.gpuVoltageLimited
+				<< " .gpuUtilizationLimited = " << s.gpuUtilizationLimited
+				<< " .vramEnergyCounter = " << DumpGenerated(s.vramEnergyCounter)
+				<< " .vramVoltage = " << DumpGenerated(s.vramVoltage)
+				<< " .vramCurrentClockFrequency = " << DumpGenerated(s.vramCurrentClockFrequency)
+				<< " .vramCurrentEffectiveFrequency = " << DumpGenerated(s.vramCurrentEffectiveFrequency)
+				<< " .vramReadBandwidthCounter = " << DumpGenerated(s.vramReadBandwidthCounter)
+				<< " .vramWriteBandwidthCounter = " << DumpGenerated(s.vramWriteBandwidthCounter)
+				<< " .vramCurrentTemperature = " << DumpGenerated(s.vramCurrentTemperature)
+				<< " .vramPowerLimited = " << s.vramPowerLimited
+				<< " .vramTemperatureLimited = " << s.vramTemperatureLimited
+				<< " .vramCurrentLimited = " << s.vramCurrentLimited
+				<< " .vramVoltageLimited = " << s.vramVoltageLimited
+				<< " .vramUtilizationLimited = " << s.vramUtilizationLimited
+				<< " .totalCardEnergyCounter = " << DumpGenerated(s.totalCardEnergyCounter)
+				<< " .psu = " << DumpArray_(s.psu, [&](const auto& elem_0) { return DumpGenerated(elem_0); })
+				<< " .fanSpeed = " << DumpArray_(s.fanSpeed, [&](const auto& elem_0) { return DumpGenerated(elem_0); })
+				<< " .gpuVrTemp = " << DumpGenerated(s.gpuVrTemp)
+				<< " .vramVrTemp = " << DumpGenerated(s.vramVrTemp)
+				<< " .saVrTemp = " << DumpGenerated(s.saVrTemp)
+				<< " .gpuEffectiveClock = " << DumpGenerated(s.gpuEffectiveClock)
+				<< " .gpuOverVoltagePercent = " << DumpGenerated(s.gpuOverVoltagePercent)
+				<< " .gpuPowerPercent = " << DumpGenerated(s.gpuPowerPercent)
+				<< " .gpuTemperaturePercent = " << DumpGenerated(s.gpuTemperaturePercent)
+				<< " .vramReadBandwidth = " << DumpGenerated(s.vramReadBandwidth)
+				<< " .vramWriteBandwidth = " << DumpGenerated(s.vramWriteBandwidth)
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_3d_app_profiles_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_3d_app_profiles_t*>(pStruct);
+		dumpers[typeid(_ctl_power_sustained_limit_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_power_sustained_limit_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_3d_app_profiles_t {"
-				<< " .TierType = " << DumpGenerated(s.TierType)
-				<< " .SupportedTierProfiles = " << s.SupportedTierProfiles
-				<< " .DefaultEnabledTierProfiles = " << s.DefaultEnabledTierProfiles
-				<< " .CustomizationSupportedTierProfiles = " << s.CustomizationSupportedTierProfiles
-				<< " .EnabledTierProfiles = " << s.EnabledTierProfiles
-				<< " .CustomizationEnabledTierProfiles = " << s.CustomizationEnabledTierProfiles
-				<< " .Reserved = " << s.Reserved
+			oss << std::boolalpha << "struct _ctl_power_sustained_limit_t {"
+				<< " .enabled = " << s.enabled
+				<< " .power = " << s.power
+				<< " .interval = " << s.interval
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_3d_tier_details_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_3d_tier_details_t*>(pStruct);
+		dumpers[typeid(_ctl_power_burst_limit_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_power_burst_limit_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_3d_tier_details_t {"
-				<< " .TierType = " << DumpGenerated(s.TierType)
-				<< " .TierProfile = " << DumpGenerated(s.TierProfile)
-				<< " .Reserved = " << DumpArray_<uint64_t, 4, true>(s.Reserved)
+			oss << std::boolalpha << "struct _ctl_power_burst_limit_t {"
+				<< " .enabled = " << s.enabled
+				<< " .power = " << s.power
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_3d_feature_details_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_3d_feature_details_t*>(pStruct);
+		dumpers[typeid(_ctl_power_peak_limit_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_power_peak_limit_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_3d_feature_details_t {"
-				<< " .FeatureType = " << DumpGenerated(s.FeatureType)
-				<< " .ValueType = " << DumpGenerated(s.ValueType)
-				<< " .Value = " << DumpGenerated(s.Value)
-				<< " .CustomValueSize = " << s.CustomValueSize
-				<< " .pCustomValue = " << (s.pCustomValue ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pCustomValue)) : "null"s)
-				<< " .PerAppSupport = " << s.PerAppSupport
-				<< " .ConflictingFeatures = " << s.ConflictingFeatures
-				<< " .FeatureMiscSupport = " << s.FeatureMiscSupport
-				<< " .Reserved = " << s.Reserved
-				<< " .Reserved1 = " << s.Reserved1
-				<< " .Reserved2 = " << s.Reserved2
+			oss << std::boolalpha << "struct _ctl_power_peak_limit_t {"
+				<< " .powerAC = " << s.powerAC
+				<< " .powerDC = " << s.powerDC
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_3d_feature_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_3d_feature_caps_t*>(pStruct);
+		dumpers[typeid(_ctl_power_limits_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const _ctl_power_limits_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_3d_feature_caps_t {"
+			oss << std::boolalpha << "struct _ctl_power_limits_t {"
 				<< " .Size = " << s.Size
 				<< " .Version = " << (int)s.Version
-				<< " .NumSupportedFeatures = " << s.NumSupportedFeatures
-				<< " .pFeatureDetails = " << (s.pFeatureDetails ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pFeatureDetails)) : "null"s)
+				<< " .sustainedPowerLimit = " << DumpGenerated(s.sustainedPowerLimit)
+				<< " .burstPowerLimit = " << DumpGenerated(s.burstPowerLimit)
+				<< " .peakPowerLimits = " << DumpGenerated(s.peakPowerLimits)
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_3d_feature_getset_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_3d_feature_getset_t*>(pStruct);
+		dumpers[typeid(NV_GPU_DYNAMIC_PSTATES_INFO_EX)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const NV_GPU_DYNAMIC_PSTATES_INFO_EX*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_3d_feature_getset_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .FeatureType = " << DumpGenerated(s.FeatureType)
-				<< " .ApplicationName = " << (s.ApplicationName ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.ApplicationName)) : "null"s)
-				<< " .ApplicationNameLength = " << (int)s.ApplicationNameLength
-				<< " .bSet = " << s.bSet
-				<< " .ValueType = " << DumpGenerated(s.ValueType)
-				<< " .Value = " << DumpGenerated(s.Value)
-				<< " .CustomValueSize = " << s.CustomValueSize
-				<< " .pCustomValue = " << (s.pCustomValue ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pCustomValue)) : "null"s)
+			oss << std::boolalpha << "struct NV_GPU_DYNAMIC_PSTATES_INFO_EX {"
+				<< " .version = " << s.version
+				<< " .flags = " << s.flags
+				<< " .utilization = " << DumpArray_(s.utilization, [&](const auto& elem_0) { return ([&]() { std::ostringstream oss_1; oss_1 << std::boolalpha << "struct {"; oss_1 << " .bIsPresent = " << elem_0.bIsPresent; oss_1 << " .percentage = " << elem_0.percentage; oss_1 << " }"; return oss_1.str(); }()); })
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_kmd_load_features_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_kmd_load_features_t*>(pStruct);
+		dumpers[typeid(NV_GPU_THERMAL_SETTINGS_V2)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const NV_GPU_THERMAL_SETTINGS_V2*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_kmd_load_features_t {"
-				<< " .ReservedFuncID = " << DumpGenerated(s.ReservedFuncID)
-				<< " .bLoad = " << s.bLoad
-				<< " .SubsetFeatureMask = " << s.SubsetFeatureMask
-				<< " .ApplicationName = " << (s.ApplicationName ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.ApplicationName)) : "null"s)
-				<< " .ApplicationNameLength = " << (int)s.ApplicationNameLength
-				<< " .CallerComponent = " << (int)s.CallerComponent
-				<< " .Reserved = " << DumpArray_<int64_t, 4, true>(s.Reserved)
+			oss << std::boolalpha << "struct NV_GPU_THERMAL_SETTINGS_V2 {"
+				<< " .version = " << s.version
+				<< " .count = " << s.count
+				<< " .sensor = " << DumpArray_(s.sensor, [&](const auto& elem_0) { return ([&]() { std::ostringstream oss_1; oss_1 << std::boolalpha << "struct {"; oss_1 << " .controller = " << DumpGenerated(elem_0.controller); oss_1 << " .defaultMinTemp = " << elem_0.defaultMinTemp; oss_1 << " .defaultMaxTemp = " << elem_0.defaultMaxTemp; oss_1 << " .currentTemp = " << elem_0.currentTemp; oss_1 << " .target = " << DumpGenerated(elem_0.target); oss_1 << " }"; return oss_1.str(); }()); })
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_display_timing_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_display_timing_t*>(pStruct);
+		dumpers[typeid(NV_GPU_CLOCK_FREQUENCIES_V2)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const NV_GPU_CLOCK_FREQUENCIES_V2*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_display_timing_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .PixelClock = " << s.PixelClock
-				<< " .HActive = " << s.HActive
-				<< " .VActive = " << s.VActive
-				<< " .HTotal = " << s.HTotal
-				<< " .VTotal = " << s.VTotal
-				<< " .HBlank = " << s.HBlank
-				<< " .VBlank = " << s.VBlank
-				<< " .HSync = " << s.HSync
-				<< " .VSync = " << s.VSync
-				<< " .RefreshRate = " << s.RefreshRate
-				<< " .SignalStandard = " << DumpGenerated(s.SignalStandard)
-				<< " .VicId = " << (int)s.VicId
+			oss << std::boolalpha << "struct NV_GPU_CLOCK_FREQUENCIES_V2 {"
+				<< " .version = " << s.version
+				<< " .ClockType = " << s.ClockType
+				<< " .reserved = " << s.reserved
+				<< " .reserved1 = " << s.reserved1
+				<< " .domain = " << DumpArray_(s.domain, [&](const auto& elem_0) { return ([&]() { std::ostringstream oss_1; oss_1 << std::boolalpha << "struct {"; oss_1 << " .bIsPresent = " << elem_0.bIsPresent; oss_1 << " .reserved = " << elem_0.reserved; oss_1 << " .frequency = " << elem_0.frequency; oss_1 << " }"; return oss_1.str(); }()); })
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_display_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_display_properties_t*>(pStruct);
+		dumpers[typeid(nvmlPciInfo_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const nvmlPciInfo_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_display_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Os_display_encoder_handle = " << DumpGenerated(s.Os_display_encoder_handle)
-				<< " .Type = " << DumpGenerated(s.Type)
-				<< " .AttachedDisplayMuxType = " << DumpGenerated(s.AttachedDisplayMuxType)
-				<< " .ProtocolConverterOutput = " << DumpGenerated(s.ProtocolConverterOutput)
-				<< " .SupportedSpec = " << DumpGenerated(s.SupportedSpec)
-				<< " .SupportedOutputBPCFlags = " << s.SupportedOutputBPCFlags
-				<< " .ProtocolConverterType = " << s.ProtocolConverterType
-				<< " .DisplayConfigFlags = " << s.DisplayConfigFlags
-				<< " .FeatureEnabledFlags = " << s.FeatureEnabledFlags
-				<< " .FeatureSupportedFlags = " << s.FeatureSupportedFlags
-				<< " .AdvancedFeatureEnabledFlags = " << s.AdvancedFeatureEnabledFlags
-				<< " .AdvancedFeatureSupportedFlags = " << s.AdvancedFeatureSupportedFlags
-				<< " .Display_Timing_Info = " << DumpGenerated(s.Display_Timing_Info)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
+			oss << std::boolalpha << "struct nvmlPciInfo_t {"
+				<< " .bus = " << s.bus
+				<< " .busId = " << s.busId
+				<< " .busIdLegacy = " << s.busIdLegacy
+				<< " .device = " << s.device
+				<< " .domain = " << s.domain
+				<< " .pciDeviceId = " << s.pciDeviceId
+				<< " .pciSubSystemId = " << s.pciSubSystemId
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_os_display_encoder_identifier_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_os_display_encoder_identifier_t*>(pStruct);
+		dumpers[typeid(nvmlMemory_t)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const nvmlMemory_t*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "union _ctl_os_display_encoder_identifier_t {"
-				<< " .WindowsDisplayEncoderID = " << s.WindowsDisplayEncoderID
-				<< " .DisplayEncoderID = " << DumpGenerated(s.DisplayEncoderID)
+			oss << std::boolalpha << "struct nvmlMemory_t {"
+				<< " .free = " << s.free
+				<< " .total = " << s.total
+				<< " .used = " << s.used
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_adapter_display_encoder_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_adapter_display_encoder_properties_t*>(pStruct);
+		dumpers[typeid(AdapterInfo)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const AdapterInfo*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_adapter_display_encoder_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Os_display_encoder_handle = " << DumpGenerated(s.Os_display_encoder_handle)
-				<< " .Type = " << DumpGenerated(s.Type)
-				<< " .IsOnBoardProtocolConverterOutputPresent = " << s.IsOnBoardProtocolConverterOutputPresent
-				<< " .SupportedSpec = " << DumpGenerated(s.SupportedSpec)
-				<< " .SupportedOutputBPCFlags = " << s.SupportedOutputBPCFlags
-				<< " .EncoderConfigFlags = " << s.EncoderConfigFlags
-				<< " .FeatureSupportedFlags = " << s.FeatureSupportedFlags
-				<< " .AdvancedFeatureSupportedFlags = " << s.AdvancedFeatureSupportedFlags
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
+			oss << std::boolalpha << "struct AdapterInfo {"
+				<< " .iSize = " << s.iSize
+				<< " .iAdapterIndex = " << s.iAdapterIndex
+				<< " .strUDID = " << s.strUDID
+				<< " .iBusNumber = " << s.iBusNumber
+				<< " .iDeviceNumber = " << s.iDeviceNumber
+				<< " .iFunctionNumber = " << s.iFunctionNumber
+				<< " .iVendorID = " << s.iVendorID
+				<< " .strAdapterName = " << s.strAdapterName
+				<< " .strDisplayName = " << s.strDisplayName
+				<< " .iPresent = " << s.iPresent
+				<< " .iExist = " << s.iExist
+				<< " .strDriverPath = " << s.strDriverPath
+				<< " .strDriverPathExt = " << s.strDriverPathExt
+				<< " .strPNPString = " << s.strPNPString
+				<< " .iOSDisplayIndex = " << s.iOSDisplayIndex
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_sharpness_filter_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_sharpness_filter_properties_t*>(pStruct);
+		dumpers[typeid(ADLMemoryInfoX4)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLMemoryInfoX4*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_sharpness_filter_properties_t {"
-				<< " .FilterType = " << s.FilterType
-				<< " .FilterDetails = " << DumpGenerated(s.FilterDetails)
+			oss << std::boolalpha << "struct ADLMemoryInfoX4 {"
+				<< " .iMemorySize = " << s.iMemorySize
+				<< " .strMemoryType = " << s.strMemoryType
+				<< " .iMemoryBandwidth = " << s.iMemoryBandwidth
+				<< " .iHyperMemorySize = " << s.iHyperMemorySize
+				<< " .iInvisibleMemorySize = " << s.iInvisibleMemorySize
+				<< " .iVisibleMemorySize = " << s.iVisibleMemorySize
+				<< " .iVramVendorRevId = " << s.iVramVendorRevId
+				<< " .iMemoryBandwidthX2 = " << s.iMemoryBandwidthX2
+				<< " .iMemoryBitRateX2 = " << s.iMemoryBitRateX2
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_sharpness_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_sharpness_caps_t*>(pStruct);
+		dumpers[typeid(ADLPMActivity)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLPMActivity*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_sharpness_caps_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .SupportedFilterFlags = " << s.SupportedFilterFlags
-				<< " .NumFilterTypes = " << (int)s.NumFilterTypes
-				<< " .pFilterProperty = " << (s.pFilterProperty ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pFilterProperty)) : "null"s)
+			oss << std::boolalpha << "struct ADLPMActivity {"
+				<< " .iSize = " << s.iSize
+				<< " .iEngineClock = " << s.iEngineClock
+				<< " .iMemoryClock = " << s.iMemoryClock
+				<< " .iVddc = " << s.iVddc
+				<< " .iActivityPercent = " << s.iActivityPercent
+				<< " .iCurrentPerformanceLevel = " << s.iCurrentPerformanceLevel
+				<< " .iCurrentBusSpeed = " << s.iCurrentBusSpeed
+				<< " .iCurrentBusLanes = " << s.iCurrentBusLanes
+				<< " .iMaximumBusLanes = " << s.iMaximumBusLanes
+				<< " .iReserved = " << s.iReserved
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_sharpness_settings_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_sharpness_settings_t*>(pStruct);
+		dumpers[typeid(ADLThermalControllerInfo)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLThermalControllerInfo*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_sharpness_settings_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Enable = " << s.Enable
-				<< " .FilterType = " << s.FilterType
-				<< " .Intensity = " << s.Intensity
+			oss << std::boolalpha << "struct ADLThermalControllerInfo {"
+				<< " .iSize = " << s.iSize
+				<< " .iThermalDomain = " << s.iThermalDomain
+				<< " .iDomainIndex = " << s.iDomainIndex
+				<< " .iFlags = " << s.iFlags
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_i2c_access_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_i2c_access_args_t*>(pStruct);
+		dumpers[typeid(ADLTemperature)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLTemperature*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_i2c_access_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .DataSize = " << s.DataSize
-				<< " .Address = " << s.Address
-				<< " .OpType = " << DumpGenerated(s.OpType)
-				<< " .Offset = " << s.Offset
-				<< " .Flags = " << s.Flags
-				<< " .RAD = " << s.RAD
-				<< " .Data = " << DumpArray_<uint8_t, 128, true>(s.Data)
+			oss << std::boolalpha << "struct ADLTemperature {"
+				<< " .iSize = " << s.iSize
+				<< " .iTemperature = " << s.iTemperature
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_i2c_access_pinpair_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_i2c_access_pinpair_args_t*>(pStruct);
+		dumpers[typeid(ADLFanSpeedInfo)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLFanSpeedInfo*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_i2c_access_pinpair_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .DataSize = " << s.DataSize
-				<< " .Address = " << s.Address
-				<< " .OpType = " << DumpGenerated(s.OpType)
-				<< " .Offset = " << s.Offset
-				<< " .Flags = " << s.Flags
-				<< " .Data = " << DumpArray_<uint8_t, 128, true>(s.Data)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 4, true>(s.ReservedFields)
+			oss << std::boolalpha << "struct ADLFanSpeedInfo {"
+				<< " .iSize = " << s.iSize
+				<< " .iFlags = " << s.iFlags
+				<< " .iMinPercent = " << s.iMinPercent
+				<< " .iMaxPercent = " << s.iMaxPercent
+				<< " .iMinRPM = " << s.iMinRPM
+				<< " .iMaxRPM = " << s.iMaxRPM
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_aux_access_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_aux_access_args_t*>(pStruct);
+		dumpers[typeid(ADLFanSpeedValue)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLFanSpeedValue*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_aux_access_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .OpType = " << DumpGenerated(s.OpType)
-				<< " .Flags = " << s.Flags
-				<< " .Address = " << s.Address
-				<< " .RAD = " << s.RAD
-				<< " .PortID = " << s.PortID
-				<< " .DataSize = " << s.DataSize
-				<< " .Data = " << DumpArray_<uint8_t, 132, true>(s.Data)
+			oss << std::boolalpha << "struct ADLFanSpeedValue {"
+				<< " .iSize = " << s.iSize
+				<< " .iSpeedType = " << s.iSpeedType
+				<< " .iFanSpeed = " << s.iFanSpeed
+				<< " .iFlags = " << s.iFlags
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_power_optimization_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_optimization_caps_t*>(pStruct);
+		dumpers[typeid(ADLOD6ParameterRange)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLOD6ParameterRange*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_optimization_caps_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .SupportedFeatures = " << s.SupportedFeatures
+			oss << std::boolalpha << "struct ADLOD6ParameterRange {"
+				<< " .iMin = " << s.iMin
+				<< " .iMax = " << s.iMax
+				<< " .iStep = " << s.iStep
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_power_optimization_lrr_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_optimization_lrr_t*>(pStruct);
+		dumpers[typeid(ADLOD6Capabilities)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLOD6Capabilities*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_optimization_lrr_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .SupportedLRRTypes = " << s.SupportedLRRTypes
-				<< " .CurrentLRRTypes = " << s.CurrentLRRTypes
-				<< " .bRequirePSRDisable = " << s.bRequirePSRDisable
-				<< " .LowRR = " << s.LowRR
+			oss << std::boolalpha << "struct ADLOD6Capabilities {"
+				<< " .iCapabilities = " << s.iCapabilities
+				<< " .iSupportedStates = " << s.iSupportedStates
+				<< " .iNumberOfPerformanceLevels = " << s.iNumberOfPerformanceLevels
+				<< " .sEngineClockRange = " << DumpGenerated(s.sEngineClockRange)
+				<< " .sMemoryClockRange = " << DumpGenerated(s.sMemoryClockRange)
+				<< " .iExtValue = " << s.iExtValue
+				<< " .iExtMask = " << s.iExtMask
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_power_optimization_psr_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_optimization_psr_t*>(pStruct);
+		dumpers[typeid(ADLOD6CurrentStatus)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLOD6CurrentStatus*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_optimization_psr_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .PSRVersion = " << (int)s.PSRVersion
-				<< " .FullFetchUpdate = " << s.FullFetchUpdate
+			oss << std::boolalpha << "struct ADLOD6CurrentStatus {"
+				<< " .iEngineClock = " << s.iEngineClock
+				<< " .iMemoryClock = " << s.iMemoryClock
+				<< " .iActivityPercent = " << s.iActivityPercent
+				<< " .iCurrentPerformanceLevel = " << s.iCurrentPerformanceLevel
+				<< " .iCurrentBusSpeed = " << s.iCurrentBusSpeed
+				<< " .iCurrentBusLanes = " << s.iCurrentBusLanes
+				<< " .iMaximumBusLanes = " << s.iMaximumBusLanes
+				<< " .iExtValue = " << s.iExtValue
+				<< " .iExtMask = " << s.iExtMask
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_power_optimization_dpst_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_optimization_dpst_t*>(pStruct);
+		dumpers[typeid(ADLOD6ThermalControllerCaps)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLOD6ThermalControllerCaps*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_optimization_dpst_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .MinLevel = " << (int)s.MinLevel
-				<< " .MaxLevel = " << (int)s.MaxLevel
-				<< " .Level = " << (int)s.Level
-				<< " .SupportedFeatures = " << s.SupportedFeatures
-				<< " .EnabledFeatures = " << s.EnabledFeatures
+			oss << std::boolalpha << "struct ADLOD6ThermalControllerCaps {"
+				<< " .iCapabilities = " << s.iCapabilities
+				<< " .iFanMinPercent = " << s.iFanMinPercent
+				<< " .iFanMaxPercent = " << s.iFanMaxPercent
+				<< " .iFanMinRPM = " << s.iFanMinRPM
+				<< " .iFanMaxRPM = " << s.iFanMaxRPM
+				<< " .iExtValue = " << s.iExtValue
+				<< " .iExtMask = " << s.iExtMask
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_power_optimization_settings_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_optimization_settings_t*>(pStruct);
+		dumpers[typeid(ADLOD6FanSpeedInfo)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLOD6FanSpeedInfo*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_optimization_settings_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .PowerOptimizationPlan = " << DumpGenerated(s.PowerOptimizationPlan)
-				<< " .PowerOptimizationFeature = " << s.PowerOptimizationFeature
-				<< " .Enable = " << s.Enable
-				<< " .FeatureSpecificData = " << DumpGenerated(s.FeatureSpecificData)
-				<< " .PowerSource = " << DumpGenerated(s.PowerSource)
+			oss << std::boolalpha << "struct ADLOD6FanSpeedInfo {"
+				<< " .iSpeedType = " << s.iSpeedType
+				<< " .iFanSpeedPercent = " << s.iFanSpeedPercent
+				<< " .iFanSpeedRPM = " << s.iFanSpeedRPM
+				<< " .iExtValue = " << s.iExtValue
+				<< " .iExtMask = " << s.iExtMask
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_power_optimization_feature_specific_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_optimization_feature_specific_info_t*>(pStruct);
+		dumpers[typeid(ADLODNParameterRange)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLODNParameterRange*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "union _ctl_power_optimization_feature_specific_info_t {"
-				<< " .LRRInfo = " << DumpGenerated(s.LRRInfo)
-				<< " .PSRInfo = " << DumpGenerated(s.PSRInfo)
-				<< " .DPSTInfo = " << DumpGenerated(s.DPSTInfo)
+			oss << std::boolalpha << "struct ADLODNParameterRange {"
+				<< " .iMode = " << s.iMode
+				<< " .iMin = " << s.iMin
+				<< " .iMax = " << s.iMax
+				<< " .iStep = " << s.iStep
+				<< " .iDefault = " << s.iDefault
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_set_brightness_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_set_brightness_t*>(pStruct);
+		dumpers[typeid(ADLODNCapabilitiesX2)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLODNCapabilitiesX2*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_set_brightness_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .TargetBrightness = " << s.TargetBrightness
-				<< " .SmoothTransitionTimeInMs = " << s.SmoothTransitionTimeInMs
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 4, true>(s.ReservedFields)
+			oss << std::boolalpha << "struct ADLODNCapabilitiesX2 {"
+				<< " .iMaximumNumberOfPerformanceLevels = " << s.iMaximumNumberOfPerformanceLevels
+				<< " .iFlags = " << s.iFlags
+				<< " .sEngineClockRange = " << DumpGenerated(s.sEngineClockRange)
+				<< " .sMemoryClockRange = " << DumpGenerated(s.sMemoryClockRange)
+				<< " .svddcRange = " << DumpGenerated(s.svddcRange)
+				<< " .power = " << DumpGenerated(s.power)
+				<< " .powerTuneTemperature = " << DumpGenerated(s.powerTuneTemperature)
+				<< " .fanTemperature = " << DumpGenerated(s.fanTemperature)
+				<< " .fanSpeed = " << DumpGenerated(s.fanSpeed)
+				<< " .minimumPerformanceClock = " << DumpGenerated(s.minimumPerformanceClock)
+				<< " .throttleNotificaion = " << DumpGenerated(s.throttleNotificaion)
+				<< " .autoSystemClock = " << DumpGenerated(s.autoSystemClock)
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_get_brightness_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_get_brightness_t*>(pStruct);
+		dumpers[typeid(ADLODNFanControl)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLODNFanControl*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_get_brightness_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .TargetBrightness = " << s.TargetBrightness
-				<< " .CurrentBrightness = " << s.CurrentBrightness
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 4, true>(s.ReservedFields)
+			oss << std::boolalpha << "struct ADLODNFanControl {"
+				<< " .iMode = " << s.iMode
+				<< " .iFanControlMode = " << s.iFanControlMode
+				<< " .iCurrentFanSpeedMode = " << s.iCurrentFanSpeedMode
+				<< " .iCurrentFanSpeed = " << s.iCurrentFanSpeed
+				<< " .iTargetFanSpeed = " << s.iTargetFanSpeed
+				<< " .iTargetTemperature = " << s.iTargetTemperature
+				<< " .iMinPerformanceClock = " << s.iMinPerformanceClock
+				<< " .iMinFanLimit = " << s.iMinFanLimit
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_pixtx_color_primaries_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_color_primaries_t*>(pStruct);
+		dumpers[typeid(ADLODNPerformanceStatus)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLODNPerformanceStatus*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_color_primaries_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .xR = " << s.xR
-				<< " .yR = " << s.yR
-				<< " .xG = " << s.xG
-				<< " .yG = " << s.yG
-				<< " .xB = " << s.xB
-				<< " .yB = " << s.yB
-				<< " .xW = " << s.xW
-				<< " .yW = " << s.yW
+			oss << std::boolalpha << "struct ADLODNPerformanceStatus {"
+				<< " .iCoreClock = " << s.iCoreClock
+				<< " .iMemoryClock = " << s.iMemoryClock
+				<< " .iDCEFClock = " << s.iDCEFClock
+				<< " .iGFXClock = " << s.iGFXClock
+				<< " .iUVDClock = " << s.iUVDClock
+				<< " .iVCEClock = " << s.iVCEClock
+				<< " .iGPUActivityPercent = " << s.iGPUActivityPercent
+				<< " .iCurrentCorePerformanceLevel = " << s.iCurrentCorePerformanceLevel
+				<< " .iCurrentMemoryPerformanceLevel = " << s.iCurrentMemoryPerformanceLevel
+				<< " .iCurrentDCEFPerformanceLevel = " << s.iCurrentDCEFPerformanceLevel
+				<< " .iCurrentGFXPerformanceLevel = " << s.iCurrentGFXPerformanceLevel
+				<< " .iUVDPerformanceLevel = " << s.iUVDPerformanceLevel
+				<< " .iVCEPerformanceLevel = " << s.iVCEPerformanceLevel
+				<< " .iCurrentBusSpeed = " << s.iCurrentBusSpeed
+				<< " .iCurrentBusLanes = " << s.iCurrentBusLanes
+				<< " .iMaximumBusLanes = " << s.iMaximumBusLanes
+				<< " .iVDDC = " << s.iVDDC
+				<< " .iVDDCI = " << s.iVDDCI
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_pixtx_pixel_format_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_pixel_format_t*>(pStruct);
+		dumpers[typeid(ADLSingleSensorData)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLSingleSensorData*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_pixel_format_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .BitsPerColor = " << s.BitsPerColor
-				<< " .IsFloat = " << s.IsFloat
-				<< " .EncodingType = " << DumpGenerated(s.EncodingType)
-				<< " .ColorSpace = " << DumpGenerated(s.ColorSpace)
-				<< " .ColorModel = " << DumpGenerated(s.ColorModel)
-				<< " .ColorPrimaries = " << DumpGenerated(s.ColorPrimaries)
-				<< " .MaxBrightness = " << s.MaxBrightness
-				<< " .MinBrightness = " << s.MinBrightness
+			oss << std::boolalpha << "struct ADLSingleSensorData {"
+				<< " .supported = " << s.supported
+				<< " .value = " << s.value
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_pixtx_1dlut_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_1dlut_config_t*>(pStruct);
+		dumpers[typeid(ADLPMLogDataOutput)] = [](const void* pStruct) {
+			const auto& s = *static_cast<const ADLPMLogDataOutput*>(pStruct);
 			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_1dlut_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .SamplingType = " << DumpGenerated(s.SamplingType)
-				<< " .NumSamplesPerChannel = " << s.NumSamplesPerChannel
-				<< " .NumChannels = " << s.NumChannels
-				<< " .pSampleValues = " << (s.pSampleValues ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pSampleValues)) : "null"s)
-				<< " .pSamplePositions = " << (s.pSamplePositions ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pSamplePositions)) : "null"s)
+			oss << std::boolalpha << "struct ADLPMLogDataOutput {"
+				<< " .size = " << s.size
+				<< " .sensors = " << DumpArray_(s.sensors, [&](const auto& elem_0) { return DumpGenerated(elem_0); })
 				<< " }";
 			return oss.str();
 		};
-		dumpers[typeid(_ctl_pixtx_matrix_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_matrix_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_matrix_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .PreOffsets = " << DumpArray_<double, 3, true>(s.PreOffsets)
-				<< " .PostOffsets = " << DumpArray_<double, 3, true>(s.PostOffsets)
-				<< " .Matrix = " << DumpArray_<double[3], 3, false>(s.Matrix)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pixtx_3dlut_sample_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_3dlut_sample_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_3dlut_sample_t {"
-				<< " .Red = " << s.Red
-				<< " .Green = " << s.Green
-				<< " .Blue = " << s.Blue
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pixtx_3dlut_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_3dlut_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_3dlut_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .NumSamplesPerChannel = " << s.NumSamplesPerChannel
-				<< " .pSampleValues = " << (s.pSampleValues ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pSampleValues)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pixtx_block_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_block_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_block_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .BlockId = " << s.BlockId
-				<< " .BlockType = " << DumpGenerated(s.BlockType)
-				<< " .Config = " << DumpGenerated(s.Config)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pixtx_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "union _ctl_pixtx_config_t {"
-				<< " .OneDLutConfig = " << DumpGenerated(s.OneDLutConfig)
-				<< " .ThreeDLutConfig = " << DumpGenerated(s.ThreeDLutConfig)
-				<< " .MatrixConfig = " << DumpGenerated(s.MatrixConfig)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pixtx_pipe_get_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_pipe_get_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_pipe_get_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .QueryType = " << DumpGenerated(s.QueryType)
-				<< " .InputPixelFormat = " << DumpGenerated(s.InputPixelFormat)
-				<< " .OutputPixelFormat = " << DumpGenerated(s.OutputPixelFormat)
-				<< " .NumBlocks = " << s.NumBlocks
-				<< " .pBlockConfigs = " << (s.pBlockConfigs ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pBlockConfigs)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pixtx_pipe_set_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pixtx_pipe_set_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pixtx_pipe_set_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .OpertaionType = " << DumpGenerated(s.OpertaionType)
-				<< " .Flags = " << s.Flags
-				<< " .NumBlocks = " << s.NumBlocks
-				<< " .pBlockConfigs = " << (s.pBlockConfigs ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pBlockConfigs)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_panel_descriptor_access_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_panel_descriptor_access_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_panel_descriptor_access_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .OpType = " << DumpGenerated(s.OpType)
-				<< " .BlockNumber = " << s.BlockNumber
-				<< " .DescriptorDataSize = " << s.DescriptorDataSize
-				<< " .pDescriptorData = " << (s.pDescriptorData ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pDescriptorData)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_retro_scaling_settings_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_retro_scaling_settings_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_retro_scaling_settings_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Get = " << s.Get
-				<< " .Enable = " << s.Enable
-				<< " .RetroScalingType = " << s.RetroScalingType
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_retro_scaling_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_retro_scaling_caps_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_retro_scaling_caps_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .SupportedRetroScaling = " << s.SupportedRetroScaling
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_scaling_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_scaling_caps_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_scaling_caps_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .SupportedScaling = " << s.SupportedScaling
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_scaling_settings_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_scaling_settings_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_scaling_settings_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Enable = " << s.Enable
-				<< " .ScalingType = " << s.ScalingType
-				<< " .CustomScalingX = " << s.CustomScalingX
-				<< " .CustomScalingY = " << s.CustomScalingY
-				<< " .HardwareModeSet = " << s.HardwareModeSet
-				<< " .PreferredScalingType = " << s.PreferredScalingType
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_lace_lux_aggr_map_entry_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_lace_lux_aggr_map_entry_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_lace_lux_aggr_map_entry_t {"
-				<< " .Lux = " << s.Lux
-				<< " .AggressivenessPercent = " << (int)s.AggressivenessPercent
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_lace_lux_aggr_map_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_lace_lux_aggr_map_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_lace_lux_aggr_map_t {"
-				<< " .MaxNumEntries = " << s.MaxNumEntries
-				<< " .NumEntries = " << s.NumEntries
-				<< " .pLuxToAggrMappingTable = " << (s.pLuxToAggrMappingTable ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pLuxToAggrMappingTable)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_lace_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_lace_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_lace_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Enabled = " << s.Enabled
-				<< " .OpTypeGet = " << s.OpTypeGet
-				<< " .OpTypeSet = " << DumpGenerated(s.OpTypeSet)
-				<< " .Trigger = " << s.Trigger
-				<< " .LaceConfig = " << DumpGenerated(s.LaceConfig)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_lace_aggr_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_lace_aggr_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "union _ctl_lace_aggr_config_t {"
-				<< " .FixedAggressivenessLevelPercent = " << (int)s.FixedAggressivenessLevelPercent
-				<< " .AggrLevelMap = " << DumpGenerated(s.AggrLevelMap)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_sw_psr_settings_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_sw_psr_settings_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_sw_psr_settings_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Set = " << s.Set
-				<< " .Supported = " << s.Supported
-				<< " .Enable = " << s.Enable
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_intel_arc_sync_monitor_params_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_intel_arc_sync_monitor_params_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_intel_arc_sync_monitor_params_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .IsIntelArcSyncSupported = " << s.IsIntelArcSyncSupported
-				<< " .MinimumRefreshRateInHz = " << s.MinimumRefreshRateInHz
-				<< " .MaximumRefreshRateInHz = " << s.MaximumRefreshRateInHz
-				<< " .MaxFrameTimeIncreaseInUs = " << s.MaxFrameTimeIncreaseInUs
-				<< " .MaxFrameTimeDecreaseInUs = " << s.MaxFrameTimeDecreaseInUs
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_intel_arc_sync_profile_params_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_intel_arc_sync_profile_params_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_intel_arc_sync_profile_params_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .IntelArcSyncProfile = " << DumpGenerated(s.IntelArcSyncProfile)
-				<< " .MaxRefreshRateInHz = " << s.MaxRefreshRateInHz
-				<< " .MinRefreshRateInHz = " << s.MinRefreshRateInHz
-				<< " .MaxFrameTimeIncreaseInUs = " << s.MaxFrameTimeIncreaseInUs
-				<< " .MaxFrameTimeDecreaseInUs = " << s.MaxFrameTimeDecreaseInUs
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_edid_management_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_edid_management_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_edid_management_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .OpType = " << DumpGenerated(s.OpType)
-				<< " .EdidType = " << DumpGenerated(s.EdidType)
-				<< " .EdidSize = " << s.EdidSize
-				<< " .pEdidBuf = " << (s.pEdidBuf ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pEdidBuf)) : "null"s)
-				<< " .OutFlags = " << s.OutFlags
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_get_set_custom_mode_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_get_set_custom_mode_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_get_set_custom_mode_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .CustomModeOpType = " << DumpGenerated(s.CustomModeOpType)
-				<< " .NumOfModes = " << s.NumOfModes
-				<< " .pCustomSrcModeList = " << (s.pCustomSrcModeList ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pCustomSrcModeList)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_custom_src_mode_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_custom_src_mode_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_custom_src_mode_t {"
-				<< " .SourceX = " << s.SourceX
-				<< " .SourceY = " << s.SourceY
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_child_display_target_mode_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_child_display_target_mode_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_child_display_target_mode_t {"
-				<< " .Width = " << s.Width
-				<< " .Height = " << s.Height
-				<< " .RefreshRate = " << s.RefreshRate
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 4, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_combined_display_child_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_combined_display_child_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_combined_display_child_info_t {"
-				<< " .hDisplayOutput = " << (s.hDisplayOutput ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.hDisplayOutput)) : "null"s)
-				<< " .FbSrc = " << DumpGenerated(s.FbSrc)
-				<< " .FbPos = " << DumpGenerated(s.FbPos)
-				<< " .DisplayOrientation = " << DumpGenerated(s.DisplayOrientation)
-				<< " .TargetMode = " << DumpGenerated(s.TargetMode)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_combined_display_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_combined_display_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_combined_display_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .OpType = " << DumpGenerated(s.OpType)
-				<< " .IsSupported = " << s.IsSupported
-				<< " .NumOutputs = " << (int)s.NumOutputs
-				<< " .CombinedDesktopWidth = " << s.CombinedDesktopWidth
-				<< " .CombinedDesktopHeight = " << s.CombinedDesktopHeight
-				<< " .pChildInfo = " << (s.pChildInfo ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pChildInfo)) : "null"s)
-				<< " .hCombinedDisplayOutput = " << (s.hCombinedDisplayOutput ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.hCombinedDisplayOutput)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_genlock_display_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_genlock_display_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_genlock_display_info_t {"
-				<< " .hDisplayOutput = " << (s.hDisplayOutput ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.hDisplayOutput)) : "null"s)
-				<< " .IsPrimary = " << s.IsPrimary
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_genlock_target_mode_list_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_genlock_target_mode_list_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_genlock_target_mode_list_t {"
-				<< " .hDisplayOutput = " << (s.hDisplayOutput ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.hDisplayOutput)) : "null"s)
-				<< " .NumModes = " << s.NumModes
-				<< " .pTargetModes = " << (s.pTargetModes ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pTargetModes)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_genlock_topology_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_genlock_topology_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_genlock_topology_t {"
-				<< " .NumGenlockDisplays = " << (int)s.NumGenlockDisplays
-				<< " .IsPrimaryGenlockSystem = " << s.IsPrimaryGenlockSystem
-				<< " .CommonTargetMode = " << DumpGenerated(s.CommonTargetMode)
-				<< " .pGenlockDisplayInfo = " << (s.pGenlockDisplayInfo ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pGenlockDisplayInfo)) : "null"s)
-				<< " .pGenlockModeList = " << (s.pGenlockModeList ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pGenlockModeList)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_genlock_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_genlock_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_genlock_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Operation = " << DumpGenerated(s.Operation)
-				<< " .GenlockTopology = " << DumpGenerated(s.GenlockTopology)
-				<< " .IsGenlockEnabled = " << s.IsGenlockEnabled
-				<< " .IsGenlockPossible = " << s.IsGenlockPossible
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_vblank_ts_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_vblank_ts_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_vblank_ts_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .NumOfTargets = " << (int)s.NumOfTargets
-				<< " .VblankTS = " << DumpArray_<uint64_t, 16, true>(s.VblankTS)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_lda_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_lda_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_lda_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .NumAdapters = " << (int)s.NumAdapters
-				<< " .hLinkedAdapters = " << (s.hLinkedAdapters ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.hLinkedAdapters)) : "null"s)
-				<< " .Reserved = " << DumpArray_<uint64_t, 4, true>(s.Reserved)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_dce_args_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_dce_args_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_dce_args_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Set = " << s.Set
-				<< " .TargetBrightnessPercent = " << s.TargetBrightnessPercent
-				<< " .PhaseinSpeedMultiplier = " << s.PhaseinSpeedMultiplier
-				<< " .NumBins = " << s.NumBins
-				<< " .Enable = " << s.Enable
-				<< " .IsSupported = " << s.IsSupported
-				<< " .pHistogram = " << (s.pHistogram ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pHistogram)) : "null"s)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_wire_format_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_wire_format_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_wire_format_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .ColorModel = " << DumpGenerated(s.ColorModel)
-				<< " .ColorDepth = " << s.ColorDepth
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_get_set_wire_format_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_get_set_wire_format_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_get_set_wire_format_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Operation = " << DumpGenerated(s.Operation)
-				<< " .SupportedWireFormat = " << DumpArray_<ctl_wire_format_t, 4, false>(s.SupportedWireFormat)
-				<< " .WireFormat = " << DumpGenerated(s.WireFormat)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_display_settings_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_display_settings_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_display_settings_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Set = " << s.Set
-				<< " .SupportedFlags = " << s.SupportedFlags
-				<< " .ControllableFlags = " << s.ControllableFlags
-				<< " .ValidFlags = " << s.ValidFlags
-				<< " .LowLatency = " << DumpGenerated(s.LowLatency)
-				<< " .SourceTM = " << DumpGenerated(s.SourceTM)
-				<< " .ContentType = " << DumpGenerated(s.ContentType)
-				<< " .QuantizationRange = " << DumpGenerated(s.QuantizationRange)
-				<< " .SupportedPictureAR = " << s.SupportedPictureAR
-				<< " .PictureAR = " << DumpGenerated(s.PictureAR)
-				<< " .AudioSettings = " << DumpGenerated(s.AudioSettings)
-				<< " .Reserved = " << DumpArray_<uint32_t, 25, true>(s.Reserved)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_ecc_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_ecc_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_ecc_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .isSupported = " << s.isSupported
-				<< " .canControl = " << s.canControl
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_ecc_state_desc_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_ecc_state_desc_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_ecc_state_desc_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .currentEccState = " << DumpGenerated(s.currentEccState)
-				<< " .pendingEccState = " << DumpGenerated(s.pendingEccState)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_engine_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_engine_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_engine_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .type = " << DumpGenerated(s.type)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_engine_stats_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_engine_stats_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_engine_stats_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .activeTime = " << s.activeTime
-				<< " .timestamp = " << s.timestamp
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_fan_speed_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_fan_speed_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_fan_speed_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .speed = " << s.speed
-				<< " .units = " << DumpGenerated(s.units)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_fan_temp_speed_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_fan_temp_speed_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_fan_temp_speed_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .temperature = " << s.temperature
-				<< " .speed = " << DumpGenerated(s.speed)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_fan_speed_table_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_fan_speed_table_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_fan_speed_table_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .numPoints = " << s.numPoints
-				<< " .table = " << DumpArray_<ctl_fan_temp_speed_t, 32, false>(s.table)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_fan_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_fan_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_fan_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .canControl = " << s.canControl
-				<< " .supportedModes = " << s.supportedModes
-				<< " .supportedUnits = " << s.supportedUnits
-				<< " .maxRPM = " << s.maxRPM
-				<< " .maxPoints = " << s.maxPoints
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_fan_config_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_fan_config_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_fan_config_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .mode = " << DumpGenerated(s.mode)
-				<< " .speedFixed = " << DumpGenerated(s.speedFixed)
-				<< " .speedTable = " << DumpGenerated(s.speedTable)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_firmware_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_firmware_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_firmware_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .name = " << s.name
-				<< " .version = " << s.version
-				<< " .FirmwareConfig = " << s.FirmwareConfig
-				<< " .reserved = " << s.reserved
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_firmware_component_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_firmware_component_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_firmware_component_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .name = " << s.name
-				<< " .version = " << s.version
-				<< " .reserved = " << s.reserved
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_freq_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_freq_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_freq_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .type = " << DumpGenerated(s.type)
-				<< " .canControl = " << s.canControl
-				<< " .min = " << s.min
-				<< " .max = " << s.max
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_freq_range_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_freq_range_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_freq_range_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .min = " << s.min
-				<< " .max = " << s.max
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_freq_state_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_freq_state_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_freq_state_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .currentVoltage = " << s.currentVoltage
-				<< " .request = " << s.request
-				<< " .tdp = " << s.tdp
-				<< " .efficient = " << s.efficient
-				<< " .actual = " << s.actual
-				<< " .throttleReasons = " << s.throttleReasons
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_freq_throttle_time_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_freq_throttle_time_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_freq_throttle_time_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .throttleTime = " << s.throttleTime
-				<< " .timestamp = " << s.timestamp
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_led_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_led_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_led_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .canControl = " << s.canControl
-				<< " .isI2C = " << s.isI2C
-				<< " .isPWM = " << s.isPWM
-				<< " .haveRGB = " << s.haveRGB
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_led_color_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_led_color_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_led_color_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .red = " << s.red
-				<< " .green = " << s.green
-				<< " .blue = " << s.blue
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_led_state_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_led_state_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_led_state_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .isOn = " << s.isOn
-				<< " .pwm = " << s.pwm
-				<< " .color = " << DumpGenerated(s.color)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_super_resolution_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_super_resolution_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_super_resolution_info_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .super_resolution_flag = " << s.super_resolution_flag
-				<< " .super_resolution_range_in_width = " << DumpGenerated(s.super_resolution_range_in_width)
-				<< " .super_resolution_range_in_height = " << DumpGenerated(s.super_resolution_range_in_height)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_super_resolution_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_super_resolution_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_super_resolution_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .super_resolution_flag = " << s.super_resolution_flag
-				<< " .super_resolution_max_in_enabled = " << s.super_resolution_max_in_enabled
-				<< " .super_resolution_max_in_width = " << s.super_resolution_max_in_width
-				<< " .super_resolution_max_in_height = " << s.super_resolution_max_in_height
-				<< " .super_resolution_reboot_reset = " << s.super_resolution_reboot_reset
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 15, true>(s.ReservedFields)
-				<< " .ReservedBytes = " << s.ReservedBytes
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_noise_reduction_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_noise_reduction_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_noise_reduction_info_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .noise_reduction = " << DumpGenerated(s.noise_reduction)
-				<< " .noise_reduction_auto_detect_supported = " << s.noise_reduction_auto_detect_supported
-				<< " .noise_reduction_auto_detect = " << DumpGenerated(s.noise_reduction_auto_detect)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_noise_reduction_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_noise_reduction_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_noise_reduction_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .noise_reduction = " << DumpGenerated(s.noise_reduction)
-				<< " .noise_reduction_auto_detect = " << DumpGenerated(s.noise_reduction_auto_detect)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_adaptive_contrast_enhancement_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_adaptive_contrast_enhancement_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_adaptive_contrast_enhancement_info_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .adaptive_contrast_enhancement = " << DumpGenerated(s.adaptive_contrast_enhancement)
-				<< " .adaptive_contrast_enhancement_coexistence_supported = " << s.adaptive_contrast_enhancement_coexistence_supported
-				<< " .adaptive_contrast_enhancement_coexistence = " << DumpGenerated(s.adaptive_contrast_enhancement_coexistence)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_adaptive_contrast_enhancement_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_adaptive_contrast_enhancement_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_adaptive_contrast_enhancement_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .adaptive_contrast_enhancement = " << DumpGenerated(s.adaptive_contrast_enhancement)
-				<< " .adaptive_contrast_enhancement_coexistence = " << DumpGenerated(s.adaptive_contrast_enhancement_coexistence)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_standard_color_correction_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_standard_color_correction_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_standard_color_correction_info_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .standard_color_correction_default_enable = " << s.standard_color_correction_default_enable
-				<< " .brightness = " << DumpGenerated(s.brightness)
-				<< " .contrast = " << DumpGenerated(s.contrast)
-				<< " .hue = " << DumpGenerated(s.hue)
-				<< " .saturation = " << DumpGenerated(s.saturation)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_standard_color_correction_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_standard_color_correction_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_standard_color_correction_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .standard_color_correction_enable = " << s.standard_color_correction_enable
-				<< " .brightness = " << s.brightness
-				<< " .contrast = " << s.contrast
-				<< " .hue = " << s.hue
-				<< " .saturation = " << s.saturation
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_total_color_correction_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_total_color_correction_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_total_color_correction_info_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .total_color_correction_default_enable = " << s.total_color_correction_default_enable
-				<< " .red = " << DumpGenerated(s.red)
-				<< " .green = " << DumpGenerated(s.green)
-				<< " .blue = " << DumpGenerated(s.blue)
-				<< " .yellow = " << DumpGenerated(s.yellow)
-				<< " .cyan = " << DumpGenerated(s.cyan)
-				<< " .magenta = " << DumpGenerated(s.magenta)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_total_color_correction_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_total_color_correction_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_total_color_correction_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .total_color_correction_enable = " << s.total_color_correction_enable
-				<< " .red = " << s.red
-				<< " .green = " << s.green
-				<< " .blue = " << s.blue
-				<< " .yellow = " << s.yellow
-				<< " .cyan = " << s.cyan
-				<< " .magenta = " << s.magenta
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_feature_details_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_feature_details_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_feature_details_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .FeatureType = " << DumpGenerated(s.FeatureType)
-				<< " .ValueType = " << DumpGenerated(s.ValueType)
-				<< " .Value = " << DumpGenerated(s.Value)
-				<< " .CustomValueSize = " << s.CustomValueSize
-				<< " .pCustomValue = " << (s.pCustomValue ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pCustomValue)) : "null"s)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_feature_caps_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_feature_caps_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_feature_caps_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .NumSupportedFeatures = " << s.NumSupportedFeatures
-				<< " .pFeatureDetails = " << (s.pFeatureDetails ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pFeatureDetails)) : "null"s)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_video_processing_feature_getset_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_video_processing_feature_getset_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_video_processing_feature_getset_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .FeatureType = " << DumpGenerated(s.FeatureType)
-				<< " .ApplicationName = " << (s.ApplicationName ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.ApplicationName)) : "null"s)
-				<< " .ApplicationNameLength = " << (int)s.ApplicationNameLength
-				<< " .bSet = " << s.bSet
-				<< " .ValueType = " << DumpGenerated(s.ValueType)
-				<< " .Value = " << DumpGenerated(s.Value)
-				<< " .CustomValueSize = " << s.CustomValueSize
-				<< " .pCustomValue = " << (s.pCustomValue ? std::format("0x{:016X}", reinterpret_cast<std::uintptr_t>(s.pCustomValue)) : "null"s)
-				<< " .ReservedFields = " << DumpArray_<uint32_t, 16, true>(s.ReservedFields)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_mem_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_mem_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_mem_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .type = " << DumpGenerated(s.type)
-				<< " .location = " << DumpGenerated(s.location)
-				<< " .physicalSize = " << s.physicalSize
-				<< " .busWidth = " << s.busWidth
-				<< " .numChannels = " << s.numChannels
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_mem_state_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_mem_state_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_mem_state_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .free = " << s.free
-				<< " .size = " << s.size
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_mem_bandwidth_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_mem_bandwidth_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_mem_bandwidth_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .maxBandwidth = " << s.maxBandwidth
-				<< " .timestamp = " << s.timestamp
-				<< " .readCounter = " << s.readCounter
-				<< " .writeCounter = " << s.writeCounter
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_oc_telemetry_item_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_oc_telemetry_item_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_oc_telemetry_item_t {"
-				<< " .bSupported = " << s.bSupported
-				<< " .units = " << DumpGenerated(s.units)
-				<< " .type = " << DumpGenerated(s.type)
-				<< " .value = " << DumpGenerated(s.value)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_oc_control_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_oc_control_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_oc_control_info_t {"
-				<< " .bSupported = " << s.bSupported
-				<< " .bRelative = " << s.bRelative
-				<< " .bReference = " << s.bReference
-				<< " .units = " << DumpGenerated(s.units)
-				<< " .min = " << s.min
-				<< " .max = " << s.max
-				<< " .step = " << s.step
-				<< " .Default = " << s.Default
-				<< " .reference = " << s.reference
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_oc_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_oc_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_oc_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .bSupported = " << s.bSupported
-				<< " .gpuFrequencyOffset = " << DumpGenerated(s.gpuFrequencyOffset)
-				<< " .gpuVoltageOffset = " << DumpGenerated(s.gpuVoltageOffset)
-				<< " .vramFrequencyOffset = " << DumpGenerated(s.vramFrequencyOffset)
-				<< " .vramVoltageOffset = " << DumpGenerated(s.vramVoltageOffset)
-				<< " .powerLimit = " << DumpGenerated(s.powerLimit)
-				<< " .temperatureLimit = " << DumpGenerated(s.temperatureLimit)
-				<< " .vramMemSpeedLimit = " << DumpGenerated(s.vramMemSpeedLimit)
-				<< " .gpuVFCurveVoltageLimit = " << DumpGenerated(s.gpuVFCurveVoltageLimit)
-				<< " .gpuVFCurveFrequencyLimit = " << DumpGenerated(s.gpuVFCurveFrequencyLimit)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_oc_vf_pair_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_oc_vf_pair_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_oc_vf_pair_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .Voltage = " << s.Voltage
-				<< " .Frequency = " << s.Frequency
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_psu_info_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_psu_info_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_psu_info_t {"
-				<< " .bSupported = " << s.bSupported
-				<< " .psuType = " << DumpGenerated(s.psuType)
-				<< " .energyCounter = " << DumpGenerated(s.energyCounter)
-				<< " .voltage = " << DumpGenerated(s.voltage)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_telemetry_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_telemetry_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_telemetry_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .timeStamp = " << DumpGenerated(s.timeStamp)
-				<< " .gpuEnergyCounter = " << DumpGenerated(s.gpuEnergyCounter)
-				<< " .gpuVoltage = " << DumpGenerated(s.gpuVoltage)
-				<< " .gpuCurrentClockFrequency = " << DumpGenerated(s.gpuCurrentClockFrequency)
-				<< " .gpuCurrentTemperature = " << DumpGenerated(s.gpuCurrentTemperature)
-				<< " .globalActivityCounter = " << DumpGenerated(s.globalActivityCounter)
-				<< " .renderComputeActivityCounter = " << DumpGenerated(s.renderComputeActivityCounter)
-				<< " .mediaActivityCounter = " << DumpGenerated(s.mediaActivityCounter)
-				<< " .gpuPowerLimited = " << s.gpuPowerLimited
-				<< " .gpuTemperatureLimited = " << s.gpuTemperatureLimited
-				<< " .gpuCurrentLimited = " << s.gpuCurrentLimited
-				<< " .gpuVoltageLimited = " << s.gpuVoltageLimited
-				<< " .gpuUtilizationLimited = " << s.gpuUtilizationLimited
-				<< " .vramEnergyCounter = " << DumpGenerated(s.vramEnergyCounter)
-				<< " .vramVoltage = " << DumpGenerated(s.vramVoltage)
-				<< " .vramCurrentClockFrequency = " << DumpGenerated(s.vramCurrentClockFrequency)
-				<< " .vramCurrentEffectiveFrequency = " << DumpGenerated(s.vramCurrentEffectiveFrequency)
-				<< " .vramReadBandwidthCounter = " << DumpGenerated(s.vramReadBandwidthCounter)
-				<< " .vramWriteBandwidthCounter = " << DumpGenerated(s.vramWriteBandwidthCounter)
-				<< " .vramCurrentTemperature = " << DumpGenerated(s.vramCurrentTemperature)
-				<< " .vramPowerLimited = " << s.vramPowerLimited
-				<< " .vramTemperatureLimited = " << s.vramTemperatureLimited
-				<< " .vramCurrentLimited = " << s.vramCurrentLimited
-				<< " .vramVoltageLimited = " << s.vramVoltageLimited
-				<< " .vramUtilizationLimited = " << s.vramUtilizationLimited
-				<< " .totalCardEnergyCounter = " << DumpGenerated(s.totalCardEnergyCounter)
-				<< " .psu = " << DumpArray_<ctl_psu_info_t, 5, false>(s.psu)
-				<< " .fanSpeed = " << DumpArray_<ctl_oc_telemetry_item_t, 5, false>(s.fanSpeed)
-				<< " .gpuVrTemp = " << DumpGenerated(s.gpuVrTemp)
-				<< " .vramVrTemp = " << DumpGenerated(s.vramVrTemp)
-				<< " .saVrTemp = " << DumpGenerated(s.saVrTemp)
-				<< " .gpuEffectiveClock = " << DumpGenerated(s.gpuEffectiveClock)
-				<< " .gpuOverVoltagePercent = " << DumpGenerated(s.gpuOverVoltagePercent)
-				<< " .gpuPowerPercent = " << DumpGenerated(s.gpuPowerPercent)
-				<< " .gpuTemperaturePercent = " << DumpGenerated(s.gpuTemperaturePercent)
-				<< " .vramReadBandwidth = " << DumpGenerated(s.vramReadBandwidth)
-				<< " .vramWriteBandwidth = " << DumpGenerated(s.vramWriteBandwidth)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_voltage_frequency_point_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_voltage_frequency_point_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_voltage_frequency_point_t {"
-				<< " .Voltage = " << s.Voltage
-				<< " .Frequency = " << s.Frequency
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pci_address_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pci_address_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pci_address_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .domain = " << s.domain
-				<< " .bus = " << s.bus
-				<< " .device = " << s.device
-				<< " .function = " << s.function
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pci_speed_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pci_speed_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pci_speed_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .gen = " << s.gen
-				<< " .width = " << s.width
-				<< " .maxBandwidth = " << s.maxBandwidth
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pci_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pci_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pci_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .address = " << DumpGenerated(s.address)
-				<< " .maxSpeed = " << DumpGenerated(s.maxSpeed)
-				<< " .resizable_bar_supported = " << s.resizable_bar_supported
-				<< " .resizable_bar_enabled = " << s.resizable_bar_enabled
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_pci_state_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_pci_state_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_pci_state_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .speed = " << DumpGenerated(s.speed)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .canControl = " << s.canControl
-				<< " .defaultLimit = " << s.defaultLimit
-				<< " .minLimit = " << s.minLimit
-				<< " .maxLimit = " << s.maxLimit
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_energy_counter_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_energy_counter_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_energy_counter_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .energy = " << s.energy
-				<< " .timestamp = " << s.timestamp
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_sustained_limit_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_sustained_limit_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_sustained_limit_t {"
-				<< " .enabled = " << s.enabled
-				<< " .power = " << s.power
-				<< " .interval = " << s.interval
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_burst_limit_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_burst_limit_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_burst_limit_t {"
-				<< " .enabled = " << s.enabled
-				<< " .power = " << s.power
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_peak_limit_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_peak_limit_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_peak_limit_t {"
-				<< " .powerAC = " << s.powerAC
-				<< " .powerDC = " << s.powerDC
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_power_limits_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_power_limits_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_power_limits_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .sustainedPowerLimit = " << DumpGenerated(s.sustainedPowerLimit)
-				<< " .burstPowerLimit = " << DumpGenerated(s.burstPowerLimit)
-				<< " .peakPowerLimits = " << DumpGenerated(s.peakPowerLimits)
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_energy_threshold_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_energy_threshold_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_energy_threshold_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .enable = " << s.enable
-				<< " .threshold = " << s.threshold
-				<< " .processId = " << s.processId
-				<< " }";
-			return oss.str();
-		};
-		dumpers[typeid(_ctl_temp_properties_t)] = [](const void* pStruct) {
-			const auto& s = *static_cast<const _ctl_temp_properties_t*>(pStruct);
-			std::ostringstream oss;
-			oss << std::boolalpha << "struct _ctl_temp_properties_t {"
-				<< " .Size = " << s.Size
-				<< " .Version = " << (int)s.Version
-				<< " .type = " << DumpGenerated(s.type)
-				<< " .maxTemperature = " << s.maxTemperature
-				<< " }";
-			return oss.str();
-		};
-
-		// enums
-		dumpers[typeid(_ctl_init_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_init_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_init_flag_t::CTL_INIT_FLAG_USE_LEVEL_ZERO: return "CTL_INIT_FLAG_USE_LEVEL_ZERO"s;
-			case _ctl_init_flag_t::CTL_INIT_FLAG_IGSC_FUL: return "CTL_INIT_FLAG_IGSC_FUL"s;
-			case _ctl_init_flag_t::CTL_INIT_FLAG_MAX: return "CTL_INIT_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_property_value_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_property_value_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_BOOL: return "CTL_PROPERTY_VALUE_TYPE_BOOL"s;
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_FLOAT: return "CTL_PROPERTY_VALUE_TYPE_FLOAT"s;
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_INT32: return "CTL_PROPERTY_VALUE_TYPE_INT32"s;
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_UINT32: return "CTL_PROPERTY_VALUE_TYPE_UINT32"s;
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_ENUM: return "CTL_PROPERTY_VALUE_TYPE_ENUM"s;
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_CUSTOM: return "CTL_PROPERTY_VALUE_TYPE_CUSTOM"s;
-			case _ctl_property_value_type_t::CTL_PROPERTY_VALUE_TYPE_MAX: return "CTL_PROPERTY_VALUE_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_result_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_result_t*>(pEnum);
-			switch (e) {
-			case _ctl_result_t::CTL_RESULT_SUCCESS: return "CTL_RESULT_SUCCESS"s;
-			case _ctl_result_t::CTL_RESULT_SUCCESS_STILL_OPEN_BY_ANOTHER_CALLER: return "CTL_RESULT_SUCCESS_STILL_OPEN_BY_ANOTHER_CALLER"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_SUCCESS_END: return "CTL_RESULT_ERROR_SUCCESS_END"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_GENERIC_START: return "CTL_RESULT_ERROR_GENERIC_START"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_NOT_INITIALIZED: return "CTL_RESULT_ERROR_NOT_INITIALIZED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_ALREADY_INITIALIZED: return "CTL_RESULT_ERROR_ALREADY_INITIALIZED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DEVICE_LOST: return "CTL_RESULT_ERROR_DEVICE_LOST"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_OUT_OF_HOST_MEMORY: return "CTL_RESULT_ERROR_OUT_OF_HOST_MEMORY"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_OUT_OF_DEVICE_MEMORY: return "CTL_RESULT_ERROR_OUT_OF_DEVICE_MEMORY"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INSUFFICIENT_PERMISSIONS: return "CTL_RESULT_ERROR_INSUFFICIENT_PERMISSIONS"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_NOT_AVAILABLE: return "CTL_RESULT_ERROR_NOT_AVAILABLE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNINITIALIZED: return "CTL_RESULT_ERROR_UNINITIALIZED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_VERSION: return "CTL_RESULT_ERROR_UNSUPPORTED_VERSION"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_FEATURE: return "CTL_RESULT_ERROR_UNSUPPORTED_FEATURE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_ARGUMENT: return "CTL_RESULT_ERROR_INVALID_ARGUMENT"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_API_HANDLE: return "CTL_RESULT_ERROR_INVALID_API_HANDLE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_NULL_HANDLE: return "CTL_RESULT_ERROR_INVALID_NULL_HANDLE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_NULL_POINTER: return "CTL_RESULT_ERROR_INVALID_NULL_POINTER"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_SIZE: return "CTL_RESULT_ERROR_INVALID_SIZE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_SIZE: return "CTL_RESULT_ERROR_UNSUPPORTED_SIZE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT: return "CTL_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DATA_READ: return "CTL_RESULT_ERROR_DATA_READ"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DATA_WRITE: return "CTL_RESULT_ERROR_DATA_WRITE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DATA_NOT_FOUND: return "CTL_RESULT_ERROR_DATA_NOT_FOUND"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_NOT_IMPLEMENTED: return "CTL_RESULT_ERROR_NOT_IMPLEMENTED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_OS_CALL: return "CTL_RESULT_ERROR_OS_CALL"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_KMD_CALL: return "CTL_RESULT_ERROR_KMD_CALL"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNLOAD: return "CTL_RESULT_ERROR_UNLOAD"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_ZE_LOADER: return "CTL_RESULT_ERROR_ZE_LOADER"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_OPERATION_TYPE: return "CTL_RESULT_ERROR_INVALID_OPERATION_TYPE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_NULL_OS_INTERFACE: return "CTL_RESULT_ERROR_NULL_OS_INTERFACE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_NULL_OS_ADAPATER_HANDLE: return "CTL_RESULT_ERROR_NULL_OS_ADAPATER_HANDLE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_NULL_OS_DISPLAY_OUTPUT_HANDLE: return "CTL_RESULT_ERROR_NULL_OS_DISPLAY_OUTPUT_HANDLE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_WAIT_TIMEOUT: return "CTL_RESULT_ERROR_WAIT_TIMEOUT"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_PERSISTANCE_NOT_SUPPORTED: return "CTL_RESULT_ERROR_PERSISTANCE_NOT_SUPPORTED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_PLATFORM_NOT_SUPPORTED: return "CTL_RESULT_ERROR_PLATFORM_NOT_SUPPORTED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNKNOWN_APPLICATION_UID: return "CTL_RESULT_ERROR_UNKNOWN_APPLICATION_UID"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_ENUMERATION: return "CTL_RESULT_ERROR_INVALID_ENUMERATION"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_FILE_DELETE: return "CTL_RESULT_ERROR_FILE_DELETE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_RESET_DEVICE_REQUIRED: return "CTL_RESULT_ERROR_RESET_DEVICE_REQUIRED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_FULL_REBOOT_REQUIRED: return "CTL_RESULT_ERROR_FULL_REBOOT_REQUIRED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_LOAD: return "CTL_RESULT_ERROR_LOAD"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_UNKNOWN: return "CTL_RESULT_ERROR_UNKNOWN"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_RETRY_OPERATION: return "CTL_RESULT_ERROR_RETRY_OPERATION"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_IGSC_LOADER: return "CTL_RESULT_ERROR_IGSC_LOADER"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_RESTRICTED_APPLICATION: return "CTL_RESULT_ERROR_RESTRICTED_APPLICATION"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_START: return "CTL_RESULT_ERROR_CORE_START"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_NOT_SUPPORTED: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_NOT_SUPPORTED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_VOLTAGE_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_VOLTAGE_OUTSIDE_RANGE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_FREQUENCY_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_FREQUENCY_OUTSIDE_RANGE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_POWER_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_POWER_OUTSIDE_RANGE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_TEMPERATURE_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_TEMPERATURE_OUTSIDE_RANGE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_IN_VOLTAGE_LOCKED_MODE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_IN_VOLTAGE_LOCKED_MODE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_RESET_REQUIRED: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_RESET_REQUIRED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_WAIVER_NOT_SET: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_WAIVER_NOT_SET"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_DEPRECATED_API: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_DEPRECATED_API"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_LED_GET_STATE_NOT_SUPPORTED_FOR_I2C_LED: return "CTL_RESULT_ERROR_CORE_LED_GET_STATE_NOT_SUPPORTED_FOR_I2C_LED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_LED_SET_STATE_NOT_SUPPORTED_FOR_I2C_LED: return "CTL_RESULT_ERROR_CORE_LED_SET_STATE_NOT_SUPPORTED_FOR_I2C_LED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_LED_TOO_FREQUENT_SET_REQUESTS: return "CTL_RESULT_ERROR_CORE_LED_TOO_FREQUENT_SET_REQUESTS"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_VRAM_MEMORY_SPEED_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_VRAM_MEMORY_SPEED_OUTSIDE_RANGE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_INVALID_CUSTOM_VF_CURVE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_INVALID_CUSTOM_VF_CURVE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CORE_END: return "CTL_RESULT_ERROR_CORE_END"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3D_START: return "CTL_RESULT_ERROR_3D_START"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3D_END: return "CTL_RESULT_ERROR_3D_END"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_MEDIA_START: return "CTL_RESULT_ERROR_MEDIA_START"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_MEDIA_END: return "CTL_RESULT_ERROR_MEDIA_END"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_START: return "CTL_RESULT_ERROR_DISPLAY_START"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_AUX_ACCESS_FLAG: return "CTL_RESULT_ERROR_INVALID_AUX_ACCESS_FLAG"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_SHARPNESS_FILTER_FLAG: return "CTL_RESULT_ERROR_INVALID_SHARPNESS_FILTER_FLAG"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_NOT_ATTACHED: return "CTL_RESULT_ERROR_DISPLAY_NOT_ATTACHED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_NOT_ACTIVE: return "CTL_RESULT_ERROR_DISPLAY_NOT_ACTIVE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_POWERFEATURE_OPTIMIZATION_FLAG: return "CTL_RESULT_ERROR_INVALID_POWERFEATURE_OPTIMIZATION_FLAG"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_POWERSOURCE_TYPE_FOR_DPST: return "CTL_RESULT_ERROR_INVALID_POWERSOURCE_TYPE_FOR_DPST"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_GET_CONFIG_QUERY_TYPE: return "CTL_RESULT_ERROR_INVALID_PIXTX_GET_CONFIG_QUERY_TYPE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_SET_CONFIG_OPERATION_TYPE: return "CTL_RESULT_ERROR_INVALID_PIXTX_SET_CONFIG_OPERATION_TYPE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_SET_CONFIG_NUMBER_OF_SAMPLES: return "CTL_RESULT_ERROR_INVALID_SET_CONFIG_NUMBER_OF_SAMPLES"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_ID: return "CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_ID"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_TYPE: return "CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_TYPE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_NUMBER: return "CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_NUMBER"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_INSUFFICIENT_PIXTX_BLOCK_CONFIG_MEMORY: return "CTL_RESULT_ERROR_INSUFFICIENT_PIXTX_BLOCK_CONFIG_MEMORY"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_INVALID_PIPE: return "CTL_RESULT_ERROR_3DLUT_INVALID_PIPE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_INVALID_DATA: return "CTL_RESULT_ERROR_3DLUT_INVALID_DATA"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_NOT_SUPPORTED_IN_HDR: return "CTL_RESULT_ERROR_3DLUT_NOT_SUPPORTED_IN_HDR"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_INVALID_OPERATION: return "CTL_RESULT_ERROR_3DLUT_INVALID_OPERATION"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_UNSUCCESSFUL: return "CTL_RESULT_ERROR_3DLUT_UNSUCCESSFUL"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_AUX_DEFER: return "CTL_RESULT_ERROR_AUX_DEFER"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_AUX_TIMEOUT: return "CTL_RESULT_ERROR_AUX_TIMEOUT"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_AUX_INCOMPLETE_WRITE: return "CTL_RESULT_ERROR_AUX_INCOMPLETE_WRITE"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_I2C_AUX_STATUS_UNKNOWN: return "CTL_RESULT_ERROR_I2C_AUX_STATUS_UNKNOWN"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_I2C_AUX_UNSUCCESSFUL: return "CTL_RESULT_ERROR_I2C_AUX_UNSUCCESSFUL"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_LACE_INVALID_DATA_ARGUMENT_PASSED: return "CTL_RESULT_ERROR_LACE_INVALID_DATA_ARGUMENT_PASSED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_EXTERNAL_DISPLAY_ATTACHED: return "CTL_RESULT_ERROR_EXTERNAL_DISPLAY_ATTACHED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CUSTOM_MODE_STANDARD_CUSTOM_MODE_EXISTS: return "CTL_RESULT_ERROR_CUSTOM_MODE_STANDARD_CUSTOM_MODE_EXISTS"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CUSTOM_MODE_NON_CUSTOM_MATCHING_MODE_EXISTS: return "CTL_RESULT_ERROR_CUSTOM_MODE_NON_CUSTOM_MATCHING_MODE_EXISTS"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_CUSTOM_MODE_INSUFFICIENT_MEMORY: return "CTL_RESULT_ERROR_CUSTOM_MODE_INSUFFICIENT_MEMORY"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_ADAPTER_ALREADY_LINKED: return "CTL_RESULT_ERROR_ADAPTER_ALREADY_LINKED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_ADAPTER_NOT_IDENTICAL: return "CTL_RESULT_ERROR_ADAPTER_NOT_IDENTICAL"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_ADAPTER_NOT_SUPPORTED_ON_LDA_SECONDARY: return "CTL_RESULT_ERROR_ADAPTER_NOT_SUPPORTED_ON_LDA_SECONDARY"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_SET_FBC_FEATURE_NOT_SUPPORTED: return "CTL_RESULT_ERROR_SET_FBC_FEATURE_NOT_SUPPORTED"s;
-			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_END: return "CTL_RESULT_ERROR_DISPLAY_END"s;
-			case _ctl_result_t::CTL_RESULT_MAX: return "CTL_RESULT_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_units_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_units_t*>(pEnum);
-			switch (e) {
-			case _ctl_units_t::CTL_UNITS_FREQUENCY_MHZ: return "CTL_UNITS_FREQUENCY_MHZ"s;
-			case _ctl_units_t::CTL_UNITS_OPERATIONS_GTS: return "CTL_UNITS_OPERATIONS_GTS"s;
-			case _ctl_units_t::CTL_UNITS_OPERATIONS_MTS: return "CTL_UNITS_OPERATIONS_MTS"s;
-			case _ctl_units_t::CTL_UNITS_VOLTAGE_VOLTS: return "CTL_UNITS_VOLTAGE_VOLTS"s;
-			case _ctl_units_t::CTL_UNITS_POWER_WATTS: return "CTL_UNITS_POWER_WATTS"s;
-			case _ctl_units_t::CTL_UNITS_TEMPERATURE_CELSIUS: return "CTL_UNITS_TEMPERATURE_CELSIUS"s;
-			case _ctl_units_t::CTL_UNITS_ENERGY_JOULES: return "CTL_UNITS_ENERGY_JOULES"s;
-			case _ctl_units_t::CTL_UNITS_TIME_SECONDS: return "CTL_UNITS_TIME_SECONDS"s;
-			case _ctl_units_t::CTL_UNITS_MEMORY_BYTES: return "CTL_UNITS_MEMORY_BYTES"s;
-			case _ctl_units_t::CTL_UNITS_ANGULAR_SPEED_RPM: return "CTL_UNITS_ANGULAR_SPEED_RPM"s;
-			case _ctl_units_t::CTL_UNITS_POWER_MILLIWATTS: return "CTL_UNITS_POWER_MILLIWATTS"s;
-			case _ctl_units_t::CTL_UNITS_PERCENT: return "CTL_UNITS_PERCENT"s;
-			case _ctl_units_t::CTL_UNITS_MEM_SPEED_GBPS: return "CTL_UNITS_MEM_SPEED_GBPS"s;
-			case _ctl_units_t::CTL_UNITS_VOLTAGE_MILLIVOLTS: return "CTL_UNITS_VOLTAGE_MILLIVOLTS"s;
-			case _ctl_units_t::CTL_UNITS_BANDWIDTH_MBPS: return "CTL_UNITS_BANDWIDTH_MBPS"s;
-			case _ctl_units_t::CTL_UNITS_UNKNOWN: return "CTL_UNITS_UNKNOWN"s;
-			case _ctl_units_t::CTL_UNITS_MAX: return "CTL_UNITS_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_data_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_data_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_data_type_t::CTL_DATA_TYPE_INT8: return "CTL_DATA_TYPE_INT8"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_UINT8: return "CTL_DATA_TYPE_UINT8"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_INT16: return "CTL_DATA_TYPE_INT16"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_UINT16: return "CTL_DATA_TYPE_UINT16"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_INT32: return "CTL_DATA_TYPE_INT32"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_UINT32: return "CTL_DATA_TYPE_UINT32"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_INT64: return "CTL_DATA_TYPE_INT64"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_UINT64: return "CTL_DATA_TYPE_UINT64"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_FLOAT: return "CTL_DATA_TYPE_FLOAT"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_DOUBLE: return "CTL_DATA_TYPE_DOUBLE"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_STRING_ASCII: return "CTL_DATA_TYPE_STRING_ASCII"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_STRING_UTF16: return "CTL_DATA_TYPE_STRING_UTF16"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_STRING_UTF132: return "CTL_DATA_TYPE_STRING_UTF132"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_UNKNOWN: return "CTL_DATA_TYPE_UNKNOWN"s;
-			case _ctl_data_type_t::CTL_DATA_TYPE_MAX: return "CTL_DATA_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_supported_functions_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_supported_functions_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_supported_functions_flag_t::CTL_SUPPORTED_FUNCTIONS_FLAG_DISPLAY: return "CTL_SUPPORTED_FUNCTIONS_FLAG_DISPLAY"s;
-			case _ctl_supported_functions_flag_t::CTL_SUPPORTED_FUNCTIONS_FLAG_3D: return "CTL_SUPPORTED_FUNCTIONS_FLAG_3D"s;
-			case _ctl_supported_functions_flag_t::CTL_SUPPORTED_FUNCTIONS_FLAG_MEDIA: return "CTL_SUPPORTED_FUNCTIONS_FLAG_MEDIA"s;
-			case _ctl_supported_functions_flag_t::CTL_SUPPORTED_FUNCTIONS_FLAG_MAX: return "CTL_SUPPORTED_FUNCTIONS_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_device_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_device_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_device_type_t::CTL_DEVICE_TYPE_GRAPHICS: return "CTL_DEVICE_TYPE_GRAPHICS"s;
-			case _ctl_device_type_t::CTL_DEVICE_TYPE_SYSTEM: return "CTL_DEVICE_TYPE_SYSTEM"s;
-			case _ctl_device_type_t::CTL_DEVICE_TYPE_MAX: return "CTL_DEVICE_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_adapter_properties_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_adapter_properties_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_adapter_properties_flag_t::CTL_ADAPTER_PROPERTIES_FLAG_INTEGRATED: return "CTL_ADAPTER_PROPERTIES_FLAG_INTEGRATED"s;
-			case _ctl_adapter_properties_flag_t::CTL_ADAPTER_PROPERTIES_FLAG_LDA_PRIMARY: return "CTL_ADAPTER_PROPERTIES_FLAG_LDA_PRIMARY"s;
-			case _ctl_adapter_properties_flag_t::CTL_ADAPTER_PROPERTIES_FLAG_LDA_SECONDARY: return "CTL_ADAPTER_PROPERTIES_FLAG_LDA_SECONDARY"s;
-			case _ctl_adapter_properties_flag_t::CTL_ADAPTER_PROPERTIES_FLAG_MAX: return "CTL_ADAPTER_PROPERTIES_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_operation_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_operation_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_operation_type_t::CTL_OPERATION_TYPE_READ: return "CTL_OPERATION_TYPE_READ"s;
-			case _ctl_operation_type_t::CTL_OPERATION_TYPE_WRITE: return "CTL_OPERATION_TYPE_WRITE"s;
-			case _ctl_operation_type_t::CTL_OPERATION_TYPE_MAX: return "CTL_OPERATION_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_property_type_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_property_type_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_property_type_flag_t::CTL_PROPERTY_TYPE_FLAG_DISPLAY: return "CTL_PROPERTY_TYPE_FLAG_DISPLAY"s;
-			case _ctl_property_type_flag_t::CTL_PROPERTY_TYPE_FLAG_3D: return "CTL_PROPERTY_TYPE_FLAG_3D"s;
-			case _ctl_property_type_flag_t::CTL_PROPERTY_TYPE_FLAG_MEDIA: return "CTL_PROPERTY_TYPE_FLAG_MEDIA"s;
-			case _ctl_property_type_flag_t::CTL_PROPERTY_TYPE_FLAG_CORE: return "CTL_PROPERTY_TYPE_FLAG_CORE"s;
-			case _ctl_property_type_flag_t::CTL_PROPERTY_TYPE_FLAG_MAX: return "CTL_PROPERTY_TYPE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_orientation_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_orientation_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_orientation_t::CTL_DISPLAY_ORIENTATION_0: return "CTL_DISPLAY_ORIENTATION_0"s;
-			case _ctl_display_orientation_t::CTL_DISPLAY_ORIENTATION_90: return "CTL_DISPLAY_ORIENTATION_90"s;
-			case _ctl_display_orientation_t::CTL_DISPLAY_ORIENTATION_180: return "CTL_DISPLAY_ORIENTATION_180"s;
-			case _ctl_display_orientation_t::CTL_DISPLAY_ORIENTATION_270: return "CTL_DISPLAY_ORIENTATION_270"s;
-			case _ctl_display_orientation_t::CTL_DISPLAY_ORIENTATION_MAX: return "CTL_DISPLAY_ORIENTATION_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_endurance_gaming_control_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_endurance_gaming_control_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_endurance_gaming_control_t::CTL_3D_ENDURANCE_GAMING_CONTROL_TURN_OFF: return "CTL_3D_ENDURANCE_GAMING_CONTROL_TURN_OFF"s;
-			case _ctl_3d_endurance_gaming_control_t::CTL_3D_ENDURANCE_GAMING_CONTROL_TURN_ON: return "CTL_3D_ENDURANCE_GAMING_CONTROL_TURN_ON"s;
-			case _ctl_3d_endurance_gaming_control_t::CTL_3D_ENDURANCE_GAMING_CONTROL_AUTO: return "CTL_3D_ENDURANCE_GAMING_CONTROL_AUTO"s;
-			case _ctl_3d_endurance_gaming_control_t::CTL_3D_ENDURANCE_GAMING_CONTROL_MAX: return "CTL_3D_ENDURANCE_GAMING_CONTROL_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_endurance_gaming_mode_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_endurance_gaming_mode_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_endurance_gaming_mode_t::CTL_3D_ENDURANCE_GAMING_MODE_BETTER_PERFORMANCE: return "CTL_3D_ENDURANCE_GAMING_MODE_BETTER_PERFORMANCE"s;
-			case _ctl_3d_endurance_gaming_mode_t::CTL_3D_ENDURANCE_GAMING_MODE_BALANCED: return "CTL_3D_ENDURANCE_GAMING_MODE_BALANCED"s;
-			case _ctl_3d_endurance_gaming_mode_t::CTL_3D_ENDURANCE_GAMING_MODE_MAXIMUM_BATTERY: return "CTL_3D_ENDURANCE_GAMING_MODE_MAXIMUM_BATTERY"s;
-			case _ctl_3d_endurance_gaming_mode_t::CTL_3D_ENDURANCE_GAMING_MODE_MAX: return "CTL_3D_ENDURANCE_GAMING_MODE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_tier_type_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_tier_type_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_tier_type_flag_t::CTL_3D_TIER_TYPE_FLAG_COMPATIBILITY: return "CTL_3D_TIER_TYPE_FLAG_COMPATIBILITY"s;
-			case _ctl_3d_tier_type_flag_t::CTL_3D_TIER_TYPE_FLAG_PERFORMANCE: return "CTL_3D_TIER_TYPE_FLAG_PERFORMANCE"s;
-			case _ctl_3d_tier_type_flag_t::CTL_3D_TIER_TYPE_FLAG_MAX: return "CTL_3D_TIER_TYPE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_tier_profile_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_tier_profile_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_tier_profile_flag_t::CTL_3D_TIER_PROFILE_FLAG_TIER_1: return "CTL_3D_TIER_PROFILE_FLAG_TIER_1"s;
-			case _ctl_3d_tier_profile_flag_t::CTL_3D_TIER_PROFILE_FLAG_TIER_2: return "CTL_3D_TIER_PROFILE_FLAG_TIER_2"s;
-			case _ctl_3d_tier_profile_flag_t::CTL_3D_TIER_PROFILE_FLAG_TIER_RECOMMENDED: return "CTL_3D_TIER_PROFILE_FLAG_TIER_RECOMMENDED"s;
-			case _ctl_3d_tier_profile_flag_t::CTL_3D_TIER_PROFILE_FLAG_MAX: return "CTL_3D_TIER_PROFILE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_feature_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_feature_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_FRAME_PACING: return "CTL_3D_FEATURE_FRAME_PACING"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_ENDURANCE_GAMING: return "CTL_3D_FEATURE_ENDURANCE_GAMING"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_FRAME_LIMIT: return "CTL_3D_FEATURE_FRAME_LIMIT"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_ANISOTROPIC: return "CTL_3D_FEATURE_ANISOTROPIC"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_CMAA: return "CTL_3D_FEATURE_CMAA"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_TEXTURE_FILTERING_QUALITY: return "CTL_3D_FEATURE_TEXTURE_FILTERING_QUALITY"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_ADAPTIVE_TESSELLATION: return "CTL_3D_FEATURE_ADAPTIVE_TESSELLATION"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_SHARPENING_FILTER: return "CTL_3D_FEATURE_SHARPENING_FILTER"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_MSAA: return "CTL_3D_FEATURE_MSAA"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_GAMING_FLIP_MODES: return "CTL_3D_FEATURE_GAMING_FLIP_MODES"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_ADAPTIVE_SYNC_PLUS: return "CTL_3D_FEATURE_ADAPTIVE_SYNC_PLUS"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_APP_PROFILES: return "CTL_3D_FEATURE_APP_PROFILES"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_APP_PROFILE_DETAILS: return "CTL_3D_FEATURE_APP_PROFILE_DETAILS"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_EMULATED_TYPED_64BIT_ATOMICS: return "CTL_3D_FEATURE_EMULATED_TYPED_64BIT_ATOMICS"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_VRR_WINDOWED_BLT: return "CTL_3D_FEATURE_VRR_WINDOWED_BLT"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_GLOBAL_OR_PER_APP: return "CTL_3D_FEATURE_GLOBAL_OR_PER_APP"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_LOW_LATENCY: return "CTL_3D_FEATURE_LOW_LATENCY"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_FRAME_GENERATION: return "CTL_3D_FEATURE_FRAME_GENERATION"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_PREBUILT_SHADER_DOWNLOAD: return "CTL_3D_FEATURE_PREBUILT_SHADER_DOWNLOAD"s;
-			case _ctl_3d_feature_t::CTL_3D_FEATURE_MAX: return "CTL_3D_FEATURE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_signal_standard_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_signal_standard_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_UNKNOWN: return "CTL_SIGNAL_STANDARD_TYPE_UNKNOWN"s;
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_CUSTOM: return "CTL_SIGNAL_STANDARD_TYPE_CUSTOM"s;
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_DMT: return "CTL_SIGNAL_STANDARD_TYPE_DMT"s;
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_GTF: return "CTL_SIGNAL_STANDARD_TYPE_GTF"s;
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_CVT: return "CTL_SIGNAL_STANDARD_TYPE_CVT"s;
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_CTA: return "CTL_SIGNAL_STANDARD_TYPE_CTA"s;
-			case _ctl_signal_standard_type_t::CTL_SIGNAL_STANDARD_TYPE_MAX: return "CTL_SIGNAL_STANDARD_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_output_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_output_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_INVALID: return "CTL_DISPLAY_OUTPUT_TYPES_INVALID"s;
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_DISPLAYPORT: return "CTL_DISPLAY_OUTPUT_TYPES_DISPLAYPORT"s;
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_HDMI: return "CTL_DISPLAY_OUTPUT_TYPES_HDMI"s;
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_DVI: return "CTL_DISPLAY_OUTPUT_TYPES_DVI"s;
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_MIPI: return "CTL_DISPLAY_OUTPUT_TYPES_MIPI"s;
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_CRT: return "CTL_DISPLAY_OUTPUT_TYPES_CRT"s;
-			case _ctl_display_output_types_t::CTL_DISPLAY_OUTPUT_TYPES_MAX: return "CTL_DISPLAY_OUTPUT_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_attached_display_mux_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_attached_display_mux_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_attached_display_mux_type_t::CTL_ATTACHED_DISPLAY_MUX_TYPE_NATIVE: return "CTL_ATTACHED_DISPLAY_MUX_TYPE_NATIVE"s;
-			case _ctl_attached_display_mux_type_t::CTL_ATTACHED_DISPLAY_MUX_TYPE_THUNDERBOLT: return "CTL_ATTACHED_DISPLAY_MUX_TYPE_THUNDERBOLT"s;
-			case _ctl_attached_display_mux_type_t::CTL_ATTACHED_DISPLAY_MUX_TYPE_TYPE_C: return "CTL_ATTACHED_DISPLAY_MUX_TYPE_TYPE_C"s;
-			case _ctl_attached_display_mux_type_t::CTL_ATTACHED_DISPLAY_MUX_TYPE_USB4: return "CTL_ATTACHED_DISPLAY_MUX_TYPE_USB4"s;
-			case _ctl_attached_display_mux_type_t::CTL_ATTACHED_DISPLAY_MUX_TYPE_MAX: return "CTL_ATTACHED_DISPLAY_MUX_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_power_optimization_plan_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_power_optimization_plan_t*>(pEnum);
-			switch (e) {
-			case _ctl_power_optimization_plan_t::CTL_POWER_OPTIMIZATION_PLAN_BALANCED: return "CTL_POWER_OPTIMIZATION_PLAN_BALANCED"s;
-			case _ctl_power_optimization_plan_t::CTL_POWER_OPTIMIZATION_PLAN_HIGH_PERFORMANCE: return "CTL_POWER_OPTIMIZATION_PLAN_HIGH_PERFORMANCE"s;
-			case _ctl_power_optimization_plan_t::CTL_POWER_OPTIMIZATION_PLAN_POWER_SAVER: return "CTL_POWER_OPTIMIZATION_PLAN_POWER_SAVER"s;
-			case _ctl_power_optimization_plan_t::CTL_POWER_OPTIMIZATION_PLAN_MAX: return "CTL_POWER_OPTIMIZATION_PLAN_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_power_source_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_power_source_t*>(pEnum);
-			switch (e) {
-			case _ctl_power_source_t::CTL_POWER_SOURCE_AC: return "CTL_POWER_SOURCE_AC"s;
-			case _ctl_power_source_t::CTL_POWER_SOURCE_DC: return "CTL_POWER_SOURCE_DC"s;
-			case _ctl_power_source_t::CTL_POWER_SOURCE_MAX: return "CTL_POWER_SOURCE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_gamma_encoding_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_gamma_encoding_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_gamma_encoding_type_t::CTL_PIXTX_GAMMA_ENCODING_TYPE_SRGB: return "CTL_PIXTX_GAMMA_ENCODING_TYPE_SRGB"s;
-			case _ctl_pixtx_gamma_encoding_type_t::CTL_PIXTX_GAMMA_ENCODING_TYPE_REC709: return "CTL_PIXTX_GAMMA_ENCODING_TYPE_REC709"s;
-			case _ctl_pixtx_gamma_encoding_type_t::CTL_PIXTX_GAMMA_ENCODING_TYPE_ST2084: return "CTL_PIXTX_GAMMA_ENCODING_TYPE_ST2084"s;
-			case _ctl_pixtx_gamma_encoding_type_t::CTL_PIXTX_GAMMA_ENCODING_TYPE_HLG: return "CTL_PIXTX_GAMMA_ENCODING_TYPE_HLG"s;
-			case _ctl_pixtx_gamma_encoding_type_t::CTL_PIXTX_GAMMA_ENCODING_TYPE_LINEAR: return "CTL_PIXTX_GAMMA_ENCODING_TYPE_LINEAR"s;
-			case _ctl_pixtx_gamma_encoding_type_t::CTL_PIXTX_GAMMA_ENCODING_TYPE_MAX: return "CTL_PIXTX_GAMMA_ENCODING_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_color_space_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_color_space_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_REC709: return "CTL_PIXTX_COLOR_SPACE_REC709"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_REC2020: return "CTL_PIXTX_COLOR_SPACE_REC2020"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_ADOBE_RGB: return "CTL_PIXTX_COLOR_SPACE_ADOBE_RGB"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_P3_D65: return "CTL_PIXTX_COLOR_SPACE_P3_D65"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_P3_DCI: return "CTL_PIXTX_COLOR_SPACE_P3_DCI"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_P3_D60: return "CTL_PIXTX_COLOR_SPACE_P3_D60"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_CUSTOM: return "CTL_PIXTX_COLOR_SPACE_CUSTOM"s;
-			case _ctl_pixtx_color_space_t::CTL_PIXTX_COLOR_SPACE_MAX: return "CTL_PIXTX_COLOR_SPACE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_color_model_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_color_model_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_RGB_FR: return "CTL_PIXTX_COLOR_MODEL_RGB_FR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_RGB_LR: return "CTL_PIXTX_COLOR_MODEL_RGB_LR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_YCBCR_422_FR: return "CTL_PIXTX_COLOR_MODEL_YCBCR_422_FR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_YCBCR_422_LR: return "CTL_PIXTX_COLOR_MODEL_YCBCR_422_LR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_YCBCR_420_FR: return "CTL_PIXTX_COLOR_MODEL_YCBCR_420_FR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_YCBCR_420_LR: return "CTL_PIXTX_COLOR_MODEL_YCBCR_420_LR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_YCBCR_444_FR: return "CTL_PIXTX_COLOR_MODEL_YCBCR_444_FR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_YCBCR_444_LR: return "CTL_PIXTX_COLOR_MODEL_YCBCR_444_LR"s;
-			case _ctl_pixtx_color_model_t::CTL_PIXTX_COLOR_MODEL_MAX: return "CTL_PIXTX_COLOR_MODEL_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_lut_sampling_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_lut_sampling_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_lut_sampling_type_t::CTL_PIXTX_LUT_SAMPLING_TYPE_UNIFORM: return "CTL_PIXTX_LUT_SAMPLING_TYPE_UNIFORM"s;
-			case _ctl_pixtx_lut_sampling_type_t::CTL_PIXTX_LUT_SAMPLING_TYPE_NONUNIFORM: return "CTL_PIXTX_LUT_SAMPLING_TYPE_NONUNIFORM"s;
-			case _ctl_pixtx_lut_sampling_type_t::CTL_PIXTX_LUT_SAMPLING_TYPE_MAX: return "CTL_PIXTX_LUT_SAMPLING_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_block_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_block_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_block_type_t::CTL_PIXTX_BLOCK_TYPE_1D_LUT: return "CTL_PIXTX_BLOCK_TYPE_1D_LUT"s;
-			case _ctl_pixtx_block_type_t::CTL_PIXTX_BLOCK_TYPE_3D_LUT: return "CTL_PIXTX_BLOCK_TYPE_3D_LUT"s;
-			case _ctl_pixtx_block_type_t::CTL_PIXTX_BLOCK_TYPE_3X3_MATRIX: return "CTL_PIXTX_BLOCK_TYPE_3X3_MATRIX"s;
-			case _ctl_pixtx_block_type_t::CTL_PIXTX_BLOCK_TYPE_3X3_MATRIX_AND_OFFSETS: return "CTL_PIXTX_BLOCK_TYPE_3X3_MATRIX_AND_OFFSETS"s;
-			case _ctl_pixtx_block_type_t::CTL_PIXTX_BLOCK_TYPE_MAX: return "CTL_PIXTX_BLOCK_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_config_query_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_config_query_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_config_query_type_t::CTL_PIXTX_CONFIG_QUERY_TYPE_CAPABILITY: return "CTL_PIXTX_CONFIG_QUERY_TYPE_CAPABILITY"s;
-			case _ctl_pixtx_config_query_type_t::CTL_PIXTX_CONFIG_QUERY_TYPE_CURRENT: return "CTL_PIXTX_CONFIG_QUERY_TYPE_CURRENT"s;
-			case _ctl_pixtx_config_query_type_t::CTL_PIXTX_CONFIG_QUERY_TYPE_MAX: return "CTL_PIXTX_CONFIG_QUERY_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_config_opertaion_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_config_opertaion_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_config_opertaion_type_t::CTL_PIXTX_CONFIG_OPERTAION_TYPE_RESTORE_DEFAULT: return "CTL_PIXTX_CONFIG_OPERTAION_TYPE_RESTORE_DEFAULT"s;
-			case _ctl_pixtx_config_opertaion_type_t::CTL_PIXTX_CONFIG_OPERTAION_TYPE_SET_CUSTOM: return "CTL_PIXTX_CONFIG_OPERTAION_TYPE_SET_CUSTOM"s;
-			case _ctl_pixtx_config_opertaion_type_t::CTL_PIXTX_CONFIG_OPERTAION_TYPE_MAX: return "CTL_PIXTX_CONFIG_OPERTAION_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_set_operation_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_set_operation_t*>(pEnum);
-			switch (e) {
-			case _ctl_set_operation_t::CTL_SET_OPERATION_RESTORE_DEFAULT: return "CTL_SET_OPERATION_RESTORE_DEFAULT"s;
-			case _ctl_set_operation_t::CTL_SET_OPERATION_CUSTOM: return "CTL_SET_OPERATION_CUSTOM"s;
-			case _ctl_set_operation_t::CTL_SET_OPERATION_MAX: return "CTL_SET_OPERATION_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_intel_arc_sync_profile_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_intel_arc_sync_profile_t*>(pEnum);
-			switch (e) {
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_INVALID: return "CTL_INTEL_ARC_SYNC_PROFILE_INVALID"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_RECOMMENDED: return "CTL_INTEL_ARC_SYNC_PROFILE_RECOMMENDED"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_EXCELLENT: return "CTL_INTEL_ARC_SYNC_PROFILE_EXCELLENT"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_GOOD: return "CTL_INTEL_ARC_SYNC_PROFILE_GOOD"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_COMPATIBLE: return "CTL_INTEL_ARC_SYNC_PROFILE_COMPATIBLE"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_OFF: return "CTL_INTEL_ARC_SYNC_PROFILE_OFF"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_VESA: return "CTL_INTEL_ARC_SYNC_PROFILE_VESA"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_CUSTOM: return "CTL_INTEL_ARC_SYNC_PROFILE_CUSTOM"s;
-			case _ctl_intel_arc_sync_profile_t::CTL_INTEL_ARC_SYNC_PROFILE_MAX: return "CTL_INTEL_ARC_SYNC_PROFILE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_edid_management_optype_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_edid_management_optype_t*>(pEnum);
-			switch (e) {
-			case _ctl_edid_management_optype_t::CTL_EDID_MANAGEMENT_OPTYPE_READ_EDID: return "CTL_EDID_MANAGEMENT_OPTYPE_READ_EDID"s;
-			case _ctl_edid_management_optype_t::CTL_EDID_MANAGEMENT_OPTYPE_LOCK_EDID: return "CTL_EDID_MANAGEMENT_OPTYPE_LOCK_EDID"s;
-			case _ctl_edid_management_optype_t::CTL_EDID_MANAGEMENT_OPTYPE_UNLOCK_EDID: return "CTL_EDID_MANAGEMENT_OPTYPE_UNLOCK_EDID"s;
-			case _ctl_edid_management_optype_t::CTL_EDID_MANAGEMENT_OPTYPE_OVERRIDE_EDID: return "CTL_EDID_MANAGEMENT_OPTYPE_OVERRIDE_EDID"s;
-			case _ctl_edid_management_optype_t::CTL_EDID_MANAGEMENT_OPTYPE_UNDO_OVERRIDE_EDID: return "CTL_EDID_MANAGEMENT_OPTYPE_UNDO_OVERRIDE_EDID"s;
-			case _ctl_edid_management_optype_t::CTL_EDID_MANAGEMENT_OPTYPE_MAX: return "CTL_EDID_MANAGEMENT_OPTYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_edid_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_edid_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_edid_type_t::CTL_EDID_TYPE_CURRENT: return "CTL_EDID_TYPE_CURRENT"s;
-			case _ctl_edid_type_t::CTL_EDID_TYPE_OVERRIDE: return "CTL_EDID_TYPE_OVERRIDE"s;
-			case _ctl_edid_type_t::CTL_EDID_TYPE_MONITOR: return "CTL_EDID_TYPE_MONITOR"s;
-			case _ctl_edid_type_t::CTL_EDID_TYPE_MAX: return "CTL_EDID_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_custom_mode_operation_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_custom_mode_operation_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_custom_mode_operation_types_t::CTL_CUSTOM_MODE_OPERATION_TYPES_GET_CUSTOM_SOURCE_MODES: return "CTL_CUSTOM_MODE_OPERATION_TYPES_GET_CUSTOM_SOURCE_MODES"s;
-			case _ctl_custom_mode_operation_types_t::CTL_CUSTOM_MODE_OPERATION_TYPES_ADD_CUSTOM_SOURCE_MODE: return "CTL_CUSTOM_MODE_OPERATION_TYPES_ADD_CUSTOM_SOURCE_MODE"s;
-			case _ctl_custom_mode_operation_types_t::CTL_CUSTOM_MODE_OPERATION_TYPES_REMOVE_CUSTOM_SOURCE_MODES: return "CTL_CUSTOM_MODE_OPERATION_TYPES_REMOVE_CUSTOM_SOURCE_MODES"s;
-			case _ctl_custom_mode_operation_types_t::CTL_CUSTOM_MODE_OPERATION_TYPES_MAX: return "CTL_CUSTOM_MODE_OPERATION_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_combined_display_optype_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_combined_display_optype_t*>(pEnum);
-			switch (e) {
-			case _ctl_combined_display_optype_t::CTL_COMBINED_DISPLAY_OPTYPE_IS_SUPPORTED_CONFIG: return "CTL_COMBINED_DISPLAY_OPTYPE_IS_SUPPORTED_CONFIG"s;
-			case _ctl_combined_display_optype_t::CTL_COMBINED_DISPLAY_OPTYPE_ENABLE: return "CTL_COMBINED_DISPLAY_OPTYPE_ENABLE"s;
-			case _ctl_combined_display_optype_t::CTL_COMBINED_DISPLAY_OPTYPE_DISABLE: return "CTL_COMBINED_DISPLAY_OPTYPE_DISABLE"s;
-			case _ctl_combined_display_optype_t::CTL_COMBINED_DISPLAY_OPTYPE_QUERY_CONFIG: return "CTL_COMBINED_DISPLAY_OPTYPE_QUERY_CONFIG"s;
-			case _ctl_combined_display_optype_t::CTL_COMBINED_DISPLAY_OPTYPE_MAX: return "CTL_COMBINED_DISPLAY_OPTYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_genlock_operation_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_genlock_operation_t*>(pEnum);
-			switch (e) {
-			case _ctl_genlock_operation_t::CTL_GENLOCK_OPERATION_GET_TIMING_DETAILS: return "CTL_GENLOCK_OPERATION_GET_TIMING_DETAILS"s;
-			case _ctl_genlock_operation_t::CTL_GENLOCK_OPERATION_VALIDATE: return "CTL_GENLOCK_OPERATION_VALIDATE"s;
-			case _ctl_genlock_operation_t::CTL_GENLOCK_OPERATION_ENABLE: return "CTL_GENLOCK_OPERATION_ENABLE"s;
-			case _ctl_genlock_operation_t::CTL_GENLOCK_OPERATION_DISABLE: return "CTL_GENLOCK_OPERATION_DISABLE"s;
-			case _ctl_genlock_operation_t::CTL_GENLOCK_OPERATION_GET_TOPOLOGY: return "CTL_GENLOCK_OPERATION_GET_TOPOLOGY"s;
-			case _ctl_genlock_operation_t::CTL_GENLOCK_OPERATION_MAX: return "CTL_GENLOCK_OPERATION_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_wire_format_color_model_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_wire_format_color_model_t*>(pEnum);
-			switch (e) {
-			case _ctl_wire_format_color_model_t::CTL_WIRE_FORMAT_COLOR_MODEL_RGB: return "CTL_WIRE_FORMAT_COLOR_MODEL_RGB"s;
-			case _ctl_wire_format_color_model_t::CTL_WIRE_FORMAT_COLOR_MODEL_YCBCR_420: return "CTL_WIRE_FORMAT_COLOR_MODEL_YCBCR_420"s;
-			case _ctl_wire_format_color_model_t::CTL_WIRE_FORMAT_COLOR_MODEL_YCBCR_422: return "CTL_WIRE_FORMAT_COLOR_MODEL_YCBCR_422"s;
-			case _ctl_wire_format_color_model_t::CTL_WIRE_FORMAT_COLOR_MODEL_YCBCR_444: return "CTL_WIRE_FORMAT_COLOR_MODEL_YCBCR_444"s;
-			case _ctl_wire_format_color_model_t::CTL_WIRE_FORMAT_COLOR_MODEL_MAX: return "CTL_WIRE_FORMAT_COLOR_MODEL_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_wire_format_operation_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_wire_format_operation_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_wire_format_operation_type_t::CTL_WIRE_FORMAT_OPERATION_TYPE_GET: return "CTL_WIRE_FORMAT_OPERATION_TYPE_GET"s;
-			case _ctl_wire_format_operation_type_t::CTL_WIRE_FORMAT_OPERATION_TYPE_SET: return "CTL_WIRE_FORMAT_OPERATION_TYPE_SET"s;
-			case _ctl_wire_format_operation_type_t::CTL_WIRE_FORMAT_OPERATION_TYPE_RESTORE_DEFAULT: return "CTL_WIRE_FORMAT_OPERATION_TYPE_RESTORE_DEFAULT"s;
-			case _ctl_wire_format_operation_type_t::CTL_WIRE_FORMAT_OPERATION_TYPE_MAX: return "CTL_WIRE_FORMAT_OPERATION_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_low_latency_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_low_latency_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_low_latency_t::CTL_DISPLAY_SETTING_LOW_LATENCY_DEFAULT: return "CTL_DISPLAY_SETTING_LOW_LATENCY_DEFAULT"s;
-			case _ctl_display_setting_low_latency_t::CTL_DISPLAY_SETTING_LOW_LATENCY_DISABLED: return "CTL_DISPLAY_SETTING_LOW_LATENCY_DISABLED"s;
-			case _ctl_display_setting_low_latency_t::CTL_DISPLAY_SETTING_LOW_LATENCY_ENABLED: return "CTL_DISPLAY_SETTING_LOW_LATENCY_ENABLED"s;
-			case _ctl_display_setting_low_latency_t::CTL_DISPLAY_SETTING_LOW_LATENCY_MAX: return "CTL_DISPLAY_SETTING_LOW_LATENCY_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_sourcetm_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_sourcetm_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_sourcetm_t::CTL_DISPLAY_SETTING_SOURCETM_DEFAULT: return "CTL_DISPLAY_SETTING_SOURCETM_DEFAULT"s;
-			case _ctl_display_setting_sourcetm_t::CTL_DISPLAY_SETTING_SOURCETM_DISABLED: return "CTL_DISPLAY_SETTING_SOURCETM_DISABLED"s;
-			case _ctl_display_setting_sourcetm_t::CTL_DISPLAY_SETTING_SOURCETM_ENABLED: return "CTL_DISPLAY_SETTING_SOURCETM_ENABLED"s;
-			case _ctl_display_setting_sourcetm_t::CTL_DISPLAY_SETTING_SOURCETM_MAX: return "CTL_DISPLAY_SETTING_SOURCETM_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_content_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_content_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_content_type_t::CTL_DISPLAY_SETTING_CONTENT_TYPE_DEFAULT: return "CTL_DISPLAY_SETTING_CONTENT_TYPE_DEFAULT"s;
-			case _ctl_display_setting_content_type_t::CTL_DISPLAY_SETTING_CONTENT_TYPE_DISABLED: return "CTL_DISPLAY_SETTING_CONTENT_TYPE_DISABLED"s;
-			case _ctl_display_setting_content_type_t::CTL_DISPLAY_SETTING_CONTENT_TYPE_DESKTOP: return "CTL_DISPLAY_SETTING_CONTENT_TYPE_DESKTOP"s;
-			case _ctl_display_setting_content_type_t::CTL_DISPLAY_SETTING_CONTENT_TYPE_MEDIA: return "CTL_DISPLAY_SETTING_CONTENT_TYPE_MEDIA"s;
-			case _ctl_display_setting_content_type_t::CTL_DISPLAY_SETTING_CONTENT_TYPE_GAMING: return "CTL_DISPLAY_SETTING_CONTENT_TYPE_GAMING"s;
-			case _ctl_display_setting_content_type_t::CTL_DISPLAY_SETTING_CONTENT_TYPE_MAX: return "CTL_DISPLAY_SETTING_CONTENT_TYPE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_quantization_range_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_quantization_range_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_quantization_range_t::CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_DEFAULT: return "CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_DEFAULT"s;
-			case _ctl_display_setting_quantization_range_t::CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_LIMITED_RANGE: return "CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_LIMITED_RANGE"s;
-			case _ctl_display_setting_quantization_range_t::CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_FULL_RANGE: return "CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_FULL_RANGE"s;
-			case _ctl_display_setting_quantization_range_t::CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_MAX: return "CTL_DISPLAY_SETTING_QUANTIZATION_RANGE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_picture_ar_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_picture_ar_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_DEFAULT: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_DEFAULT"s;
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_DISABLED: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_DISABLED"s;
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_4_3: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_4_3"s;
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_16_9: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_16_9"s;
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_64_27: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_64_27"s;
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_256_135: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_AR_256_135"s;
-			case _ctl_display_setting_picture_ar_flag_t::CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_MAX: return "CTL_DISPLAY_SETTING_PICTURE_AR_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_audio_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_audio_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_audio_t::CTL_DISPLAY_SETTING_AUDIO_DEFAULT: return "CTL_DISPLAY_SETTING_AUDIO_DEFAULT"s;
-			case _ctl_display_setting_audio_t::CTL_DISPLAY_SETTING_AUDIO_DISABLED: return "CTL_DISPLAY_SETTING_AUDIO_DISABLED"s;
-			case _ctl_display_setting_audio_t::CTL_DISPLAY_SETTING_AUDIO_MAX: return "CTL_DISPLAY_SETTING_AUDIO_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_ecc_state_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_ecc_state_t*>(pEnum);
-			switch (e) {
-			case _ctl_ecc_state_t::CTL_ECC_STATE_ECC_DEFAULT_STATE: return "CTL_ECC_STATE_ECC_DEFAULT_STATE"s;
-			case _ctl_ecc_state_t::CTL_ECC_STATE_ECC_ENABLED_STATE: return "CTL_ECC_STATE_ECC_ENABLED_STATE"s;
-			case _ctl_ecc_state_t::CTL_ECC_STATE_ECC_DISABLED_STATE: return "CTL_ECC_STATE_ECC_DISABLED_STATE"s;
-			case _ctl_ecc_state_t::CTL_ECC_STATE_MAX: return "CTL_ECC_STATE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_engine_group_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_engine_group_t*>(pEnum);
-			switch (e) {
-			case _ctl_engine_group_t::CTL_ENGINE_GROUP_GT: return "CTL_ENGINE_GROUP_GT"s;
-			case _ctl_engine_group_t::CTL_ENGINE_GROUP_RENDER: return "CTL_ENGINE_GROUP_RENDER"s;
-			case _ctl_engine_group_t::CTL_ENGINE_GROUP_MEDIA: return "CTL_ENGINE_GROUP_MEDIA"s;
-			case _ctl_engine_group_t::CTL_ENGINE_GROUP_MAX: return "CTL_ENGINE_GROUP_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_fan_speed_units_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_fan_speed_units_t*>(pEnum);
-			switch (e) {
-			case _ctl_fan_speed_units_t::CTL_FAN_SPEED_UNITS_RPM: return "CTL_FAN_SPEED_UNITS_RPM"s;
-			case _ctl_fan_speed_units_t::CTL_FAN_SPEED_UNITS_PERCENT: return "CTL_FAN_SPEED_UNITS_PERCENT"s;
-			case _ctl_fan_speed_units_t::CTL_FAN_SPEED_UNITS_MAX: return "CTL_FAN_SPEED_UNITS_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_fan_speed_mode_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_fan_speed_mode_t*>(pEnum);
-			switch (e) {
-			case _ctl_fan_speed_mode_t::CTL_FAN_SPEED_MODE_DEFAULT: return "CTL_FAN_SPEED_MODE_DEFAULT"s;
-			case _ctl_fan_speed_mode_t::CTL_FAN_SPEED_MODE_FIXED: return "CTL_FAN_SPEED_MODE_FIXED"s;
-			case _ctl_fan_speed_mode_t::CTL_FAN_SPEED_MODE_TABLE: return "CTL_FAN_SPEED_MODE_TABLE"s;
-			case _ctl_fan_speed_mode_t::CTL_FAN_SPEED_MODE_MAX: return "CTL_FAN_SPEED_MODE_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_freq_domain_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_freq_domain_t*>(pEnum);
+
+		// enums
+		dumpers[typeid(_ctl_result_t)] = [](const void* pEnum) {
+			const auto& e = *static_cast<const _ctl_result_t*>(pEnum);
 			switch (e) {
-			case _ctl_freq_domain_t::CTL_FREQ_DOMAIN_GPU: return "CTL_FREQ_DOMAIN_GPU"s;
-			case _ctl_freq_domain_t::CTL_FREQ_DOMAIN_MEMORY: return "CTL_FREQ_DOMAIN_MEMORY"s;
-			case _ctl_freq_domain_t::CTL_FREQ_DOMAIN_MEDIA: return "CTL_FREQ_DOMAIN_MEDIA"s;
-			case _ctl_freq_domain_t::CTL_FREQ_DOMAIN_MAX: return "CTL_FREQ_DOMAIN_MAX"s;
+			case _ctl_result_t::CTL_RESULT_SUCCESS: return "CTL_RESULT_SUCCESS"s;
+			case _ctl_result_t::CTL_RESULT_SUCCESS_STILL_OPEN_BY_ANOTHER_CALLER: return "CTL_RESULT_SUCCESS_STILL_OPEN_BY_ANOTHER_CALLER"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_SUCCESS_END: return "CTL_RESULT_ERROR_SUCCESS_END"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_GENERIC_START: return "CTL_RESULT_ERROR_GENERIC_START"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_NOT_INITIALIZED: return "CTL_RESULT_ERROR_NOT_INITIALIZED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_ALREADY_INITIALIZED: return "CTL_RESULT_ERROR_ALREADY_INITIALIZED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DEVICE_LOST: return "CTL_RESULT_ERROR_DEVICE_LOST"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_OUT_OF_HOST_MEMORY: return "CTL_RESULT_ERROR_OUT_OF_HOST_MEMORY"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_OUT_OF_DEVICE_MEMORY: return "CTL_RESULT_ERROR_OUT_OF_DEVICE_MEMORY"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INSUFFICIENT_PERMISSIONS: return "CTL_RESULT_ERROR_INSUFFICIENT_PERMISSIONS"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_NOT_AVAILABLE: return "CTL_RESULT_ERROR_NOT_AVAILABLE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNINITIALIZED: return "CTL_RESULT_ERROR_UNINITIALIZED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_VERSION: return "CTL_RESULT_ERROR_UNSUPPORTED_VERSION"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_FEATURE: return "CTL_RESULT_ERROR_UNSUPPORTED_FEATURE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_ARGUMENT: return "CTL_RESULT_ERROR_INVALID_ARGUMENT"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_API_HANDLE: return "CTL_RESULT_ERROR_INVALID_API_HANDLE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_NULL_HANDLE: return "CTL_RESULT_ERROR_INVALID_NULL_HANDLE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_NULL_POINTER: return "CTL_RESULT_ERROR_INVALID_NULL_POINTER"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_SIZE: return "CTL_RESULT_ERROR_INVALID_SIZE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_SIZE: return "CTL_RESULT_ERROR_UNSUPPORTED_SIZE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT: return "CTL_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DATA_READ: return "CTL_RESULT_ERROR_DATA_READ"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DATA_WRITE: return "CTL_RESULT_ERROR_DATA_WRITE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DATA_NOT_FOUND: return "CTL_RESULT_ERROR_DATA_NOT_FOUND"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_NOT_IMPLEMENTED: return "CTL_RESULT_ERROR_NOT_IMPLEMENTED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_OS_CALL: return "CTL_RESULT_ERROR_OS_CALL"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_KMD_CALL: return "CTL_RESULT_ERROR_KMD_CALL"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNLOAD: return "CTL_RESULT_ERROR_UNLOAD"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_ZE_LOADER: return "CTL_RESULT_ERROR_ZE_LOADER"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_OPERATION_TYPE: return "CTL_RESULT_ERROR_INVALID_OPERATION_TYPE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_NULL_OS_INTERFACE: return "CTL_RESULT_ERROR_NULL_OS_INTERFACE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_NULL_OS_ADAPATER_HANDLE: return "CTL_RESULT_ERROR_NULL_OS_ADAPATER_HANDLE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_NULL_OS_DISPLAY_OUTPUT_HANDLE: return "CTL_RESULT_ERROR_NULL_OS_DISPLAY_OUTPUT_HANDLE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_WAIT_TIMEOUT: return "CTL_RESULT_ERROR_WAIT_TIMEOUT"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_PERSISTANCE_NOT_SUPPORTED: return "CTL_RESULT_ERROR_PERSISTANCE_NOT_SUPPORTED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_PLATFORM_NOT_SUPPORTED: return "CTL_RESULT_ERROR_PLATFORM_NOT_SUPPORTED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNKNOWN_APPLICATION_UID: return "CTL_RESULT_ERROR_UNKNOWN_APPLICATION_UID"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_ENUMERATION: return "CTL_RESULT_ERROR_INVALID_ENUMERATION"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_FILE_DELETE: return "CTL_RESULT_ERROR_FILE_DELETE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_RESET_DEVICE_REQUIRED: return "CTL_RESULT_ERROR_RESET_DEVICE_REQUIRED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_FULL_REBOOT_REQUIRED: return "CTL_RESULT_ERROR_FULL_REBOOT_REQUIRED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_LOAD: return "CTL_RESULT_ERROR_LOAD"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_UNKNOWN: return "CTL_RESULT_ERROR_UNKNOWN"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_RETRY_OPERATION: return "CTL_RESULT_ERROR_RETRY_OPERATION"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_IGSC_LOADER: return "CTL_RESULT_ERROR_IGSC_LOADER"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_RESTRICTED_APPLICATION: return "CTL_RESULT_ERROR_RESTRICTED_APPLICATION"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_START: return "CTL_RESULT_ERROR_CORE_START"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_NOT_SUPPORTED: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_NOT_SUPPORTED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_VOLTAGE_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_VOLTAGE_OUTSIDE_RANGE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_FREQUENCY_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_FREQUENCY_OUTSIDE_RANGE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_POWER_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_POWER_OUTSIDE_RANGE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_TEMPERATURE_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_TEMPERATURE_OUTSIDE_RANGE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_IN_VOLTAGE_LOCKED_MODE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_IN_VOLTAGE_LOCKED_MODE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_RESET_REQUIRED: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_RESET_REQUIRED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_WAIVER_NOT_SET: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_WAIVER_NOT_SET"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_DEPRECATED_API: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_DEPRECATED_API"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_LED_GET_STATE_NOT_SUPPORTED_FOR_I2C_LED: return "CTL_RESULT_ERROR_CORE_LED_GET_STATE_NOT_SUPPORTED_FOR_I2C_LED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_LED_SET_STATE_NOT_SUPPORTED_FOR_I2C_LED: return "CTL_RESULT_ERROR_CORE_LED_SET_STATE_NOT_SUPPORTED_FOR_I2C_LED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_LED_TOO_FREQUENT_SET_REQUESTS: return "CTL_RESULT_ERROR_CORE_LED_TOO_FREQUENT_SET_REQUESTS"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_VRAM_MEMORY_SPEED_OUTSIDE_RANGE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_VRAM_MEMORY_SPEED_OUTSIDE_RANGE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_OVERCLOCK_INVALID_CUSTOM_VF_CURVE: return "CTL_RESULT_ERROR_CORE_OVERCLOCK_INVALID_CUSTOM_VF_CURVE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CORE_END: return "CTL_RESULT_ERROR_CORE_END"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3D_START: return "CTL_RESULT_ERROR_3D_START"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3D_END: return "CTL_RESULT_ERROR_3D_END"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_MEDIA_START: return "CTL_RESULT_ERROR_MEDIA_START"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_MEDIA_END: return "CTL_RESULT_ERROR_MEDIA_END"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_START: return "CTL_RESULT_ERROR_DISPLAY_START"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_AUX_ACCESS_FLAG: return "CTL_RESULT_ERROR_INVALID_AUX_ACCESS_FLAG"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_SHARPNESS_FILTER_FLAG: return "CTL_RESULT_ERROR_INVALID_SHARPNESS_FILTER_FLAG"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_NOT_ATTACHED: return "CTL_RESULT_ERROR_DISPLAY_NOT_ATTACHED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_NOT_ACTIVE: return "CTL_RESULT_ERROR_DISPLAY_NOT_ACTIVE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_POWERFEATURE_OPTIMIZATION_FLAG: return "CTL_RESULT_ERROR_INVALID_POWERFEATURE_OPTIMIZATION_FLAG"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_POWERSOURCE_TYPE_FOR_DPST: return "CTL_RESULT_ERROR_INVALID_POWERSOURCE_TYPE_FOR_DPST"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_GET_CONFIG_QUERY_TYPE: return "CTL_RESULT_ERROR_INVALID_PIXTX_GET_CONFIG_QUERY_TYPE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_SET_CONFIG_OPERATION_TYPE: return "CTL_RESULT_ERROR_INVALID_PIXTX_SET_CONFIG_OPERATION_TYPE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_SET_CONFIG_NUMBER_OF_SAMPLES: return "CTL_RESULT_ERROR_INVALID_SET_CONFIG_NUMBER_OF_SAMPLES"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_ID: return "CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_ID"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_TYPE: return "CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_TYPE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_NUMBER: return "CTL_RESULT_ERROR_INVALID_PIXTX_BLOCK_NUMBER"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_INSUFFICIENT_PIXTX_BLOCK_CONFIG_MEMORY: return "CTL_RESULT_ERROR_INSUFFICIENT_PIXTX_BLOCK_CONFIG_MEMORY"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_INVALID_PIPE: return "CTL_RESULT_ERROR_3DLUT_INVALID_PIPE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_INVALID_DATA: return "CTL_RESULT_ERROR_3DLUT_INVALID_DATA"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_NOT_SUPPORTED_IN_HDR: return "CTL_RESULT_ERROR_3DLUT_NOT_SUPPORTED_IN_HDR"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_INVALID_OPERATION: return "CTL_RESULT_ERROR_3DLUT_INVALID_OPERATION"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_3DLUT_UNSUCCESSFUL: return "CTL_RESULT_ERROR_3DLUT_UNSUCCESSFUL"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_AUX_DEFER: return "CTL_RESULT_ERROR_AUX_DEFER"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_AUX_TIMEOUT: return "CTL_RESULT_ERROR_AUX_TIMEOUT"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_AUX_INCOMPLETE_WRITE: return "CTL_RESULT_ERROR_AUX_INCOMPLETE_WRITE"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_I2C_AUX_STATUS_UNKNOWN: return "CTL_RESULT_ERROR_I2C_AUX_STATUS_UNKNOWN"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_I2C_AUX_UNSUCCESSFUL: return "CTL_RESULT_ERROR_I2C_AUX_UNSUCCESSFUL"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_LACE_INVALID_DATA_ARGUMENT_PASSED: return "CTL_RESULT_ERROR_LACE_INVALID_DATA_ARGUMENT_PASSED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_EXTERNAL_DISPLAY_ATTACHED: return "CTL_RESULT_ERROR_EXTERNAL_DISPLAY_ATTACHED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CUSTOM_MODE_STANDARD_CUSTOM_MODE_EXISTS: return "CTL_RESULT_ERROR_CUSTOM_MODE_STANDARD_CUSTOM_MODE_EXISTS"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CUSTOM_MODE_NON_CUSTOM_MATCHING_MODE_EXISTS: return "CTL_RESULT_ERROR_CUSTOM_MODE_NON_CUSTOM_MATCHING_MODE_EXISTS"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_CUSTOM_MODE_INSUFFICIENT_MEMORY: return "CTL_RESULT_ERROR_CUSTOM_MODE_INSUFFICIENT_MEMORY"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_ADAPTER_ALREADY_LINKED: return "CTL_RESULT_ERROR_ADAPTER_ALREADY_LINKED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_ADAPTER_NOT_IDENTICAL: return "CTL_RESULT_ERROR_ADAPTER_NOT_IDENTICAL"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_ADAPTER_NOT_SUPPORTED_ON_LDA_SECONDARY: return "CTL_RESULT_ERROR_ADAPTER_NOT_SUPPORTED_ON_LDA_SECONDARY"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_SET_FBC_FEATURE_NOT_SUPPORTED: return "CTL_RESULT_ERROR_SET_FBC_FEATURE_NOT_SUPPORTED"s;
+			case _ctl_result_t::CTL_RESULT_ERROR_DISPLAY_END: return "CTL_RESULT_ERROR_DISPLAY_END"s;
+			case _ctl_result_t::CTL_RESULT_MAX: return "CTL_RESULT_MAX"s;
 			default: return "{ unknown }"s;
 			}
 		};
-		dumpers[typeid(_ctl_video_processing_feature_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_video_processing_feature_t*>(pEnum);
+		dumpers[typeid(_ctl_units_t)] = [](const void* pEnum) {
+			const auto& e = *static_cast<const _ctl_units_t*>(pEnum);
 			switch (e) {
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_FILM_MODE_DETECTION: return "CTL_VIDEO_PROCESSING_FEATURE_FILM_MODE_DETECTION"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_NOISE_REDUCTION: return "CTL_VIDEO_PROCESSING_FEATURE_NOISE_REDUCTION"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_SHARPNESS: return "CTL_VIDEO_PROCESSING_FEATURE_SHARPNESS"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_ADAPTIVE_CONTRAST_ENHANCEMENT: return "CTL_VIDEO_PROCESSING_FEATURE_ADAPTIVE_CONTRAST_ENHANCEMENT"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_SUPER_RESOLUTION: return "CTL_VIDEO_PROCESSING_FEATURE_SUPER_RESOLUTION"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_STANDARD_COLOR_CORRECTION: return "CTL_VIDEO_PROCESSING_FEATURE_STANDARD_COLOR_CORRECTION"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_TOTAL_COLOR_CORRECTION: return "CTL_VIDEO_PROCESSING_FEATURE_TOTAL_COLOR_CORRECTION"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_SKIN_TONE_ENHANCEMENT: return "CTL_VIDEO_PROCESSING_FEATURE_SKIN_TONE_ENHANCEMENT"s;
-			case _ctl_video_processing_feature_t::CTL_VIDEO_PROCESSING_FEATURE_MAX: return "CTL_VIDEO_PROCESSING_FEATURE_MAX"s;
+			case _ctl_units_t::CTL_UNITS_FREQUENCY_MHZ: return "CTL_UNITS_FREQUENCY_MHZ"s;
+			case _ctl_units_t::CTL_UNITS_OPERATIONS_GTS: return "CTL_UNITS_OPERATIONS_GTS"s;
+			case _ctl_units_t::CTL_UNITS_OPERATIONS_MTS: return "CTL_UNITS_OPERATIONS_MTS"s;
+			case _ctl_units_t::CTL_UNITS_VOLTAGE_VOLTS: return "CTL_UNITS_VOLTAGE_VOLTS"s;
+			case _ctl_units_t::CTL_UNITS_POWER_WATTS: return "CTL_UNITS_POWER_WATTS"s;
+			case _ctl_units_t::CTL_UNITS_TEMPERATURE_CELSIUS: return "CTL_UNITS_TEMPERATURE_CELSIUS"s;
+			case _ctl_units_t::CTL_UNITS_ENERGY_JOULES: return "CTL_UNITS_ENERGY_JOULES"s;
+			case _ctl_units_t::CTL_UNITS_TIME_SECONDS: return "CTL_UNITS_TIME_SECONDS"s;
+			case _ctl_units_t::CTL_UNITS_MEMORY_BYTES: return "CTL_UNITS_MEMORY_BYTES"s;
+			case _ctl_units_t::CTL_UNITS_ANGULAR_SPEED_RPM: return "CTL_UNITS_ANGULAR_SPEED_RPM"s;
+			case _ctl_units_t::CTL_UNITS_POWER_MILLIWATTS: return "CTL_UNITS_POWER_MILLIWATTS"s;
+			case _ctl_units_t::CTL_UNITS_PERCENT: return "CTL_UNITS_PERCENT"s;
+			case _ctl_units_t::CTL_UNITS_MEM_SPEED_GBPS: return "CTL_UNITS_MEM_SPEED_GBPS"s;
+			case _ctl_units_t::CTL_UNITS_VOLTAGE_MILLIVOLTS: return "CTL_UNITS_VOLTAGE_MILLIVOLTS"s;
+			case _ctl_units_t::CTL_UNITS_BANDWIDTH_MBPS: return "CTL_UNITS_BANDWIDTH_MBPS"s;
+			case _ctl_units_t::CTL_UNITS_UNKNOWN: return "CTL_UNITS_UNKNOWN"s;
+			case _ctl_units_t::CTL_UNITS_MAX: return "CTL_UNITS_MAX"s;
 			default: return "{ unknown }"s;
 			}
 		};
-		dumpers[typeid(_ctl_mem_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_mem_type_t*>(pEnum);
+		dumpers[typeid(_ctl_data_type_t)] = [](const void* pEnum) {
+			const auto& e = *static_cast<const _ctl_data_type_t*>(pEnum);
 			switch (e) {
-			case _ctl_mem_type_t::CTL_MEM_TYPE_HBM: return "CTL_MEM_TYPE_HBM"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_DDR: return "CTL_MEM_TYPE_DDR"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_DDR3: return "CTL_MEM_TYPE_DDR3"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_DDR4: return "CTL_MEM_TYPE_DDR4"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_DDR5: return "CTL_MEM_TYPE_DDR5"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_LPDDR: return "CTL_MEM_TYPE_LPDDR"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_LPDDR3: return "CTL_MEM_TYPE_LPDDR3"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_LPDDR4: return "CTL_MEM_TYPE_LPDDR4"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_LPDDR5: return "CTL_MEM_TYPE_LPDDR5"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_GDDR4: return "CTL_MEM_TYPE_GDDR4"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_GDDR5: return "CTL_MEM_TYPE_GDDR5"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_GDDR5X: return "CTL_MEM_TYPE_GDDR5X"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_GDDR6: return "CTL_MEM_TYPE_GDDR6"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_GDDR6X: return "CTL_MEM_TYPE_GDDR6X"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_GDDR7: return "CTL_MEM_TYPE_GDDR7"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_UNKNOWN: return "CTL_MEM_TYPE_UNKNOWN"s;
-			case _ctl_mem_type_t::CTL_MEM_TYPE_MAX: return "CTL_MEM_TYPE_MAX"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_INT8: return "CTL_DATA_TYPE_INT8"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_UINT8: return "CTL_DATA_TYPE_UINT8"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_INT16: return "CTL_DATA_TYPE_INT16"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_UINT16: return "CTL_DATA_TYPE_UINT16"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_INT32: return "CTL_DATA_TYPE_INT32"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_UINT32: return "CTL_DATA_TYPE_UINT32"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_INT64: return "CTL_DATA_TYPE_INT64"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_UINT64: return "CTL_DATA_TYPE_UINT64"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_FLOAT: return "CTL_DATA_TYPE_FLOAT"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_DOUBLE: return "CTL_DATA_TYPE_DOUBLE"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_STRING_ASCII: return "CTL_DATA_TYPE_STRING_ASCII"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_STRING_UTF16: return "CTL_DATA_TYPE_STRING_UTF16"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_STRING_UTF132: return "CTL_DATA_TYPE_STRING_UTF132"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_UNKNOWN: return "CTL_DATA_TYPE_UNKNOWN"s;
+			case _ctl_data_type_t::CTL_DATA_TYPE_MAX: return "CTL_DATA_TYPE_MAX"s;
 			default: return "{ unknown }"s;
 			}
 		};
-		dumpers[typeid(_ctl_mem_loc_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_mem_loc_t*>(pEnum);
+		dumpers[typeid(_ctl_device_type_t)] = [](const void* pEnum) {
+			const auto& e = *static_cast<const _ctl_device_type_t*>(pEnum);
 			switch (e) {
-			case _ctl_mem_loc_t::CTL_MEM_LOC_SYSTEM: return "CTL_MEM_LOC_SYSTEM"s;
-			case _ctl_mem_loc_t::CTL_MEM_LOC_DEVICE: return "CTL_MEM_LOC_DEVICE"s;
-			case _ctl_mem_loc_t::CTL_MEM_LOC_MAX: return "CTL_MEM_LOC_MAX"s;
+			case _ctl_device_type_t::CTL_DEVICE_TYPE_GRAPHICS: return "CTL_DEVICE_TYPE_GRAPHICS"s;
+			case _ctl_device_type_t::CTL_DEVICE_TYPE_SYSTEM: return "CTL_DEVICE_TYPE_SYSTEM"s;
+			case _ctl_device_type_t::CTL_DEVICE_TYPE_MAX: return "CTL_DEVICE_TYPE_MAX"s;
 			default: return "{ unknown }"s;
 			}
 		};
@@ -2625,447 +759,198 @@ namespace pmon::util::ref::gen
 			default: return "{ unknown }"s;
 			}
 		};
-		dumpers[typeid(_ctl_temp_sensors_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_temp_sensors_t*>(pEnum);
-			switch (e) {
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_GLOBAL: return "CTL_TEMP_SENSORS_GLOBAL"s;
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_GPU: return "CTL_TEMP_SENSORS_GPU"s;
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_MEMORY: return "CTL_TEMP_SENSORS_MEMORY"s;
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_GLOBAL_MIN: return "CTL_TEMP_SENSORS_GLOBAL_MIN"s;
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_GPU_MIN: return "CTL_TEMP_SENSORS_GPU_MIN"s;
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_MEMORY_MIN: return "CTL_TEMP_SENSORS_MEMORY_MIN"s;
-			case _ctl_temp_sensors_t::CTL_TEMP_SENSORS_MAX: return "CTL_TEMP_SENSORS_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_feature_misc_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_feature_misc_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_feature_misc_flag_t::CTL_3D_FEATURE_MISC_FLAG_DX9: return "CTL_3D_FEATURE_MISC_FLAG_DX9"s;
-			case _ctl_3d_feature_misc_flag_t::CTL_3D_FEATURE_MISC_FLAG_DX11: return "CTL_3D_FEATURE_MISC_FLAG_DX11"s;
-			case _ctl_3d_feature_misc_flag_t::CTL_3D_FEATURE_MISC_FLAG_DX12: return "CTL_3D_FEATURE_MISC_FLAG_DX12"s;
-			case _ctl_3d_feature_misc_flag_t::CTL_3D_FEATURE_MISC_FLAG_VULKAN: return "CTL_3D_FEATURE_MISC_FLAG_VULKAN"s;
-			case _ctl_3d_feature_misc_flag_t::CTL_3D_FEATURE_MISC_FLAG_LIVE_CHANGE: return "CTL_3D_FEATURE_MISC_FLAG_LIVE_CHANGE"s;
-			case _ctl_3d_feature_misc_flag_t::CTL_3D_FEATURE_MISC_FLAG_MAX: return "CTL_3D_FEATURE_MISC_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_anisotropic_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_anisotropic_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_anisotropic_types_t::CTL_3D_ANISOTROPIC_TYPES_APP_CHOICE: return "CTL_3D_ANISOTROPIC_TYPES_APP_CHOICE"s;
-			case _ctl_3d_anisotropic_types_t::CTL_3D_ANISOTROPIC_TYPES_2X: return "CTL_3D_ANISOTROPIC_TYPES_2X"s;
-			case _ctl_3d_anisotropic_types_t::CTL_3D_ANISOTROPIC_TYPES_4X: return "CTL_3D_ANISOTROPIC_TYPES_4X"s;
-			case _ctl_3d_anisotropic_types_t::CTL_3D_ANISOTROPIC_TYPES_8X: return "CTL_3D_ANISOTROPIC_TYPES_8X"s;
-			case _ctl_3d_anisotropic_types_t::CTL_3D_ANISOTROPIC_TYPES_16X: return "CTL_3D_ANISOTROPIC_TYPES_16X"s;
-			case _ctl_3d_anisotropic_types_t::CTL_3D_ANISOTROPIC_TYPES_MAX: return "CTL_3D_ANISOTROPIC_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_texture_filtering_quality_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_texture_filtering_quality_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_texture_filtering_quality_types_t::CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_PERFORMANCE: return "CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_PERFORMANCE"s;
-			case _ctl_3d_texture_filtering_quality_types_t::CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_BALANCED: return "CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_BALANCED"s;
-			case _ctl_3d_texture_filtering_quality_types_t::CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_QUALITY: return "CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_QUALITY"s;
-			case _ctl_3d_texture_filtering_quality_types_t::CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_MAX: return "CTL_3D_TEXTURE_FILTERING_QUALITY_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_frame_pacing_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_frame_pacing_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_frame_pacing_types_t::CTL_3D_FRAME_PACING_TYPES_DISABLE: return "CTL_3D_FRAME_PACING_TYPES_DISABLE"s;
-			case _ctl_3d_frame_pacing_types_t::CTL_3D_FRAME_PACING_TYPES_ENABLE_MODE_FRAME_NO_SMOOTHENING: return "CTL_3D_FRAME_PACING_TYPES_ENABLE_MODE_FRAME_NO_SMOOTHENING"s;
-			case _ctl_3d_frame_pacing_types_t::CTL_3D_FRAME_PACING_TYPES_ENABLE_MODE_FRAME_MAX_SMOOTHENING: return "CTL_3D_FRAME_PACING_TYPES_ENABLE_MODE_FRAME_MAX_SMOOTHENING"s;
-			case _ctl_3d_frame_pacing_types_t::CTL_3D_FRAME_PACING_TYPES_ENABLE_MODE_COMPETITIVE_GAMING: return "CTL_3D_FRAME_PACING_TYPES_ENABLE_MODE_COMPETITIVE_GAMING"s;
-			case _ctl_3d_frame_pacing_types_t::CTL_3D_FRAME_PACING_TYPES_MAX: return "CTL_3D_FRAME_PACING_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_low_latency_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_low_latency_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_low_latency_types_t::CTL_3D_LOW_LATENCY_TYPES_TURN_OFF: return "CTL_3D_LOW_LATENCY_TYPES_TURN_OFF"s;
-			case _ctl_3d_low_latency_types_t::CTL_3D_LOW_LATENCY_TYPES_TURN_ON: return "CTL_3D_LOW_LATENCY_TYPES_TURN_ON"s;
-			case _ctl_3d_low_latency_types_t::CTL_3D_LOW_LATENCY_TYPES_TURN_ON_BOOST_MODE_ON: return "CTL_3D_LOW_LATENCY_TYPES_TURN_ON_BOOST_MODE_ON"s;
-			case _ctl_3d_low_latency_types_t::CTL_3D_LOW_LATENCY_TYPES_MAX: return "CTL_3D_LOW_LATENCY_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_cmaa_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_cmaa_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_cmaa_types_t::CTL_3D_CMAA_TYPES_TURN_OFF: return "CTL_3D_CMAA_TYPES_TURN_OFF"s;
-			case _ctl_3d_cmaa_types_t::CTL_3D_CMAA_TYPES_OVERRIDE_MSAA: return "CTL_3D_CMAA_TYPES_OVERRIDE_MSAA"s;
-			case _ctl_3d_cmaa_types_t::CTL_3D_CMAA_TYPES_ENHANCE_APPLICATION: return "CTL_3D_CMAA_TYPES_ENHANCE_APPLICATION"s;
-			case _ctl_3d_cmaa_types_t::CTL_3D_CMAA_TYPES_MAX: return "CTL_3D_CMAA_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_adaptive_tessellation_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_adaptive_tessellation_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_adaptive_tessellation_types_t::CTL_3D_ADAPTIVE_TESSELLATION_TYPES_TURN_OFF: return "CTL_3D_ADAPTIVE_TESSELLATION_TYPES_TURN_OFF"s;
-			case _ctl_3d_adaptive_tessellation_types_t::CTL_3D_ADAPTIVE_TESSELLATION_TYPES_TURN_ON: return "CTL_3D_ADAPTIVE_TESSELLATION_TYPES_TURN_ON"s;
-			case _ctl_3d_adaptive_tessellation_types_t::CTL_3D_ADAPTIVE_TESSELLATION_TYPES_MAX: return "CTL_3D_ADAPTIVE_TESSELLATION_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_sharpening_filter_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_sharpening_filter_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_sharpening_filter_types_t::CTL_3D_SHARPENING_FILTER_TYPES_TURN_OFF: return "CTL_3D_SHARPENING_FILTER_TYPES_TURN_OFF"s;
-			case _ctl_3d_sharpening_filter_types_t::CTL_3D_SHARPENING_FILTER_TYPES_TURN_ON: return "CTL_3D_SHARPENING_FILTER_TYPES_TURN_ON"s;
-			case _ctl_3d_sharpening_filter_types_t::CTL_3D_SHARPENING_FILTER_TYPES_MAX: return "CTL_3D_SHARPENING_FILTER_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_msaa_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_msaa_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_APP_CHOICE: return "CTL_3D_MSAA_TYPES_APP_CHOICE"s;
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_DISABLED: return "CTL_3D_MSAA_TYPES_DISABLED"s;
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_2X: return "CTL_3D_MSAA_TYPES_2X"s;
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_4X: return "CTL_3D_MSAA_TYPES_4X"s;
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_8X: return "CTL_3D_MSAA_TYPES_8X"s;
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_16X: return "CTL_3D_MSAA_TYPES_16X"s;
-			case _ctl_3d_msaa_types_t::CTL_3D_MSAA_TYPES_MAX: return "CTL_3D_MSAA_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_gaming_flip_mode_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_gaming_flip_mode_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_APPLICATION_DEFAULT: return "CTL_GAMING_FLIP_MODE_FLAG_APPLICATION_DEFAULT"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_VSYNC_OFF: return "CTL_GAMING_FLIP_MODE_FLAG_VSYNC_OFF"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_VSYNC_ON: return "CTL_GAMING_FLIP_MODE_FLAG_VSYNC_ON"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_SMOOTH_SYNC: return "CTL_GAMING_FLIP_MODE_FLAG_SMOOTH_SYNC"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_SPEED_FRAME: return "CTL_GAMING_FLIP_MODE_FLAG_SPEED_FRAME"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_CAPPED_FPS: return "CTL_GAMING_FLIP_MODE_FLAG_CAPPED_FPS"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_VSYNC_OFF_IGNORE_ALLOW_LIST: return "CTL_GAMING_FLIP_MODE_FLAG_VSYNC_OFF_IGNORE_ALLOW_LIST"s;
-			case _ctl_gaming_flip_mode_flag_t::CTL_GAMING_FLIP_MODE_FLAG_MAX: return "CTL_GAMING_FLIP_MODE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_emulated_typed_64bit_atomics_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_emulated_typed_64bit_atomics_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_emulated_typed_64bit_atomics_types_t::CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_DEFAULT: return "CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_DEFAULT"s;
-			case _ctl_emulated_typed_64bit_atomics_types_t::CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_TURN_ON: return "CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_TURN_ON"s;
-			case _ctl_emulated_typed_64bit_atomics_types_t::CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_TURN_OFF: return "CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_TURN_OFF"s;
-			case _ctl_emulated_typed_64bit_atomics_types_t::CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_MAX: return "CTL_EMULATED_TYPED_64BIT_ATOMICS_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_vrr_windowed_blt_reserved_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_vrr_windowed_blt_reserved_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_vrr_windowed_blt_reserved_t::CTL_3D_VRR_WINDOWED_BLT_RESERVED_AUTO: return "CTL_3D_VRR_WINDOWED_BLT_RESERVED_AUTO"s;
-			case _ctl_3d_vrr_windowed_blt_reserved_t::CTL_3D_VRR_WINDOWED_BLT_RESERVED_TURN_ON: return "CTL_3D_VRR_WINDOWED_BLT_RESERVED_TURN_ON"s;
-			case _ctl_3d_vrr_windowed_blt_reserved_t::CTL_3D_VRR_WINDOWED_BLT_RESERVED_TURN_OFF: return "CTL_3D_VRR_WINDOWED_BLT_RESERVED_TURN_OFF"s;
-			case _ctl_3d_vrr_windowed_blt_reserved_t::CTL_3D_VRR_WINDOWED_BLT_RESERVED_MAX: return "CTL_3D_VRR_WINDOWED_BLT_RESERVED_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_3d_global_or_per_app_types_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_3d_global_or_per_app_types_t*>(pEnum);
-			switch (e) {
-			case _ctl_3d_global_or_per_app_types_t::CTL_3D_GLOBAL_OR_PER_APP_TYPES_NONE: return "CTL_3D_GLOBAL_OR_PER_APP_TYPES_NONE"s;
-			case _ctl_3d_global_or_per_app_types_t::CTL_3D_GLOBAL_OR_PER_APP_TYPES_PER_APP: return "CTL_3D_GLOBAL_OR_PER_APP_TYPES_PER_APP"s;
-			case _ctl_3d_global_or_per_app_types_t::CTL_3D_GLOBAL_OR_PER_APP_TYPES_GLOBAL: return "CTL_3D_GLOBAL_OR_PER_APP_TYPES_GLOBAL"s;
-			case _ctl_3d_global_or_per_app_types_t::CTL_3D_GLOBAL_OR_PER_APP_TYPES_MAX: return "CTL_3D_GLOBAL_OR_PER_APP_TYPES_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_output_bpc_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_output_bpc_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_output_bpc_flag_t::CTL_OUTPUT_BPC_FLAG_6BPC: return "CTL_OUTPUT_BPC_FLAG_6BPC"s;
-			case _ctl_output_bpc_flag_t::CTL_OUTPUT_BPC_FLAG_8BPC: return "CTL_OUTPUT_BPC_FLAG_8BPC"s;
-			case _ctl_output_bpc_flag_t::CTL_OUTPUT_BPC_FLAG_10BPC: return "CTL_OUTPUT_BPC_FLAG_10BPC"s;
-			case _ctl_output_bpc_flag_t::CTL_OUTPUT_BPC_FLAG_12BPC: return "CTL_OUTPUT_BPC_FLAG_12BPC"s;
-			case _ctl_output_bpc_flag_t::CTL_OUTPUT_BPC_FLAG_MAX: return "CTL_OUTPUT_BPC_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_std_display_feature_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_std_display_feature_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_HDCP: return "CTL_STD_DISPLAY_FEATURE_FLAG_HDCP"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_HD_AUDIO: return "CTL_STD_DISPLAY_FEATURE_FLAG_HD_AUDIO"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_PSR: return "CTL_STD_DISPLAY_FEATURE_FLAG_PSR"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_ADAPTIVESYNC_VRR: return "CTL_STD_DISPLAY_FEATURE_FLAG_ADAPTIVESYNC_VRR"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_VESA_COMPRESSION: return "CTL_STD_DISPLAY_FEATURE_FLAG_VESA_COMPRESSION"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_HDR: return "CTL_STD_DISPLAY_FEATURE_FLAG_HDR"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_HDMI_QMS: return "CTL_STD_DISPLAY_FEATURE_FLAG_HDMI_QMS"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_HDR10_PLUS_CERTIFIED: return "CTL_STD_DISPLAY_FEATURE_FLAG_HDR10_PLUS_CERTIFIED"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_VESA_HDR_CERTIFIED: return "CTL_STD_DISPLAY_FEATURE_FLAG_VESA_HDR_CERTIFIED"s;
-			case _ctl_std_display_feature_flag_t::CTL_STD_DISPLAY_FEATURE_FLAG_MAX: return "CTL_STD_DISPLAY_FEATURE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_intel_display_feature_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_intel_display_feature_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_intel_display_feature_flag_t::CTL_INTEL_DISPLAY_FEATURE_FLAG_DPST: return "CTL_INTEL_DISPLAY_FEATURE_FLAG_DPST"s;
-			case _ctl_intel_display_feature_flag_t::CTL_INTEL_DISPLAY_FEATURE_FLAG_LACE: return "CTL_INTEL_DISPLAY_FEATURE_FLAG_LACE"s;
-			case _ctl_intel_display_feature_flag_t::CTL_INTEL_DISPLAY_FEATURE_FLAG_DRRS: return "CTL_INTEL_DISPLAY_FEATURE_FLAG_DRRS"s;
-			case _ctl_intel_display_feature_flag_t::CTL_INTEL_DISPLAY_FEATURE_FLAG_ARC_ADAPTIVE_SYNC_CERTIFIED: return "CTL_INTEL_DISPLAY_FEATURE_FLAG_ARC_ADAPTIVE_SYNC_CERTIFIED"s;
-			case _ctl_intel_display_feature_flag_t::CTL_INTEL_DISPLAY_FEATURE_FLAG_MAX: return "CTL_INTEL_DISPLAY_FEATURE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_protocol_converter_location_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_protocol_converter_location_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_protocol_converter_location_flag_t::CTL_PROTOCOL_CONVERTER_LOCATION_FLAG_ONBOARD: return "CTL_PROTOCOL_CONVERTER_LOCATION_FLAG_ONBOARD"s;
-			case _ctl_protocol_converter_location_flag_t::CTL_PROTOCOL_CONVERTER_LOCATION_FLAG_EXTERNAL: return "CTL_PROTOCOL_CONVERTER_LOCATION_FLAG_EXTERNAL"s;
-			case _ctl_protocol_converter_location_flag_t::CTL_PROTOCOL_CONVERTER_LOCATION_FLAG_MAX: return "CTL_PROTOCOL_CONVERTER_LOCATION_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_config_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_config_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_config_flag_t::CTL_DISPLAY_CONFIG_FLAG_DISPLAY_ACTIVE: return "CTL_DISPLAY_CONFIG_FLAG_DISPLAY_ACTIVE"s;
-			case _ctl_display_config_flag_t::CTL_DISPLAY_CONFIG_FLAG_DISPLAY_ATTACHED: return "CTL_DISPLAY_CONFIG_FLAG_DISPLAY_ATTACHED"s;
-			case _ctl_display_config_flag_t::CTL_DISPLAY_CONFIG_FLAG_IS_DONGLE_CONNECTED_TO_ENCODER: return "CTL_DISPLAY_CONFIG_FLAG_IS_DONGLE_CONNECTED_TO_ENCODER"s;
-			case _ctl_display_config_flag_t::CTL_DISPLAY_CONFIG_FLAG_DITHERING_ENABLED: return "CTL_DISPLAY_CONFIG_FLAG_DITHERING_ENABLED"s;
-			case _ctl_display_config_flag_t::CTL_DISPLAY_CONFIG_FLAG_MAX: return "CTL_DISPLAY_CONFIG_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_encoder_config_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_encoder_config_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_INTERNAL_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_INTERNAL_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_VESA_TILED_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_VESA_TILED_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_TYPEC_CAPABLE: return "CTL_ENCODER_CONFIG_FLAG_TYPEC_CAPABLE"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_TBT_CAPABLE: return "CTL_ENCODER_CONFIG_FLAG_TBT_CAPABLE"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_DITHERING_SUPPORTED: return "CTL_ENCODER_CONFIG_FLAG_DITHERING_SUPPORTED"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_VIRTUAL_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_VIRTUAL_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_HIDDEN_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_HIDDEN_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_COLLAGE_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_COLLAGE_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_SPLIT_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_SPLIT_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_COMPANION_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_COMPANION_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_MGPU_COLLAGE_DISPLAY: return "CTL_ENCODER_CONFIG_FLAG_MGPU_COLLAGE_DISPLAY"s;
-			case _ctl_encoder_config_flag_t::CTL_ENCODER_CONFIG_FLAG_MAX: return "CTL_ENCODER_CONFIG_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_sharpness_filter_type_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_sharpness_filter_type_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_sharpness_filter_type_flag_t::CTL_SHARPNESS_FILTER_TYPE_FLAG_NON_ADAPTIVE: return "CTL_SHARPNESS_FILTER_TYPE_FLAG_NON_ADAPTIVE"s;
-			case _ctl_sharpness_filter_type_flag_t::CTL_SHARPNESS_FILTER_TYPE_FLAG_ADAPTIVE: return "CTL_SHARPNESS_FILTER_TYPE_FLAG_ADAPTIVE"s;
-			case _ctl_sharpness_filter_type_flag_t::CTL_SHARPNESS_FILTER_TYPE_FLAG_MAX: return "CTL_SHARPNESS_FILTER_TYPE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_i2c_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_i2c_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_ATOMICI2C: return "CTL_I2C_FLAG_ATOMICI2C"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_1BYTE_INDEX: return "CTL_I2C_FLAG_1BYTE_INDEX"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_2BYTE_INDEX: return "CTL_I2C_FLAG_2BYTE_INDEX"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_4BYTE_INDEX: return "CTL_I2C_FLAG_4BYTE_INDEX"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_SPEED_SLOW: return "CTL_I2C_FLAG_SPEED_SLOW"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_SPEED_FAST: return "CTL_I2C_FLAG_SPEED_FAST"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_SPEED_BIT_BASH: return "CTL_I2C_FLAG_SPEED_BIT_BASH"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_DRIVER_OVERRIDE: return "CTL_I2C_FLAG_DRIVER_OVERRIDE"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_START: return "CTL_I2C_FLAG_START"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_STOP: return "CTL_I2C_FLAG_STOP"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_RESTART: return "CTL_I2C_FLAG_RESTART"s;
-			case _ctl_i2c_flag_t::CTL_I2C_FLAG_MAX: return "CTL_I2C_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_i2c_pinpair_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_i2c_pinpair_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_ATOMICI2C: return "CTL_I2C_PINPAIR_FLAG_ATOMICI2C"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_1BYTE_INDEX: return "CTL_I2C_PINPAIR_FLAG_1BYTE_INDEX"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_2BYTE_INDEX: return "CTL_I2C_PINPAIR_FLAG_2BYTE_INDEX"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_4BYTE_INDEX: return "CTL_I2C_PINPAIR_FLAG_4BYTE_INDEX"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_SPEED_SLOW: return "CTL_I2C_PINPAIR_FLAG_SPEED_SLOW"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_SPEED_FAST: return "CTL_I2C_PINPAIR_FLAG_SPEED_FAST"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_SPEED_BIT_BASH: return "CTL_I2C_PINPAIR_FLAG_SPEED_BIT_BASH"s;
-			case _ctl_i2c_pinpair_flag_t::CTL_I2C_PINPAIR_FLAG_MAX: return "CTL_I2C_PINPAIR_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_aux_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_aux_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_aux_flag_t::CTL_AUX_FLAG_NATIVE_AUX: return "CTL_AUX_FLAG_NATIVE_AUX"s;
-			case _ctl_aux_flag_t::CTL_AUX_FLAG_I2C_AUX: return "CTL_AUX_FLAG_I2C_AUX"s;
-			case _ctl_aux_flag_t::CTL_AUX_FLAG_I2C_AUX_MOT: return "CTL_AUX_FLAG_I2C_AUX_MOT"s;
-			case _ctl_aux_flag_t::CTL_AUX_FLAG_MAX: return "CTL_AUX_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_power_optimization_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_power_optimization_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_power_optimization_flag_t::CTL_POWER_OPTIMIZATION_FLAG_FBC: return "CTL_POWER_OPTIMIZATION_FLAG_FBC"s;
-			case _ctl_power_optimization_flag_t::CTL_POWER_OPTIMIZATION_FLAG_PSR: return "CTL_POWER_OPTIMIZATION_FLAG_PSR"s;
-			case _ctl_power_optimization_flag_t::CTL_POWER_OPTIMIZATION_FLAG_DPST: return "CTL_POWER_OPTIMIZATION_FLAG_DPST"s;
-			case _ctl_power_optimization_flag_t::CTL_POWER_OPTIMIZATION_FLAG_LRR: return "CTL_POWER_OPTIMIZATION_FLAG_LRR"s;
-			case _ctl_power_optimization_flag_t::CTL_POWER_OPTIMIZATION_FLAG_LACE: return "CTL_POWER_OPTIMIZATION_FLAG_LACE"s;
-			case _ctl_power_optimization_flag_t::CTL_POWER_OPTIMIZATION_FLAG_MAX: return "CTL_POWER_OPTIMIZATION_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_power_optimization_dpst_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_power_optimization_dpst_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_BKLT: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_BKLT"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_PANEL_CABC: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_PANEL_CABC"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_OPST: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_OPST"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_ELP: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_ELP"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_EPSM: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_EPSM"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_APD: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_APD"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_PIXOPTIX: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_PIXOPTIX"s;
-			case _ctl_power_optimization_dpst_flag_t::CTL_POWER_OPTIMIZATION_DPST_FLAG_MAX: return "CTL_POWER_OPTIMIZATION_DPST_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_power_optimization_lrr_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_power_optimization_lrr_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_LRR10: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_LRR10"s;
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_LRR20: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_LRR20"s;
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_LRR25: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_LRR25"s;
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_ALRR: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_ALRR"s;
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_UBLRR: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_UBLRR"s;
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_UBZRR: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_UBZRR"s;
-			case _ctl_power_optimization_lrr_flag_t::CTL_POWER_OPTIMIZATION_LRR_FLAG_MAX: return "CTL_POWER_OPTIMIZATION_LRR_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_pixtx_pipe_set_config_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_pixtx_pipe_set_config_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_pixtx_pipe_set_config_flag_t::CTL_PIXTX_PIPE_SET_CONFIG_FLAG_PERSIST_ACROSS_POWER_EVENTS: return "CTL_PIXTX_PIPE_SET_CONFIG_FLAG_PERSIST_ACROSS_POWER_EVENTS"s;
-			case _ctl_pixtx_pipe_set_config_flag_t::CTL_PIXTX_PIPE_SET_CONFIG_FLAG_MAX: return "CTL_PIXTX_PIPE_SET_CONFIG_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_retro_scaling_type_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_retro_scaling_type_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_retro_scaling_type_flag_t::CTL_RETRO_SCALING_TYPE_FLAG_INTEGER: return "CTL_RETRO_SCALING_TYPE_FLAG_INTEGER"s;
-			case _ctl_retro_scaling_type_flag_t::CTL_RETRO_SCALING_TYPE_FLAG_NEAREST_NEIGHBOUR: return "CTL_RETRO_SCALING_TYPE_FLAG_NEAREST_NEIGHBOUR"s;
-			case _ctl_retro_scaling_type_flag_t::CTL_RETRO_SCALING_TYPE_FLAG_MAX: return "CTL_RETRO_SCALING_TYPE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_scaling_type_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_scaling_type_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_scaling_type_flag_t::CTL_SCALING_TYPE_FLAG_IDENTITY: return "CTL_SCALING_TYPE_FLAG_IDENTITY"s;
-			case _ctl_scaling_type_flag_t::CTL_SCALING_TYPE_FLAG_CENTERED: return "CTL_SCALING_TYPE_FLAG_CENTERED"s;
-			case _ctl_scaling_type_flag_t::CTL_SCALING_TYPE_FLAG_STRETCHED: return "CTL_SCALING_TYPE_FLAG_STRETCHED"s;
-			case _ctl_scaling_type_flag_t::CTL_SCALING_TYPE_FLAG_ASPECT_RATIO_CENTERED_MAX: return "CTL_SCALING_TYPE_FLAG_ASPECT_RATIO_CENTERED_MAX"s;
-			case _ctl_scaling_type_flag_t::CTL_SCALING_TYPE_FLAG_CUSTOM: return "CTL_SCALING_TYPE_FLAG_CUSTOM"s;
-			case _ctl_scaling_type_flag_t::CTL_SCALING_TYPE_FLAG_MAX: return "CTL_SCALING_TYPE_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_get_operation_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_get_operation_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_get_operation_flag_t::CTL_GET_OPERATION_FLAG_CURRENT: return "CTL_GET_OPERATION_FLAG_CURRENT"s;
-			case _ctl_get_operation_flag_t::CTL_GET_OPERATION_FLAG_DEFAULT: return "CTL_GET_OPERATION_FLAG_DEFAULT"s;
-			case _ctl_get_operation_flag_t::CTL_GET_OPERATION_FLAG_CAPABILITY: return "CTL_GET_OPERATION_FLAG_CAPABILITY"s;
-			case _ctl_get_operation_flag_t::CTL_GET_OPERATION_FLAG_MAX: return "CTL_GET_OPERATION_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_lace_trigger_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_lace_trigger_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_lace_trigger_flag_t::CTL_LACE_TRIGGER_FLAG_AMBIENT_LIGHT: return "CTL_LACE_TRIGGER_FLAG_AMBIENT_LIGHT"s;
-			case _ctl_lace_trigger_flag_t::CTL_LACE_TRIGGER_FLAG_FIXED_AGGRESSIVENESS: return "CTL_LACE_TRIGGER_FLAG_FIXED_AGGRESSIVENESS"s;
-			case _ctl_lace_trigger_flag_t::CTL_LACE_TRIGGER_FLAG_MAX: return "CTL_LACE_TRIGGER_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_edid_management_out_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_edid_management_out_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_edid_management_out_flag_t::CTL_EDID_MANAGEMENT_OUT_FLAG_OS_CONN_NOTIFICATION: return "CTL_EDID_MANAGEMENT_OUT_FLAG_OS_CONN_NOTIFICATION"s;
-			case _ctl_edid_management_out_flag_t::CTL_EDID_MANAGEMENT_OUT_FLAG_SUPPLIED_EDID: return "CTL_EDID_MANAGEMENT_OUT_FLAG_SUPPLIED_EDID"s;
-			case _ctl_edid_management_out_flag_t::CTL_EDID_MANAGEMENT_OUT_FLAG_MONITOR_EDID: return "CTL_EDID_MANAGEMENT_OUT_FLAG_MONITOR_EDID"s;
-			case _ctl_edid_management_out_flag_t::CTL_EDID_MANAGEMENT_OUT_FLAG_DISPLAY_CONNECTED: return "CTL_EDID_MANAGEMENT_OUT_FLAG_DISPLAY_CONNECTED"s;
-			case _ctl_edid_management_out_flag_t::CTL_EDID_MANAGEMENT_OUT_FLAG_MAX: return "CTL_EDID_MANAGEMENT_OUT_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_display_setting_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_display_setting_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_LOW_LATENCY: return "CTL_DISPLAY_SETTING_FLAG_LOW_LATENCY"s;
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_SOURCE_TM: return "CTL_DISPLAY_SETTING_FLAG_SOURCE_TM"s;
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_CONTENT_TYPE: return "CTL_DISPLAY_SETTING_FLAG_CONTENT_TYPE"s;
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_QUANTIZATION_RANGE: return "CTL_DISPLAY_SETTING_FLAG_QUANTIZATION_RANGE"s;
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_PICTURE_AR: return "CTL_DISPLAY_SETTING_FLAG_PICTURE_AR"s;
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_AUDIO: return "CTL_DISPLAY_SETTING_FLAG_AUDIO"s;
-			case _ctl_display_setting_flag_t::CTL_DISPLAY_SETTING_FLAG_MAX: return "CTL_DISPLAY_SETTING_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_firmware_config_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_firmware_config_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_firmware_config_flag_t::CTL_FIRMWARE_CONFIG_FLAG_IS_DEVICE_LINK_SPEED_DOWNGRADE_CAPABLE: return "CTL_FIRMWARE_CONFIG_FLAG_IS_DEVICE_LINK_SPEED_DOWNGRADE_CAPABLE"s;
-			case _ctl_firmware_config_flag_t::CTL_FIRMWARE_CONFIG_FLAG_IS_DEVICE_LINK_SPEED_DOWNGRADE_ACTIVE: return "CTL_FIRMWARE_CONFIG_FLAG_IS_DEVICE_LINK_SPEED_DOWNGRADE_ACTIVE"s;
-			case _ctl_firmware_config_flag_t::CTL_FIRMWARE_CONFIG_FLAG_MAX: return "CTL_FIRMWARE_CONFIG_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_freq_throttle_reason_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_freq_throttle_reason_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP: return "CTL_FREQ_THROTTLE_REASON_FLAG_AVE_PWR_CAP"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_BURST_PWR_CAP: return "CTL_FREQ_THROTTLE_REASON_FLAG_BURST_PWR_CAP"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_CURRENT_LIMIT: return "CTL_FREQ_THROTTLE_REASON_FLAG_CURRENT_LIMIT"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT: return "CTL_FREQ_THROTTLE_REASON_FLAG_THERMAL_LIMIT"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_PSU_ALERT: return "CTL_FREQ_THROTTLE_REASON_FLAG_PSU_ALERT"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_SW_RANGE: return "CTL_FREQ_THROTTLE_REASON_FLAG_SW_RANGE"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_HW_RANGE: return "CTL_FREQ_THROTTLE_REASON_FLAG_HW_RANGE"s;
-			case _ctl_freq_throttle_reason_flag_t::CTL_FREQ_THROTTLE_REASON_FLAG_MAX: return "CTL_FREQ_THROTTLE_REASON_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_video_processing_super_resolution_flag_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_video_processing_super_resolution_flag_t*>(pEnum);
-			switch (e) {
-			case _ctl_video_processing_super_resolution_flag_t::CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_DISABLE: return "CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_DISABLE"s;
-			case _ctl_video_processing_super_resolution_flag_t::CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_ENABLE_DEFAULT_SCENARIO_MODE: return "CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_ENABLE_DEFAULT_SCENARIO_MODE"s;
-			case _ctl_video_processing_super_resolution_flag_t::CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_ENABLE_CONFERENCE_SCENARIO_MODE: return "CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_ENABLE_CONFERENCE_SCENARIO_MODE"s;
-			case _ctl_video_processing_super_resolution_flag_t::CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_ENABLE_CAMERA_SCENARIO_MODE: return "CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_ENABLE_CAMERA_SCENARIO_MODE"s;
-			case _ctl_video_processing_super_resolution_flag_t::CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_MAX: return "CTL_VIDEO_PROCESSING_SUPER_RESOLUTION_FLAG_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_vf_curve_details_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_vf_curve_details_t*>(pEnum);
-			switch (e) {
-			case _ctl_vf_curve_details_t::CTL_VF_CURVE_DETAILS_SIMPLIFIED: return "CTL_VF_CURVE_DETAILS_SIMPLIFIED"s;
-			case _ctl_vf_curve_details_t::CTL_VF_CURVE_DETAILS_MEDIUM: return "CTL_VF_CURVE_DETAILS_MEDIUM"s;
-			case _ctl_vf_curve_details_t::CTL_VF_CURVE_DETAILS_ELABORATE: return "CTL_VF_CURVE_DETAILS_ELABORATE"s;
-			case _ctl_vf_curve_details_t::CTL_VF_CURVE_DETAILS_MAX: return "CTL_VF_CURVE_DETAILS_MAX"s;
-			default: return "{ unknown }"s;
-			}
-		};
-		dumpers[typeid(_ctl_vf_curve_type_t)] = [](const void* pEnum) {
-			const auto& e = *static_cast<const _ctl_vf_curve_type_t*>(pEnum);
-			switch (e) {
-			case _ctl_vf_curve_type_t::CTL_VF_CURVE_TYPE_STOCK: return "CTL_VF_CURVE_TYPE_STOCK"s;
-			case _ctl_vf_curve_type_t::CTL_VF_CURVE_TYPE_LIVE: return "CTL_VF_CURVE_TYPE_LIVE"s;
-			case _ctl_vf_curve_type_t::CTL_VF_CURVE_TYPE_MAX: return "CTL_VF_CURVE_TYPE_MAX"s;
+		dumpers[typeid(_NvAPI_Status)] = [](const void* pEnum) {
+			const auto& e = *static_cast<const _NvAPI_Status*>(pEnum);
+			switch (e) {
+			case _NvAPI_Status::NVAPI_OK: return "NVAPI_OK"s;
+			case _NvAPI_Status::NVAPI_ERROR: return "NVAPI_ERROR"s;
+			case _NvAPI_Status::NVAPI_LIBRARY_NOT_FOUND: return "NVAPI_LIBRARY_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_NO_IMPLEMENTATION: return "NVAPI_NO_IMPLEMENTATION"s;
+			case _NvAPI_Status::NVAPI_API_NOT_INITIALIZED: return "NVAPI_API_NOT_INITIALIZED"s;
+			case _NvAPI_Status::NVAPI_INVALID_ARGUMENT: return "NVAPI_INVALID_ARGUMENT"s;
+			case _NvAPI_Status::NVAPI_NVIDIA_DEVICE_NOT_FOUND: return "NVAPI_NVIDIA_DEVICE_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_END_ENUMERATION: return "NVAPI_END_ENUMERATION"s;
+			case _NvAPI_Status::NVAPI_INVALID_HANDLE: return "NVAPI_INVALID_HANDLE"s;
+			case _NvAPI_Status::NVAPI_INCOMPATIBLE_STRUCT_VERSION: return "NVAPI_INCOMPATIBLE_STRUCT_VERSION"s;
+			case _NvAPI_Status::NVAPI_HANDLE_INVALIDATED: return "NVAPI_HANDLE_INVALIDATED"s;
+			case _NvAPI_Status::NVAPI_OPENGL_CONTEXT_NOT_CURRENT: return "NVAPI_OPENGL_CONTEXT_NOT_CURRENT"s;
+			case _NvAPI_Status::NVAPI_INVALID_POINTER: return "NVAPI_INVALID_POINTER"s;
+			case _NvAPI_Status::NVAPI_NO_GL_EXPERT: return "NVAPI_NO_GL_EXPERT"s;
+			case _NvAPI_Status::NVAPI_INSTRUMENTATION_DISABLED: return "NVAPI_INSTRUMENTATION_DISABLED"s;
+			case _NvAPI_Status::NVAPI_NO_GL_NSIGHT: return "NVAPI_NO_GL_NSIGHT"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_LOGICAL_GPU_HANDLE: return "NVAPI_EXPECTED_LOGICAL_GPU_HANDLE"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_PHYSICAL_GPU_HANDLE: return "NVAPI_EXPECTED_PHYSICAL_GPU_HANDLE"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_DISPLAY_HANDLE: return "NVAPI_EXPECTED_DISPLAY_HANDLE"s;
+			case _NvAPI_Status::NVAPI_INVALID_COMBINATION: return "NVAPI_INVALID_COMBINATION"s;
+			case _NvAPI_Status::NVAPI_NOT_SUPPORTED: return "NVAPI_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_PORTID_NOT_FOUND: return "NVAPI_PORTID_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_UNATTACHED_DISPLAY_HANDLE: return "NVAPI_EXPECTED_UNATTACHED_DISPLAY_HANDLE"s;
+			case _NvAPI_Status::NVAPI_INVALID_PERF_LEVEL: return "NVAPI_INVALID_PERF_LEVEL"s;
+			case _NvAPI_Status::NVAPI_DEVICE_BUSY: return "NVAPI_DEVICE_BUSY"s;
+			case _NvAPI_Status::NVAPI_NV_PERSIST_FILE_NOT_FOUND: return "NVAPI_NV_PERSIST_FILE_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_PERSIST_DATA_NOT_FOUND: return "NVAPI_PERSIST_DATA_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_TV_DISPLAY: return "NVAPI_EXPECTED_TV_DISPLAY"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_TV_DISPLAY_ON_DCONNECTOR: return "NVAPI_EXPECTED_TV_DISPLAY_ON_DCONNECTOR"s;
+			case _NvAPI_Status::NVAPI_NO_ACTIVE_SLI_TOPOLOGY: return "NVAPI_NO_ACTIVE_SLI_TOPOLOGY"s;
+			case _NvAPI_Status::NVAPI_SLI_RENDERING_MODE_NOTALLOWED: return "NVAPI_SLI_RENDERING_MODE_NOTALLOWED"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_DIGITAL_FLAT_PANEL: return "NVAPI_EXPECTED_DIGITAL_FLAT_PANEL"s;
+			case _NvAPI_Status::NVAPI_ARGUMENT_EXCEED_MAX_SIZE: return "NVAPI_ARGUMENT_EXCEED_MAX_SIZE"s;
+			case _NvAPI_Status::NVAPI_DEVICE_SWITCHING_NOT_ALLOWED: return "NVAPI_DEVICE_SWITCHING_NOT_ALLOWED"s;
+			case _NvAPI_Status::NVAPI_TESTING_CLOCKS_NOT_SUPPORTED: return "NVAPI_TESTING_CLOCKS_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_UNKNOWN_UNDERSCAN_CONFIG: return "NVAPI_UNKNOWN_UNDERSCAN_CONFIG"s;
+			case _NvAPI_Status::NVAPI_TIMEOUT_RECONFIGURING_GPU_TOPO: return "NVAPI_TIMEOUT_RECONFIGURING_GPU_TOPO"s;
+			case _NvAPI_Status::NVAPI_DATA_NOT_FOUND: return "NVAPI_DATA_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_ANALOG_DISPLAY: return "NVAPI_EXPECTED_ANALOG_DISPLAY"s;
+			case _NvAPI_Status::NVAPI_NO_VIDLINK: return "NVAPI_NO_VIDLINK"s;
+			case _NvAPI_Status::NVAPI_REQUIRES_REBOOT: return "NVAPI_REQUIRES_REBOOT"s;
+			case _NvAPI_Status::NVAPI_INVALID_HYBRID_MODE: return "NVAPI_INVALID_HYBRID_MODE"s;
+			case _NvAPI_Status::NVAPI_MIXED_TARGET_TYPES: return "NVAPI_MIXED_TARGET_TYPES"s;
+			case _NvAPI_Status::NVAPI_SYSWOW64_NOT_SUPPORTED: return "NVAPI_SYSWOW64_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_IMPLICIT_SET_GPU_TOPOLOGY_CHANGE_NOT_ALLOWED: return "NVAPI_IMPLICIT_SET_GPU_TOPOLOGY_CHANGE_NOT_ALLOWED"s;
+			case _NvAPI_Status::NVAPI_REQUEST_USER_TO_CLOSE_NON_MIGRATABLE_APPS: return "NVAPI_REQUEST_USER_TO_CLOSE_NON_MIGRATABLE_APPS"s;
+			case _NvAPI_Status::NVAPI_OUT_OF_MEMORY: return "NVAPI_OUT_OF_MEMORY"s;
+			case _NvAPI_Status::NVAPI_WAS_STILL_DRAWING: return "NVAPI_WAS_STILL_DRAWING"s;
+			case _NvAPI_Status::NVAPI_FILE_NOT_FOUND: return "NVAPI_FILE_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_TOO_MANY_UNIQUE_STATE_OBJECTS: return "NVAPI_TOO_MANY_UNIQUE_STATE_OBJECTS"s;
+			case _NvAPI_Status::NVAPI_INVALID_CALL: return "NVAPI_INVALID_CALL"s;
+			case _NvAPI_Status::NVAPI_D3D10_1_LIBRARY_NOT_FOUND: return "NVAPI_D3D10_1_LIBRARY_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_FUNCTION_NOT_FOUND: return "NVAPI_FUNCTION_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_INVALID_USER_PRIVILEGE: return "NVAPI_INVALID_USER_PRIVILEGE"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_NON_PRIMARY_DISPLAY_HANDLE: return "NVAPI_EXPECTED_NON_PRIMARY_DISPLAY_HANDLE"s;
+			case _NvAPI_Status::NVAPI_EXPECTED_COMPUTE_GPU_HANDLE: return "NVAPI_EXPECTED_COMPUTE_GPU_HANDLE"s;
+			case _NvAPI_Status::NVAPI_STEREO_NOT_INITIALIZED: return "NVAPI_STEREO_NOT_INITIALIZED"s;
+			case _NvAPI_Status::NVAPI_STEREO_REGISTRY_ACCESS_FAILED: return "NVAPI_STEREO_REGISTRY_ACCESS_FAILED"s;
+			case _NvAPI_Status::NVAPI_STEREO_REGISTRY_PROFILE_TYPE_NOT_SUPPORTED: return "NVAPI_STEREO_REGISTRY_PROFILE_TYPE_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_STEREO_REGISTRY_VALUE_NOT_SUPPORTED: return "NVAPI_STEREO_REGISTRY_VALUE_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_STEREO_NOT_ENABLED: return "NVAPI_STEREO_NOT_ENABLED"s;
+			case _NvAPI_Status::NVAPI_STEREO_NOT_TURNED_ON: return "NVAPI_STEREO_NOT_TURNED_ON"s;
+			case _NvAPI_Status::NVAPI_STEREO_INVALID_DEVICE_INTERFACE: return "NVAPI_STEREO_INVALID_DEVICE_INTERFACE"s;
+			case _NvAPI_Status::NVAPI_STEREO_PARAMETER_OUT_OF_RANGE: return "NVAPI_STEREO_PARAMETER_OUT_OF_RANGE"s;
+			case _NvAPI_Status::NVAPI_STEREO_FRUSTUM_ADJUST_MODE_NOT_SUPPORTED: return "NVAPI_STEREO_FRUSTUM_ADJUST_MODE_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_TOPO_NOT_POSSIBLE: return "NVAPI_TOPO_NOT_POSSIBLE"s;
+			case _NvAPI_Status::NVAPI_MODE_CHANGE_FAILED: return "NVAPI_MODE_CHANGE_FAILED"s;
+			case _NvAPI_Status::NVAPI_D3D11_LIBRARY_NOT_FOUND: return "NVAPI_D3D11_LIBRARY_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_INVALID_ADDRESS: return "NVAPI_INVALID_ADDRESS"s;
+			case _NvAPI_Status::NVAPI_STRING_TOO_SMALL: return "NVAPI_STRING_TOO_SMALL"s;
+			case _NvAPI_Status::NVAPI_MATCHING_DEVICE_NOT_FOUND: return "NVAPI_MATCHING_DEVICE_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_DRIVER_RUNNING: return "NVAPI_DRIVER_RUNNING"s;
+			case _NvAPI_Status::NVAPI_DRIVER_NOTRUNNING: return "NVAPI_DRIVER_NOTRUNNING"s;
+			case _NvAPI_Status::NVAPI_ERROR_DRIVER_RELOAD_REQUIRED: return "NVAPI_ERROR_DRIVER_RELOAD_REQUIRED"s;
+			case _NvAPI_Status::NVAPI_SET_NOT_ALLOWED: return "NVAPI_SET_NOT_ALLOWED"s;
+			case _NvAPI_Status::NVAPI_ADVANCED_DISPLAY_TOPOLOGY_REQUIRED: return "NVAPI_ADVANCED_DISPLAY_TOPOLOGY_REQUIRED"s;
+			case _NvAPI_Status::NVAPI_SETTING_NOT_FOUND: return "NVAPI_SETTING_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_SETTING_SIZE_TOO_LARGE: return "NVAPI_SETTING_SIZE_TOO_LARGE"s;
+			case _NvAPI_Status::NVAPI_TOO_MANY_SETTINGS_IN_PROFILE: return "NVAPI_TOO_MANY_SETTINGS_IN_PROFILE"s;
+			case _NvAPI_Status::NVAPI_PROFILE_NOT_FOUND: return "NVAPI_PROFILE_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_PROFILE_NAME_IN_USE: return "NVAPI_PROFILE_NAME_IN_USE"s;
+			case _NvAPI_Status::NVAPI_PROFILE_NAME_EMPTY: return "NVAPI_PROFILE_NAME_EMPTY"s;
+			case _NvAPI_Status::NVAPI_EXECUTABLE_NOT_FOUND: return "NVAPI_EXECUTABLE_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_EXECUTABLE_ALREADY_IN_USE: return "NVAPI_EXECUTABLE_ALREADY_IN_USE"s;
+			case _NvAPI_Status::NVAPI_DATATYPE_MISMATCH: return "NVAPI_DATATYPE_MISMATCH"s;
+			case _NvAPI_Status::NVAPI_PROFILE_REMOVED: return "NVAPI_PROFILE_REMOVED"s;
+			case _NvAPI_Status::NVAPI_UNREGISTERED_RESOURCE: return "NVAPI_UNREGISTERED_RESOURCE"s;
+			case _NvAPI_Status::NVAPI_ID_OUT_OF_RANGE: return "NVAPI_ID_OUT_OF_RANGE"s;
+			case _NvAPI_Status::NVAPI_DISPLAYCONFIG_VALIDATION_FAILED: return "NVAPI_DISPLAYCONFIG_VALIDATION_FAILED"s;
+			case _NvAPI_Status::NVAPI_DPMST_CHANGED: return "NVAPI_DPMST_CHANGED"s;
+			case _NvAPI_Status::NVAPI_INSUFFICIENT_BUFFER: return "NVAPI_INSUFFICIENT_BUFFER"s;
+			case _NvAPI_Status::NVAPI_ACCESS_DENIED: return "NVAPI_ACCESS_DENIED"s;
+			case _NvAPI_Status::NVAPI_MOSAIC_NOT_ACTIVE: return "NVAPI_MOSAIC_NOT_ACTIVE"s;
+			case _NvAPI_Status::NVAPI_SHARE_RESOURCE_RELOCATED: return "NVAPI_SHARE_RESOURCE_RELOCATED"s;
+			case _NvAPI_Status::NVAPI_REQUEST_USER_TO_DISABLE_DWM: return "NVAPI_REQUEST_USER_TO_DISABLE_DWM"s;
+			case _NvAPI_Status::NVAPI_D3D_DEVICE_LOST: return "NVAPI_D3D_DEVICE_LOST"s;
+			case _NvAPI_Status::NVAPI_INVALID_CONFIGURATION: return "NVAPI_INVALID_CONFIGURATION"s;
+			case _NvAPI_Status::NVAPI_STEREO_HANDSHAKE_NOT_DONE: return "NVAPI_STEREO_HANDSHAKE_NOT_DONE"s;
+			case _NvAPI_Status::NVAPI_EXECUTABLE_PATH_IS_AMBIGUOUS: return "NVAPI_EXECUTABLE_PATH_IS_AMBIGUOUS"s;
+			case _NvAPI_Status::NVAPI_DEFAULT_STEREO_PROFILE_IS_NOT_DEFINED: return "NVAPI_DEFAULT_STEREO_PROFILE_IS_NOT_DEFINED"s;
+			case _NvAPI_Status::NVAPI_DEFAULT_STEREO_PROFILE_DOES_NOT_EXIST: return "NVAPI_DEFAULT_STEREO_PROFILE_DOES_NOT_EXIST"s;
+			case _NvAPI_Status::NVAPI_CLUSTER_ALREADY_EXISTS: return "NVAPI_CLUSTER_ALREADY_EXISTS"s;
+			case _NvAPI_Status::NVAPI_DPMST_DISPLAY_ID_EXPECTED: return "NVAPI_DPMST_DISPLAY_ID_EXPECTED"s;
+			case _NvAPI_Status::NVAPI_INVALID_DISPLAY_ID: return "NVAPI_INVALID_DISPLAY_ID"s;
+			case _NvAPI_Status::NVAPI_STREAM_IS_OUT_OF_SYNC: return "NVAPI_STREAM_IS_OUT_OF_SYNC"s;
+			case _NvAPI_Status::NVAPI_INCOMPATIBLE_AUDIO_DRIVER: return "NVAPI_INCOMPATIBLE_AUDIO_DRIVER"s;
+			case _NvAPI_Status::NVAPI_VALUE_ALREADY_SET: return "NVAPI_VALUE_ALREADY_SET"s;
+			case _NvAPI_Status::NVAPI_TIMEOUT: return "NVAPI_TIMEOUT"s;
+			case _NvAPI_Status::NVAPI_GPU_WORKSTATION_FEATURE_INCOMPLETE: return "NVAPI_GPU_WORKSTATION_FEATURE_INCOMPLETE"s;
+			case _NvAPI_Status::NVAPI_STEREO_INIT_ACTIVATION_NOT_DONE: return "NVAPI_STEREO_INIT_ACTIVATION_NOT_DONE"s;
+			case _NvAPI_Status::NVAPI_SYNC_NOT_ACTIVE: return "NVAPI_SYNC_NOT_ACTIVE"s;
+			case _NvAPI_Status::NVAPI_SYNC_MASTER_NOT_FOUND: return "NVAPI_SYNC_MASTER_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_INVALID_SYNC_TOPOLOGY: return "NVAPI_INVALID_SYNC_TOPOLOGY"s;
+			case _NvAPI_Status::NVAPI_ECID_SIGN_ALGO_UNSUPPORTED: return "NVAPI_ECID_SIGN_ALGO_UNSUPPORTED"s;
+			case _NvAPI_Status::NVAPI_ECID_KEY_VERIFICATION_FAILED: return "NVAPI_ECID_KEY_VERIFICATION_FAILED"s;
+			case _NvAPI_Status::NVAPI_FIRMWARE_OUT_OF_DATE: return "NVAPI_FIRMWARE_OUT_OF_DATE"s;
+			case _NvAPI_Status::NVAPI_FIRMWARE_REVISION_NOT_SUPPORTED: return "NVAPI_FIRMWARE_REVISION_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_LICENSE_CALLER_AUTHENTICATION_FAILED: return "NVAPI_LICENSE_CALLER_AUTHENTICATION_FAILED"s;
+			case _NvAPI_Status::NVAPI_D3D_DEVICE_NOT_REGISTERED: return "NVAPI_D3D_DEVICE_NOT_REGISTERED"s;
+			case _NvAPI_Status::NVAPI_RESOURCE_NOT_ACQUIRED: return "NVAPI_RESOURCE_NOT_ACQUIRED"s;
+			case _NvAPI_Status::NVAPI_TIMING_NOT_SUPPORTED: return "NVAPI_TIMING_NOT_SUPPORTED"s;
+			case _NvAPI_Status::NVAPI_HDCP_ENCRYPTION_FAILED: return "NVAPI_HDCP_ENCRYPTION_FAILED"s;
+			case _NvAPI_Status::NVAPI_PCLK_LIMITATION_FAILED: return "NVAPI_PCLK_LIMITATION_FAILED"s;
+			case _NvAPI_Status::NVAPI_NO_CONNECTOR_FOUND: return "NVAPI_NO_CONNECTOR_FOUND"s;
+			case _NvAPI_Status::NVAPI_HDCP_DISABLED: return "NVAPI_HDCP_DISABLED"s;
+			case _NvAPI_Status::NVAPI_API_IN_USE: return "NVAPI_API_IN_USE"s;
+			case _NvAPI_Status::NVAPI_NVIDIA_DISPLAY_NOT_FOUND: return "NVAPI_NVIDIA_DISPLAY_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_PRIV_SEC_VIOLATION: return "NVAPI_PRIV_SEC_VIOLATION"s;
+			case _NvAPI_Status::NVAPI_INCORRECT_VENDOR: return "NVAPI_INCORRECT_VENDOR"s;
+			case _NvAPI_Status::NVAPI_DISPLAY_IN_USE: return "NVAPI_DISPLAY_IN_USE"s;
+			case _NvAPI_Status::NVAPI_UNSUPPORTED_CONFIG_NON_HDCP_HMD: return "NVAPI_UNSUPPORTED_CONFIG_NON_HDCP_HMD"s;
+			case _NvAPI_Status::NVAPI_MAX_DISPLAY_LIMIT_REACHED: return "NVAPI_MAX_DISPLAY_LIMIT_REACHED"s;
+			case _NvAPI_Status::NVAPI_INVALID_DIRECT_MODE_DISPLAY: return "NVAPI_INVALID_DIRECT_MODE_DISPLAY"s;
+			case _NvAPI_Status::NVAPI_GPU_IN_DEBUG_MODE: return "NVAPI_GPU_IN_DEBUG_MODE"s;
+			case _NvAPI_Status::NVAPI_D3D_CONTEXT_NOT_FOUND: return "NVAPI_D3D_CONTEXT_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_STEREO_VERSION_MISMATCH: return "NVAPI_STEREO_VERSION_MISMATCH"s;
+			case _NvAPI_Status::NVAPI_GPU_NOT_POWERED: return "NVAPI_GPU_NOT_POWERED"s;
+			case _NvAPI_Status::NVAPI_ERROR_DRIVER_RELOAD_IN_PROGRESS: return "NVAPI_ERROR_DRIVER_RELOAD_IN_PROGRESS"s;
+			case _NvAPI_Status::NVAPI_WAIT_FOR_HW_RESOURCE: return "NVAPI_WAIT_FOR_HW_RESOURCE"s;
+			case _NvAPI_Status::NVAPI_REQUIRE_FURTHER_HDCP_ACTION: return "NVAPI_REQUIRE_FURTHER_HDCP_ACTION"s;
+			case _NvAPI_Status::NVAPI_DISPLAY_MUX_TRANSITION_FAILED: return "NVAPI_DISPLAY_MUX_TRANSITION_FAILED"s;
+			case _NvAPI_Status::NVAPI_INVALID_DSC_VERSION: return "NVAPI_INVALID_DSC_VERSION"s;
+			case _NvAPI_Status::NVAPI_INVALID_DSC_SLICECOUNT: return "NVAPI_INVALID_DSC_SLICECOUNT"s;
+			case _NvAPI_Status::NVAPI_INVALID_DSC_OUTPUT_BPP: return "NVAPI_INVALID_DSC_OUTPUT_BPP"s;
+			case _NvAPI_Status::NVAPI_FAILED_TO_LOAD_FROM_DRIVER_STORE: return "NVAPI_FAILED_TO_LOAD_FROM_DRIVER_STORE"s;
+			case _NvAPI_Status::NVAPI_NO_VULKAN: return "NVAPI_NO_VULKAN"s;
+			case _NvAPI_Status::NVAPI_REQUEST_PENDING: return "NVAPI_REQUEST_PENDING"s;
+			case _NvAPI_Status::NVAPI_RESOURCE_IN_USE: return "NVAPI_RESOURCE_IN_USE"s;
+			case _NvAPI_Status::NVAPI_INVALID_IMAGE: return "NVAPI_INVALID_IMAGE"s;
+			case _NvAPI_Status::NVAPI_INVALID_PTX: return "NVAPI_INVALID_PTX"s;
+			case _NvAPI_Status::NVAPI_NVLINK_UNCORRECTABLE: return "NVAPI_NVLINK_UNCORRECTABLE"s;
+			case _NvAPI_Status::NVAPI_JIT_COMPILER_NOT_FOUND: return "NVAPI_JIT_COMPILER_NOT_FOUND"s;
+			case _NvAPI_Status::NVAPI_INVALID_SOURCE: return "NVAPI_INVALID_SOURCE"s;
+			case _NvAPI_Status::NVAPI_ILLEGAL_INSTRUCTION: return "NVAPI_ILLEGAL_INSTRUCTION"s;
+			case _NvAPI_Status::NVAPI_INVALID_PC: return "NVAPI_INVALID_PC"s;
+			case _NvAPI_Status::NVAPI_LAUNCH_FAILED: return "NVAPI_LAUNCH_FAILED"s;
+			case _NvAPI_Status::NVAPI_NOT_PERMITTED: return "NVAPI_NOT_PERMITTED"s;
+			default: return "{ unknown }"s;
+			}
+		};
+		dumpers[typeid(nvmlReturn_t)] = [](const void* pEnum) {
+			const auto& e = *static_cast<const nvmlReturn_t*>(pEnum);
+			switch (e) {
+			case nvmlReturn_t::NVML_SUCCESS: return "NVML_SUCCESS"s;
+			case nvmlReturn_t::NVML_ERROR_UNINITIALIZED: return "NVML_ERROR_UNINITIALIZED"s;
+			case nvmlReturn_t::NVML_ERROR_INVALID_ARGUMENT: return "NVML_ERROR_INVALID_ARGUMENT"s;
+			case nvmlReturn_t::NVML_ERROR_NOT_SUPPORTED: return "NVML_ERROR_NOT_SUPPORTED"s;
+			case nvmlReturn_t::NVML_ERROR_NO_PERMISSION: return "NVML_ERROR_NO_PERMISSION"s;
+			case nvmlReturn_t::NVML_ERROR_ALREADY_INITIALIZED: return "NVML_ERROR_ALREADY_INITIALIZED"s;
+			case nvmlReturn_t::NVML_ERROR_NOT_FOUND: return "NVML_ERROR_NOT_FOUND"s;
+			case nvmlReturn_t::NVML_ERROR_INSUFFICIENT_SIZE: return "NVML_ERROR_INSUFFICIENT_SIZE"s;
+			case nvmlReturn_t::NVML_ERROR_INSUFFICIENT_POWER: return "NVML_ERROR_INSUFFICIENT_POWER"s;
+			case nvmlReturn_t::NVML_ERROR_DRIVER_NOT_LOADED: return "NVML_ERROR_DRIVER_NOT_LOADED"s;
+			case nvmlReturn_t::NVML_ERROR_TIMEOUT: return "NVML_ERROR_TIMEOUT"s;
+			case nvmlReturn_t::NVML_ERROR_IRQ_ISSUE: return "NVML_ERROR_IRQ_ISSUE"s;
+			case nvmlReturn_t::NVML_ERROR_LIBRARY_NOT_FOUND: return "NVML_ERROR_LIBRARY_NOT_FOUND"s;
+			case nvmlReturn_t::NVML_ERROR_FUNCTION_NOT_FOUND: return "NVML_ERROR_FUNCTION_NOT_FOUND"s;
+			case nvmlReturn_t::NVML_ERROR_CORRUPTED_INFOROM: return "NVML_ERROR_CORRUPTED_INFOROM"s;
+			case nvmlReturn_t::NVML_ERROR_GPU_IS_LOST: return "NVML_ERROR_GPU_IS_LOST"s;
+			case nvmlReturn_t::NVML_ERROR_RESET_REQUIRED: return "NVML_ERROR_RESET_REQUIRED"s;
+			case nvmlReturn_t::NVML_ERROR_OPERATING_SYSTEM: return "NVML_ERROR_OPERATING_SYSTEM"s;
+			case nvmlReturn_t::NVML_ERROR_LIB_RM_VERSION_MISMATCH: return "NVML_ERROR_LIB_RM_VERSION_MISMATCH"s;
+			case nvmlReturn_t::NVML_ERROR_IN_USE: return "NVML_ERROR_IN_USE"s;
+			case nvmlReturn_t::NVML_ERROR_MEMORY: return "NVML_ERROR_MEMORY"s;
+			case nvmlReturn_t::NVML_ERROR_NO_DATA: return "NVML_ERROR_NO_DATA"s;
+			case nvmlReturn_t::NVML_ERROR_VGPU_ECC_NOT_SUPPORTED: return "NVML_ERROR_VGPU_ECC_NOT_SUPPORTED"s;
+			case nvmlReturn_t::NVML_ERROR_INSUFFICIENT_RESOURCES: return "NVML_ERROR_INSUFFICIENT_RESOURCES"s;
+			case nvmlReturn_t::NVML_ERROR_FREQ_NOT_SUPPORTED: return "NVML_ERROR_FREQ_NOT_SUPPORTED"s;
+			case nvmlReturn_t::NVML_ERROR_UNKNOWN: return "NVML_ERROR_UNKNOWN"s;
 			default: return "{ unknown }"s;
 			}
 		};
diff --git a/IntelPresentMon/CommonUtilities/win/com/WbemConnection.cpp b/IntelPresentMon/CommonUtilities/win/com/WbemConnection.cpp
index c978d6447..032ed59fc 100644
--- a/IntelPresentMon/CommonUtilities/win/com/WbemConnection.cpp
+++ b/IntelPresentMon/CommonUtilities/win/com/WbemConnection.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "WbemConnection.h"
 #include "Comdef.h"
@@ -62,8 +62,14 @@ namespace pmon::util::win::com
 			throw Except<Exception>();
 		}
 	}
+
+	IWbemServices* WbemConnection::GetServices() const noexcept
+	{
+		return pConnection.Get();
+	}
+
 	std::unique_ptr<WbemListener> WbemConnection::CreateListener_(WbemSink* pSink)
 	{
 		return std::make_unique<WbemListener>(pSink, pConnection);
 	}
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/CommonUtilities/win/com/WbemConnection.h b/IntelPresentMon/CommonUtilities/win/com/WbemConnection.h
index 7c2e589bd..907a48cdd 100644
--- a/IntelPresentMon/CommonUtilities/win/com/WbemConnection.h
+++ b/IntelPresentMon/CommonUtilities/win/com/WbemConnection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
 #include "ComPtr.h"
@@ -16,6 +16,7 @@ namespace pmon::util::win::com
 	{
 	public:
 		WbemConnection();
+		IWbemServices* GetServices() const noexcept;
 		template<class T, class...P>
 		std::unique_ptr<WbemListener> MakeListener(P&&...params)
 		{
@@ -30,4 +31,4 @@ namespace pmon::util::win::com
 		ComManager com;
 		Microsoft::WRL::ComPtr<IWbemServices> pConnection;
 	};
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.cpp b/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.cpp
deleted file mode 100644
index 8521cae01..000000000
--- a/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include "AmdPowerTelemetryAdapter.h"
-#include "Logging.h"
-
-#include "../CommonUtilities/log/GlogShim.h"
-
-#define MAX_OD5_THERMAL_DEVICES 5;
-
-namespace pwr::amd {
-AmdCheckerToken chk;
-
-AmdResultGrabber::AmdResultGrabber(int result,
-                                   std::source_location loc) noexcept
-    : result_(result), loc_(loc) {}
-int operator>>(AmdResultGrabber g, AmdCheckerToken) noexcept {
-  if (g.result_ != ADL_OK) {
-      try {
-          LOG(INFO) << "Failed Telemetry Query: " << g.loc_.file_name() << " "
-              << g.loc_.line() << " " << g.result_;
-      }
-      catch (...) {}
-  }
-  return g.result_;
-}
-
-AmdPowerTelemetryAdapter::AmdPowerTelemetryAdapter(
-    uint32_t deviceId, const Adl2Wrapper* adl2_wrapper, std::string adl_adapter_name,
-    int adl_adapter_index, int overdrive_version)
-    : PowerTelemetryAdapter(deviceId),
-      adl2_(adl2_wrapper),
-      name_(std::move(adl_adapter_name)),
-      adl_adapter_index_(adl_adapter_index),
-      overdrive_version_(overdrive_version) {}
-
-bool AmdPowerTelemetryAdapter::GetVideoMemoryInfo(uint64_t& gpu_mem_size, uint64_t& gpu_mem_max_bandwidth) const noexcept {
-
-  bool success = false;
-  ADLMemoryInfoX4 memory_info;
-
-  gpu_mem_size = 0;
-  gpu_mem_max_bandwidth = 0;
-
-  auto result = adl2_->Adapter_MemoryInfoX4_Get(adl_adapter_index_, &memory_info) >> chk;
-  if (adl2_->Ok(result)) {
-    // iMemoryBandwidthX2 does not specify size but iMemoryBandwith
-    // returns megabytes per second. Assuming they are the same.
-    gpu_mem_max_bandwidth = static_cast<uint64_t>(memory_info.iMemoryBandwidth) * 1000000;
-    // iMemorySize is the memory size in bytes
-    gpu_mem_size = static_cast<uint64_t>(memory_info.iMemorySize);
-    success = true;
-  }
-    
-  return success;
-}
-
-
-bool AmdPowerTelemetryAdapter::GetSustainedPowerLimit(double& sustainedPowerLimit) const noexcept {
-  sustainedPowerLimit = 0.f;
-  if (overdrive_version_ == 5) {
-    int power_control_supported = 0;
-    int result = adl2_->Overdrive5_PowerControl_Caps(
-      adl_adapter_index_, &power_control_supported) >> chk;
-      if (adl2_->Ok(result)) {
-        if (power_control_supported) {
-          int power_control_current = 0;
-          int power_control_default = 0;
-          result = adl2_->Overdrive5_PowerControl_Get(adl_adapter_index_,
-            &power_control_current, &power_control_default) >> chk;
-          if (adl2_->Ok(result)) {
-            // Not sure on return type, assuming watts
-            sustainedPowerLimit = (double)power_control_current;
-            return true;
-          }
-        }
-      }
-    } else if (overdrive_version_ == 6) {
-      int power_control_supported = 0;
-      int result = adl2_->Overdrive6_PowerControl_Caps(
-        adl_adapter_index_, &power_control_supported) >> chk;
-      if (adl2_->Ok(result)) {
-        if (power_control_supported) {
-          int power_control_current = 0;
-          int power_control_default = 0;
-          result = adl2_->Overdrive6_PowerControl_Get(adl_adapter_index_,
-            &power_control_current, &power_control_default) >> chk;
-          if (adl2_->Ok(result)) {
-            sustainedPowerLimit = (double)power_control_current;
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-}
-
-uint64_t AmdPowerTelemetryAdapter::GetDedicatedVideoMemory() const noexcept {
-  uint64_t video_mem_size = 0;
-  uint64_t video_max_bandwidth = 0;
-  GetVideoMemoryInfo(video_mem_size, video_max_bandwidth);
-  return video_mem_size;
-}
-
-uint64_t AmdPowerTelemetryAdapter::GetVideoMemoryMaxBandwidth() const noexcept {
-  uint64_t video_mem_size = 0;
-  uint64_t video_max_bandwidth = 0;
-
-  GetVideoMemoryInfo(video_mem_size, video_max_bandwidth);
-  return video_max_bandwidth;
-}
-
-double AmdPowerTelemetryAdapter::GetSustainedPowerLimit() const noexcept {
-  double sustainedPowerLimit = 0.f;
-  GetSustainedPowerLimit(sustainedPowerLimit);
-  return sustainedPowerLimit;
-}
-
-PresentMonPowerTelemetryInfo AmdPowerTelemetryAdapter::Sample() noexcept {
-  LARGE_INTEGER qpc;
-  QueryPerformanceCounter(&qpc);
-
-  PresentMonPowerTelemetryInfo info{
-      .qpc = (uint64_t)qpc.QuadPart,
-  };
-
-  // Sample metrics based on supported overdrive version
-  bool sample_return = false;
-  if (overdrive_version_ == 5) {
-    sample_return = Overdrive5Sample(info);
-  } else if (overdrive_version_ == 6) {
-    sample_return = Overdrive6Sample(info);
-  } else if (overdrive_version_ == 7) {
-    sample_return = Overdrive7Sample(info);
-  } else {
-    sample_return = Overdrive8Sample(info);
-  }
-
-  // Next sample telemery data that is common. Starting with VRAM usage
-  {
-    int vram_usage = 0;
-    auto result =
-        adl2_->Adapter_VRAMUsage_Get(adl_adapter_index_, &vram_usage) >> chk;
-    // ADL Adapter_VRAMUsage_Get returns VRAM memory usage in MB
-    if (adl2_->Ok(result)) {
-      info.gpu_mem_used_b = static_cast<uint64_t>(vram_usage) * 1000000;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_used);
-    }
-  }
-
-  // Next sample memory usage
-  { 
-    if (GetVideoMemoryInfo(info.gpu_mem_total_size_b, info.gpu_mem_max_bandwidth_bps)){
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_max_bandwidth);
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_size);
-    }
-  }
-
-  (void)sample_return;
-  return info;
-}
-
-bool AmdPowerTelemetryAdapter::Overdrive5Sample(
-    PresentMonPowerTelemetryInfo& info) noexcept {
-  // gpu temperature and fan speed
-  {
-    int result = 0;
-    ADLThermalControllerInfo thermals = {.iSize =
-                                             sizeof(ADLThermalControllerInfo)};
-    // Call ADL_Overdrive5_ThermalDevices_Enum(). This is an interesting one as
-    // the ADL specification states to "Set to 0" for the
-    // iThermalControllerIndex but sample pieces of code in the SDK perform loop
-    // over this call increasing the index until ADL_WARNING_NO_DATA is
-    // returned. For now, follow the sample code and loop up to 5. We
-    // will report the LAST successful enumeration for now.
-    // TODO (megalvan) test this code out to see if 0 is the correct
-    // value to send OR if we are supposed to iterate.
-    for (int thermal_controller_index = 0; thermal_controller_index < 10;
-         thermal_controller_index++) {
-      result =
-          adl2_->Overdrive5_ThermalDevices_Enum(
-              adl_adapter_index_, thermal_controller_index, &thermals) >>
-          chk;
-      if (adl2_->Ok(result)) {
-        if (thermals.iThermalDomain == ADL_DL_THERMAL_DOMAIN_GPU) {
-          ADLTemperature temp = {.iSize = sizeof(ADLTemperature)};
-          result = adl2_->Overdrive5_Temperature_Get(
-                       adl_adapter_index_, thermal_controller_index, &temp) >>
-                   chk;
-          if (adl2_->Ok(result)) {
-            // Temperature is returned in millidegrees Celsius
-            info.gpu_temperature_c = (double)temp.iTemperature / 1000.;
-            SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
-          }
-          ADLFanSpeedInfo fan_speed_info = {.iSize = sizeof(ADLFanSpeedInfo)};
-          result = adl2_->Overdrive5_FanSpeedInfo_Get(adl_adapter_index_,
-                                                      thermal_controller_index,
-                                                      &fan_speed_info) >>
-                   chk;
-          if (adl2_->Ok(result)) {
-            // Fan speed can be reported as RPMs or in percent. We only
-            // support RPMs. Probably should report both and let user
-            // select which they want.
-            if ((fan_speed_info.iFlags & ADL_DL_FANCTRL_SUPPORTS_RPM_READ) ==
-                ADL_DL_FANCTRL_SUPPORTS_RPM_READ) {
-              ADLFanSpeedValue fan_speed_value = {
-                  .iSize = sizeof(ADLFanSpeedValue),
-                  .iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM};
-              result = adl2_->Overdrive5_FanSpeed_Get(adl_adapter_index_,
-                                                      thermal_controller_index,
-                                                      &fan_speed_value) >>
-                       chk;
-              if (adl2_->Ok(result)) {
-                info.fan_speed_rpm[thermal_controller_index] =
-                    (double)fan_speed_value.iFanSpeed;
-                // TODO -> create function to fix this!!
-                SetTelemetryCapBit(GpuTelemetryCapBits::fan_speed_1);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // GPU, VRAM clock frequencies and GPU voltage
-  {
-    ADLPMActivity activity = {.iSize = sizeof(ADLPMActivity)};
-    int result =
-        adl2_->Overdrive5_CurrentActivity_Get(adl_adapter_index_, &activity) >>
-        chk;
-    if (adl2_->Ok(result)) {
-      info.gpu_utilization = (double)activity.iActivityPercent;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_utilization);
-      // It appears iEngineClock and iMemory clock come back as 10 Khz.
-      // This is what the Overdrive6 API reports back and appears to be
-      // confirmed from the Overdrive sample applications.
-      info.gpu_frequency_mhz = (double)activity.iEngineClock / 100;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_frequency);
-      info.vram_frequency_mhz = (double)activity.iMemoryClock / 100;
-      SetTelemetryCapBit(GpuTelemetryCapBits::vram_frequency);
-      // Overdrive sample application treats this as volts.
-      info.gpu_voltage_v = (double)activity.iVddc;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_voltage);
-    }
-  }
-
-  // Current Sustained Power Control limit
-  {
-    if (GetSustainedPowerLimit(info.gpu_sustained_power_limit_w)) {
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_sustained_power_limit);
-    }
-  }
-
-  // How does one make sure the OverdriveN functions are available??
-  {
-    ADLODNPerformanceStatus performance_status = {};
-    int result = adl2_->OverdriveN_PerformanceStatus_Get(adl_adapter_index_,
-                                                         &performance_status) >>
-                 chk;
-    if (adl2_->Ok(result)) {
-      // Overdrive sample application treats this as volts.
-      info.gpu_voltage_v = (double)performance_status.iVDDC;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_voltage);
-    }
-  }
-
-  return true;
-}
-
-bool AmdPowerTelemetryAdapter::Overdrive6Sample(
-    PresentMonPowerTelemetryInfo& info) noexcept {
-  // gpu temperature and fan speed
-  {
-    ADLOD6ThermalControllerCaps thermals = {};
-    int result = adl2_->Overdrive6_ThermalController_Caps(adl_adapter_index_,
-                                                          &thermals) >>
-                 chk;
-    if (adl2_->Ok(result)) {
-      // As with overdrive 5 we must check if reading of RPMs is allowed by the
-      // gpu.
-      if ((thermals.iCapabilities & ADL_OD6_TCCAPS_FANSPEED_RPM_READ) ==
-          ADL_OD6_TCCAPS_FANSPEED_RPM_READ) {
-        ADLOD6FanSpeedInfo fan_speed_info = {};
-        result = adl2_->Overdrive6_FanSpeed_Get(adl_adapter_index_,
-                                                &fan_speed_info) >>
-                 chk;
-        if (adl2_->Ok(result)) {
-          if ((fan_speed_info.iSpeedType & ADL_OD6_FANSPEED_TYPE_RPM) ==
-              ADL_OD6_FANSPEED_TYPE_RPM) {
-            info.fan_speed_rpm[0] = (double)fan_speed_info.iFanSpeedRPM;
-            SetTelemetryCapBit(GpuTelemetryCapBits::fan_speed_1);
-          }
-        }
-      }
-
-      // Make sure thermal controller exists on the gpu
-      if ((thermals.iCapabilities & ADL_OD6_TCCAPS_THERMAL_CONTROLLER) ==
-          ADL_OD6_TCCAPS_THERMAL_CONTROLLER) {
-        int temp = 0;
-        result =
-            adl2_->Overdrive6_Temperature_Get(adl_adapter_index_, &temp) >> chk;
-        if (adl2_->Ok(result)) {
-          // Temperature is returned in millidegrees Celsius
-          info.gpu_temperature_c = (double)temp / 1000.;
-          SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
-        }
-      }
-    }
-  }
-
-  // gpu and vram frequencies, as well as gpu utilization
-  {
-    ADLOD6CurrentStatus currentStatus = {};
-    int result = adl2_->Overdrive6_CurrentStatus_Get(adl_adapter_index_,
-                                                     &currentStatus) >>
-                 chk;
-    if (adl2_->Ok(result)) {
-      // iEngineClock and iMemory clock are returned as 10 Khz
-      info.gpu_frequency_mhz =
-          static_cast<double>(currentStatus.iEngineClock) / 100.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_frequency);
-      info.vram_frequency_mhz =
-          static_cast<double>(currentStatus.iMemoryClock) / 100.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::vram_frequency);
-      ADLOD6Capabilities caps = {};
-      result =
-          adl2_->Overdrive6_Capabilities_Get(adl_adapter_index_, &caps) >> chk;
-      if (adl2_->Ok(result)) {
-        if ((caps.iCapabilities & ADL_OD6_CAPABILITY_GPU_ACTIVITY_MONITOR) ==
-            ADL_OD6_CAPABILITY_GPU_ACTIVITY_MONITOR) {
-          info.gpu_utilization = (double)currentStatus.iActivityPercent;
-          SetTelemetryCapBit(GpuTelemetryCapBits::gpu_utilization);
-        }
-      }
-    }
-  }
-
-  // gpu power
-  {
-    int current_power_w = 0;
-    int result = adl2_->Overdrive6_CurrentPower_Get(adl_adapter_index_, 0,
-                                                    &current_power_w) >>
-                 chk;
-    if (adl2_->Ok(result)) {
-      // The returned int contains the current power in Watts with 8
-      // fractional bits
-      info.gpu_power_w = (double)(current_power_w >> 8);
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_power);
-    }
-  }
-
-  // sustained power control limit
-  {
-    if (GetSustainedPowerLimit(info.gpu_sustained_power_limit_w)) {
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_sustained_power_limit);
-    }
-  }
-
-  return true;
-}
-
-bool AmdPowerTelemetryAdapter::Overdrive7Sample(
-    PresentMonPowerTelemetryInfo& info) noexcept {
-
-  ADLODNCapabilitiesX2 od_caps = {};
-  int result =
-      adl2_->OverdriveN_CapabilitiesX2_Get(adl_adapter_index_, &od_caps) >>
-      chk;
-  if (adl2_->Ok(result)) {
-    ADLODNPerformanceStatus od_perf_status = {};
-    result = adl2_->OverdriveN_PerformanceStatus_Get(adl_adapter_index_,
-                                                     &od_perf_status) >>
-             chk;
-    if (adl2_->Ok(result)) {
-      // iEngineClock and iMemory clock are returned as 10 Khz
-      info.gpu_frequency_mhz = (double)od_perf_status.iCoreClock / 100.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_frequency);
-      info.vram_frequency_mhz = (double)od_perf_status.iMemoryClock / 100.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::vram_frequency);
-      info.gpu_voltage_v = (double)od_perf_status.iVDDC / 1000.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_voltage);
-      info.gpu_utilization = (double)od_perf_status.iGPUActivityPercent;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_utilization);
-    }
-    int temperature = 0;
-    result = adl2_->OverdriveN_Temperature_Get(adl_adapter_index_, 1,
-                                               &temperature) >>
-             chk;
-    if (adl2_->Ok(result)) {
-      // Temperature is returned in millidegrees Celsius
-      info.gpu_temperature_c = (double)temperature / 1000.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
-    }
-    ADLODNFanControl od_fan_control = {};
-    result =
-        adl2_->OverdriveN_FanControl_Get(adl_adapter_index_, &od_fan_control) >> chk;
-    if (adl2_->Ok(result)) {
-      info.fan_speed_rpm[0] = (double)od_fan_control.iCurrentFanSpeed;
-      SetTelemetryCapBit(GpuTelemetryCapBits::fan_speed_0);
-    }
-  }
-
-  // gpu power
-  {
-    int current_power_w = 0;
-    int result = adl2_->Overdrive6_CurrentPower_Get(adl_adapter_index_, 0,
-                                                    &current_power_w) >>
-                 chk;
-    if (adl2_->Ok(result)) {
-      // The returned int contains the current power in Watts with 8
-      // fractional bits
-      info.gpu_power_w = (double)(current_power_w >> 8);
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_power);
-    }
-  }
-
-  return true;
-}
-
-bool AmdPowerTelemetryAdapter::Overdrive8Sample(
-    PresentMonPowerTelemetryInfo& info) noexcept {
-  ADLPMLogDataOutput data_output = {};
-  if (adl2_->Ok(adl2_->New_QueryPMLogData_Get(adl_adapter_index_,
-                                              &data_output))) {
-    if (data_output.sensors[PMLOG_CLK_GFXCLK].supported) {
-      info.gpu_frequency_mhz = (double)data_output.sensors[PMLOG_CLK_GFXCLK].value;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_frequency);
-    }
-    if (data_output.sensors[PMLOG_CLK_MEMCLK].supported) {
-      info.vram_frequency_mhz = (double)data_output.sensors[PMLOG_CLK_MEMCLK].value;
-      SetTelemetryCapBit(GpuTelemetryCapBits::vram_frequency);
-    }
-    if (data_output.sensors[PMLOG_FAN_RPM].supported) {
-      info.fan_speed_rpm[0] = (double)data_output.sensors[PMLOG_FAN_RPM].value;
-      SetTelemetryCapBit(GpuTelemetryCapBits::fan_speed_0);
-    }
-    if (data_output.sensors[PMLOG_TEMPERATURE_EDGE].supported) {
-      info.gpu_temperature_c =
-          (double)data_output.sensors[PMLOG_TEMPERATURE_EDGE].value;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
-    }
-    if (data_output.sensors[PMLOG_INFO_ACTIVITY_GFX].supported) {
-      info.gpu_utilization =
-          (double)data_output.sensors[PMLOG_INFO_ACTIVITY_GFX].value;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_utilization);
-    }
-    if (data_output.sensors[PMLOG_GFX_VOLTAGE].supported) {
-      info.gpu_voltage_v =
-          (double)data_output.sensors[PMLOG_GFX_VOLTAGE].value / 1000.;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_voltage);
-    }
-    if (data_output.sensors[PMLOG_ASIC_POWER].supported) {
-      info.gpu_power_w = (double)data_output.sensors[PMLOG_ASIC_POWER].value;
-      SetTelemetryCapBit(GpuTelemetryCapBits::gpu_power);
-    }
-    return true;
-  } else {
-    return false;
-  }
-}
-
-PM_DEVICE_VENDOR AmdPowerTelemetryAdapter::GetVendor() const noexcept {
-  return PM_DEVICE_VENDOR::PM_DEVICE_VENDOR_AMD;
-}
-
-std::string AmdPowerTelemetryAdapter::GetName() const noexcept {
-  return name_;
-}
-
-}  // namespace pwr::amd
diff --git a/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.h b/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.h
deleted file mode 100644
index 45361e5ee..000000000
--- a/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include <source_location>
-#include "PowerTelemetryAdapter.h"
-#include "Adl2Wrapper.h"
-
-namespace pwr::amd {
-struct AmdCheckerToken {};
-extern AmdCheckerToken chk;
-struct AmdResultGrabber {
-  AmdResultGrabber(int result,
-            std::source_location = std::source_location::current()) noexcept;
-  int result_;
-  std::source_location loc_;
-};
-int operator>>(AmdResultGrabber, AmdCheckerToken) noexcept;
-
-class AmdPowerTelemetryAdapter : public PowerTelemetryAdapter {
- public:
-  AmdPowerTelemetryAdapter(uint32_t deviceId, const Adl2Wrapper* adl_wrapper, std::string adl_adapter_name, 
-                           int adl_adapter_index, int overdrive_version);
-  PresentMonPowerTelemetryInfo Sample() noexcept override;
-  PM_DEVICE_VENDOR GetVendor() const noexcept override;
-  std::string GetName() const noexcept override;
-  uint64_t GetDedicatedVideoMemory() const noexcept override;
-  uint64_t GetVideoMemoryMaxBandwidth() const noexcept override;
-  double GetSustainedPowerLimit() const noexcept override;
-
- private:
-  bool Overdrive5Sample(PresentMonPowerTelemetryInfo& info) noexcept;
-  bool Overdrive6Sample(PresentMonPowerTelemetryInfo& info) noexcept;
-  bool Overdrive7Sample(PresentMonPowerTelemetryInfo& info) noexcept;
-  bool Overdrive8Sample(PresentMonPowerTelemetryInfo& info) noexcept;
-  bool GetVideoMemoryInfo(uint64_t& gpu_mem_size, uint64_t& gpu_mem_max_bandwidth) const noexcept;
-  bool GetSustainedPowerLimit(double& sustainedPowerLimit) const noexcept;
-
-  const Adl2Wrapper* adl2_;
-  int adl_adapter_index_ = 0;
-  int overdrive_version_ = 0;
-  std::string name_ = "Unknown Adapter Name";
-};
-}
diff --git a/IntelPresentMon/ControlLib/AmdPowerTelemetryProvider.cpp b/IntelPresentMon/ControlLib/AmdPowerTelemetryProvider.cpp
deleted file mode 100644
index 8df1b950c..000000000
--- a/IntelPresentMon/ControlLib/AmdPowerTelemetryProvider.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include <format>
-#include <map>
-#include "AmdPowerTelemetryProvider.h"
-#include "AmdPowerTelemetryAdapter.h"
-#include "Logging.h"
-
-#define AMDVENDORID (1002)
-
-namespace pwr::amd {
-
-AmdPowerTelemetryProvider::AmdPowerTelemetryProvider(DeviceIdAllocator& allocator) {
-  int count = 0;
-  if (!adl_.Ok(adl_.Adapter_NumberOfAdapters_Get(&count))) {
-    throw std::runtime_error{"Failed to get number of amd gpus"};
-  }
-  // Resize the container to the actual count of adl adapter infos
-  adl_adapter_infos_.resize(count);
-
-  // Get the adapter infos
-  int full_adapter_info_size =
-      (int)(adl_adapter_infos_.size() * sizeof(AdapterInfo));
-  if (!adl_.Ok(adl_.Adapter_AdapterInfo_Get(adl_adapter_infos_.data(),
-                                            full_adapter_info_size))) {
-      throw std::runtime_error{"Failed to adapter infos for amd gpus"};
-  }
-
-  // Map of bus number to adapter string to track unique adapters
-  std::map<int, std::string> adapters;
-
-  for (auto& ai : adl_adapter_infos_) {
-    // Following the AMD example code for using Overdrive8 here. Instead of making
-    // a call to ADL2_Adapter_Active_Get the sample code checks the bus number. We
-    // are following this methodology as well because when making this call from
-    // the service ADL2_Adapter_Active_Get never returns an active adapter while
-    // the bus number is active and Overdrive caps report support.
-    if ((ai.iBusNumber > -1) && ai.iVendorID == AMDVENDORID) {
-      int overdrive_supported = 0;
-      int overdrive_enabled = 0;
-      int overdrive_version = 0;
-      // Again following the AMD Overdrive8 sample code. The code does not
-      // check for success on the Overdrive_Caps call. Instead just checks
-      // the supported overdrive version.
-      adl_.Overdrive_Caps(ai.iAdapterIndex, &overdrive_supported,
-                          &overdrive_enabled, &overdrive_version);
-
-      // If we don't get updated values for ANY of the passed in parameters
-      // bail out.
-      if ((overdrive_supported == 0) && (overdrive_enabled == 0) &&
-          (overdrive_version == 0)) {
-        throw std::runtime_error{"Failed to get overdrive caps for amd gpus"};
-      }
-
-      // If it's not a version of overdrive we support, bail out.
-      if ((overdrive_version < 5) || (overdrive_version > 8)) {
-        throw std::runtime_error{
-            std::format(
-                "Overdrive version is not supported. Version reported: {}",
-                overdrive_version)
-                .c_str()};
-      }
-
-      auto result =
-          adapters.insert(std::pair{ai.iBusNumber, ai.strAdapterName});
-      if (result.second) {
-        try {
-          std::string adl_adapter_name = ai.strAdapterName;
-          adapter_ptrs_.push_back(std::make_shared<AmdPowerTelemetryAdapter>(
-              allocator.Next(), &adl_, adl_adapter_name, ai.iAdapterIndex, overdrive_version));
-        } catch (const std::exception& e) {
-          TELE_ERR(e.what());
-        } catch (...) {
-          TELE_ERR("unknown error");
-        }
-      }
-    }
-  }
-}
-
-AmdPowerTelemetryProvider::~AmdPowerTelemetryProvider() {
-  adapter_ptrs_.clear();
-}
-
-const std::vector<std::shared_ptr<PowerTelemetryAdapter>>&
-AmdPowerTelemetryProvider::GetAdapters() noexcept {
-  return adapter_ptrs_;
-}
-
-uint32_t AmdPowerTelemetryProvider::GetAdapterCount() const noexcept {
-  return (uint32_t)adapter_ptrs_.size();
-}
-
-}  // namespace pwr::amd
diff --git a/IntelPresentMon/ControlLib/AmdPowerTelemetryProvider.h b/IntelPresentMon/ControlLib/AmdPowerTelemetryProvider.h
deleted file mode 100644
index c79fb500d..000000000
--- a/IntelPresentMon/ControlLib/AmdPowerTelemetryProvider.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#define NOMINMAX
-#include <Windows.h>
-#include <memory>
-#include <mutex>
-#include <vector>
-#include "PresentMonPowerTelemetry.h"
-#include "PowerTelemetryProvider.h"
-#include "Adl2Wrapper.h"
-#include "DeviceIdAllocator.h"
-
-namespace pwr::amd {
-class AmdPowerTelemetryProvider : public PowerTelemetryProvider {
- public:
-  explicit AmdPowerTelemetryProvider(DeviceIdAllocator& allocator);
-  AmdPowerTelemetryProvider(const AmdPowerTelemetryProvider& t) = delete;
-  AmdPowerTelemetryProvider& operator=(const AmdPowerTelemetryProvider& t) = delete;
-  ~AmdPowerTelemetryProvider() override;
-  const std::vector<std::shared_ptr<PowerTelemetryAdapter>>&
-  GetAdapters() noexcept override;
-  uint32_t GetAdapterCount() const noexcept override;
-
- private:
-  Adl2Wrapper adl_;
-  std::vector<AdapterInfo> adl_adapter_infos_;
-  std::vector<std::shared_ptr<PowerTelemetryAdapter>> adapter_ptrs_;
-};
-}  // namespace pwr::amd
diff --git a/IntelPresentMon/ControlLib/ControlLib.vcxproj b/IntelPresentMon/ControlLib/ControlLib.vcxproj
index 9c90ec617..06201c62c 100644
--- a/IntelPresentMon/ControlLib/ControlLib.vcxproj
+++ b/IntelPresentMon/ControlLib/ControlLib.vcxproj
@@ -73,6 +73,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <AdditionalIncludeDirectories>$(UciSdkIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -95,6 +96,7 @@
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <AdditionalIncludeDirectories>$(UciSdkIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -107,52 +109,52 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="AmdPowerTelemetryAdapter.h" />
-    <ClInclude Include="AmdPowerTelemetryProvider.h" />
-    <ClInclude Include="Adl2Wrapper.h" />
-    <ClInclude Include="CpuTelemetryInfo.h" />
+    <ClInclude Include="adl\adl_defines.h" />
+    <ClInclude Include="adl\adl_sdk.h" />
+    <ClInclude Include="adl\adl_structures.h" />
+    <ClInclude Include="adl\Adl2Wrapper.h" />
+    <ClInclude Include="adl\AdlTelemetryProvider.h" />
     <ClInclude Include="DllModule.h" />
-    <ClInclude Include="CpuTelemetry.h" />
     <ClInclude Include="Exceptions.h" />
-    <ClInclude Include="IgclErrorCodeProvider.h" />
-    <ClInclude Include="IntelPowerTelemetryAdapter.h" />
+    <ClInclude Include="igcl\IgclErrorCodeProvider.h" />
+    <ClInclude Include="igcl\igcl_api.h" />
     <ClInclude Include="Logging.h" />
     <ClInclude Include="MacroHelpers.h" />
-    <ClInclude Include="nvapi.h" />
-    <ClInclude Include="NvapiWrapper.h" />
-    <ClInclude Include="nvapi_interface_table.h" />
-    <ClInclude Include="NvidiaPowerTelemetryAdapter.h" />
-    <ClInclude Include="NvidiaPowerTelemetryProvider.h" />
-    <ClInclude Include="nvml.h" />
-    <ClInclude Include="NvmlWrapper.h" />
-    <ClInclude Include="PowerTelemetryAdapter.h" />
-    <ClInclude Include="PowerTelemetryProvider.h" />
-    <ClInclude Include="igcl_api.h" />
-    <ClInclude Include="IntelPowerTelemetryProvider.h" />
-    <ClInclude Include="PresentMonPowerTelemetry.h" />
-    <ClInclude Include="PowerTelemetryProviderFactory.h" />
-    <ClInclude Include="SignatureComparison.h" />
-    <ClInclude Include="WmiCpu.h" />
+    <ClInclude Include="nvapi\nvapi.h" />
+    <ClInclude Include="nvapi\NvapiWrapper.h" />
+    <ClInclude Include="nvapi\NvapiTelemetryProvider.h" />
+    <ClInclude Include="nvapi\nvapi_interface_table.h" />
+    <ClInclude Include="nvml\NvmlWrapper.h" />
+    <ClInclude Include="nvml\NvmlTelemetryProvider.h" />
+    <ClInclude Include="nvml\nvml.h" />
+    <ClInclude Include="EndpointCache.h" />
+    <ClInclude Include="igcl\IgclTelemetryProvider.h" />
+    <ClInclude Include="TelemetryCoordinator.h" />
+    <ClInclude Include="TelemetryDeviceFingerprint.h" />
+    <ClInclude Include="TelemetryProvider.h" />
+    <ClInclude Include="uci\UciSdk.h" />
+    <ClInclude Include="uci\UciTelemetryProvider.h" />
+    <ClInclude Include="wmi\WmiTelemetryProvider.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AmdPowerTelemetryAdapter.cpp" />
-    <ClCompile Include="Adl2Wrapper.cpp" />
-    <ClCompile Include="cApiWrapper.cpp" />
-    <ClCompile Include="IgclErrorCodeProvider.cpp" />
-    <ClCompile Include="IntelPowerTelemetryProvider.cpp" />
-    <ClCompile Include="IntelPowerTelemetryAdapter.cpp" />
-    <ClCompile Include="NvapiWrapper.cpp" />
-    <ClCompile Include="NvidiaPowerTelemetryAdapter.cpp" />
-    <ClCompile Include="NvidiaPowerTelemetryProvider.cpp" />
-    <ClCompile Include="NvmlWrapper.cpp" />
-    <ClCompile Include="PowerTelemetryAdapter.cpp" />
-    <ClCompile Include="PowerTelemetryProviderFactory.cpp" />
-    <ClCompile Include="SignatureComparison.cpp" />
-    <ClCompile Include="AmdPowerTelemetryProvider.cpp" />
-    <ClCompile Include="CpuTelemetry.cpp" />
-    <ClCompile Include="WmiCpu.cpp" />
+    <ClCompile Include="adl\Adl2Wrapper.cpp" />
+    <ClCompile Include="adl\AdlTelemetryProvider.cpp" />
+    <ClCompile Include="igcl\cApiWrapper.cpp" />
+    <ClCompile Include="igcl\IgclErrorCodeProvider.cpp" />
+    <ClCompile Include="igcl\IgclTelemetryProvider.cpp" />
+    <ClCompile Include="nvapi\NvapiWrapper.cpp" />
+    <ClCompile Include="nvapi\NvapiTelemetryProvider.cpp" />
+    <ClCompile Include="nvml\NvmlWrapper.cpp" />
+    <ClCompile Include="nvml\NvmlTelemetryProvider.cpp" />
+    <ClCompile Include="TelemetryCoordinator.cpp" />
+    <ClCompile Include="TelemetryDeviceFingerprint.cpp" />
+    <ClCompile Include="uci\UciTelemetryProvider.cpp" />
+    <ClCompile Include="wmi\WmiTelemetryProvider.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Interprocess\Interprocess.vcxproj">
+      <Project>{ca23d648-daef-4f06-81d5-fe619bd31f0b}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\PresentMonUtils\PresentMonUtils.vcxproj" Condition="Exists('..\PresentMonUtils\PresentMonUtils.vcxproj')">
       <Project>{66e9f6c5-28db-4218-81b9-31e0e146ecc0}</Project>
     </ProjectReference>
@@ -160,4 +162,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/ControlLib/ControlLib.vcxproj.filters b/IntelPresentMon/ControlLib/ControlLib.vcxproj.filters
index f444096b9..7d30782fe 100644
--- a/IntelPresentMon/ControlLib/ControlLib.vcxproj.filters
+++ b/IntelPresentMon/ControlLib/ControlLib.vcxproj.filters
@@ -5,7 +5,7 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Amd">
+    <Filter Include="Adl">
       <UniqueIdentifier>{7be1b9fe-f3a5-48d2-b9f7-4b1ffa529257}</UniqueIdentifier>
     </Filter>
     <Filter Include="Intel">
@@ -14,30 +14,39 @@
     <Filter Include="Nvidia">
       <UniqueIdentifier>{b9383b96-c78b-4e0f-bd7a-bb9eace086ef}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Wmi">
+      <UniqueIdentifier>{a6df2cb9-9e2a-46e5-8adb-ff8f258e2a36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Uci">
+      <UniqueIdentifier>{6db4e810-a194-46a6-ac19-44e86c4b2645}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="IntelPowerTelemetryAdapter.h">
-      <Filter>Intel</Filter>
+    <ClInclude Include="adl\adl_defines.h">
+      <Filter>Adl</Filter>
     </ClInclude>
-    <ClInclude Include="IntelPowerTelemetryProvider.h">
-      <Filter>Intel</Filter>
+    <ClInclude Include="adl\adl_sdk.h">
+      <Filter>Adl</Filter>
     </ClInclude>
-    <ClInclude Include="igcl_api.h">
-      <Filter>Intel</Filter>
+    <ClInclude Include="adl\adl_structures.h">
+      <Filter>Adl</Filter>
+    </ClInclude>
+    <ClInclude Include="nvapi\nvapi_interface_table.h">
+      <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="NvidiaPowerTelemetryAdapter.h">
+    <ClInclude Include="nvapi\nvapi.h">
       <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="NvidiaPowerTelemetryProvider.h">
+    <ClInclude Include="nvapi\NvapiWrapper.h">
       <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi_interface_table.h">
+    <ClInclude Include="nvapi\NvapiTelemetryProvider.h">
       <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi.h">
+    <ClInclude Include="nvml\NvmlTelemetryProvider.h">
       <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="NvapiWrapper.h">
+    <ClInclude Include="nvml\NvmlWrapper.h">
       <Filter>Nvidia</Filter>
     </ClInclude>
     <ClInclude Include="MacroHelpers.h">
@@ -46,81 +55,75 @@
     <ClInclude Include="DllModule.h">
       <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="nvml.h">
-      <Filter>Nvidia</Filter>
+    <ClInclude Include="adl\Adl2Wrapper.h">
+      <Filter>Adl</Filter>
     </ClInclude>
-    <ClInclude Include="NvmlWrapper.h">
-      <Filter>Nvidia</Filter>
+    <ClInclude Include="adl\AdlTelemetryProvider.h">
+      <Filter>Adl</Filter>
     </ClInclude>
-    <ClInclude Include="SignatureComparison.h">
-      <Filter>Nvidia</Filter>
+    <ClInclude Include="Logging.h" />
+    <ClInclude Include="Exceptions.h" />
+    <ClInclude Include="TelemetryCoordinator.h" />
+    <ClInclude Include="TelemetryDeviceFingerprint.h" />
+    <ClInclude Include="TelemetryProvider.h" />
+    <ClInclude Include="EndpointCache.h" />
+    <ClInclude Include="igcl\IgclTelemetryProvider.h">
+      <Filter>Intel</Filter>
     </ClInclude>
-    <ClInclude Include="AmdPowerTelemetryAdapter.h">
-      <Filter>Amd</Filter>
+    <ClInclude Include="igcl\IgclErrorCodeProvider.h">
+      <Filter>Intel</Filter>
     </ClInclude>
-    <ClInclude Include="AmdPowerTelemetryProvider.h">
-      <Filter>Amd</Filter>
+    <ClInclude Include="igcl\igcl_api.h">
+      <Filter>Intel</Filter>
     </ClInclude>
-    <ClInclude Include="Adl2Wrapper.h">
-      <Filter>Amd</Filter>
+    <ClInclude Include="nvml\nvml.h">
+      <Filter>Nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="WmiCpu.h">
-      <Filter>Intel</Filter>
+    <ClInclude Include="wmi\WmiTelemetryProvider.h">
+      <Filter>Wmi</Filter>
     </ClInclude>
-    <ClInclude Include="CpuTelemetry.h" />
-    <ClInclude Include="CpuTelemetryInfo.h" />
-    <ClInclude Include="Logging.h" />
-    <ClInclude Include="PowerTelemetryAdapter.h" />
-    <ClInclude Include="PowerTelemetryProvider.h" />
-    <ClInclude Include="PowerTelemetryProviderFactory.h" />
-    <ClInclude Include="PresentMonPowerTelemetry.h" />
-    <ClInclude Include="Exceptions.h" />
-    <ClInclude Include="IgclErrorCodeProvider.h">
-      <Filter>Intel</Filter>
+    <ClInclude Include="uci\UciTelemetryProvider.h">
+      <Filter>Uci</Filter>
+    </ClInclude>
+    <ClInclude Include="uci\UciSdk.h">
+      <Filter>Uci</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="NvapiWrapper.cpp">
+    <ClCompile Include="nvapi\NvapiWrapper.cpp">
       <Filter>Nvidia</Filter>
     </ClCompile>
-    <ClCompile Include="NvidiaPowerTelemetryAdapter.cpp">
+    <ClCompile Include="nvapi\NvapiTelemetryProvider.cpp">
       <Filter>Nvidia</Filter>
     </ClCompile>
-    <ClCompile Include="NvidiaPowerTelemetryProvider.cpp">
+    <ClCompile Include="nvml\NvmlWrapper.cpp">
       <Filter>Nvidia</Filter>
     </ClCompile>
-    <ClCompile Include="NvmlWrapper.cpp">
+    <ClCompile Include="nvml\NvmlTelemetryProvider.cpp">
       <Filter>Nvidia</Filter>
     </ClCompile>
-    <ClCompile Include="SignatureComparison.cpp">
-      <Filter>Nvidia</Filter>
+    <ClCompile Include="adl\Adl2Wrapper.cpp">
+      <Filter>Adl</Filter>
     </ClCompile>
-    <ClCompile Include="cApiWrapper.cpp">
-      <Filter>Intel</Filter>
+    <ClCompile Include="adl\AdlTelemetryProvider.cpp">
+      <Filter>Adl</Filter>
     </ClCompile>
-    <ClCompile Include="IntelPowerTelemetryAdapter.cpp">
+    <ClCompile Include="igcl\IgclTelemetryProvider.cpp">
       <Filter>Intel</Filter>
     </ClCompile>
-    <ClCompile Include="IntelPowerTelemetryProvider.cpp">
+    <ClCompile Include="TelemetryCoordinator.cpp" />
+    <ClCompile Include="TelemetryDeviceFingerprint.cpp" />
+    <ClCompile Include="igcl\cApiWrapper.cpp">
       <Filter>Intel</Filter>
     </ClCompile>
-    <ClCompile Include="WmiCpu.cpp">
+    <ClCompile Include="igcl\IgclErrorCodeProvider.cpp">
       <Filter>Intel</Filter>
     </ClCompile>
-    <ClCompile Include="Adl2Wrapper.cpp">
-      <Filter>Amd</Filter>
+    <ClCompile Include="wmi\WmiTelemetryProvider.cpp">
+      <Filter>Wmi</Filter>
     </ClCompile>
-    <ClCompile Include="AmdPowerTelemetryAdapter.cpp">
-      <Filter>Amd</Filter>
-    </ClCompile>
-    <ClCompile Include="AmdPowerTelemetryProvider.cpp">
-      <Filter>Amd</Filter>
-    </ClCompile>
-    <ClCompile Include="PowerTelemetryProviderFactory.cpp" />
-    <ClCompile Include="CpuTelemetry.cpp" />
-    <ClCompile Include="PowerTelemetryAdapter.cpp" />
-    <ClCompile Include="IgclErrorCodeProvider.cpp">
-      <Filter>Intel</Filter>
+    <ClCompile Include="uci\UciTelemetryProvider.cpp">
+      <Filter>Uci</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/ControlLib/CpuTelemetry.cpp b/IntelPresentMon/ControlLib/CpuTelemetry.cpp
deleted file mode 100644
index 0700923ad..000000000
--- a/IntelPresentMon/ControlLib/CpuTelemetry.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include <format>
-#include "CpuTelemetry.h"
-#include "../CommonUtilities/str/String.h"
-
-#include "../CommonUtilities/log/GlogShim.h"
-
-
-namespace pwr::cpu {
-    using namespace pmon::util;
-
-std::string CpuTelemetry::GetCpuName() {
-  if (cpu_name_.size() == 0) {
-    std::wstring local_cpu_name{};
-    if (ExecuteWQLProcessorNameQuery(local_cpu_name)) {
-      cpu_name_ = str::TrimWhitespace(str::ToNarrow(local_cpu_name));
-    } else {
-      cpu_name_ = "UNKNOWN_CPU";
-    }
-  }
-
-  return cpu_name_;
-}
-
-bool CpuTelemetry::ExecuteWQLProcessorNameQuery(
-    std::wstring& processor_name) {
-  struct ComHelper {
-    ComHelper() {
-      HRESULT result{CoInitializeEx(nullptr, COINIT_MULTITHREADED)};
-
-      if (FAILED(result)) {
-        throw std::runtime_error(
-            std::format("Failed CoInitializeEx. Result: {}", result).c_str());
-      }
-
-      result = CoInitializeSecurity(
-          nullptr, -1, nullptr, nullptr, RPC_C_AUTHN_LEVEL_DEFAULT,
-          RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, EOAC_NONE, nullptr);
-
-      if (FAILED(result)) {
-        CoUninitialize();
-        throw std::runtime_error(
-            std::format("Failed CoInitializeSecurity. Result: {}", result)
-                .c_str());
-      }
-    }
-    ComHelper(const ComHelper& t) = delete;
-    ComHelper& operator=(const ComHelper& t) = delete;
-    ~ComHelper() { CoUninitialize(); }
-  };
-
-  // Initialize to empty state
-  processor_name.clear();
-
-  try {
-    ComHelper com_helper;
-
-    std::wstring query(L"SELECT Name FROM Win32_Processor");
-    std::wstring server_name(L"ROOT\\CIMV2");
-    std::wstring locale(L"MS_409");
-
-    Microsoft::WRL::ComPtr<IWbemLocator> locator;
-    HRESULT result =
-        CoCreateInstance(CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER,
-                         IID_IWbemLocator, (&locator));
-
-    if (FAILED(result)) {
-      LOG(INFO) << "Failed CoCreateInstance: " << result << std::endl;
-      return false;
-    }
-
-    Microsoft::WRL::ComPtr<IWbemServices> services;
-    result = locator->ConnectServer(_bstr_t(server_name.c_str()), nullptr,
-                                    nullptr, _bstr_t(locale.c_str()), NULL,
-                                    nullptr, nullptr, &services);
-
-    if (FAILED(result)) {
-      LOG(INFO) << "Failed ConnectServer: " << result << std::endl;
-      return false;
-    }
-
-    result =
-        CoSetProxyBlanket(services.Get(), RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE,
-                          nullptr, RPC_C_AUTHN_LEVEL_CALL,
-                          RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, EOAC_NONE);
-
-    if (FAILED(result)) {
-      LOG(INFO) << "Failed CoSetProxyBlanket: " << result << std::endl;
-      return false;
-    }
-
-    Microsoft::WRL::ComPtr<IEnumWbemClassObject> enumerator;
-    result = services->ExecQuery(
-        bstr_t(L"WQL"), bstr_t(query.c_str()),
-        WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr,
-        &enumerator);
-
-    if (FAILED(result)) {
-      LOG(INFO) << "Failed ExecQuery: " << result << std::endl;
-      return false;
-    }
-
-    IWbemClassObject* ClassObject{};
-    DWORD returned{};
-    result = enumerator->Next(WBEM_INFINITE, 1, &ClassObject, &returned);
-
-    if (FAILED(result) || returned == 0) {
-      LOG(INFO) << "Failed Next: " << result << std::endl;
-      return false;
-    }
-
-    VARIANT variant{};
-    result = ClassObject->Get(L"Name", 0, &variant, nullptr, nullptr);
-    if (FAILED(result)) {
-      LOG(INFO) << "Failed Name Get: " << result << std::endl;
-      return false;
-    }
-
-    if (variant.vt == VT_BSTR) {
-      processor_name = variant.bstrVal;
-    }
-
-    VariantClear(&variant);
-    ClassObject->Release();
-
-    return true;
-
-  } catch (const std::runtime_error& e) {
-    LOG(INFO) << e.what() << std::endl;
-    return false;
-  } catch (...) {
-    LOG(INFO) << "Unknown COM Initialize Error" << std::endl;
-    return false;
-  }
-}
-
-}
\ No newline at end of file
diff --git a/IntelPresentMon/ControlLib/CpuTelemetry.h b/IntelPresentMon/ControlLib/CpuTelemetry.h
deleted file mode 100644
index dcee0bd3c..000000000
--- a/IntelPresentMon/ControlLib/CpuTelemetry.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-
-#include <bitset>
-#include <vector>
-#include <Wbemidl.h>
-#include <comdef.h>
-#include <wrl/client.h>
-#include <stdexcept>
-#include "CpuTelemetryInfo.h"
-
-namespace pwr::cpu {
-
-class CpuTelemetry {
- public:
-  virtual ~CpuTelemetry() = default;
-  virtual CpuTelemetryInfo Sample() noexcept = 0;
-  void SetTelemetryCapBit(CpuTelemetryCapBits telemetryCapBit) noexcept
-  {
-      cpuTelemetryCapBits_.set(static_cast<size_t>(telemetryCapBit));
-  }
-  std::bitset<static_cast<size_t>(CpuTelemetryCapBits::cpu_telemetry_count)> GetCpuTelemetryCapBits()
-  {
-      return cpuTelemetryCapBits_;
-  }
-
-  std::string GetCpuName();
-  double GetCpuPowerLimit() { return 0.; }
-  
- private:
-
-  bool ExecuteWQLProcessorNameQuery(std::wstring& processor_name);
-
-  std::bitset<static_cast<size_t>(CpuTelemetryCapBits::cpu_telemetry_count)>
-      cpuTelemetryCapBits_{};
-  std::string cpu_name_;
-};
-}
diff --git a/IntelPresentMon/ControlLib/CpuTelemetryInfo.h b/IntelPresentMon/ControlLib/CpuTelemetryInfo.h
deleted file mode 100644
index 23c2fa475..000000000
--- a/IntelPresentMon/ControlLib/CpuTelemetryInfo.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-
-#include <cstdint>
-#include <bitset>
-
-struct CpuTelemetryInfo {
-  uint64_t qpc;
-
-  double cpu_utilization;
-  double cpu_power_w;
-  double cpu_power_limit_w;
-  double cpu_temperature;
-  double cpu_frequency;
-};
-
-enum class CpuTelemetryCapBits {
-  cpu_utilization,
-  cpu_power,
-  cpu_power_limit,
-  cpu_temperature,
-  cpu_frequency,
-  cpu_core_utility,
-  cpu_telemetry_count
-};
-
-using CpuTelemetryBitset = std::bitset<static_cast<size_t>(CpuTelemetryCapBits::cpu_telemetry_count)>;
\ No newline at end of file
diff --git a/IntelPresentMon/ControlLib/DeviceIdAllocator.h b/IntelPresentMon/ControlLib/DeviceIdAllocator.h
deleted file mode 100644
index 1e1e7f482..000000000
--- a/IntelPresentMon/ControlLib/DeviceIdAllocator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (C) 2024 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-
-#include <atomic>
-#include <cstdint>
-
-namespace pwr
-{
-    class DeviceIdAllocator
-    {
-    public:
-        explicit DeviceIdAllocator(uint32_t startId = 1) noexcept
-            : nextId_{ startId } {}
-
-        uint32_t Next() noexcept
-        {
-            return nextId_.fetch_add(1, std::memory_order_relaxed);
-        }
-
-    private:
-        std::atomic<uint32_t> nextId_;
-    };
-}
diff --git a/IntelPresentMon/ControlLib/DllModule.h b/IntelPresentMon/ControlLib/DllModule.h
index e63b9db49..ebe6af578 100644
--- a/IntelPresentMon/ControlLib/DllModule.h
+++ b/IntelPresentMon/ControlLib/DllModule.h
@@ -1,8 +1,7 @@
 // Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
-#define NOMINMAX
-#include <Windows.h>
+#include "../CommonUtilities/win/WinAPI.h"
 #include <string>
 #include <vector>
 #include <stdexcept>
@@ -10,34 +9,36 @@
 #include <cassert>
 #include "Exceptions.h"
 
-
-class DllModule
+namespace pmon::tel
 {
-public:
-    DllModule(const DllModule& t) = delete;
-    DllModule& operator=(const DllModule& t) = delete;
-	DllModule(const std::vector<std::string>& dllFiles)
-	{
-		assert(!dllFiles.empty());
+    class DllModule
+    {
+    public:
+        DllModule(const DllModule& t) = delete;
+        DllModule& operator=(const DllModule& t) = delete;
+        DllModule(const std::vector<std::string>& dllFiles)
+        {
+            assert(!dllFiles.empty());
 
-		// try list of dll candidates in order
-		for (const auto& file : dllFiles) {
-			if (hModule = LoadLibraryExA(file.c_str(), NULL, LOAD_LIBRARY_SEARCH_SYSTEM32)) {
-				return;
-			}
-		}
-		// if all failed to load, throw exception
-		auto msg = std::format("Unable to locate telemetry library, last DLL tried: {}", dllFiles.back().c_str());
-		throw Except<TelemetrySubsystemAbsent>(std::move(msg));
-	}
-	~DllModule()
-	{
-		FreeLibrary(hModule);
-	}
-	void* GetProcAddress(const std::string& procName) const
-	{
-		return ::GetProcAddress(hModule, procName.c_str());
-	}
-private:
-	HMODULE hModule = nullptr;
-};
\ No newline at end of file
+            // try list of dll candidates in order
+            for (const auto& file : dllFiles) {
+                if (hModule = LoadLibraryExA(file.c_str(), NULL, LOAD_LIBRARY_SEARCH_SYSTEM32)) {
+                    return;
+                }
+            }
+            // if all failed to load, throw exception
+            auto msg = std::format("Unable to locate telemetry library, last DLL tried: {}", dllFiles.back().c_str());
+            throw Except<TelemetrySubsystemAbsent>(std::move(msg));
+        }
+        ~DllModule()
+        {
+            FreeLibrary(hModule);
+        }
+        void* GetProcAddress(const std::string& procName) const
+        {
+            return ::GetProcAddress(hModule, procName.c_str());
+        }
+    private:
+        HMODULE hModule = nullptr;
+    };
+}
diff --git a/IntelPresentMon/ControlLib/EndpointCache.h b/IntelPresentMon/ControlLib/EndpointCache.h
new file mode 100644
index 000000000..7a7e3d3c3
--- /dev/null
+++ b/IntelPresentMon/ControlLib/EndpointCache.h
@@ -0,0 +1,30 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include <cstdint>
+
+namespace pmon::tele
+{
+    template<class T>
+    struct EndpointCache
+    {
+        T output{};
+        int64_t requestQpc = 0;
+
+        bool Matches(int64_t candidateRequestQpc) const noexcept
+        {
+            return requestQpc == candidateRequestQpc;
+        }
+
+        bool Empty() const noexcept
+        {
+            return requestQpc == 0;
+        }
+
+        void Clear() noexcept
+        {
+            requestQpc = 0;
+        }
+    };
+}
diff --git a/IntelPresentMon/ControlLib/Exceptions.h b/IntelPresentMon/ControlLib/Exceptions.h
index fc611875f..614ae7cda 100644
--- a/IntelPresentMon/ControlLib/Exceptions.h
+++ b/IntelPresentMon/ControlLib/Exceptions.h
@@ -1,8 +1,18 @@
 #pragma once
 #include "../CommonUtilities/Exception.h"
 
-PM_DEFINE_EX(TelementryException);
+namespace pmon::tel
+{
+    PM_DEFINE_EX(TelementryException);
 
-PM_DEFINE_EX_FROM(TelementryException, TelemetrySubsystemAbsent);
+    PM_DEFINE_EX_FROM(TelementryException, TelemetrySubsystemAbsent);
+    PM_DEFINE_EX_FROM(TelementryException, TelemetryCoordinatorException);
+    PM_DEFINE_EX_FROM(TelementryException, AdlException);
+    PM_DEFINE_EX_FROM(TelementryException, IgclException);
+    PM_DEFINE_EX_FROM(TelementryException, NvapiException);
+    PM_DEFINE_EX_FROM(TelementryException, NvmlException);
+    PM_DEFINE_EX_FROM(TelementryException, UciException);
+    PM_DEFINE_EX_FROM(TelementryException, WmiException);
 
-using ::pmon::util::Except;
\ No newline at end of file
+    using ::pmon::util::Except;
+}
diff --git a/IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.cpp b/IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.cpp
deleted file mode 100644
index 86061b1ed..000000000
--- a/IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.cpp
+++ /dev/null
@@ -1,967 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include "IntelPowerTelemetryAdapter.h"
-#include "Logging.h"
-#include "../CommonUtilities/Math.h"
-#include "../CommonUtilities/ref/GeneratedReflection.h"
-#include "../CommonUtilities/ref/StaticReflection.h"
-#include <chrono>
-#include <regex>
-#include <ranges>
-
-using namespace pmon;
-using namespace util;
-namespace vi = std::views;
-using v = log::V;
-
-namespace pwr::intel
-{
-    namespace {
-        GpuTelemetryCapBits GetFanSpeedTelemetryCapBit_(
-            uint32_t fan_index) {
-            switch (fan_index) {
-            case 0:
-                return GpuTelemetryCapBits::fan_speed_0;
-            case 1:
-                return GpuTelemetryCapBits::fan_speed_1;
-            case 2:
-                return GpuTelemetryCapBits::fan_speed_2;
-            case 3:
-                return GpuTelemetryCapBits::fan_speed_3;
-            case 4:
-                return GpuTelemetryCapBits::fan_speed_4;
-            default:
-                throw std::runtime_error{ "Invalid fan speed index" };
-            }
-        }
-        GpuTelemetryCapBits GetPsuTelemetryCapBit_(
-            uint32_t psu_index) {
-            switch (psu_index) {
-            case 0:
-                return GpuTelemetryCapBits::psu_info_0;
-            case 1:
-                return GpuTelemetryCapBits::psu_info_1;
-            case 2:
-                return GpuTelemetryCapBits::psu_info_2;
-            case 3:
-                return GpuTelemetryCapBits::psu_info_3;
-            case 4:
-                return GpuTelemetryCapBits::psu_info_4;
-            default:
-                throw std::runtime_error{ "Invalid PSU index" };
-            }
-        }
-        GpuTelemetryCapBits GetMaxFanSpeedTelemetryCapBit_(
-            uint32_t index) {
-            switch (index) {
-            case 0:
-                return GpuTelemetryCapBits::max_fan_speed_0;
-            case 1:
-                return GpuTelemetryCapBits::max_fan_speed_1;
-            case 2:
-                return GpuTelemetryCapBits::max_fan_speed_2;
-            case 3:
-                return GpuTelemetryCapBits::max_fan_speed_3;
-            case 4:
-                return GpuTelemetryCapBits::max_fan_speed_4;
-            default:
-                throw std::runtime_error{ "Invalid max fan speed index" };
-            }
-        }
-    }
-
-    // public interface functions
-
-    IntelPowerTelemetryAdapter::IntelPowerTelemetryAdapter(uint32_t deviceId, ctl_device_adapter_handle_t handle)
-        :
-        PowerTelemetryAdapter(deviceId),
-        deviceHandle{ handle }
-    {
-        properties = {
-            .Size = sizeof(ctl_device_adapter_properties_t),
-            .pDeviceID = &deviceLuid,
-            .device_id_size = sizeof(deviceLuid),
-        };
-
-        if (auto result = ctlGetDeviceProperties(deviceHandle, &properties);
-            result != CTL_RESULT_SUCCESS) {
-            pmlog_error("ctlGetDeviceProperties failed").code(result)
-                .pmwatch(GetDeviceId());
-            throw std::runtime_error{ "Failure to get device properties" };
-        }
-        pmlog_verb(v::tele_gpu)("ctlGetDeviceProperties output")
-            .pmwatch(GetName()).pmwatch(GetDeviceId())
-            .pmwatch(ref::DumpGenerated(properties))
-            .pmwatch(deviceLuid.HighPart).pmwatch(deviceLuid.LowPart);
-
-        if (properties.device_type != CTL_DEVICE_TYPE_GRAPHICS) {
-            throw NonGraphicsDeviceException{};
-        }
-
-        // check for alchemist (used to enable features whose support not reported by IGCL)
-        // use device name that match Arc followed by A### part number pattern
-        isAlchemist = std::regex_search(GetName(), std::regex{ R"(Arc.*A\d{3})" });
-        pmlog_verb(v::tele_gpu)("Alchemist detection")
-            .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(isAlchemist);
-
-        // errors are reported inside this function
-        // do not hard-fail on memory module issues, so no need to check error return code
-        EnumerateMemoryModules();
-
-        // get count of power domains
-        uint32_t powerDomainCount = 0;
-        if (auto result = ctlEnumPowerDomains(deviceHandle, &powerDomainCount, nullptr);
-            result == CTL_RESULT_SUCCESS) {
-            powerDomains.resize(powerDomainCount);
-            // get power domain handles
-            if (auto result = ctlEnumPowerDomains(deviceHandle, &powerDomainCount, powerDomains.data());
-                result == CTL_RESULT_SUCCESS) {
-                pmlog_verb(v::tele_gpu)("ctlEnumPowerDomains(output)")
-                    .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(powerDomains));
-            }
-            else {
-                pmlog_warn("ctlEnumPowerDomains(enumeration) failed")
-                    .code(result).pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-        }
-        else {
-            pmlog_warn("ctlEnumPowerDomains(count) failed")
-                .code(result).pmwatch(GetName()).pmwatch(GetDeviceId());
-        }
-
-        // enumerate fans
-        uint32_t fanCount = 0;
-        if (auto res = ctlEnumFans(deviceHandle, &fanCount, nullptr); res == CTL_RESULT_SUCCESS) {
-            if (fanCount > 0) {
-                std::vector<ctl_fan_handle_t> fanHandles(fanCount);
-                if (auto res = ctlEnumFans(deviceHandle, &fanCount, fanHandles.data()); res == CTL_RESULT_SUCCESS) {
-                    for (auto&&[iFan, hFan] : vi::enumerate(fanHandles)) {
-                        if (hFan) {
-                            ctl_fan_properties_t props{ .Size = sizeof(ctl_fan_properties_t) };
-                            if (auto res = ctlFanGetProperties(hFan, &props); res != CTL_RESULT_SUCCESS) {
-                                pmlog_warn(std::format(
-                                    "ctlFanGetProperties failed for fan #{}",
-                                    iFan)).code(res).pmwatch(GetName()).pmwatch(GetDeviceId());
-                                maxFanSpeedsRpm_.push_back(0);
-                            }
-                            pmlog_verb(v::tele_gpu)(
-                                "ctlFanGetProperties output")
-                                .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(iFan)
-                                .pmwatch(ref::DumpGenerated(props));
-                            maxFanSpeedsRpm_.push_back(props.maxRPM);
-                        }
-                        else {
-                            pmlog_warn("null handle from ctlEnumFans")
-                                .pmwatch(GetName()).pmwatch(GetDeviceId());
-                            maxFanSpeedsRpm_.push_back(0);
-                        }
-                    }
-                }
-                else {
-                    pmlog_warn("ctlEnumFans(handles) failed")
-                        .code(res).pmwatch(GetName()).pmwatch(GetDeviceId());
-                }
-            }
-        }
-        else {
-            pmlog_warn("ctlEnumFans(count) failed").code(res)
-                .pmwatch(GetName()).pmwatch(GetDeviceId());
-        }
-    }
-
-    PresentMonPowerTelemetryInfo IntelPowerTelemetryAdapter::Sample() noexcept
-    {
-        pmlog_verb(v::tele_gpu)("telemetry poll tick").pmwatch(GetName()).pmwatch(GetDeviceId());
-
-        LARGE_INTEGER qpc;
-        QueryPerformanceCounter(&qpc);
-        bool success = true;
-        PresentMonPowerTelemetryInfo sample{
-            .qpc = (uint64_t)qpc.QuadPart,
-        };
-
-        ctl_power_telemetry_t currentSample{
-            .Size = sizeof(ctl_power_telemetry_t),
-            .Version = 1,
-        };
-        if (const auto result = ctlPowerTelemetryGet(deviceHandle, &currentSample);
-            result != CTL_RESULT_SUCCESS) {
-            success = false;
-            pmlog_warn("ctlPowerTelemetryGet failed").code(result).every(std::chrono::seconds{ 60 })
-                .pmwatch(GetName()).pmwatch(GetDeviceId());
-        }
-        pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet output")
-            .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(currentSample));
-
-        // Query memory state and bandwidth if supported
-        ctl_mem_state_t memory_state = {.Size = sizeof(ctl_mem_state_t)};
-        ctl_mem_bandwidth_t memory_bandwidth = {
-            .Size = sizeof(ctl_mem_bandwidth_t),
-            .Version = 1,
-        };
-        bool hasMemoryState = false;
-        bool hasMemoryBandwidth = false;
-        // Question: why are we only using the first element of memoryModules here?
-        if (memoryModules.size() > 0) {
-            if (const auto result = ctlMemoryGetState(memoryModules[0], &memory_state);
-                result != CTL_RESULT_SUCCESS) {
-                success = false;
-                pmlog_warn("ctlMemoryGetState failed").code(result).every(std::chrono::seconds{ 60 })
-                    .pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-            else {
-                hasMemoryState = true;
-            }
-            pmlog_verb(v::tele_gpu)("ctlMemoryGetState output")
-                .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(memory_state));
-            
-            if (const auto result = ctlMemoryGetBandwidth(memoryModules[0], &memory_bandwidth);
-                result != CTL_RESULT_SUCCESS) {
-                success = false;
-                pmlog_warn("ctlMemoryGetBandwidth failed").code(result).every(std::chrono::seconds{ 60 })
-                    .pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-            else {
-                hasMemoryBandwidth = true;
-            }
-            pmlog_verb(v::tele_gpu)("ctlMemoryGetBandwidth output")
-                .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(memory_bandwidth));
-        }
-
-        std::optional<double> gpu_sustained_power_limit_mw;
-        if (!powerDomains.empty()) {
-            ctl_power_limits_t limits{
-                .Size = sizeof(ctl_power_limits_t),
-            };
-            if (const auto result = ctlPowerGetLimits(powerDomains[0], &limits);
-                result == CTL_RESULT_SUCCESS) {
-                if (limits.sustainedPowerLimit.enabled) {
-                    gpu_sustained_power_limit_mw = (double)limits.sustainedPowerLimit.power;
-                }
-                pmlog_verb(v::tele_gpu)("ctlPowerGetLimits output").pmwatch(GetName())
-                    .pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(limits));
-            }
-            else {
-                success = false;
-                pmlog_warn("ctlPowerGetLimits failed").code(result).every(std::chrono::seconds{ 60 })
-                    .pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-        }
-
-        success = GatherSampleData(currentSample, memory_state, hasMemoryState,
-            memory_bandwidth, hasMemoryBandwidth, gpu_sustained_power_limit_mw, (uint64_t)qpc.QuadPart, sample) && success;
-
-        (void)success;
-        return sample;
-    }
-
-    PM_DEVICE_VENDOR IntelPowerTelemetryAdapter::GetVendor() const noexcept
-    {
-        return PM_DEVICE_VENDOR::PM_DEVICE_VENDOR_INTEL;
-    }
-
-    std::string IntelPowerTelemetryAdapter::GetName() const noexcept
-    {
-        return properties.name;
-    }
-
-    uint64_t IntelPowerTelemetryAdapter::GetDedicatedVideoMemory() const noexcept
-    {
-        ctl_mem_state_t memory_state = {.Size = sizeof(ctl_mem_state_t)};
-        uint64_t video_mem_size = 0;
-        if (memoryModules.size() > 0) {
-            if (const auto result = ctlMemoryGetState(memoryModules[0], &memory_state);
-                result == CTL_RESULT_SUCCESS) {
-                video_mem_size = memory_state.size;
-            }
-            else {
-                pmlog_warn("ctlMemoryGetState failed").code(result)
-                    .pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-            pmlog_verb(v::tele_gpu)("ctlMemoryGetState output")
-                .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(memory_state));
-        }
-        return video_mem_size;
-    }
-
-    uint64_t IntelPowerTelemetryAdapter::GetVideoMemoryMaxBandwidth() const noexcept
-    {
-        ctl_mem_bandwidth_t memoryBandwidth = {
-            .Size = sizeof(ctl_mem_bandwidth_t),
-            .Version = 1,
-        };
-        uint64_t videoMemMaxBandwidth = 0;
-        if (memoryModules.size() > 0) {
-            if (const auto result = ctlMemoryGetBandwidth(memoryModules[0], &memoryBandwidth);
-                result == CTL_RESULT_SUCCESS) {
-                videoMemMaxBandwidth = memoryBandwidth.maxBandwidth;
-            }
-            else {
-                pmlog_warn("ctlMemoryGetBandwidth failed")
-                    .code(result).pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-            pmlog_verb(v::tele_gpu)("ctlMemoryGetBandwidth output")
-                .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(memoryBandwidth));
-        }
-        return videoMemMaxBandwidth;
-    }
-
-    double IntelPowerTelemetryAdapter::GetSustainedPowerLimit() const noexcept
-    {
-        double gpuSustainedPowerLimit = 0.;
-        if (!powerDomains.empty()) {
-            ctl_power_limits_t limits{
-                .Size = sizeof(ctl_power_limits_t),
-            };
-            if (const auto result = ctlPowerGetLimits(powerDomains[0], &limits);
-                result == CTL_RESULT_SUCCESS) {
-                gpuSustainedPowerLimit = (double)limits.sustainedPowerLimit.power;
-                pmlog_verb(v::tele_gpu)("ctlPowerGetLimits output")
-                    .pmwatch(GetName()).pmwatch(GetDeviceId())
-                    .pmwatch(ref::DumpGenerated(limits));
-            }
-            else {
-                pmlog_warn("ctlPowerGetLimits failed").code(result)
-                    .pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-        }
-        // Control lib returns back in milliwatts
-        return gpuSustainedPowerLimit / 1000.;
-    }
-
-    uint64_t IntelPowerTelemetryAdapter::GetAdapterId() const noexcept
-    {
-        // LUID is a struct with LowPart (DWORD) and HighPart (LONG)
-        // We pack it into a uint64_t
-        uint64_t id = 0;
-        id |= (uint64_t)deviceLuid.LowPart;
-        id |= (uint64_t)deviceLuid.HighPart << 32;
-        return id;
-    }
-    // private implementation functions
-
-    ctl_result_t IntelPowerTelemetryAdapter::EnumerateMemoryModules()
-    {
-        // first call ctlEnumMemoryModules with nullptr to get number of modules
-        // and resize vector to accomodate
-        uint32_t memory_module_count = 0;
-        if (auto result = ctlEnumMemoryModules(deviceHandle, &memory_module_count,
-            nullptr); result != CTL_RESULT_SUCCESS)
-        {
-            pmlog_warn("ctlEnumMemoryModules(count) failed")
-                .code(result).pmwatch(GetName()).pmwatch(GetDeviceId());
-            return result;
-        }
-        memoryModules.resize(size_t(memory_module_count));
-        // call ctlEnumMemoryModules to get the actual module data now
-        if (auto result = ctlEnumMemoryModules(deviceHandle, &memory_module_count,
-            memoryModules.data()); result != CTL_RESULT_SUCCESS)
-        {
-            pmlog_warn("ctlEnumMemoryModules(data) failed")
-                .code(result).pmwatch(GetName()).pmwatch(GetDeviceId());
-            memoryModules.clear();
-            return result;
-        }
-        pmlog_verb(v::tele_gpu)("ctlEnumMemoryModules output")
-            .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpGenerated(memoryModules));
-
-        return CTL_RESULT_SUCCESS;
-    }
-
-    bool IntelPowerTelemetryAdapter::GatherSampleData(ctl_power_telemetry_t& currentSample,
-        ctl_mem_state_t& memory_state,
-        bool has_memory_state,
-        ctl_mem_bandwidth_t& memory_bandwidth,
-        bool has_memory_bandwidth,
-        std::optional<double> gpu_sustained_power_limit_mw,
-        uint64_t qpc,
-        PresentMonPowerTelemetryInfo& sample)
-    {
-        bool success = true;
-
-        if (const auto result = GetTimeDelta(currentSample);
-            result != CTL_RESULT_SUCCESS)
-        {
-            success = false;
-            pmlog_warn("ctlPowerTelemetryGet timestamp delta processing failed").code(result).every(std::chrono::seconds{ 60 })
-                .pmwatch(GetName()).pmwatch(GetDeviceId());
-        }
-
-        sample.qpc = qpc;
-
-        if (previousSample) {
-
-            if (const auto result = GetGPUPowerTelemetryData(
-                currentSample, sample); result != CTL_RESULT_SUCCESS)
-            {
-                success = false;
-                pmlog_warn("ctlPowerTelemetryGet GPU field processing failed")
-                    .code(result).every(std::chrono::seconds{ 60 }).pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-
-            if (const auto result = GetVramPowerTelemetryData(
-                currentSample, sample); result != CTL_RESULT_SUCCESS)
-            {
-                success = false;
-                pmlog_warn("ctlPowerTelemetryGet VRAM field processing failed")
-                    .code(result).every(std::chrono::seconds{ 60 }).pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-
-            if (const auto result = GetFanPowerTelemetryData(currentSample,
-                sample); result != CTL_RESULT_SUCCESS)
-            {
-                success = false;
-                pmlog_warn("ctlPowerTelemetryGet fan field processing failed")
-                    .code(result).every(std::chrono::seconds{ 60 }).pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-
-            if (const auto result = GetPsuPowerTelemetryData(
-                currentSample, sample); result != CTL_RESULT_SUCCESS)
-            {
-                success = false;
-                pmlog_warn("ctlPowerTelemetryGet PSU field processing failed")
-                    .code(result).every(std::chrono::seconds{ 60 }).pmwatch(GetName()).pmwatch(GetDeviceId());
-            }
-
-            // Get memory state and bandwidth data
-            if (memoryModules.size() > 0) {
-                if (has_memory_state) {
-                    GetMemStateTelemetryData(memory_state,
-                        sample);
-                }
-                if (has_memory_bandwidth) {
-                    GetMemBandwidthData(memory_bandwidth,
-                        sample);
-                }
-            }
-
-            // Save and convert the gpu sustained power limit
-            sample.gpu_sustained_power_limit_w =
-                gpu_sustained_power_limit_mw.value_or(0.) / 1000.;
-            if (gpu_sustained_power_limit_mw) {
-                SetTelemetryCapBit(GpuTelemetryCapBits::gpu_sustained_power_limit);                
-            }
-
-            pmlog_verb(v::tele_gpu)("telemetry sample assembled")
-                .pmwatch(GetName()).pmwatch(GetDeviceId()).pmwatch(ref::DumpStatic(sample));
-        }
-
-        // Save off the raw control library data for calculating time delta
-        // and usage data.
-        if (const auto result = SaveTelemetry(currentSample);
-            result != CTL_RESULT_SUCCESS)
-        {
-            success = false;
-            pmlog_warn("ctlPowerTelemetryGet sample cache update failed").code(result).every(std::chrono::seconds{ 60 })
-                .pmwatch(GetName()).pmwatch(GetDeviceId());
-        }
-
-        return success;
-    }
-
-    // TODO: stop using CTL stuff for non-ctl logic
-    // TODO: better functional programming
-    ctl_result_t IntelPowerTelemetryAdapter::GetTimeDelta(const ctl_power_telemetry_t& currentSample)
-    {
-        if (!previousSample) {
-            // We do not have a previous power telemetry item to calculate time
-            // delta against.
-            time_delta_ = 0.f;
-        }
-        else {
-            if (currentSample.timeStamp.type == CTL_DATA_TYPE_DOUBLE) {
-                time_delta_ = currentSample.timeStamp.value.datadouble -
-                    previousSample->timeStamp.value.datadouble;
-            }
-            else {
-                return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-            }
-        }
-
-        return CTL_RESULT_SUCCESS;
-    }
-
-    ctl_result_t IntelPowerTelemetryAdapter::GetGPUPowerTelemetryData(
-        const ctl_power_telemetry_t& currentSample,
-        PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info)
-    {
-        ctl_result_t result;
-
-        if (!previousSample) {
-            return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.timeStamp,
-            pm_gpu_power_telemetry_info.time_stamp,
-            GpuTelemetryCapBits::time_stamp);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuVoltage,
-            pm_gpu_power_telemetry_info.gpu_voltage_v,
-            GpuTelemetryCapBits::gpu_voltage);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuCurrentClockFrequency,
-            pm_gpu_power_telemetry_info.gpu_frequency_mhz,
-            GpuTelemetryCapBits::gpu_frequency);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuCurrentTemperature,
-            pm_gpu_power_telemetry_info.gpu_temperature_c,
-            GpuTelemetryCapBits::gpu_temperature);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetPowerTelemetryItemUsage(
-            currentSample.gpuEnergyCounter,
-            previousSample->gpuEnergyCounter,
-            pm_gpu_power_telemetry_info.gpu_power_w,
-            GpuTelemetryCapBits::gpu_power);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetPowerTelemetryItemUsage(
-            currentSample.totalCardEnergyCounter,
-            previousSample->totalCardEnergyCounter,
-            pm_gpu_power_telemetry_info.gpu_card_power_w,
-            GpuTelemetryCapBits::gpu_card_power);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetPowerTelemetryItemUsagePercent(
-            currentSample.globalActivityCounter,
-            previousSample->globalActivityCounter,
-            pm_gpu_power_telemetry_info.gpu_utilization,
-            GpuTelemetryCapBits::gpu_utilization);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetPowerTelemetryItemUsagePercent(
-            currentSample.renderComputeActivityCounter,
-            previousSample->renderComputeActivityCounter,
-            pm_gpu_power_telemetry_info.gpu_render_compute_utilization,
-            GpuTelemetryCapBits::gpu_render_compute_utilization);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetPowerTelemetryItemUsagePercent(
-            currentSample.mediaActivityCounter,
-            previousSample->mediaActivityCounter,
-            pm_gpu_power_telemetry_info.gpu_media_utilization,
-            GpuTelemetryCapBits::gpu_media_utilization);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        pm_gpu_power_telemetry_info.gpu_power_limited =
-            currentSample.gpuPowerLimited;
-        pm_gpu_power_telemetry_info.gpu_temperature_limited =
-            currentSample.gpuTemperatureLimited;
-        pm_gpu_power_telemetry_info.gpu_current_limited =
-            currentSample.gpuCurrentLimited;
-        pm_gpu_power_telemetry_info.gpu_voltage_limited =
-            currentSample.gpuVoltageLimited;
-        pm_gpu_power_telemetry_info.gpu_utilization_limited =
-            currentSample.gpuUtilizationLimited;
-
-        // On Intel all GPU limitation indicators are active except...
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_power_limited);
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature_limited);
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_voltage_limited);
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_utilization_limited);
-
-        // gpu_current_limited perf limit reason seems not supported on BMG
-        // because there is no bSupported flags for the perf limit reasons
-        // we detect alchemist and use this as a proxy for support
-        if (isAlchemist) {
-            SetTelemetryCapBit(GpuTelemetryCapBits::gpu_current_limited);
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuEffectiveClock,
-            pm_gpu_power_telemetry_info.gpu_effective_frequency_mhz,
-            GpuTelemetryCapBits::gpu_effective_frequency);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuVrTemp,
-            pm_gpu_power_telemetry_info.gpu_voltage_regulator_temperature_c,
-            GpuTelemetryCapBits::gpu_voltage_regulator_temperature);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.vramCurrentEffectiveFrequency,
-            pm_gpu_power_telemetry_info.gpu_mem_effective_bandwidth_gbps,
-            GpuTelemetryCapBits::gpu_mem_effective_bandwidth);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuOverVoltagePercent,
-            pm_gpu_power_telemetry_info.gpu_overvoltage_percent,
-            GpuTelemetryCapBits::gpu_overvoltage_percent);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuTemperaturePercent,
-            pm_gpu_power_telemetry_info.gpu_temperature_percent,
-            GpuTelemetryCapBits::gpu_temperature_percent);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.gpuPowerPercent,
-            pm_gpu_power_telemetry_info.gpu_power_percent,
-            GpuTelemetryCapBits::gpu_power_percent);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        return result;
-    }
-
-    ctl_result_t IntelPowerTelemetryAdapter::GetVramPowerTelemetryData(
-        const ctl_power_telemetry_t& currentSample,
-        PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info)
-    {
-        ctl_result_t result;
-
-        if (!previousSample) {
-            return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(currentSample.vramVoltage,
-            pm_gpu_power_telemetry_info.vram_voltage_v,
-            GpuTelemetryCapBits::vram_voltage);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.vramCurrentClockFrequency,
-            pm_gpu_power_telemetry_info.vram_frequency_mhz,
-            GpuTelemetryCapBits::vram_frequency);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.vramCurrentEffectiveFrequency,
-            pm_gpu_power_telemetry_info.vram_effective_frequency_gbps,
-            GpuTelemetryCapBits::vram_effective_frequency);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        result = GetInstantaneousPowerTelemetryItem(
-            currentSample.vramCurrentTemperature,
-            pm_gpu_power_telemetry_info.vram_temperature_c,
-            GpuTelemetryCapBits::vram_temperature);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        // bandwidth telemetry has 2 possible paths for acquisition
-        using namespace pmon::util;
-        if (useNewBandwidthTelemetry) {
-            pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet VRAM bandwidth V1 path")
-                .pmwatch(GetName()).pmwatch(GetDeviceId());
-            double gpuMemReadBandwidthMegabytesPerSecond = 0;
-            result = GetInstantaneousPowerTelemetryItem(
-                currentSample.vramReadBandwidth,
-                gpuMemReadBandwidthMegabytesPerSecond,
-                GpuTelemetryCapBits::gpu_mem_read_bandwidth);
-            // we need bandwidth in bits per second, IGCL V1 gives in megabytes per second
-            pm_gpu_power_telemetry_info.gpu_mem_read_bandwidth_bps = ConvertMagnitudePrefix(
-                gpuMemReadBandwidthMegabytesPerSecond * 8.,
-                MagnitudePrefix::Mega,
-                MagnitudePrefix::Base);
-            if (result != CTL_RESULT_SUCCESS ||
-                !(HasTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_read_bandwidth))) {
-                useNewBandwidthTelemetry = false;
-                pmlog_info("ctlPowerTelemetryGet.vramReadBandwidth unavailable, falling back to V0 counters")
-                    .code(result).pmwatch(GetName()).pmwatch(GetDeviceId())
-                    .pmwatch(HasTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_read_bandwidth));
-            }
-        }
-        if (useNewBandwidthTelemetry) {
-            double gpuMemWriteBandwidthMegabytesPerSecond = 0;
-            result = GetInstantaneousPowerTelemetryItem(
-                currentSample.vramWriteBandwidth,
-                gpuMemWriteBandwidthMegabytesPerSecond,
-                GpuTelemetryCapBits::gpu_mem_write_bandwidth);
-            // we need bandwidth in bits per second, IGCL V1 gives in megabytes per second
-            pm_gpu_power_telemetry_info.gpu_mem_write_bandwidth_bps = ConvertMagnitudePrefix(
-                gpuMemWriteBandwidthMegabytesPerSecond * 8.,
-                MagnitudePrefix::Mega,
-                MagnitudePrefix::Base);
-            if (result != CTL_RESULT_SUCCESS ||
-                !(HasTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_write_bandwidth))) {
-                useNewBandwidthTelemetry = false;
-                pmlog_info("ctlPowerTelemetryGet.vramWriteBandwidth unavailable, falling back to V0 counters")
-                    .code(result).pmwatch(GetName()).pmwatch(GetDeviceId())
-                    .pmwatch(HasTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_write_bandwidth));
-            }
-        }
-        if (!useNewBandwidthTelemetry) {
-            pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet VRAM bandwidth counter path")
-                .pmwatch(GetName()).pmwatch(GetDeviceId());
-            result = GetPowerTelemetryItemUsage(
-                currentSample.vramReadBandwidthCounter,
-                previousSample->vramReadBandwidthCounter,
-                pm_gpu_power_telemetry_info.gpu_mem_read_bandwidth_bps,
-                GpuTelemetryCapBits::gpu_mem_read_bandwidth);
-            if (result != CTL_RESULT_SUCCESS) {
-                return result;
-            }
-            result = GetPowerTelemetryItemUsage(
-                currentSample.vramWriteBandwidthCounter,
-                previousSample->vramWriteBandwidthCounter,
-                pm_gpu_power_telemetry_info.gpu_mem_write_bandwidth_bps,
-                GpuTelemetryCapBits::gpu_mem_write_bandwidth);
-            if (result != CTL_RESULT_SUCCESS) {
-                return result;
-            }
-        }
-
-        result = GetPowerTelemetryItemUsage(currentSample.vramEnergyCounter,
-            previousSample->vramEnergyCounter,
-            pm_gpu_power_telemetry_info.vram_power_w,
-            GpuTelemetryCapBits::vram_power);
-        if (result != CTL_RESULT_SUCCESS) {
-            return result;
-        }
-
-        // On Intel all VRAM limitation indicators are deprecated / return false
-        // GpuTelemetryCapBits::vram_power_limited
-        // GpuTelemetryCapBits::vram_temperature_limited
-        // GpuTelemetryCapBits::vram_current_limited
-        // GpuTelemetryCapBits::vram_voltage_limited
-        // GpuTelemetryCapBits::vram_utilization_limited
-
-        return result;
-    }
-
-    ctl_result_t IntelPowerTelemetryAdapter::GetFanPowerTelemetryData(
-        const ctl_power_telemetry_t& currentSample,
-        PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info)
-    {
-        ctl_result_t result = CTL_RESULT_SUCCESS;
-
-        for (uint32_t i = 0; i < CTL_FAN_COUNT; i++) {
-            try {
-                const auto fanSpeedCapBit = GetFanSpeedTelemetryCapBit_(i);
-                result = GetInstantaneousPowerTelemetryItem(
-                    currentSample.fanSpeed[i],
-                    pm_gpu_power_telemetry_info.fan_speed_rpm[i],
-                    fanSpeedCapBit);
-                if (result != CTL_RESULT_SUCCESS) {
-                    break;
-                }
-                if (HasTelemetryCapBit(fanSpeedCapBit) && maxFanSpeedsRpm_[i] > 0) {
-                    SetTelemetryCapBit(GetMaxFanSpeedTelemetryCapBit_(i));
-                    pm_gpu_power_telemetry_info.max_fan_speed_rpm[i] = maxFanSpeedsRpm_[i];
-                }
-            } catch (...) {
-                result = CTL_RESULT_ERROR_INVALID_ARGUMENT;
-            } 
-        }
-
-        return result;
-    }
-
-    ctl_result_t IntelPowerTelemetryAdapter::GetPsuPowerTelemetryData(
-        const ctl_power_telemetry_t& currentSample,
-        PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info)
-    {
-        ctl_result_t result = CTL_RESULT_SUCCESS;
-
-        if (!previousSample) {
-            return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-        }
-
-        for (uint32_t i = 0; i < CTL_PSU_COUNT; i++) {
-            if (currentSample.psu[i].bSupported) {
-                GpuTelemetryCapBits psu_telemetry_bit;
-                try {
-                  psu_telemetry_bit = GetPsuTelemetryCapBit_(i);
-                  pm_gpu_power_telemetry_info.psu[i].psu_type =
-                      PresentMonPsuType(currentSample.psu[i].psuType);
-                  result = GetInstantaneousPowerTelemetryItem(
-                      currentSample.psu[i].voltage,
-                      pm_gpu_power_telemetry_info.psu[i].psu_voltage,
-                      psu_telemetry_bit);
-                  if (result != CTL_RESULT_SUCCESS) {
-                    break;
-                  }
-                  result = GetPowerTelemetryItemUsage(
-                      currentSample.psu[i].energyCounter,
-                      previousSample->psu[i].energyCounter,
-                      pm_gpu_power_telemetry_info.psu[i].psu_power,
-                      psu_telemetry_bit);
-                  if (result != CTL_RESULT_SUCCESS) {
-                    break;
-                  }
-                } catch (...) {
-                  result = CTL_RESULT_ERROR_INVALID_ARGUMENT;
-                  break;
-                } 
-            }
-            else {
-                pm_gpu_power_telemetry_info.psu[i].psu_type =
-                    PresentMonPsuType::None;
-                pm_gpu_power_telemetry_info.psu[i].psu_power = 0.0f;
-                pm_gpu_power_telemetry_info.psu[i].psu_voltage = 0.0f;
-            }
-        }
-
-        return result;
-    }
-
-    void IntelPowerTelemetryAdapter::GetMemStateTelemetryData(
-        const ctl_mem_state_t& mem_state,
-        PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info) {
-        pm_gpu_power_telemetry_info.gpu_mem_total_size_b = mem_state.size;
-        pm_gpu_power_telemetry_info.gpu_mem_used_b = mem_state.size - mem_state.free;
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_size);
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_used);
-        return;
-    }
-
-    void IntelPowerTelemetryAdapter::GetMemBandwidthData(
-        const ctl_mem_bandwidth_t& mem_bandwidth,
-        PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info) {
-        pm_gpu_power_telemetry_info.gpu_mem_max_bandwidth_bps = mem_bandwidth.maxBandwidth;
-        gpu_mem_max_bw_cache_value_bps_ = mem_bandwidth.maxBandwidth;
-        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_max_bandwidth);
-        return;
-    }
-    
-    ctl_result_t IntelPowerTelemetryAdapter::GetInstantaneousPowerTelemetryItem(
-        const ctl_oc_telemetry_item_t& telemetry_item,
-        double& pm_telemetry_value, GpuTelemetryCapBits telemetry_cap_bit)
-    {
-        if (telemetry_item.bSupported) {
-            if (telemetry_item.type == CTL_DATA_TYPE_DOUBLE) {
-                pm_telemetry_value = telemetry_item.value.datadouble;
-                SetTelemetryCapBit(telemetry_cap_bit);
-            }
-            else {
-                // Expecting a double return type here
-                return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-            }
-        }
-        else {
-            pm_telemetry_value = 0.0;
-        }
-        return CTL_RESULT_SUCCESS;
-    }
-
-    ctl_result_t IntelPowerTelemetryAdapter::GetPowerTelemetryItemUsagePercent(
-        const ctl_oc_telemetry_item_t& current_telemetry_item,
-        const ctl_oc_telemetry_item_t& previous_telemetry_item,
-        double& pm_telemetry_value, GpuTelemetryCapBits telemetry_cap_bit)
-    {
-        if (current_telemetry_item.bSupported) {
-            if (current_telemetry_item.type == CTL_DATA_TYPE_DOUBLE) {
-                auto data_delta = current_telemetry_item.value.datadouble -
-                    previous_telemetry_item.value.datadouble;
-                pm_telemetry_value = (data_delta / time_delta_) * 100.0f;
-                SetTelemetryCapBit(telemetry_cap_bit);
-            }
-            else {
-                // Expecting a double return type here
-                return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-            }
-        }
-        return CTL_RESULT_SUCCESS;
-    }
-
-
-    ctl_result_t IntelPowerTelemetryAdapter::GetPowerTelemetryItemUsage(
-        const ctl_oc_telemetry_item_t& current_telemetry_item,
-        const ctl_oc_telemetry_item_t& previous_telemetry_item,
-        double& pm_telemetry_value, GpuTelemetryCapBits telemetry_cap_bit)
-    {
-        if (current_telemetry_item.bSupported) {
-            if (current_telemetry_item.type == CTL_DATA_TYPE_DOUBLE) {
-                auto data_delta = current_telemetry_item.value.datadouble -
-                    previous_telemetry_item.value.datadouble;
-                pm_telemetry_value = (data_delta / time_delta_);
-                SetTelemetryCapBit(telemetry_cap_bit);
-                if (telemetry_cap_bit == GpuTelemetryCapBits::vram_power) {
-                    if (current_telemetry_item.value.datadouble < previous_telemetry_item.value.datadouble) {
-                        pm_telemetry_value = gpu_mem_power_cache_value_w_;
-                    }
-                    else {
-                        gpu_mem_power_cache_value_w_ = pm_telemetry_value;
-                    }
-                }
-            } 
-            else if (current_telemetry_item.type == CTL_DATA_TYPE_INT64) {
-                auto data_delta = current_telemetry_item.value.data64 -
-                    previous_telemetry_item.value.data64;
-                pm_telemetry_value = static_cast<double>(data_delta) / time_delta_;
-                SetTelemetryCapBit(telemetry_cap_bit);
-            }
-            else if (current_telemetry_item.type == CTL_DATA_TYPE_UINT64) {
-              auto data_delta = current_telemetry_item.value.datau64 -
-                                previous_telemetry_item.value.datau64;
-              pm_telemetry_value =
-                  static_cast<double>(data_delta) / time_delta_;
-              SetTelemetryCapBit(telemetry_cap_bit);
-              // stopgap measure for bad vram bandwidth telemetry coming out of V0 api
-              if (telemetry_cap_bit == GpuTelemetryCapBits::gpu_mem_read_bandwidth && !useNewBandwidthTelemetry) {
-                  if ((current_telemetry_item.value.datau64 < previous_telemetry_item.value.datau64) ||
-                      ((current_telemetry_item.value.datau64 - previous_telemetry_item.value.datau64) > gpu_mem_max_bw_cache_value_bps_)) {
-                      pm_telemetry_value = gpu_mem_read_bw_cache_value_bps_;
-                  }
-                  else {
-                      gpu_mem_read_bw_cache_value_bps_ = pm_telemetry_value;
-                  }
-              }
-            }
-            else {
-                // Expecting a double return type here
-                return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-            }
-        }
-        return CTL_RESULT_SUCCESS;
-    }
-
-    ctl_result_t IntelPowerTelemetryAdapter::SaveTelemetry(
-        const ctl_power_telemetry_t& currentSample)
-    {
-        if (currentSample.timeStamp.type == CTL_DATA_TYPE_DOUBLE) {
-            previousSample = currentSample;
-        }
-        else {
-            return CTL_RESULT_ERROR_INVALID_ARGUMENT;
-        }
-
-        return CTL_RESULT_SUCCESS;
-    }
-}
diff --git a/IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.h b/IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.h
deleted file mode 100644
index 0e9e49829..000000000
--- a/IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#define NOMINMAX
-#include <Windows.h>
-#include "igcl_api.h"
-#include "PowerTelemetryAdapter.h"
-#include <optional>
-
-namespace pwr::intel
-{
-	class IntelPowerTelemetryAdapter : public PowerTelemetryAdapter
-	{
-	public:
-		IntelPowerTelemetryAdapter(uint32_t deviceId, ctl_device_adapter_handle_t handle);
-		PresentMonPowerTelemetryInfo Sample() noexcept override;
-		PM_DEVICE_VENDOR GetVendor() const noexcept override;
-		std::string GetName() const noexcept override;
-        uint64_t GetDedicatedVideoMemory() const noexcept override;
-		uint64_t GetVideoMemoryMaxBandwidth() const noexcept override;
-		double GetSustainedPowerLimit() const noexcept override;
-		uint64_t GetAdapterId() const noexcept override;
-
-		// types
-		class NonGraphicsDeviceException : public std::exception {};
-
-	private:
-		// functions
-		bool GatherSampleData(ctl_power_telemetry_t& currentSample,
-			ctl_mem_state_t& memory_state,
-			bool has_memory_state,
-			ctl_mem_bandwidth_t& memory_bandwidth,
-			bool has_memory_bandwidth,
-			std::optional<double> gpu_sustained_power_limit_mw,
-			uint64_t qpc,
-			PresentMonPowerTelemetryInfo& sample);
-
-		ctl_result_t EnumerateMemoryModules();
-
-		ctl_result_t GetTimeDelta(const ctl_power_telemetry_t& power_telemetry);
-
-		// TODO: meld these into the sample function
-		ctl_result_t GetGPUPowerTelemetryData(
-			const ctl_power_telemetry_t& power_telemetry,
-			PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info);
-		ctl_result_t GetVramPowerTelemetryData(
-			const ctl_power_telemetry_t& power_telemetry,
-			PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info);
-		ctl_result_t GetFanPowerTelemetryData(
-			const ctl_power_telemetry_t& power_telemetry,
-			PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info);
-		ctl_result_t GetPsuPowerTelemetryData(
-			const ctl_power_telemetry_t& power_telemetry,
-			PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info);
-
-		void GetMemStateTelemetryData(
-			const ctl_mem_state_t& mem_state,
-			PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info);
-		void GetMemBandwidthData(
-			const ctl_mem_bandwidth_t& mem_bandwidth,
-			PresentMonPowerTelemetryInfo& pm_gpu_power_telemetry_info);
-
-        ctl_result_t SaveTelemetry(
-            const ctl_power_telemetry_t& power_telemetry);
-
-		// TODO: put these as part of the telemetry data object
-		ctl_result_t GetInstantaneousPowerTelemetryItem(
-			const ctl_oc_telemetry_item_t& telemetry_item,
-			double& pm_telemetry_value,
-			GpuTelemetryCapBits telemetry_cap_bit);
-		ctl_result_t GetPowerTelemetryItemUsagePercent(
-			const ctl_oc_telemetry_item_t& current_telemetry_item,
-			const ctl_oc_telemetry_item_t& previous_telemetry_item,
-			double& pm_telemetry_value,
-			GpuTelemetryCapBits telemetry_cap_bit);
-		ctl_result_t GetPowerTelemetryItemUsage(
-			const ctl_oc_telemetry_item_t& current_telemetry_item,
-			const ctl_oc_telemetry_item_t& previous_telemetry_item,
-			double& pm_telemetry_value,
-			GpuTelemetryCapBits telemetry_cap_bit);
-		// data
-		ctl_device_adapter_handle_t deviceHandle = nullptr;
-		LUID deviceLuid; // pointed to by a device_adapter_properties member, written to by igcl api
-		ctl_device_adapter_properties_t properties{};
-		std::vector<ctl_mem_handle_t> memoryModules;
-		std::vector<ctl_pwr_handle_t> powerDomains;
-		std::optional<ctl_power_telemetry_t> previousSample;
-		bool useNewBandwidthTelemetry = true;
-		double time_delta_ = 0.f;
-		// in V0 api readbandwidth occasionally returns what appears to be an invalid counter value
-		// this is a stopgap to cover for cases where IGCL is reporting bad data in V0 bandwidth telemetry
-		double gpu_mem_read_bw_cache_value_bps_ = 0.;
-		uint64_t gpu_mem_max_bw_cache_value_bps_ = 0;
-		// in V1 api vramEnergyCounter rolls over after hitting 1000.0 causing the current sample to be
-		// less than the previous sample. Working with IGCL to determine the correct behavior for roll
-		// over occasions
-		double gpu_mem_power_cache_value_w_ = 0;
-		// we have special handling for GPU current perf limitation on Alchemist
-		// workaround for lack of discoverablity of perf limitation availability
-		bool isAlchemist = false;
-		// populated on init, used to calculate fan %
-		std::vector<int32_t> maxFanSpeedsRpm_;
-	};
-}
diff --git a/IntelPresentMon/ControlLib/IntelPowerTelemetryProvider.cpp b/IntelPresentMon/ControlLib/IntelPowerTelemetryProvider.cpp
deleted file mode 100644
index e647bcfba..000000000
--- a/IntelPresentMon/ControlLib/IntelPowerTelemetryProvider.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include "IntelPowerTelemetryProvider.h"
-#include "IntelPowerTelemetryAdapter.h"
-#include "Logging.h"
-#include "Exceptions.h"
-#include "../CommonUtilities/ref/GeneratedReflection.h"
-
-using namespace pmon;
-using namespace util;
-using v = log::V;
-
-namespace pwr::intel
-{
-    IntelPowerTelemetryProvider::IntelPowerTelemetryProvider(DeviceIdAllocator& allocator)
-    {
-        // TODO(megalvan): Currently using the default Id of all zeros. Do we need
-        // to obtain a legit application Id or is default fine?
-        ctl_init_args_t ctl_init_args{
-            .Size = sizeof(ctl_init_args),
-            .AppVersion = CTL_MAKE_VERSION(CTL_IMPL_MAJOR_VERSION, CTL_IMPL_MINOR_VERSION),
-            .flags = CTL_INIT_FLAG_USE_LEVEL_ZERO,
-        };
-
-        // initialize the igcl api
-        if (const auto result = ctlInit(&ctl_init_args, &apiHandle); result != CTL_RESULT_SUCCESS) {
-            if (result != CTL_RESULT_ERROR_NOT_INITIALIZED) {
-                pmlog_error("ctlInit failed").code(result);
-            }
-            throw Except<TelemetrySubsystemAbsent>("Unable to initialize Intel Graphics Control Library");
-        }
-        pmlog_verb(v::tele_gpu)("ctlInit input args")
-            .pmwatch(ref::DumpGenerated(ctl_init_args));
-
-        pmlog_info(std::format("ctlInit supported version={}.{}",
-            CTL_MAJOR_VERSION(ctl_init_args.SupportedVersion),
-            CTL_MINOR_VERSION(ctl_init_args.SupportedVersion)
-        ));
-
-        // enumerate devices available via igcl (get a list of device handles)
-        std::vector<ctl_device_adapter_handle_t> handles;
-        {
-            uint32_t count = 0;
-            if (const auto result = ctlEnumerateDevices(apiHandle, &count, nullptr); result != CTL_RESULT_SUCCESS) {
-                pmlog_error("ctlEnumerateDevices(count) failed")
-                    .code(result);
-                throw std::runtime_error{ "failed igcl device enumeration (get count)" };
-            }
-            pmlog_verb(v::tele_gpu)("ctlEnumerateDevices(count) output")
-                .pmwatch(count);
-
-            handles.resize(count);
-            if (const auto result = ctlEnumerateDevices(apiHandle, &count, handles.data()); result != CTL_RESULT_SUCCESS) {
-                pmlog_error("ctlEnumerateDevices(list) failed")
-                    .code(result);
-                throw std::runtime_error{ "failed igcl device enumeration (get list)" };
-            }
-        }
-
-        // create adaptor object for each device handle
-        for (auto& handle : handles)
-        {
-            const auto deviceId = allocator.Next();
-            try {
-                adapterPtrs.push_back(std::make_shared<IntelPowerTelemetryAdapter>(deviceId, handle));
-            }
-            catch (const IntelPowerTelemetryAdapter::NonGraphicsDeviceException&) {}
-            catch (const std::exception& e) {
-                TELE_ERR(std::format(
-                    "IntelPowerTelemetryAdapter construction failed: {}",
-                    e.what())).pmwatch(deviceId);
-            }
-            catch (...) {
-                TELE_ERR("IntelPowerTelemetryAdapter construction failed: unknown error").pmwatch(deviceId);
-            }
-        }
-    }
-
-    IntelPowerTelemetryProvider::~IntelPowerTelemetryProvider()
-    {
-        // want to make sure we clear adapters *before* we close the API
-        adapterPtrs.clear();
-
-        if (apiHandle)
-        {
-            ctlClose(apiHandle);
-        }
-    }
-
-    const std::vector<std::shared_ptr<PowerTelemetryAdapter>>& IntelPowerTelemetryProvider::GetAdapters() noexcept
-    {
-        return adapterPtrs;
-    }
-
-    uint32_t IntelPowerTelemetryProvider::GetAdapterCount() const noexcept
-    {
-        return (uint32_t)adapterPtrs.size();
-    }
-}
diff --git a/IntelPresentMon/ControlLib/IntelPowerTelemetryProvider.h b/IntelPresentMon/ControlLib/IntelPowerTelemetryProvider.h
deleted file mode 100644
index b51d3f332..000000000
--- a/IntelPresentMon/ControlLib/IntelPowerTelemetryProvider.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#define NOMINMAX
-#include <Windows.h>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include "igcl_api.h"
-#include "PresentMonPowerTelemetry.h"
-#include "PowerTelemetryProvider.h"
-#include "DeviceIdAllocator.h"
-
-namespace pwr::intel
-{
-    class IntelPowerTelemetryProvider : public PowerTelemetryProvider
-    {
-    public:
-        explicit IntelPowerTelemetryProvider(DeviceIdAllocator& allocator);
-        IntelPowerTelemetryProvider(const IntelPowerTelemetryProvider& t) = delete;
-        IntelPowerTelemetryProvider& operator=(const IntelPowerTelemetryProvider& t) = delete;
-        ~IntelPowerTelemetryProvider() override;
-        const std::vector<std::shared_ptr<PowerTelemetryAdapter>>& GetAdapters() noexcept override;
-        uint32_t GetAdapterCount() const noexcept override;
-
-    private:
-        ctl_api_handle_t apiHandle = nullptr;
-        std::vector<std::shared_ptr<PowerTelemetryAdapter>> adapterPtrs;
-    };
-}
diff --git a/IntelPresentMon/ControlLib/Logging.h b/IntelPresentMon/ControlLib/Logging.h
index 996c481ba..0dce14703 100644
--- a/IntelPresentMon/ControlLib/Logging.h
+++ b/IntelPresentMon/ControlLib/Logging.h
@@ -1,12 +1,12 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
 #include <string>
 #include <format>
-#include "igcl_api.h"
+#include "igcl/igcl_api.h"
 #include "../CommonUtilities/log/Log.h"
 
-namespace pwr::log
+namespace pmon::tel::log
 {
     inline std::string MakeErrorLocationString(int line, const char* file, const char* function)
     {
diff --git a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.cpp b/IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.cpp
deleted file mode 100644
index 24861179b..000000000
--- a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#define NOMINMAX
-#include <Windows.h>
-#include "NvidiaPowerTelemetryAdapter.h"
-#include "Logging.h"
-#include <optional>
-
-
-namespace pwr::nv
-{
-    NvidiaPowerTelemetryAdapter::NvidiaPowerTelemetryAdapter(
-        uint32_t deviceId,
-        const NvapiWrapper* pNvapi,
-        const NvmlWrapper* pNvml,
-        NvPhysicalGpuHandle hGpuNvapi,
-        std::optional<nvmlDevice_t> hGpuNvml)
-        :
-        PowerTelemetryAdapter(deviceId),
-        nvapi{ pNvapi },
-        nvml{ pNvml },
-        hNvapi{ hGpuNvapi },
-        hNvml{ hGpuNvml }
-    {
-        char adapterName[NVAPI_SHORT_STRING_MAX];
-        if (nvapi->Ok(nvapi->GPU_GetFullName(hGpuNvapi, adapterName)))
-        {
-            name = adapterName;
-        }
-    }
-
-
-
-    uint64_t NvidiaPowerTelemetryAdapter::GetDedicatedVideoMemory() const noexcept {
-        uint64_t video_mem_size = 0;
-        nvmlMemory_t mem{};
-        if (nvml->Ok(nvml->DeviceGetMemoryInfo(*hNvml, &mem))) {
-            // free and total might be swapped in nvml; accessing .free to get
-            // total
-            video_mem_size = uint64_t(mem.free);
-        }
-        return video_mem_size;
-    }
-
-    double NvidiaPowerTelemetryAdapter::GetSustainedPowerLimit() const noexcept
-    {
-        unsigned int limitMw = 0;
-        if (nvml->Ok(nvml->DeviceGetPowerManagementLimit(*hNvml, &limitMw)))
-        {
-            return double(limitMw) / 1000.;
-        }
-        return 0.f;
-    }
-
-    PresentMonPowerTelemetryInfo NvidiaPowerTelemetryAdapter::Sample() noexcept
-    {
-        LARGE_INTEGER qpc;
-        QueryPerformanceCounter(&qpc);
-
-        PresentMonPowerTelemetryInfo info{
-            .qpc = (uint64_t)qpc.QuadPart,
-        };
-        
-        // nvapi-sourced telemetry
-        {// gpu and vram temperatures
-            NV_GPU_THERMAL_SETTINGS thermals = {
-                .version = NV_GPU_THERMAL_SETTINGS_VER_2
-            };
-            if (nvapi->Ok(nvapi->GPU_GetThermalSettings(hNvapi, NVAPI_THERMAL_TARGET_ALL, &thermals)))
-            {
-                // loop through all sensors, read those of interest into output struct
-                for (const auto& sensor : thermals.sensor)
-                {
-                    // TODO: consider prioritizing sensor.controller == NVAPI_THERMAL_CONTROLLER_GPU_INTERNAL when multiple GPU thermals are present
-                    if ((sensor.target == NVAPI_THERMAL_TARGET_GPU) &&
-                        (sensor.controller == NVAPI_THERMAL_CONTROLLER_GPU_INTERNAL)) {
-                        info.gpu_temperature_c = (double)sensor.currentTemp;
-                        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
-                    }
-                    else if (sensor.target == NVAPI_THERMAL_TARGET_MEMORY)
-                    {
-                        info.vram_temperature_c = (double)sensor.currentTemp;
-                        SetTelemetryCapBit(GpuTelemetryCapBits::vram_temperature);
-                    }
-                }
-            }
-            // TODO: consider logging failure (lower logging level perhaps)
-        }
-
-        {// gpu and vram clock frequencies
-            NV_GPU_CLOCK_FREQUENCIES freqs{
-                .version = NV_GPU_CLOCK_FREQUENCIES_VER_3
-            };
-            if (nvapi->Ok(nvapi->GPU_GetAllClockFrequencies(hNvapi, &freqs)))
-            {
-                if (const auto& gpuDomain = freqs.domain[NVAPI_GPU_PUBLIC_CLOCK_GRAPHICS];
-                    gpuDomain.bIsPresent)
-                {
-                    info.gpu_frequency_mhz = double(gpuDomain.frequency) / 1000.;
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_frequency);
-                }
-                if (const auto& vramDomain = freqs.domain[NVAPI_GPU_PUBLIC_CLOCK_MEMORY];
-                    vramDomain.bIsPresent)
-                {
-                    info.vram_frequency_mhz = double(vramDomain.frequency) / 1000.;
-                    SetTelemetryCapBit(GpuTelemetryCapBits::vram_frequency);
-                }
-            }
-            // TODO: consider logging failure (lower logging level perhaps)
-        }
-
-        {// fan speed
-            NvU32 tach = 0;
-            if (nvapi->Ok(nvapi->GPU_GetTachReading(hNvapi, &tach)))
-            {
-                info.fan_speed_rpm[0] = double(tach);
-                SetTelemetryCapBit(GpuTelemetryCapBits::fan_speed_0);
-            }
-            // TODO: consider logging failure (lower logging level perhaps)
-        }
-
-        {// gpu utilization
-            NV_GPU_DYNAMIC_PSTATES_INFO_EX pstates{
-                .version = NV_GPU_DYNAMIC_PSTATES_INFO_EX_VER
-            };
-            if (nvapi->Ok(nvapi->GPU_GetDynamicPstatesInfoEx(hNvapi, &pstates)))
-            {
-                if (const auto& domain = pstates.utilization[NVAPI_GPU_UTILIZATION_DOMAIN_GPU];
-                    domain.bIsPresent)
-                {
-                    info.gpu_utilization = double(domain.percentage);
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_utilization);
-                }
-                if (const auto& domain = pstates.utilization[NVAPI_GPU_UTILIZATION_DOMAIN_VID];
-                    domain.bIsPresent)
-                {
-                    info.gpu_media_utilization = double(domain.percentage);
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_media_utilization);
-                }
-            }
-            // TODO: consider logging failure (lower logging level perhaps)
-        }
-
-
-        // nvml-sourced telemetry (if we have a valid nvml handle)
-        if (*hNvml)
-        {
-            {// gpu power
-                unsigned int powerMw = 0;
-                if (nvml->Ok(nvml->DeviceGetPowerUsage(*hNvml, &powerMw)))
-                {
-                    info.gpu_power_w = double(powerMw) / 1000.;
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_power);
-                }
-                // TODO: consider logging failure (lower logging level perhaps)
-            }
-
-            {// power limit
-                unsigned int limitMw = 0;
-                if (nvml->Ok(nvml->DeviceGetPowerManagementLimit(*hNvml, &limitMw)))
-                {
-                    info.gpu_sustained_power_limit_w = double(limitMw) / 1000.;
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_sustained_power_limit);
-                }
-                // TODO: consider logging failure (lower logging level perhaps)
-            }
-
-            {// memory usage
-                nvmlMemory_t mem{};
-                if (nvml->Ok(nvml->DeviceGetMemoryInfo(*hNvml, &mem)))
-                {
-                    // free and total might be swapped in nvml; accessing .free to get total
-                    info.gpu_mem_total_size_b = uint64_t(mem.free);
-                    info.gpu_mem_used_b = uint64_t(mem.used);
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_size);
-                    SetTelemetryCapBit(GpuTelemetryCapBits::gpu_mem_used);
-                }
-                // TODO: consider logging failure (lower logging level perhaps)
-            }
-
-            {// temperature
-                if (!GetPowerTelemetryCapBits().test(static_cast<size_t>(GpuTelemetryCapBits::gpu_temperature))||
-                    (useNvmlTemperature))
-                {
-                    unsigned int temp = 0;
-                    if (nvml->Ok(nvml->DeviceGetTemperature(*hNvml, nvmlTemperatureSensors_t::NVML_TEMPERATURE_GPU, &temp)))
-                    {
-                        info.gpu_temperature_c = (double)temp;
-                        SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
-                        useNvmlTemperature = true;
-                    }
-                    // TODO: consider logging failure (lower logging level perhaps)
-                }
-            }
-        }
-
-        return info;
-    }
-
-    PM_DEVICE_VENDOR NvidiaPowerTelemetryAdapter::GetVendor() const noexcept
-    {
-        return PM_DEVICE_VENDOR::PM_DEVICE_VENDOR_NVIDIA;
-    }
-
-    std::string NvidiaPowerTelemetryAdapter::GetName() const noexcept
-    {
-        return name;
-    }
-}
diff --git a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.h b/IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.h
deleted file mode 100644
index efe7297fd..000000000
--- a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include "PowerTelemetryAdapter.h"
-#include <optional>
-#include "NvapiWrapper.h"
-#include "NvmlWrapper.h"
-
-namespace pwr::nv
-{
-	class NvidiaPowerTelemetryAdapter : public PowerTelemetryAdapter
-	{
-	public:
-		NvidiaPowerTelemetryAdapter(
-            uint32_t deviceId,
-			const NvapiWrapper* pNvapi,
-			const NvmlWrapper* pNvml,
-			NvPhysicalGpuHandle hGpuNvapi,
-			std::optional<nvmlDevice_t> hGpuNvml);
-		PresentMonPowerTelemetryInfo Sample() noexcept override;
-		PM_DEVICE_VENDOR GetVendor() const noexcept override;
-		std::string GetName() const noexcept override;
-        uint64_t GetDedicatedVideoMemory() const noexcept override;
-		uint64_t GetVideoMemoryMaxBandwidth() const noexcept override { return 0; }
-		double GetSustainedPowerLimit() const noexcept override;
-
-	private:
-		// data
-		const NvapiWrapper* nvapi;
-		const NvmlWrapper* nvml;
-		NvPhysicalGpuHandle hNvapi;
-		std::optional<nvmlDevice_t> hNvml;
-		std::string name = "Unknown Adapter Name";
-		bool useNvmlTemperature = false;
-	};
-}
diff --git a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryProvider.cpp b/IntelPresentMon/ControlLib/NvidiaPowerTelemetryProvider.cpp
deleted file mode 100644
index 93f412bbd..000000000
--- a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryProvider.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include "NvidiaPowerTelemetryProvider.h"
-#include "NvidiaPowerTelemetryAdapter.h"
-#include "Logging.h"
-#include "SignatureComparison.h"
-
-namespace pwr::nv
-{
-    NvidiaPowerTelemetryProvider::NvidiaPowerTelemetryProvider(DeviceIdAllocator& allocator)
-    {
-        // enumerate nvapi gpu device handles
-        std::vector<std::pair<NvPhysicalGpuHandle, NvapiAdapterSignature>> nvapiHandlePairs;
-        {
-            std::vector<NvPhysicalGpuHandle> nvapiHandles(32);
-
-            // enumerate gpu handles
-            auto count = (NvU32)nvapiHandles.size();
-            if (!nvapi.Ok(nvapi.EnumPhysicalGPUs(nvapiHandles.data(), &count)))
-            {
-                throw std::runtime_error{ "Failed to enumerate nvapi gpus" };
-            }
-            // resize container to actual count of handles that were set
-            nvapiHandles.resize(size_t(count));
-            // package handles together with their adapter signatures
-            for (auto& handle : nvapiHandles)
-            {
-                nvapiHandlePairs.emplace_back(handle, nvapi.GetAdapterSignature(handle));
-            }
-        }
-
-        // enumerate nvml gpu device handles
-        using NvmlHandlePair = std::pair<nvmlDevice_t, NvmlAdapterSignature>;
-        std::vector<NvmlHandlePair> nvmlHandlePairs;
-        {
-            std::vector<nvmlDevice_t> nvmlHandles;
-
-            // get number of devices
-            unsigned int count = 0;
-            if (!nvml.Ok(nvml.DeviceGetCount_v2(&count)))
-            {
-                throw std::runtime_error{ "Failed to get nvml device count" };
-            }
-
-            // get device handles by index from 0 to n_devices-1
-            for (unsigned int i = 0; i < count; i++)
-            {
-                nvmlDevice_t handle;
-                if (nvml.Ok(nvml.DeviceGetHandleByIndex_v2(i, &handle)))
-                {
-                    nvmlHandles.push_back(handle);
-                }
-                // TODO: else consider logging low severity error on fail
-            }
-
-            // package handles together with their adapter signatures
-            for (auto& handle : nvmlHandles)
-            {
-                nvmlHandlePairs.emplace_back(handle, nvml.GetAdapterSignature(handle));
-            }
-        }
-
-        // create adaptor object for each api adapter handle pair
-        // lambda to factor out repeated code pattern adapter creation and insertion into container, with exception quelling
-        const auto TryCreateAddAdapter = [this, &allocator](NvPhysicalGpuHandle nvapiHandle, std::optional<nvmlDevice_t> nvmlHandle) {
-            try {
-                adapterPtrs.push_back(std::make_shared<NvidiaPowerTelemetryAdapter>(
-                    allocator.Next(), &nvapi, &nvml, nvapiHandle, nvmlHandle
-                ));
-            }
-            catch (const std::exception& e) { TELE_ERR(e.what()); }
-            catch (...) { TELE_ERR("unknown error"); }
-        };
-        // in the special case where there is only one handle for each api, we assume they match
-        if (nvapiHandlePairs.size() == 1 && nvmlHandlePairs.size() == 1)
-        {
-            TryCreateAddAdapter(nvapiHandlePairs.front().first, nvmlHandlePairs.front().first);
-            return;
-        }
-        // otherwise use signatures to greedy find nvml matches for each nvapi adapter handle
-        for (const auto nvapiHandlePair : nvapiHandlePairs)
-        {
-            // find first matching nvml handle
-            const auto i = std::ranges::find_if(nvmlHandlePairs, [&nvapiHandlePair](const NvmlHandlePair& nvmlPair) {
-                return nvapiHandlePair.second == nvmlPair.second;
-            });
-            // create adapter object using both handles if we find a match
-            if (i != nvmlHandlePairs.end())
-            {
-                TryCreateAddAdapter(nvapiHandlePair.first, i->first);
-                // remove nvml handle from list of candidates after creating
-                nvmlHandlePairs.erase(i);
-            }
-            else
-            {
-                // create adapter object using nvapi only
-                TryCreateAddAdapter(nvapiHandlePair.first, std::nullopt);
-            }
-        }
-    }
-
-    const std::vector<std::shared_ptr<PowerTelemetryAdapter>>& NvidiaPowerTelemetryProvider::GetAdapters() noexcept
-    {
-        return adapterPtrs;
-    }
-
-    uint32_t NvidiaPowerTelemetryProvider::GetAdapterCount() const noexcept
-    {
-        return (uint32_t)adapterPtrs.size();
-    }
-}
diff --git a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryProvider.h b/IntelPresentMon/ControlLib/NvidiaPowerTelemetryProvider.h
deleted file mode 100644
index a778b7525..000000000
--- a/IntelPresentMon/ControlLib/NvidiaPowerTelemetryProvider.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#define NOMINMAX
-#include <Windows.h>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include "PresentMonPowerTelemetry.h"
-#include "PowerTelemetryProvider.h"
-#include "NvapiWrapper.h"
-#include "NvmlWrapper.h"
-#include "DeviceIdAllocator.h"
-
-namespace pwr::nv
-{
-    class NvidiaPowerTelemetryProvider : public PowerTelemetryProvider
-    {
-    public:
-        explicit NvidiaPowerTelemetryProvider(DeviceIdAllocator& allocator);
-        const std::vector<std::shared_ptr<PowerTelemetryAdapter>>& GetAdapters() noexcept override;
-        uint32_t GetAdapterCount() const noexcept override;
-
-    private:
-        NvapiWrapper nvapi;
-        NvmlWrapper nvml;
-        std::vector<std::shared_ptr<PowerTelemetryAdapter>> adapterPtrs;
-    };
-}
diff --git a/IntelPresentMon/ControlLib/PowerTelemetryAdapter.cpp b/IntelPresentMon/ControlLib/PowerTelemetryAdapter.cpp
deleted file mode 100644
index f50567f65..000000000
--- a/IntelPresentMon/ControlLib/PowerTelemetryAdapter.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "PowerTelemetryAdapter.h"
-#include "Logging.h"
-#include "../CommonUtilities/ref/WrapReflect.h"
-#include "../CommonUtilities/ref/StaticReflection.h"
-#include <format>
-
-
-namespace pwr
-{
-    using namespace std::literals;
-    using namespace pmon::util;
-    using v = ::pmon::util::log::V;
-    using ::pmon::util::log::GlobalPolicy;
-
-    PowerTelemetryAdapter::PowerTelemetryAdapter(uint32_t deviceId) noexcept
-        : deviceId_{ deviceId } {}
-
-    uint32_t PowerTelemetryAdapter::GetDeviceId() const noexcept
-    {
-        return deviceId_;
-    }
-
-    void PowerTelemetryAdapter::SetTelemetryCapBit(GpuTelemetryCapBits telemetryCapBit) noexcept
-    {
-        if (GlobalPolicy::VCheck(v::tele_gpu)) {
-            if (!gpuTelemetryCapBits_.test(static_cast<size_t>(telemetryCapBit))) {
-                pmlog_verb(v::tele_gpu)("Telemetry cap bit being set: "s + std::string(reflect::enum_name(telemetryCapBit)))
-                    .pmwatch(GetName());
-            }
-        }
-        gpuTelemetryCapBits_.set(static_cast<size_t>(telemetryCapBit));
-    }
-    PowerTelemetryAdapter::SetTelemetryCapBitset PowerTelemetryAdapter::GetPowerTelemetryCapBits()
-    {
-        pmlog_verb(v::tele_gpu)("Telemetry cap bits being retrieved").pmwatch(GetName())
-            .pmwatch(ref::DumpEnumBitset<GpuTelemetryCapBits>(gpuTelemetryCapBits_));
-        return gpuTelemetryCapBits_;
-    }
-    bool PowerTelemetryAdapter::HasTelemetryCapBit(GpuTelemetryCapBits bit) const
-    {
-        pmlog_verb(v::tele_gpu)("Telemetry cap bit being retrieved: "s + std::string(reflect::enum_name(bit)))
-            .pmwatch(GetName()).pmwatch(gpuTelemetryCapBits_.test(size_t(bit)));
-        return gpuTelemetryCapBits_.test(size_t(bit));
-    }
-}
diff --git a/IntelPresentMon/ControlLib/PowerTelemetryAdapter.h b/IntelPresentMon/ControlLib/PowerTelemetryAdapter.h
deleted file mode 100644
index c2157f526..000000000
--- a/IntelPresentMon/ControlLib/PowerTelemetryAdapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-
-#include <string>
-#include <vector>
-#include <bitset>
-#include <cstdint>
-#include "PresentMonPowerTelemetry.h"
-#include "../PresentMonAPI2/PresentMonAPI.h"
-
-namespace pwr
-{
-    class PowerTelemetryAdapter
-    {
-    public:
-        // types
-        using SetTelemetryCapBitset = std::bitset<static_cast<size_t>(GpuTelemetryCapBits::gpu_telemetry_count)>;
-        // functions
-        virtual ~PowerTelemetryAdapter() = default;
-        virtual PresentMonPowerTelemetryInfo Sample() noexcept = 0;
-        virtual PM_DEVICE_VENDOR GetVendor() const noexcept = 0;
-        virtual std::string GetName() const noexcept = 0;
-        virtual uint64_t GetDedicatedVideoMemory() const noexcept = 0;
-        virtual uint64_t GetVideoMemoryMaxBandwidth() const noexcept = 0;
-        virtual double GetSustainedPowerLimit() const noexcept = 0;
-        virtual uint64_t GetAdapterId() const noexcept { return 0; }
-        uint32_t GetDeviceId() const noexcept;
-        void SetTelemetryCapBit(GpuTelemetryCapBits telemetryCapBit) noexcept;
-        SetTelemetryCapBitset GetPowerTelemetryCapBits();
-        bool HasTelemetryCapBit(GpuTelemetryCapBits bit) const;
-    protected:
-        explicit PowerTelemetryAdapter(uint32_t deviceId) noexcept;
-
-    private:
-        // data
-        SetTelemetryCapBitset gpuTelemetryCapBits_{};
-        const uint32_t deviceId_ = 0;
-    };
-}
diff --git a/IntelPresentMon/ControlLib/PowerTelemetryProvider.h b/IntelPresentMon/ControlLib/PowerTelemetryProvider.h
deleted file mode 100644
index 34b8d84b7..000000000
--- a/IntelPresentMon/ControlLib/PowerTelemetryProvider.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include <string>
-#include <vector>
-#include <optional>
-#include <memory>
-#include "PresentMonPowerTelemetry.h"
-#include "PowerTelemetryAdapter.h"
-
-namespace pwr
-{
-    class PowerTelemetryProvider
-    {
-    public:
-        virtual ~PowerTelemetryProvider() = default;
-        virtual const std::vector<std::shared_ptr<PowerTelemetryAdapter>>& GetAdapters() noexcept = 0;
-        virtual uint32_t GetAdapterCount() const noexcept = 0;
-    };
-}
\ No newline at end of file
diff --git a/IntelPresentMon/ControlLib/PowerTelemetryProviderFactory.cpp b/IntelPresentMon/ControlLib/PowerTelemetryProviderFactory.cpp
deleted file mode 100644
index eec1143c1..000000000
--- a/IntelPresentMon/ControlLib/PowerTelemetryProviderFactory.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include "PowerTelemetryProviderFactory.h"
-#include "IntelPowerTelemetryProvider.h"
-#include "NvidiaPowerTelemetryProvider.h"
-#include "AmdPowerTelemetryProvider.h"
-
-namespace pwr
-{
-	std::unique_ptr<PowerTelemetryProvider> PowerTelemetryProviderFactory::Make(PM_DEVICE_VENDOR vendor, DeviceIdAllocator& allocator)
-	{
-		switch (vendor) {
-		case PM_DEVICE_VENDOR_INTEL: return std::make_unique<intel::IntelPowerTelemetryProvider>(allocator);
-		case PM_DEVICE_VENDOR_NVIDIA: return std::make_unique<nv::NvidiaPowerTelemetryProvider>(allocator);
-        case PM_DEVICE_VENDOR_AMD: return std::make_unique<amd::AmdPowerTelemetryProvider>(allocator);
-		}
-		return {};
-	}
-}
diff --git a/IntelPresentMon/ControlLib/PowerTelemetryProviderFactory.h b/IntelPresentMon/ControlLib/PowerTelemetryProviderFactory.h
deleted file mode 100644
index 37fa9d364..000000000
--- a/IntelPresentMon/ControlLib/PowerTelemetryProviderFactory.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include "PowerTelemetryProvider.h"
-#include "DeviceIdAllocator.h"
-#include "../PresentMonAPI2/PresentMonAPI.h"
-#include <memory>
-
-namespace pwr
-{
-	class PowerTelemetryProviderFactory
-	{
-	public:
-		static std::unique_ptr<PowerTelemetryProvider> Make(PM_DEVICE_VENDOR vendor, DeviceIdAllocator& allocator);
-	};
-}
diff --git a/IntelPresentMon/ControlLib/PresentMonPowerTelemetry.h b/IntelPresentMon/ControlLib/PresentMonPowerTelemetry.h
deleted file mode 100644
index cceb1fc66..000000000
--- a/IntelPresentMon/ControlLib/PresentMonPowerTelemetry.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include <cstdint>
-#include <bitset>
-#include <array>
-
-enum class PresentMonPsuType
-{
-    None,
-    Pcie,
-    Pin6,
-    Pin8,
-};
-
-struct PresentMonPsuPowerTelemetryInfo {
-    PresentMonPsuType psu_type;
-    double psu_power;
-    double psu_voltage;
-};
-
-struct PresentMonPowerTelemetryInfo {
-    uint64_t qpc;
-
-    double time_stamp;
-
-    double gpu_power_w;
-    double gpu_sustained_power_limit_w;
-    double gpu_voltage_v;
-    double gpu_frequency_mhz;
-    double gpu_temperature_c;
-    double gpu_utilization;
-    double gpu_render_compute_utilization;
-    double gpu_media_utilization;
-    double gpu_effective_frequency_mhz;
-    double gpu_voltage_regulator_temperature_c;
-    double gpu_mem_effective_bandwidth_gbps;
-    double gpu_overvoltage_percent;
-    double gpu_temperature_percent;
-    double gpu_power_percent;
-    double gpu_card_power_w;
-
-    double vram_power_w;
-    double vram_voltage_v;
-    double vram_frequency_mhz;
-    double vram_effective_frequency_gbps;
-    double vram_temperature_c;
-
-    std::array<double, 5> fan_speed_rpm;
-    std::array<int32_t, 5> max_fan_speed_rpm;
-    std::array<PresentMonPsuPowerTelemetryInfo, 5> psu;
-
-    // GPU memory state
-    uint64_t gpu_mem_total_size_b;
-    uint64_t gpu_mem_used_b;
-
-    // GPU memory bandwidth
-    uint64_t gpu_mem_max_bandwidth_bps;
-    double gpu_mem_write_bandwidth_bps;
-    double gpu_mem_read_bandwidth_bps;
-
-    // Throttling flags
-    bool gpu_power_limited;
-    bool gpu_temperature_limited;
-    bool gpu_current_limited;
-    bool gpu_voltage_limited;
-    bool gpu_utilization_limited;
-
-    bool vram_power_limited;
-    bool vram_temperature_limited;
-    bool vram_current_limited;
-    bool vram_voltage_limited;
-    bool vram_utilization_limited;
-};
-
-enum class GpuTelemetryCapBits {
-    time_stamp,
-    gpu_power,
-    gpu_sustained_power_limit,
-    gpu_voltage,
-    gpu_frequency,
-    gpu_temperature,
-    gpu_utilization,
-    gpu_render_compute_utilization,
-    gpu_media_utilization,
-    vram_power,
-    vram_voltage,
-    vram_frequency,
-    vram_effective_frequency,
-    vram_temperature,
-    fan_speed_0,
-    fan_speed_1,
-    fan_speed_2,
-    fan_speed_3,
-    fan_speed_4,
-    psu_info_0,
-    psu_info_1,
-    psu_info_2,
-    psu_info_3,
-    psu_info_4,
-    gpu_mem_size,
-    gpu_mem_used,
-    gpu_mem_max_bandwidth,
-    gpu_mem_write_bandwidth,
-    gpu_mem_read_bandwidth,
-    gpu_power_limited,
-    gpu_temperature_limited,
-    gpu_current_limited,
-    gpu_voltage_limited,
-    gpu_utilization_limited,
-    vram_power_limited,
-    vram_temperature_limited,
-    vram_current_limited,
-    vram_voltage_limited,
-    vram_utilization_limited,
-    gpu_effective_frequency,
-    gpu_voltage_regulator_temperature,
-    gpu_mem_effective_bandwidth,
-    gpu_overvoltage_percent,
-    gpu_temperature_percent,
-    gpu_power_percent,
-    max_fan_speed_0,
-    max_fan_speed_1,
-    max_fan_speed_2,
-    max_fan_speed_3,
-    max_fan_speed_4,
-    gpu_card_power,
-    gpu_telemetry_count,
-};
-
-using GpuTelemetryBitset = std::bitset<static_cast<size_t>(GpuTelemetryCapBits::gpu_telemetry_count)>;
\ No newline at end of file
diff --git a/IntelPresentMon/ControlLib/SignatureComparison.cpp b/IntelPresentMon/ControlLib/SignatureComparison.cpp
deleted file mode 100644
index 1cb2d709e..000000000
--- a/IntelPresentMon/ControlLib/SignatureComparison.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include "SignatureComparison.h"
-#include "NvapiWrapper.h"
-#include "NvmlWrapper.h"
-
-namespace pwr::nv
-{
-	bool operator==(const NvapiAdapterSignature& nvapi, const NvmlAdapterSignature& nvml) noexcept
-	{
-		// pci identifier test has priority
-		if (nvapi.deviceId == nvml.pciDeviceId && nvapi.subSystemId == nvml.pciSubSystemId)
-		{
-			return true;
-		}
-		// if pci identifier test fails, fallback to nvml domain/bus/function test
-		if (nvapi.busId == nvml.busIdBus)
-		{
-			return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/IntelPresentMon/ControlLib/SignatureComparison.h b/IntelPresentMon/ControlLib/SignatureComparison.h
deleted file mode 100644
index 55072d327..000000000
--- a/IntelPresentMon/ControlLib/SignatureComparison.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include <cstdint>
-
-namespace pwr::nv
-{
-	struct NvapiAdapterSignature;
-	struct NvmlAdapterSignature;
-
-	bool operator==(const NvapiAdapterSignature& nvapi, const NvmlAdapterSignature& nvml) noexcept;
-}
\ No newline at end of file
diff --git a/IntelPresentMon/ControlLib/TelemetryCoordinator.cpp b/IntelPresentMon/ControlLib/TelemetryCoordinator.cpp
new file mode 100644
index 000000000..2c7655d9f
--- /dev/null
+++ b/IntelPresentMon/ControlLib/TelemetryCoordinator.cpp
@@ -0,0 +1,924 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "TelemetryCoordinator.h"
+#include "Exceptions.h"
+#include "TelemetryDeviceFingerprint.h"
+#include "Logging.h"
+#include "adl/AdlTelemetryProvider.h"
+#include "igcl/IgclTelemetryProvider.h"
+#include "nvapi/NvapiTelemetryProvider.h"
+#include "nvml/NvmlTelemetryProvider.h"
+#include "uci/UciTelemetryProvider.h"
+#include "wmi/WmiTelemetryProvider.h"
+#include "../CommonUtilities/Exception.h"
+#include "../CommonUtilities/Qpc.h"
+#include "../Interprocess/source/Interprocess.h"
+#include "../Interprocess/source/SystemDeviceId.h"
+#include "../Interprocess/source/metadata/MetricList.h"
+#include <algorithm>
+#include <functional>
+#include <limits>
+#include <sstream>
+#include <span>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace pmon::tel
+{
+    namespace
+    {
+        struct RouteCandidate_
+        {
+            uint32_t providerDeviceIndex = 0;
+            uint32_t arraySize = 0;
+            uint32_t providerCoverageScore = 0;
+        };
+
+        bool IsStaticMetric_(PM_METRIC metricId) noexcept
+        {
+            switch (metricId) {
+#define X_(id_, type_, ...) case id_: return type_ == PM_METRIC_TYPE_STATIC;
+                METRIC_LIST(X_)
+#undef X_
+            default:
+                return false;
+            }
+        }
+
+        const char* GetDeviceNameOrUnknown_(const TelemetryDeviceFingerprint& fingerprint) noexcept
+        {
+            return fingerprint.deviceName.empty() ? "UNKNOWN_GPU" : fingerprint.deviceName.c_str();
+        }
+
+    }
+
+    TelemetryCoordinator::TelemetryCoordinator(uint32_t pollRateMs)
+        :
+        pollRateMs_{ std::max(pollRateMs, 1u) }
+    {
+        TryCreateConcreteProviders_();
+        BuildLogicalDevicesAndRoutes_();
+    }
+
+    void TelemetryCoordinator::RegisterDevicesToIpc(ipc::ServiceComms& comms) const
+    {
+        bool cpuRegistered = false;
+
+        for (const auto& [logicalDeviceId, logicalDevice] : logicalDevicesById_) {
+            auto fingerprint = ResolveLogicalDeviceFingerprint_(logicalDevice);
+            auto caps = BuildRoutedCapabilities_(logicalDevice);
+
+            const auto vendor = fingerprint.vendor;
+            const auto name = !fingerprint.deviceName.empty() ?
+                fingerprint.deviceName : std::string{ "UNKNOWN_CPU" };
+
+            try {
+                if (logicalDeviceId != ipc::kSystemDeviceId) {
+                    comms.RegisterGpuDevice(
+                        logicalDeviceId,
+                        vendor,
+                        !fingerprint.deviceName.empty() ?
+                            fingerprint.deviceName : std::string{ "UNKNOWN_GPU" },
+                        caps,
+                        fingerprint.luid);
+                }
+                else {
+                    comms.RegisterCpuDevice(vendor, name, caps);
+                    cpuRegistered = true;
+                }
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("RegisterDevicesToIpc failed for logical device"))
+                    .pmwatch(logicalDeviceId)
+                    .pmwatch((int)vendor)
+                    .pmwatch(fingerprint.deviceName);
+            }
+        }
+
+        if (!cpuRegistered) {
+            comms.RegisterCpuDevice(PM_DEVICE_VENDOR_UNKNOWN, "UNKNOWN_CPU", {});
+        }
+        comms.FinalizeGpuDevices();
+    }
+
+    void TelemetryCoordinator::PopulateStaticsToIpc(ipc::ServiceComms& comms) const
+    {
+        const auto requestQpc = util::GetCurrentTimestamp();
+        // TODO: make static population dynamic by metric id and metadata instead of hardcoded checks.
+        for (const auto& [logicalDeviceId, logicalDevice] : logicalDevicesById_) {
+            const auto providerFingerprint = ResolveLogicalDeviceFingerprint_(logicalDevice);
+
+            try {
+                if (logicalDeviceId != ipc::kSystemDeviceId) {
+                    auto& store = comms.GetGpuDataStore(logicalDevice.logicalDeviceId);
+                    store.statics.vendor = providerFingerprint.vendor;
+                    store.statics.name = providerFingerprint.deviceName.c_str();
+
+                    if (logicalDevice.routes.contains(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT)) {
+                        const auto value = PollMetricForRoute_(
+                            logicalDevice, PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, 0, requestQpc);
+                        if (const auto pVal = std::get_if<double>(&value)) {
+                            store.statics.sustainedPowerLimit = *pVal;
+                        }
+                        else {
+                            throw util::Except<TelemetryCoordinatorException>("Type mismatch for PM_METRIC_GPU_SUSTAINED_POWER_LIMIT static metric");
+                        }
+                    }
+                    if (logicalDevice.routes.contains(PM_METRIC_GPU_MEM_SIZE)) {
+                        const auto value = PollMetricForRoute_(
+                            logicalDevice, PM_METRIC_GPU_MEM_SIZE, 0, requestQpc);
+                        if (const auto pVal = std::get_if<uint64_t>(&value)) {
+                            store.statics.memSize = *pVal;
+                        }
+                        else {
+                            throw util::Except<TelemetryCoordinatorException>("Type mismatch for PM_METRIC_GPU_MEM_SIZE static metric");
+                        }
+                    }
+                    if (logicalDevice.routes.contains(PM_METRIC_GPU_MEM_MAX_BANDWIDTH)) {
+                        const auto value = PollMetricForRoute_(
+                            logicalDevice, PM_METRIC_GPU_MEM_MAX_BANDWIDTH, 0, requestQpc);
+                        if (const auto pVal = std::get_if<uint64_t>(&value)) {
+                            store.statics.maxMemBandwidth = *pVal;
+                        }
+                        else {
+                            throw util::Except<TelemetryCoordinatorException>("Type mismatch for PM_METRIC_GPU_MEM_MAX_BANDWIDTH static metric");
+                        }
+                    }
+                }
+                else {
+                    auto& store = comms.GetSystemDataStore();
+                    store.statics.cpuVendor = providerFingerprint.vendor;
+                    store.statics.cpuName = providerFingerprint.deviceName.c_str();
+
+                    if (logicalDevice.routes.contains(PM_METRIC_CPU_POWER_LIMIT)) {
+                        const auto value = PollMetricForRoute_(
+                            logicalDevice, PM_METRIC_CPU_POWER_LIMIT, 0, requestQpc);
+                        if (const auto pVal = std::get_if<double>(&value)) {
+                            store.statics.cpuPowerLimit = *pVal;
+                        }
+                        else {
+                            throw util::Except<TelemetryCoordinatorException>("Type mismatch for PM_METRIC_CPU_POWER_LIMIT static metric");
+                        }
+                    }
+                }
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("PopulateStaticsToIpc failed for logical device"))
+                    .pmwatch(logicalDevice.logicalDeviceId);
+            }
+        }
+    }
+
+    ipc::MetricCapabilities TelemetryCoordinator::GetAvailability() const
+    {
+        ipc::MetricCapabilities availability;
+
+        for (const auto& entry : logicalDevicesById_) {
+            const auto& logicalDevice = entry.second;
+            const auto routedCaps = BuildRoutedCapabilities_(logicalDevice);
+            for (const auto& [metricId, arraySize] : routedCaps) {
+                const auto existingSize = availability.Check(metricId);
+                if (arraySize > existingSize) {
+                    availability.Set(metricId, arraySize);
+                }
+            }
+        }
+
+        return availability;
+    }
+
+    void TelemetryCoordinator::SetPollRate(uint32_t pollRateMs)
+    {
+        pollRateMs_ = std::max(pollRateMs, 1u);
+        for (const auto& pProvider : providerPtrs_) {
+            try {
+                pProvider->SetPollRate(pollRateMs_);
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("Telemetry provider poll-rate update failed"));
+            }
+        }
+    }
+
+    void TelemetryCoordinator::SetMetricUse(const svc::DeviceMetricUse& metricUse)
+    {
+        for (const auto& pProvider : providerPtrs_) {
+            try {
+                pProvider->SetMetricUse(metricUse);
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("Telemetry provider metric-use update failed"));
+            }
+        }
+    }
+
+    size_t TelemetryCoordinator::PollToIpc(
+        const svc::DeviceMetricUse& metricUse,
+        ipc::ServiceComms& comms) const
+    {
+        const auto requestQpc = util::GetCurrentTimestamp();
+        size_t samplesWritten = 0;
+
+        for (const auto& [deviceId, deviceMetricUse] : metricUse) {
+            if (deviceId == 0) {
+                continue;
+            }
+
+            const auto itLogical = logicalDevicesById_.find(deviceId);
+            if (itLogical == logicalDevicesById_.end()) {
+                pmlog_warn("Unknown logical device id in PollToIpc request")
+                    .pmwatch(deviceId);
+                continue;
+            }
+
+            const auto& logicalDevice = itLogical->second;
+            for (const auto& use : deviceMetricUse) {
+                if (use.deviceId != deviceId) {
+                    pmlog_warn("Metric use device id did not match owning device bucket")
+                        .pmwatch(deviceId)
+                        .pmwatch(use.deviceId)
+                        .pmwatch((int)use.metricId)
+                        .pmwatch(use.arrayIdx);
+                    continue;
+                }
+                if (use.metricId >= PM_METRIC_COUNT_) {
+                    pmlog_warn("Invalid metric id in PollToIpc request")
+                        .pmwatch((int)use.metricId)
+                        .pmwatch(deviceId)
+                        .pmwatch(use.arrayIdx);
+                    continue;
+                }
+                if (IsStaticMetric_(use.metricId)) {
+                    continue;
+                }
+
+                try {
+                    const auto value = PollMetricForRoute_(
+                        logicalDevice, use.metricId, use.arrayIdx, requestQpc);
+                    const auto qpc = (uint64_t)util::GetCurrentTimestamp();
+
+                    if (logicalDevice.logicalDeviceId != ipc::kSystemDeviceId) {
+                        auto& store = comms.GetGpuDataStore(logicalDevice.logicalDeviceId);
+                        PushValueToTelemetryMap_(store.telemetryData, use.metricId, use.arrayIdx, value, qpc);
+                    }
+                    else {
+                        auto& store = comms.GetSystemDataStore();
+                        PushValueToTelemetryMap_(store.telemetryData, use.metricId, use.arrayIdx, value, qpc);
+                    }
+
+                    ++samplesWritten;
+                }
+                catch (...) {
+                    pmlog_error(util::ReportException("PollToIpc failed while writing sample"))
+                        .pmwatch(logicalDevice.logicalDeviceId)
+                        .pmwatch((int)use.metricId)
+                        .pmwatch(use.arrayIdx);
+                }
+            }
+        }
+
+        return samplesWritten;
+    }
+
+    void TelemetryCoordinator::TryCreateConcreteProviders_()
+    {
+        providerPtrs_.clear();
+
+        const auto tryAddProvider = [this]<class ProviderT>(const char* missingMessage, const char* failureMessage) {
+            try {
+                auto pProvider = std::make_shared<ProviderT>();
+                pProvider->SetPollRate(pollRateMs_);
+                providerPtrs_.push_back(std::move(pProvider));
+            }
+            catch (const TelemetrySubsystemAbsent&) {
+                pmlog_dbg(util::ReportException(missingMessage));
+            }
+            catch (...) {
+                pmlog_error(util::ReportException(failureMessage));
+            }
+        };
+
+        tryAddProvider.operator()<wmi::WmiTelemetryProvider>(
+            "WMI telemetry provider unavailable",
+            "WMI telemetry provider construction failed");
+        tryAddProvider.operator()<uci::UciTelemetryProvider>(
+            "UCI telemetry provider unavailable",
+            "UCI telemetry provider construction failed");
+        tryAddProvider.operator()<adl::AdlTelemetryProvider>(
+            "ADL telemetry provider unavailable",
+            "ADL telemetry provider construction failed");
+        tryAddProvider.operator()<igcl::IgclTelemetryProvider>(
+            "IGCL telemetry provider unavailable",
+            "IGCL telemetry provider construction failed");
+        tryAddProvider.operator()<nvapi::NvapiTelemetryProvider>(
+            "NVAPI telemetry provider unavailable",
+            "NVAPI telemetry provider construction failed");
+        tryAddProvider.operator()<nvml::NvmlTelemetryProvider>(
+            "NVML telemetry provider unavailable",
+            "NVML telemetry provider construction failed");
+    }
+
+    void TelemetryCoordinator::BuildLogicalDevicesAndRoutes_()
+    {
+        logicalDevicesById_.clear();
+        nextLogicalDeviceId_ = 1;
+
+        using CandidateMap = std::unordered_map<PM_METRIC, std::vector<RouteCandidate_>>;
+        std::unordered_map<uint32_t, CandidateMap> routeCandidatesByLogicalId;
+
+        for (const auto& pProvider : providerPtrs_) {
+            try {
+                const auto capabilityMap = pProvider->GetCaps();
+                for (const auto& [providerDeviceId, capabilities] : capabilityMap) {
+                    const auto& fingerprint = pProvider->GetFingerPrint(providerDeviceId);
+                    pmlog_dbg("Provider device LUID")
+                        .pmwatch((int)fingerprint.vendor)
+                        .pmwatch(fingerprint.deviceName)
+                        .pmwatch(providerDeviceId)
+                        .pmwatch(fingerprint.LuidAsString());
+                    auto& logicalDevice = GetOrCreateLogicalDevice_(fingerprint);
+                    const auto logicalDeviceId = logicalDevice.logicalDeviceId;
+
+                    uint32_t providerDeviceIndex = std::numeric_limits<uint32_t>::max();
+                    for (uint32_t i = 0; i < logicalDevice.providerDevices.size(); ++i) {
+                        const auto& existingProviderDevice = logicalDevice.providerDevices[i];
+                        if (existingProviderDevice.providerDeviceId != providerDeviceId) {
+                            continue;
+                        }
+                        const auto pExisting = existingProviderDevice.pProvider.lock();
+                        if (pExisting.get() == pProvider.get()) {
+                            providerDeviceIndex = i;
+                            break;
+                        }
+                    }
+
+                    if (providerDeviceIndex == std::numeric_limits<uint32_t>::max()) {
+                        logicalDevice.providerDevices.push_back(ProviderDevice_{ pProvider, providerDeviceId });
+                        providerDeviceIndex = (uint32_t)(logicalDevice.providerDevices.size() - 1u);
+                    }
+
+                    auto& metricCandidates = routeCandidatesByLogicalId[logicalDeviceId];
+                    for (const auto& [metricId, arraySize] : capabilities) {
+                        if (metricId >= PM_METRIC_COUNT_ || arraySize == 0) {
+                            pmlog_error("Invalid capability entry from provider")
+                                .pmwatch((int)fingerprint.vendor)
+                                .pmwatch(fingerprint.deviceName)
+                                .pmwatch(providerDeviceId)
+                                .pmwatch((int)metricId)
+                                .pmwatch(arraySize);
+                            continue;
+                        }
+
+                        const auto clampedArraySize = (uint32_t)(
+                            std::min(arraySize, size_t(std::numeric_limits<uint32_t>::max())));
+                        metricCandidates[metricId].push_back(RouteCandidate_{
+                            providerDeviceIndex,
+                            clampedArraySize,
+                            0
+                        });
+                    }
+                }
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("BuildLogicalDevicesAndRoutes provider pass failed"));
+                continue;
+            }
+        }
+
+        for (auto& [logicalDeviceId, metricCandidates] : routeCandidatesByLogicalId) {
+            const auto itLogical = logicalDevicesById_.find(logicalDeviceId);
+            if (itLogical == logicalDevicesById_.end()) {
+                pmlog_error("Missing logical device while finalizing routes")
+                    .pmwatch(logicalDeviceId);
+                continue;
+            }
+
+            auto& logicalDevice = itLogical->second;
+            std::unordered_map<uint32_t, uint32_t> providerCoverage;
+            for (const auto& metricCandidatesEntry : metricCandidates) {
+                const auto& candidates = metricCandidatesEntry.second;
+                std::unordered_set<uint32_t> countedProviderIndexes;
+                for (const auto& candidate : candidates) {
+                    if (countedProviderIndexes.insert(candidate.providerDeviceIndex).second) {
+                        ++providerCoverage[candidate.providerDeviceIndex];
+                    }
+                }
+            }
+
+            for (auto& [metricId, candidates] : metricCandidates) {
+                for (auto& candidate : candidates) {
+                    if (const auto itCoverage = providerCoverage.find(candidate.providerDeviceIndex);
+                        itCoverage != providerCoverage.end()) {
+                        candidate.providerCoverageScore = itCoverage->second;
+                    }
+                }
+
+                std::sort(candidates.begin(), candidates.end(), [](const RouteCandidate_& lhs, const RouteCandidate_& rhs) {
+                    if (lhs.providerCoverageScore != rhs.providerCoverageScore) {
+                        return lhs.providerCoverageScore > rhs.providerCoverageScore;
+                    }
+                    if (lhs.arraySize != rhs.arraySize) {
+                        return lhs.arraySize > rhs.arraySize;
+                    }
+                    return lhs.providerDeviceIndex < rhs.providerDeviceIndex;
+                });
+
+                candidates.erase(std::unique(candidates.begin(), candidates.end(),
+                    [](const RouteCandidate_& lhs, const RouteCandidate_& rhs) {
+                        return lhs.providerDeviceIndex == rhs.providerDeviceIndex;
+                    }), candidates.end());
+
+                if (candidates.empty()) {
+                    pmlog_error("No route candidate available for metric")
+                        .pmwatch(logicalDeviceId)
+                        .pmwatch((int)metricId);
+                    continue;
+                }
+
+                const auto& selected = candidates.front();
+                logicalDevice.routes[metricId] = selected.providerDeviceIndex;
+            }
+        }
+
+        ReassignGpuLogicalDeviceIdsByMemorySize_();
+    }
+
+    void TelemetryCoordinator::ReassignGpuLogicalDeviceIdsByMemorySize_()
+    {
+        struct GpuLogicalDeviceOrdering_
+        {
+            uint32_t oldId = 0;
+            std::string name{};
+            bool isIntegratedAdapter = false;
+            bool hasSustainedPowerLimit = false;
+            double sustainedPowerLimit = 0.0;
+            bool hasMemorySize = false;
+            uint64_t gpuMemorySize = 0;
+        };
+
+        std::vector<GpuLogicalDeviceOrdering_> gpuDevices;
+        gpuDevices.reserve(logicalDevicesById_.size());
+
+        for (const auto& [logicalDeviceId, logicalDevice] : logicalDevicesById_) {
+            if (logicalDeviceId == ipc::kSystemDeviceId) {
+                continue;
+            }
+            const auto fingerprint = ResolveLogicalDeviceFingerprint_(logicalDevice);
+            const auto powerInfo = QueryGpuSustainedPowerLimit_(logicalDevice);
+            const auto memInfo = QueryGpuMemorySize_(logicalDevice);
+
+            gpuDevices.push_back(GpuLogicalDeviceOrdering_{
+                .oldId = logicalDeviceId,
+                .name = GetDeviceNameOrUnknown_(fingerprint),
+                .isIntegratedAdapter = fingerprint.isIntegratedAdapter,
+                .hasSustainedPowerLimit = powerInfo.hasValue,
+                .sustainedPowerLimit = powerInfo.value,
+                .hasMemorySize = memInfo.hasValue,
+                .gpuMemorySize = memInfo.value,
+            });
+        }
+
+        const bool allHaveSustainedPowerLimit = !gpuDevices.empty() &&
+            std::ranges::all_of(gpuDevices, [](const GpuLogicalDeviceOrdering_& gpuDevice) {
+                return gpuDevice.hasSustainedPowerLimit;
+            });
+
+        std::sort(gpuDevices.begin(), gpuDevices.end(),
+            [allHaveSustainedPowerLimit](const GpuLogicalDeviceOrdering_& lhs, const GpuLogicalDeviceOrdering_& rhs) {
+                if (lhs.isIntegratedAdapter != rhs.isIntegratedAdapter) {
+                    return rhs.isIntegratedAdapter;
+                }
+                if (allHaveSustainedPowerLimit) {
+                    if (lhs.sustainedPowerLimit != rhs.sustainedPowerLimit) {
+                        return lhs.sustainedPowerLimit > rhs.sustainedPowerLimit;
+                    }
+                }
+                else {
+                    if (lhs.hasMemorySize != rhs.hasMemorySize) {
+                        return lhs.hasMemorySize > rhs.hasMemorySize;
+                    }
+                    if (lhs.gpuMemorySize != rhs.gpuMemorySize) {
+                        return lhs.gpuMemorySize > rhs.gpuMemorySize;
+                    }
+                }
+                return lhs.oldId < rhs.oldId;
+            });
+
+        std::unordered_map<uint32_t, LogicalDevice_> reorderedLogicalDevices;
+        reorderedLogicalDevices.reserve(logicalDevicesById_.size());
+
+        if (const auto itSystem = logicalDevicesById_.find(ipc::kSystemDeviceId);
+            itSystem != logicalDevicesById_.end()) {
+            reorderedLogicalDevices.emplace(ipc::kSystemDeviceId, itSystem->second);
+        }
+
+        uint32_t nextGpuLogicalId = 1;
+        for (const auto& gpuDevice : gpuDevices) {
+            auto nh = logicalDevicesById_.extract(gpuDevice.oldId);
+            if (nh.empty()) {
+                pmlog_error("Failed extracting logical GPU device during renumber")
+                    .pmwatch(gpuDevice.oldId);
+                continue;
+            }
+
+            if (gpuDevice.oldId != nextGpuLogicalId) {
+                std::string name = "UNKNOWN_GPU";
+                try {
+                    const auto fingerprint = ResolveLogicalDeviceFingerprint_(nh.mapped());
+                    name = GetDeviceNameOrUnknown_(fingerprint);
+                }
+                catch (...) {
+                    pmlog_warn(util::ReportException("Failed resolving GPU fingerprint while logging ID reassignment"))
+                        .pmwatch(gpuDevice.oldId)
+                        .pmwatch(nextGpuLogicalId);
+                }
+                pmlog_dbg(std::format(
+                    "GPU logical device id reassigned: name=\"{}\" oldId={} newId={} integrated={} sustainedPowerLimit={} hasSustainedPowerLimit={} memorySize={} hasMemorySize={} rankingBasis={}",
+                    name,
+                    gpuDevice.oldId,
+                    nextGpuLogicalId,
+                    gpuDevice.isIntegratedAdapter,
+                    gpuDevice.sustainedPowerLimit,
+                    gpuDevice.hasSustainedPowerLimit,
+                    gpuDevice.gpuMemorySize,
+                    gpuDevice.hasMemorySize,
+                    allHaveSustainedPowerLimit ? "sustainedPower" : "memory"));
+            }
+            nh.key() = nextGpuLogicalId;
+            nh.mapped().logicalDeviceId = nextGpuLogicalId;
+            reorderedLogicalDevices.insert(std::move(nh));
+            ++nextGpuLogicalId;
+        }
+
+        logicalDevicesById_ = std::move(reorderedLogicalDevices);
+        nextLogicalDeviceId_ = std::max(nextGpuLogicalId, 1u);
+        if (nextLogicalDeviceId_ == ipc::kSystemDeviceId) {
+            ++nextLogicalDeviceId_;
+        }
+
+        struct FinalGpuOrderEntry_
+        {
+            uint32_t id = 0;
+            PM_DEVICE_VENDOR vendor = PM_DEVICE_VENDOR_UNKNOWN;
+            std::string name{};
+            bool isIntegratedAdapter = false;
+            bool hasSustainedPowerLimit = false;
+            double sustainedPowerLimit = 0.0;
+            bool hasMemorySize = false;
+            uint64_t gpuMemorySize = 0;
+        };
+
+        std::vector<FinalGpuOrderEntry_> finalGpuOrder;
+        finalGpuOrder.reserve(logicalDevicesById_.size());
+
+        for (const auto& [logicalDeviceId, logicalDevice] : logicalDevicesById_) {
+            if (logicalDeviceId == ipc::kSystemDeviceId) {
+                continue;
+            }
+
+            FinalGpuOrderEntry_ entry{};
+            entry.id = logicalDeviceId;
+            const auto powerInfo = QueryGpuSustainedPowerLimit_(logicalDevice);
+            const auto memInfo = QueryGpuMemorySize_(logicalDevice);
+            entry.hasSustainedPowerLimit = powerInfo.hasValue;
+            entry.sustainedPowerLimit = powerInfo.value;
+            entry.hasMemorySize = memInfo.hasValue;
+            entry.gpuMemorySize = memInfo.value;
+            try {
+                const auto fingerprint = ResolveLogicalDeviceFingerprint_(logicalDevice);
+                entry.vendor = fingerprint.vendor;
+                entry.name = GetDeviceNameOrUnknown_(fingerprint);
+                entry.isIntegratedAdapter = fingerprint.isIntegratedAdapter;
+            }
+            catch (...) {
+                pmlog_warn(util::ReportException("Failed resolving GPU fingerprint while logging final order"))
+                    .pmwatch(logicalDeviceId);
+                entry.name = "UNKNOWN_GPU";
+            }
+            finalGpuOrder.push_back(std::move(entry));
+        }
+
+        std::sort(finalGpuOrder.begin(), finalGpuOrder.end(), [](const FinalGpuOrderEntry_& lhs, const FinalGpuOrderEntry_& rhs) {
+            return lhs.id < rhs.id;
+        });
+
+        std::ostringstream oss;
+        oss << "Final GPU logical device ordering:";
+        oss << "\n  rankingBasis: " << (allHaveSustainedPowerLimit ? "sustainedPower" : "memory");
+        for (size_t i = 0; i < finalGpuOrder.size(); ++i) {
+            const auto& entry = finalGpuOrder[i];
+            oss << "\n" << entry.name;
+            oss << "\n  id: " << entry.id;
+            oss << "\n  vendor: " << (int)entry.vendor;
+            oss << "\n  integrated: " << entry.isIntegratedAdapter;
+            oss << "\n  hasSustainedPowerLimit: " << entry.hasSustainedPowerLimit;
+            oss << "\n  sustainedPowerLimit: " << entry.sustainedPowerLimit;
+            oss << "\n  hasMemorySize: " << entry.hasMemorySize;
+            oss << "\n  memorySize: " << entry.gpuMemorySize;
+        }
+        pmlog_dbg(oss.str());
+    }
+
+    TelemetryCoordinator::GpuMemoryOrderingInfo_ TelemetryCoordinator::QueryGpuMemorySize_(const LogicalDevice_& logicalDevice) const
+    {
+        GpuMemoryOrderingInfo_ out{};
+        if (logicalDevice.logicalDeviceId == ipc::kSystemDeviceId ||
+            !logicalDevice.routes.contains(PM_METRIC_GPU_MEM_SIZE)) {
+            return out;
+        }
+
+        try {
+            const auto value = PollMetricForRoute_(
+                logicalDevice, PM_METRIC_GPU_MEM_SIZE, 0, util::GetCurrentTimestamp());
+            if (const auto pVal = std::get_if<uint64_t>(&value)) {
+                out.hasValue = true;
+                out.value = *pVal;
+                return out;
+            }
+
+            throw util::Except<TelemetryCoordinatorException>("Type mismatch while querying GPU memory size");
+        }
+        catch (...) {
+            pmlog_error(util::ReportException("GPU memory size query failed while ordering logical devices"))
+                .pmwatch(logicalDevice.logicalDeviceId);
+            return out;
+        }
+    }
+
+    TelemetryCoordinator::GpuPowerOrderingInfo_ TelemetryCoordinator::QueryGpuSustainedPowerLimit_(const LogicalDevice_& logicalDevice) const
+    {
+        GpuPowerOrderingInfo_ out{};
+        if (logicalDevice.logicalDeviceId == ipc::kSystemDeviceId ||
+            !logicalDevice.routes.contains(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT)) {
+            return out;
+        }
+
+        try {
+            const auto value = PollMetricForRoute_(
+                logicalDevice, PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, 0, util::GetCurrentTimestamp());
+            if (const auto pVal = std::get_if<double>(&value)) {
+                out.hasValue = true;
+                out.value = *pVal;
+                return out;
+            }
+
+            throw util::Except<TelemetryCoordinatorException>("Type mismatch while querying GPU sustained power limit");
+        }
+        catch (...) {
+            pmlog_error(util::ReportException("GPU sustained power limit query failed while ordering logical devices"))
+                .pmwatch(logicalDevice.logicalDeviceId);
+            return out;
+        }
+    }
+
+    TelemetryCoordinator::LogicalDevice_& TelemetryCoordinator::GetOrCreateLogicalDevice_(
+        const TelemetryDeviceFingerprint& fingerprint)
+    {
+        for (const auto& [logicalDeviceId, logicalDevice] : logicalDevicesById_) {
+            for (const auto& providerDevice : logicalDevice.providerDevices) {
+                const auto pProvider = providerDevice.pProvider.lock();
+                if (!pProvider) {
+                    pmlog_warn("Expired provider while matching logical devices")
+                        .pmwatch(logicalDeviceId)
+                        .pmwatch(providerDevice.providerDeviceId);
+                    continue;
+                }
+
+                try {
+                    const auto& candidateFingerprint = pProvider->GetFingerPrint(providerDevice.providerDeviceId);
+                    if (TelemetryDeviceFingerprintMatches(candidateFingerprint, fingerprint)) {
+                        return logicalDevicesById_.at(logicalDeviceId);
+                    }
+                }
+                catch (...) {
+                    pmlog_error(util::ReportException("GetOrCreateLogicalDevice fingerprint query failed"))
+                        .pmwatch(logicalDeviceId)
+                        .pmwatch(providerDevice.providerDeviceId);
+                }
+            }
+        }
+
+        uint32_t newId = 0;
+        if (fingerprint.deviceType == PM_DEVICE_TYPE_SYSTEM &&
+            logicalDevicesById_.find(ipc::kSystemDeviceId) == logicalDevicesById_.end()) {
+            newId = ipc::kSystemDeviceId;
+        }
+        else {
+            while (true) {
+                if (nextLogicalDeviceId_ == ipc::kSystemDeviceId) {
+                    ++nextLogicalDeviceId_;
+                }
+                newId = nextLogicalDeviceId_++;
+                if (logicalDevicesById_.find(newId) == logicalDevicesById_.end()) {
+                    break;
+                }
+            }
+        }
+
+        LogicalDevice_ logicalDevice{};
+        logicalDevice.logicalDeviceId = newId;
+        auto itLogical = logicalDevicesById_.emplace(newId, std::move(logicalDevice)).first;
+        return itLogical->second;
+    }
+
+    TelemetryDeviceFingerprint TelemetryCoordinator::ResolveLogicalDeviceFingerprint_(
+        const LogicalDevice_& logicalDevice) const
+    {
+        TelemetryDeviceFingerprint fingerprint{};
+        bool haveFingerprint = false;
+
+        for (const auto& providerDevice : logicalDevice.providerDevices) {
+            const auto pProvider = providerDevice.pProvider.lock();
+            if (!pProvider) {
+                pmlog_warn("Expired provider while resolving logical-device fingerprint")
+                    .pmwatch(logicalDevice.logicalDeviceId)
+                    .pmwatch(providerDevice.providerDeviceId);
+                continue;
+            }
+
+            try {
+                const auto providerFingerprint = pProvider->GetFingerPrint(providerDevice.providerDeviceId);
+                if (!haveFingerprint) {
+                    fingerprint = providerFingerprint;
+                    haveFingerprint = true;
+                }
+                else {
+                    if (!fingerprint.luid.empty() &&
+                        !providerFingerprint.luid.empty() &&
+                        fingerprint.luid != providerFingerprint.luid) {
+                        pmlog_warn("Conflicting provider LUID while resolving logical-device fingerprint")
+                            .pmwatch(logicalDevice.logicalDeviceId)
+                            .pmwatch(providerDevice.providerDeviceId);
+                    }
+                    MergeTelemetryDeviceFingerprint(fingerprint, providerFingerprint);
+                }
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("Logical-device fingerprint query failed"))
+                    .pmwatch(logicalDevice.logicalDeviceId)
+                    .pmwatch(providerDevice.providerDeviceId);
+            }
+        }
+
+        if (!haveFingerprint) {
+            pmlog_error("No provider-device fingerprint resolved for logical device")
+                .pmwatch(logicalDevice.logicalDeviceId);
+            throw util::Except<TelemetryCoordinatorException>("No provider-device fingerprint resolved for logical device");
+        }
+
+        return fingerprint;
+    }
+
+    ipc::MetricCapabilities TelemetryCoordinator::BuildRoutedCapabilities_(
+        const LogicalDevice_& logicalDevice) const
+    {
+        ipc::MetricCapabilities caps{};
+
+        for (const auto& [metricId, providerDeviceIndex] : logicalDevice.routes) {
+            if (providerDeviceIndex >= logicalDevice.providerDevices.size()) {
+                pmlog_error("Route points outside provider device list in BuildRoutedCapabilities")
+                    .pmwatch(logicalDevice.logicalDeviceId)
+                    .pmwatch((int)metricId)
+                    .pmwatch(providerDeviceIndex)
+                    .pmwatch(logicalDevice.providerDevices.size());
+                continue;
+            }
+
+            const auto& providerDevice = logicalDevice.providerDevices[providerDeviceIndex];
+            const auto pProvider = providerDevice.pProvider.lock();
+            if (!pProvider) {
+                pmlog_error("Route provider expired in BuildRoutedCapabilities")
+                    .pmwatch(logicalDevice.logicalDeviceId)
+                    .pmwatch((int)metricId)
+                    .pmwatch(providerDevice.providerDeviceId);
+                continue;
+            }
+
+            TelemetryDeviceFingerprint providerFingerprint{};
+            try {
+                providerFingerprint = pProvider->GetFingerPrint(providerDevice.providerDeviceId);
+                const auto capabilityMap = pProvider->GetCaps();
+                const auto itDeviceCaps = capabilityMap.find(providerDevice.providerDeviceId);
+                if (itDeviceCaps == capabilityMap.end()) {
+                    pmlog_error("Provider did not return caps for routed device")
+                        .pmwatch(logicalDevice.logicalDeviceId)
+                        .pmwatch((int)providerFingerprint.vendor)
+                        .pmwatch(providerFingerprint.deviceName)
+                        .pmwatch(providerDevice.providerDeviceId)
+                        .pmwatch((int)metricId);
+                    continue;
+                }
+
+                const auto arraySize = itDeviceCaps->second.Check(metricId);
+                if (arraySize == 0) {
+                    pmlog_error("Provider caps missing routed metric")
+                        .pmwatch(logicalDevice.logicalDeviceId)
+                        .pmwatch((int)providerFingerprint.vendor)
+                        .pmwatch(providerFingerprint.deviceName)
+                        .pmwatch(providerDevice.providerDeviceId)
+                        .pmwatch((int)metricId);
+                    continue;
+                }
+
+                caps.Set(metricId, arraySize);
+            }
+            catch (...) {
+                pmlog_error(util::ReportException("BuildRoutedCapabilities provider query failed"))
+                    .pmwatch(logicalDevice.logicalDeviceId)
+                    .pmwatch((int)providerFingerprint.vendor)
+                    .pmwatch(providerFingerprint.deviceName)
+                    .pmwatch(providerDevice.providerDeviceId)
+                    .pmwatch((int)metricId);
+            }
+        }
+
+        return caps;
+    }
+
+    void TelemetryCoordinator::PushValueToTelemetryMap_(
+        ipc::TelemetryMap& telemetryMap,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        const TelemetryMetricValue& value,
+        uint64_t qpc)
+    {
+        try {
+            std::visit([&](const auto& sampleValue) -> void {
+                using ValueT = std::decay_t<decltype(sampleValue)>;
+                if (auto& rings = telemetryMap.FindRing<ValueT>(metricId); arrayIndex < rings.size()) {
+                    if (!rings[arrayIndex].Push(sampleValue, qpc)) {
+                        pmlog_error("Failed pushing telemetry sample to ring (backpressured timeout)")
+                            .pmwatch((int)metricId)
+                            .pmwatch(arrayIndex);
+                        throw util::Except<TelemetryCoordinatorException>("Failed pushing telemetry sample to ring (backpressured timeout)");
+                    }
+                    return;
+                }
+                else {
+                    pmlog_error("Index out of bounds in telemetry ring")
+                        .pmwatch((int)metricId)
+                        .pmwatch(rings.size())
+                        .pmwatch(arrayIndex);
+                    throw util::Except<TelemetryCoordinatorException>("Index out of bounds in telemetry ring");
+                }
+            }, value);
+        }
+        catch (...) {
+            pmlog_error(util::ReportException("PushValueToTelemetryMap failed"))
+                .pmwatch((int)metricId)
+                .pmwatch(arrayIndex);
+            throw;
+        }
+    }
+
+    TelemetryMetricValue TelemetryCoordinator::PollMetricForRoute_(
+        const LogicalDevice_& logicalDevice,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc) const
+    {
+        const auto itRoute = logicalDevice.routes.find(metricId);
+        if (itRoute == logicalDevice.routes.end()) {
+            pmlog_error("No route found for metric on logical device")
+                .pmwatch(logicalDevice.logicalDeviceId)
+                .pmwatch((int)metricId)
+                .pmwatch(arrayIndex);
+            throw util::Except<TelemetryCoordinatorException>("No route found for metric on logical device");
+        }
+
+        const auto providerDeviceIndex = itRoute->second;
+        if (providerDeviceIndex >= logicalDevice.providerDevices.size()) {
+            pmlog_error("Route points outside provider device list")
+                .pmwatch(logicalDevice.logicalDeviceId)
+                .pmwatch((int)metricId)
+                .pmwatch(providerDeviceIndex)
+                .pmwatch(logicalDevice.providerDevices.size());
+            throw util::Except<TelemetryCoordinatorException>("Route points outside provider device list");
+        }
+
+        const auto& providerDevice = logicalDevice.providerDevices[providerDeviceIndex];
+        const auto pProvider = providerDevice.pProvider.lock();
+        if (!pProvider) {
+            pmlog_error("Route provider expired")
+                .pmwatch(logicalDevice.logicalDeviceId)
+                .pmwatch((int)metricId)
+                .pmwatch(providerDevice.providerDeviceId)
+                .pmwatch(arrayIndex);
+            throw util::Except<TelemetryCoordinatorException>("Route provider expired");
+        }
+
+        try {
+            return pProvider->PollMetric(providerDevice.providerDeviceId, metricId, arrayIndex, requestQpc);
+        }
+        catch (...) {
+            pmlog_error(util::ReportException("PollMetricForRoute failed"))
+                .pmwatch(logicalDevice.logicalDeviceId)
+                .pmwatch(providerDevice.providerDeviceId)
+                .pmwatch((int)metricId)
+                .pmwatch(arrayIndex);
+            throw;
+        }
+    }
+
+}
diff --git a/IntelPresentMon/ControlLib/TelemetryCoordinator.h b/IntelPresentMon/ControlLib/TelemetryCoordinator.h
new file mode 100644
index 000000000..13ff5707a
--- /dev/null
+++ b/IntelPresentMon/ControlLib/TelemetryCoordinator.h
@@ -0,0 +1,90 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../PresentMonService/MetricUse.h"
+#include "TelemetryProvider.h"
+#include <cstdint>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace pmon::ipc
+{
+    class ServiceComms;
+    class TelemetryMap;
+}
+
+namespace pmon::tel
+{
+    class TelemetryCoordinator
+    {
+    public:
+        // Constructs all known concrete providers, correlates logical devices,
+        // and builds metric polling routes.
+        explicit TelemetryCoordinator(uint32_t pollRateMs);
+        // Registers logical CPU/GPU devices and per-device routed capabilities with IPC.
+        void RegisterDevicesToIpc(ipc::ServiceComms& comms) const;
+        // Populates available static data into IPC device stores.
+        void PopulateStaticsToIpc(ipc::ServiceComms& comms) const;
+        // Returns aggregate availability across all routed logical devices.
+        ipc::MetricCapabilities GetAvailability() const;
+        // Broadcasts requested active telemetry polling cadence to providers that need it.
+        void SetPollRate(uint32_t pollRateMs);
+        // Broadcasts current routed metric interest to providers that need active configuration.
+        void SetMetricUse(const svc::DeviceMetricUse& metricUse);
+        // Polls routed telemetry metrics and pushes samples directly to IPC rings.
+        size_t PollToIpc(const svc::DeviceMetricUse& metricUse,
+            ipc::ServiceComms& comms) const;
+
+    private:
+        // types
+        struct ProviderDevice_
+        {
+            std::weak_ptr<TelemetryProvider> pProvider;
+            uint32_t providerDeviceId;
+        };
+        struct LogicalDevice_
+        {
+            uint32_t logicalDeviceId = 0;
+            std::vector<ProviderDevice_> providerDevices;
+            // maps metrics to an index into providerDevices
+            std::unordered_map<PM_METRIC, uint32_t> routes;
+        };
+        struct GpuMemoryOrderingInfo_
+        {
+            bool hasValue = false;
+            uint64_t value = 0;
+        };
+        struct GpuPowerOrderingInfo_
+        {
+            bool hasValue = false;
+            double value = 0.0;
+        };
+        // functions
+        void TryCreateConcreteProviders_();
+        void BuildLogicalDevicesAndRoutes_();
+        void ReassignGpuLogicalDeviceIdsByMemorySize_();
+        GpuMemoryOrderingInfo_ QueryGpuMemorySize_(const LogicalDevice_& logicalDevice) const;
+        GpuPowerOrderingInfo_ QueryGpuSustainedPowerLimit_(const LogicalDevice_& logicalDevice) const;
+        LogicalDevice_& GetOrCreateLogicalDevice_(const TelemetryDeviceFingerprint& fingerprint);
+        TelemetryDeviceFingerprint ResolveLogicalDeviceFingerprint_(const LogicalDevice_& logicalDevice) const;
+        ipc::MetricCapabilities BuildRoutedCapabilities_(const LogicalDevice_& logicalDevice) const;
+        static void PushValueToTelemetryMap_(
+            ipc::TelemetryMap& telemetryMap,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            const TelemetryMetricValue& value,
+            uint64_t qpc);
+        TelemetryMetricValue PollMetricForRoute_(
+            const LogicalDevice_& logicalDevice,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) const;
+        // data
+        std::vector<std::shared_ptr<TelemetryProvider>> providerPtrs_;
+        std::unordered_map<uint32_t, LogicalDevice_> logicalDevicesById_;
+        uint32_t nextLogicalDeviceId_ = 1;
+        uint32_t pollRateMs_ = 1000;
+    };
+}
diff --git a/IntelPresentMon/ControlLib/TelemetryDeviceFingerprint.cpp b/IntelPresentMon/ControlLib/TelemetryDeviceFingerprint.cpp
new file mode 100644
index 000000000..1a5a9d810
--- /dev/null
+++ b/IntelPresentMon/ControlLib/TelemetryDeviceFingerprint.cpp
@@ -0,0 +1,111 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "TelemetryDeviceFingerprint.h"
+#include <cctype>
+#include <format>
+
+namespace pmon::tel
+{
+    namespace
+    {
+        std::string NormalizeName_(const std::string& name)
+        {
+            std::string normalized;
+            normalized.reserve(name.size());
+            for (const auto ch : name) {
+                const auto c = static_cast<unsigned char>(ch);
+                if (std::isalnum(c)) {
+                    normalized.push_back(static_cast<char>(std::tolower(c)));
+                }
+            }
+            return normalized;
+        }
+
+        template<typename T>
+        bool OptionalEqual_(const std::optional<T>& lhs, const std::optional<T>& rhs) noexcept
+        {
+            return lhs.has_value() && rhs.has_value() && (*lhs == *rhs);
+        }
+    }
+
+    bool TelemetryDeviceFingerprintMatches(
+        const TelemetryDeviceFingerprint& lhs,
+        const TelemetryDeviceFingerprint& rhs) noexcept
+    {
+        if (lhs.deviceType != rhs.deviceType) {
+            return false;
+        }
+
+        // There is only one logical system device exposed through IPC. Any
+        // provider reporting PM_DEVICE_TYPE_SYSTEM should correlate to it.
+        if (lhs.deviceType == PM_DEVICE_TYPE_SYSTEM) {
+            return true;
+        }
+
+        if (lhs.vendor != rhs.vendor) {
+            return false;
+        }
+
+        if (OptionalEqual_(lhs.pciDeviceId, rhs.pciDeviceId) &&
+            OptionalEqual_(lhs.pciSubSystemId, rhs.pciSubSystemId)) {
+            return true;
+        }
+
+        if (OptionalEqual_(lhs.pciBusId, rhs.pciBusId)) {
+            return true;
+        }
+
+        if (!lhs.deviceName.empty() && !rhs.deviceName.empty()) {
+            return NormalizeName_(lhs.deviceName) == NormalizeName_(rhs.deviceName);
+        }
+
+        return false;
+    }
+
+    std::string TelemetryDeviceFingerprint::LuidAsString() const
+    {
+        if (luid.empty()) {
+            return "<EMPTY>";
+        }
+
+        std::string text{};
+        for (size_t i = 0; i < luid.size(); ++i) {
+            text += std::format("{}{:02X}", i != 0 ? " " : "", luid[i]);
+        }
+
+        return text;
+    }
+
+    void MergeTelemetryDeviceFingerprint(
+        TelemetryDeviceFingerprint& dst,
+        const TelemetryDeviceFingerprint& src)
+    {
+        if (dst.vendor == PM_DEVICE_VENDOR_UNKNOWN) {
+            dst.vendor = src.vendor;
+        }
+
+        if (dst.deviceName.empty()) {
+            dst.deviceName = src.deviceName;
+        }
+
+        if (!dst.isIntegratedAdapter) {
+            dst.isIntegratedAdapter = src.isIntegratedAdapter;
+        }
+
+        if (dst.luid.empty()) {
+            dst.luid = src.luid;
+        }
+
+        if (!dst.pciDeviceId.has_value()) {
+            dst.pciDeviceId = src.pciDeviceId;
+        }
+
+        if (!dst.pciSubSystemId.has_value()) {
+            dst.pciSubSystemId = src.pciSubSystemId;
+        }
+
+        if (!dst.pciBusId.has_value()) {
+            dst.pciBusId = src.pciBusId;
+        }
+    }
+}
diff --git a/IntelPresentMon/ControlLib/TelemetryDeviceFingerprint.h b/IntelPresentMon/ControlLib/TelemetryDeviceFingerprint.h
new file mode 100644
index 000000000..cd779c1c3
--- /dev/null
+++ b/IntelPresentMon/ControlLib/TelemetryDeviceFingerprint.h
@@ -0,0 +1,36 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../PresentMonAPI2/PresentMonAPI.h"
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace pmon::tel
+{
+    struct TelemetryDeviceFingerprint
+    {
+        PM_DEVICE_TYPE deviceType = PM_DEVICE_TYPE_INDEPENDENT;
+        PM_DEVICE_VENDOR vendor = PM_DEVICE_VENDOR_UNKNOWN;
+        std::string deviceName;
+        bool isIntegratedAdapter = false;
+
+        std::vector<uint8_t> luid;
+        // Correlation fields aligned with NVIDIA matching.
+        std::optional<uint32_t> pciDeviceId;
+        std::optional<uint32_t> pciSubSystemId;
+        std::optional<uint32_t> pciBusId;
+
+        std::string LuidAsString() const;
+    };
+
+    bool TelemetryDeviceFingerprintMatches(
+        const TelemetryDeviceFingerprint& lhs,
+        const TelemetryDeviceFingerprint& rhs) noexcept;
+
+    void MergeTelemetryDeviceFingerprint(
+        TelemetryDeviceFingerprint& dst,
+        const TelemetryDeviceFingerprint& src);
+}
diff --git a/IntelPresentMon/ControlLib/TelemetryProvider.h b/IntelPresentMon/ControlLib/TelemetryProvider.h
new file mode 100644
index 000000000..ee9b87cdb
--- /dev/null
+++ b/IntelPresentMon/ControlLib/TelemetryProvider.h
@@ -0,0 +1,39 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "TelemetryDeviceFingerprint.h"
+#include "../PresentMonService/MetricUse.h"
+#include "../Interprocess/source/MetricCapabilities.h"
+#include "../Interprocess/source/TelemetryMap.h"
+#include <cstdint>
+#include <memory>
+#include <unordered_map>
+
+namespace pmon::tel
+{
+    using ProviderDeviceId = uint32_t;
+    using ProviderCapabilityMap = std::unordered_map<ProviderDeviceId, ipc::MetricCapabilities>;
+    using TelemetryMetricValue = ipc::TelemetryMap::ScalarValueType;
+
+    class TelemetryProvider
+    {
+    public:
+        virtual ~TelemetryProvider() = default;
+        virtual ProviderCapabilityMap GetCaps() = 0;
+        virtual const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const = 0;
+        virtual TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) = 0;
+        virtual void SetPollRate(uint32_t pollRateMs)
+        {
+            (void)pollRateMs;
+        }
+        virtual void SetMetricUse(const svc::DeviceMetricUse& metricUse)
+        {
+            (void)metricUse;
+        }
+    };
+}
diff --git a/IntelPresentMon/ControlLib/Ver.h b/IntelPresentMon/ControlLib/Ver.h
deleted file mode 100644
index 7ec0b69ff..000000000
--- a/IntelPresentMon/ControlLib/Ver.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
-** Copyright (c) 2013-2022 Intel Corporation All Rights Reserved
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); you may not
-** use this file except in compliance with the License.
-**
-** You may obtain a copy of the License at
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-** WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-**
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-******************************************************************************/
-
-#pragma once
-
-#define VER_MAJOR        1
-#define VER_MINOR        0
-#define VER_HOTFIX       11101
-#define VER_BUILD        30068
diff --git a/IntelPresentMon/ControlLib/WmiCpu.cpp b/IntelPresentMon/ControlLib/WmiCpu.cpp
deleted file mode 100644
index 34edc5964..000000000
--- a/IntelPresentMon/ControlLib/WmiCpu.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#include <format>
-#include "WmiCpu.h"
-
-#include "../CommonUtilities/log/GlogShim.h"
-
-namespace pwr::cpu::wmi {
-
-std::wstring kProcessorFrequency =
-    L"\\Processor Information(_Total)\\Processor Frequency";
-std::wstring kProcessorPerformance =
-    L"\\Processor Information(_Total)\\% Processor Performance";
-std::wstring kProcessorIdleTime = L"\\Processor(_Total)\\% Idle Time";
-
-WmiCpu::WmiCpu() {
-  HQUERY temp_query = nullptr;
-  if (const auto result = PdhOpenQuery(NULL, NULL, &temp_query);
-      result != ERROR_SUCCESS) {
-    throw std::runtime_error{
-        std::format("PdhOpenQuery failed. Result:{}", result).c_str()};
-  }
-  query_.reset(temp_query);
-
-  if (const auto result =
-          PdhAddEnglishCounterW(query_.get(), kProcessorFrequency.c_str(), 0,
-                                        &processor_frequency_counter_);
-      result != ERROR_SUCCESS) {
-    LOG(INFO) << "PdhAddEnglishCounter failed when adding processor frequency counter. Result:"
-        << result << std::endl;
-  }
-
-  if (const auto result =
-          PdhAddEnglishCounterW(query_.get(), kProcessorPerformance.c_str(),
-                                        0, &processor_performance_counter_);
-      result != ERROR_SUCCESS) {
-    LOG(INFO) << "PdhAddEnglishCounter failed when adding processor performance counter. Result:"
-        << result << std::endl;
-  }
-
-  if (const auto result = PdhAddEnglishCounterW(query_.get(), kProcessorIdleTime.c_str(), 0,
-                                &processor_idle_time_counter_);
-      result != ERROR_SUCCESS) {
-    LOG(INFO) << "PdhAddEnglishCounter failed when adding processor time counter. Result:"
-        << result << std::endl;
-  }
-
-  // Most counters require two sample values to display a formatted value.
-  // PDH stores the current sample value and the previously collected
-  // sample value. This call retrieves the first value that will be used
-  // by PdhGetFormattedCounterValue in the next data collection.
-  if (const auto result = PdhCollectQueryData(query_.get());
-      result != ERROR_SUCCESS) {
-    throw std::runtime_error{
-        std::format("PdhCollectQueryData failed. Result: {}", result).c_str()};
-  }
-
-  // WMI specifies that it should not be sampled faster than once every
-  // second. We however allow the user to specify the sample rate for
-  // telemetry. Through testing it was observed that allowing a
-  // sample rate of faster than one second will cause the CPU utilization
-  // number to become inaccurate. Because of this we will impose
-  // a one second wait for WMI sampling.
-
-  // Grab the current QPC frequency which returns the current performance-
-  // counter frequency in counts per SECOND.
-  QueryPerformanceFrequency(&frequency_);
-  // Now grab the current value of the performance counter
-  QueryPerformanceCounter(&next_sample_qpc_);
-  // To calculate the next time we should sample take the just sampled
-  // performance counter and the frequency.
-  // next_sample_qpc_.QuadPart += frequency_.QuadPart;
-}
-
-
-CpuTelemetryInfo WmiCpu::Sample() noexcept {
-  DWORD counter_type;
-
-  LARGE_INTEGER qpc;
-  QueryPerformanceCounter(&qpc);
-  const bool should_collect = qpc.QuadPart >= next_sample_qpc_.QuadPart;
-
-  CpuTelemetryInfo info{
-      .qpc = (uint64_t)qpc.QuadPart,
-  };
-
-  if (should_collect) {
-    if (const auto result = PdhCollectQueryData(query_.get());
-        result != ERROR_SUCCESS) {
-      LOG(INFO) << "PdhCollectQueryData failed. Result:" << result << std::endl;
-    } else {
-      // Update the next sample qpc based on the current sample qpc
-      // and adding in the frequency
-      next_sample_qpc_.QuadPart = qpc.QuadPart + frequency_.QuadPart;
-    }
-  }
-
-  // Sample cpu clock. This is an approximation using the frequency and then
-  // the current percentage.
-  PDH_FMT_COUNTERVALUE counter_value;
-  {
-    if (const auto result = PdhGetFormattedCounterValue(
-            processor_frequency_counter_, PDH_FMT_DOUBLE, &counter_type,
-            &counter_value);
-        result == ERROR_SUCCESS) {
-      info.cpu_frequency = counter_value.doubleValue;
-
-      if (const auto result2 = PdhGetFormattedCounterValue(
-              processor_performance_counter_, PDH_FMT_DOUBLE, &counter_type,
-              &counter_value);
-          result2 == ERROR_SUCCESS) {
-        info.cpu_frequency =
-            info.cpu_frequency * (counter_value.doubleValue / 100.);
-        SetTelemetryCapBit(CpuTelemetryCapBits::cpu_frequency);
-      }
-    }
-  }
-
-  // Sample cpu idle time, and compute cpu utilization using it (Windows 11 Fix)
-  //
-  // Beginning with Windows 11 22H2, the performance counters for CPU idle time
-  // in SystemProcessorPerformanceInformation are broken and statistics derived
-  // from those counters will always indicate single-digit cpu utilization %.
-  //
-  // Idle time reported in SystemProcessorIdleInformation is still consistent on
-  // all versions of Windows, as well as WMI provisioned "Processor\% Idle Time".
-  //
-  // To measure CPU utilization accurately on all systems, it must be calculated:
-  // 
-  //    100.0 - "Processor(_Total)\% Idle Time"
-  {
-    if (const auto result =
-            PdhGetFormattedCounterValue(processor_idle_time_counter_, PDH_FMT_DOUBLE,
-                                        &counter_type, &counter_value);
-        result == ERROR_SUCCESS) {
-      info.cpu_utilization = 100.0 - counter_value.doubleValue;
-      SetTelemetryCapBit(CpuTelemetryCapBits::cpu_utilization);
-    }
-  }
-
-  return info;
-}
-
-}
diff --git a/IntelPresentMon/ControlLib/WmiCpu.h b/IntelPresentMon/ControlLib/WmiCpu.h
deleted file mode 100644
index 1fb67b420..000000000
--- a/IntelPresentMon/ControlLib/WmiCpu.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#define NOMINMAX
-#include <Windows.h>
-#include <pdh.h>
-#include "CpuTelemetry.h"
-
-namespace pwr::cpu::wmi {
-
-struct PDHQueryDeleter {
-  void operator()(PDH_HQUERY query) const { PdhCloseQuery(query); }
-};
-
-class WmiCpu : public CpuTelemetry {
- public:
-  WmiCpu();
-  CpuTelemetryInfo Sample() noexcept override;
-  // types
-  class NonGraphicsDeviceException : public std::exception {};
-
- private:
-  // data
-  std::unique_ptr<std::remove_pointer_t<PDH_HQUERY>, PDHQueryDeleter> query_;
-  HCOUNTER processor_frequency_counter_;
-  HCOUNTER processor_performance_counter_;
-  HCOUNTER processor_idle_time_counter_;
-  LARGE_INTEGER next_sample_qpc_ = {};
-  LARGE_INTEGER frequency_ = {};
-  std::string cpu_name_;
-};
-
-}  // namespace pwr::cpu::wmi
diff --git a/IntelPresentMon/ControlLib/Adl2Wrapper.cpp b/IntelPresentMon/ControlLib/adl/Adl2Wrapper.cpp
similarity index 84%
rename from IntelPresentMon/ControlLib/Adl2Wrapper.cpp
rename to IntelPresentMon/ControlLib/adl/Adl2Wrapper.cpp
index 72e664d90..de642d5f3 100644
--- a/IntelPresentMon/ControlLib/Adl2Wrapper.cpp
+++ b/IntelPresentMon/ControlLib/adl/Adl2Wrapper.cpp
@@ -1,8 +1,8 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "Adl2Wrapper.h"
 
-namespace pwr::amd {
+namespace pmon::tel::adl {
 
   void* __stdcall ADL_Main_Memory_Alloc(int iSize) {
     void* lpBuffer = malloc(iSize);
@@ -15,8 +15,8 @@ namespace pwr::amd {
         static_cast<int (*)(ADL_MAIN_MALLOC_CALLBACK, int, ADL_CONTEXT_HANDLE*)>(
             dll.GetProcAddress("ADL2_Main_Control_Create"));
     if (!adl2_main_control_create_ptr) {
-      throw std::runtime_error{
-          "Failed to get main control create proc for amd"};
+      throw Except<TelemetrySubsystemAbsent>(
+          "Failed to get ADL2 main control create proc");
     }
 
     // get shutdown proc, but don't throw if not found (non-critical)
@@ -33,9 +33,9 @@ namespace pwr::amd {
     // Initialize ADL2. The second parameter is 1, which means:
     // retrieve adapter information only for adapters that are physically
     // present and enabled in the system
-    if (!Ok(adl2_main_control_create_ptr(pwr::amd::ADL_Main_Memory_Alloc, 1,
+    if (!Ok(adl2_main_control_create_ptr(ADL_Main_Memory_Alloc, 1,
                                          &adl_context_))) {
-      throw std::runtime_error{"adl2 init call failed"};
+      throw Except<TelemetrySubsystemAbsent>("ADL2 initialization call failed");
     }
   }
 
@@ -56,4 +56,4 @@ namespace pwr::amd {
   }
   AMD_ADL2_ENDPOINT_LIST
 #undef X_
-} // namespace pwr::amd
\ No newline at end of file
+} // namespace pmon::tel::adl
diff --git a/IntelPresentMon/ControlLib/Adl2Wrapper.h b/IntelPresentMon/ControlLib/adl/Adl2Wrapper.h
similarity index 92%
rename from IntelPresentMon/ControlLib/Adl2Wrapper.h
rename to IntelPresentMon/ControlLib/adl/Adl2Wrapper.h
index 8657ff1ed..3d3fe0794 100644
--- a/IntelPresentMon/ControlLib/Adl2Wrapper.h
+++ b/IntelPresentMon/ControlLib/adl/Adl2Wrapper.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
 #include "adl_sdk.h"
-#include "DllModule.h"
-#include "MacroHelpers.h"
+#include "../DllModule.h"
+#include "../MacroHelpers.h"
 
 
 // goals: single source of truth, automatic id lookup, parameter names in
@@ -13,6 +13,10 @@
   X_(Adapter_NumberOfAdapters_Get, int*, lpNumAdapters)                        \
   X_(Adapter_AdapterInfo_Get, LPAdapterInfo, lpInfo, int, iInputSize)          \
   X_(Adapter_Active_Get, int, iAdapterIndex, int*, lpStatus)                   \
+  X_(Adapter_ASICFamilyType_Get, int, iAdapterIndex, int*, lpAsicTypes,        \
+     int*, lpValids)                                                           \
+  X_(Adapter_DedicatedVRAMUsage_Get, int, iAdapterIndex, int*,                 \
+     iVRAMUsageInMB)                                                           \
   X_(Adapter_VRAMUsage_Get, int, iAdapterIndex, int*, iVRAMUsageInMB)          \
   X_(Adapter_MemoryInfoX4_Get, int, iAdapterIndex, ADLMemoryInfoX4*,           \
      lpMemoryInfoX4)                                                           \
@@ -67,7 +71,7 @@
   X_(OverdriveN_FanControl_Get, int, iAdapterIndex, ADLODNFanControl*,         \
      lpOdFanControl)
 
-namespace pwr::amd {
+namespace pmon::tel::adl {
 	class Adl2Wrapper {
 	public:
 		Adl2Wrapper();
@@ -91,4 +95,4 @@ namespace pwr::amd {
 		// Private endpoint pointer to shutdown ADL2
 		int (*ADL2_Main_Control_Destroy_ptr_)(ADL_CONTEXT_HANDLE) = nullptr;
 	};
-}  // namespace pwr::amd
\ No newline at end of file
+}  // namespace pmon::tel::adl
diff --git a/IntelPresentMon/ControlLib/adl/AdlTelemetryProvider.cpp b/IntelPresentMon/ControlLib/adl/AdlTelemetryProvider.cpp
new file mode 100644
index 000000000..2e10b3bc6
--- /dev/null
+++ b/IntelPresentMon/ControlLib/adl/AdlTelemetryProvider.cpp
@@ -0,0 +1,1022 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "AdlTelemetryProvider.h"
+
+#include "../Exceptions.h"
+#include "../Logging.h"
+#include "../../CommonUtilities/Qpc.h"
+#include "../../CommonUtilities/ref/GeneratedReflection.h"
+
+#include <chrono>
+#include <unordered_set>
+
+using namespace pmon;
+using namespace util;
+using namespace std::literals;
+using v = log::V;
+
+namespace pmon::tel::adl
+{
+    namespace
+    {
+        constexpr int kAmdVendorId_ = 1002;
+        constexpr int kOverdriveVersionMin_ = 5;
+        constexpr int kOverdriveVersionMax_ = 8;
+        constexpr int kOdnGpuTemperatureSensor_ = 1;
+
+        bool HasFlag_(int value, int flag) noexcept
+        {
+            return (value & flag) == flag;
+        }
+    }
+
+    AdlTelemetryProvider::AdlTelemetryProvider()
+    {
+        pAdl_ = std::make_unique<Adl2Wrapper>();
+
+        int adapterCount = 0;
+        const auto countResult = pAdl_->Adapter_NumberOfAdapters_Get(&adapterCount);
+        if (!Adl2Wrapper::Ok(countResult)) {
+            pmlog_error("ADL2_Adapter_NumberOfAdapters_Get failed").code(countResult);
+            throw Except<AdlException>("ADL adapter count query failed");
+        }
+        pmlog_verb(v::tele_gpu)("ADL2_Adapter_NumberOfAdapters_Get output")
+            .pmwatch(adapterCount);
+
+        if (adapterCount <= 0) {
+            return;
+        }
+
+        std::vector<AdapterInfo> adapterInfos((size_t)adapterCount);
+        for (auto& adapterInfo : adapterInfos) {
+            adapterInfo.iSize = sizeof(AdapterInfo);
+        }
+
+        const auto infoResult = pAdl_->Adapter_AdapterInfo_Get(
+            adapterInfos.data(),
+            (int)(adapterInfos.size() * sizeof(AdapterInfo)));
+        if (!Adl2Wrapper::Ok(infoResult)) {
+            pmlog_error("ADL2_Adapter_AdapterInfo_Get failed").code(infoResult);
+            throw Except<AdlException>("ADL adapter info query failed");
+        }
+        pmlog_verb(v::tele_gpu)("ADL2_Adapter_AdapterInfo_Get output")
+            .pmwatch(ref::DumpGenerated(adapterInfos));
+
+        std::unordered_set<int> seenBusNumbers{};
+        for (const auto& adapterInfo : adapterInfos) {
+            if (adapterInfo.iVendorID != kAmdVendorId_) {
+                continue;
+            }
+            if (adapterInfo.iBusNumber < 0) {
+                pmlog_warn("Skipping AMD adapter with invalid PCI bus number")
+                    .pmwatch(adapterInfo.iAdapterIndex)
+                    .pmwatch(adapterInfo.strAdapterName);
+                continue;
+            }
+            if (!seenBusNumbers.insert(adapterInfo.iBusNumber).second) {
+                continue;
+            }
+
+            const auto providerDeviceId = nextProviderDeviceId_;
+            const auto emplaceResult = devicesById_.try_emplace(providerDeviceId);
+            if (!emplaceResult.second) {
+                throw Except<AdlException>("Duplicate ADL provider device id encountered");
+            }
+
+            auto& device = emplaceResult.first->second;
+            device.providerDeviceId = providerDeviceId;
+            if (!TryInitializeDevice_(device, adapterInfo)) {
+                devicesById_.erase(emplaceResult.first);
+                continue;
+            }
+
+            device.caps = BuildCapsForDevice_(device);
+            ++nextProviderDeviceId_;
+        }
+    }
+
+    ProviderCapabilityMap AdlTelemetryProvider::GetCaps()
+    {
+        ProviderCapabilityMap capsByDeviceId{};
+        for (const auto& entry : devicesById_) {
+            capsByDeviceId.emplace(entry.first, entry.second.caps);
+        }
+        return capsByDeviceId;
+    }
+
+    const TelemetryDeviceFingerprint& AdlTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<AdlException>("ADL provider device not found");
+        }
+        return iDevice->second.fingerprint;
+    }
+
+    TelemetryMetricValue AdlTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<AdlException>("ADL provider device not found");
+        }
+
+        auto& device = iDevice->second;
+
+        switch (metricId) {
+        case PM_METRIC_GPU_VENDOR:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return (int)device.fingerprint.vendor;
+        case PM_METRIC_GPU_NAME:
+            throw Except<AdlException>("PM_METRIC_GPU_NAME is static-only and is not served by poll path");
+        case PM_METRIC_GPU_SUSTAINED_POWER_LIMIT:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto limit = QuerySustainedPowerLimit_(device);
+            return limit ? *limit : 0.0;
+        }
+        case PM_METRIC_GPU_MEM_SIZE:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto pMemoryInfo = QueryMemoryInfo_(device);
+            return pMemoryInfo != nullptr ? GetMemorySizeBytes_(*pMemoryInfo) : (uint64_t)0;
+        }
+        case PM_METRIC_GPU_MEM_MAX_BANDWIDTH:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto pMemoryInfo = QueryMemoryInfo_(device);
+            return pMemoryInfo != nullptr ? GetMemoryMaxBandwidthBitsPerSecond_(*pMemoryInfo) : (uint64_t)0;
+        }
+        default:
+            break;
+        }
+
+        const auto& snapshot = PollDynamicSnapshot_(device, requestQpc);
+
+        switch (metricId) {
+        case PM_METRIC_GPU_POWER:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuPower ? snapshot.gpuPowerW : 0.0;
+        case PM_METRIC_GPU_VOLTAGE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuVoltage ? snapshot.gpuVoltageV : 0.0;
+        case PM_METRIC_GPU_FREQUENCY:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuFrequency ? snapshot.gpuFrequencyMhz : 0.0;
+        case PM_METRIC_GPU_TEMPERATURE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuTemperature ? snapshot.gpuTemperatureC : 0.0;
+        case PM_METRIC_GPU_UTILIZATION:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuUtilization ? snapshot.gpuUtilizationPercent : 0.0;
+        case PM_METRIC_GPU_MEM_FREQUENCY:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuMemFrequency ? snapshot.gpuMemFrequencyMhz : 0.0;
+        case PM_METRIC_GPU_MEM_USED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuMemUsed ? snapshot.gpuMemUsedBytes : (uint64_t)0;
+        case PM_METRIC_GPU_MEM_UTILIZATION:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto pMemoryInfo = QueryMemoryInfo_(device);
+            if (!snapshot.hasGpuMemUsed || pMemoryInfo == nullptr) {
+                return 0.0;
+            }
+            const auto totalBytes = GetMemorySizeBytes_(*pMemoryInfo);
+            if (totalBytes == 0) {
+                return 0.0;
+            }
+            return 100.0 * ((double)snapshot.gpuMemUsedBytes / (double)totalBytes);
+        }
+        case PM_METRIC_GPU_MEM_TEMPERATURE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuMemTemperature ? snapshot.gpuMemTemperatureC : 0.0;
+        case PM_METRIC_GPU_MEM_VOLTAGE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasGpuMemVoltage ? snapshot.gpuMemVoltageV : 0.0;
+        case PM_METRIC_GPU_POWER_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasThrottleStatus ? snapshot.gpuPowerLimited : false;
+        case PM_METRIC_GPU_TEMPERATURE_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasThrottleStatus ? snapshot.gpuTemperatureLimited : false;
+        case PM_METRIC_GPU_CURRENT_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return snapshot.hasThrottleStatus ? snapshot.gpuCurrentLimited : false;
+        case PM_METRIC_GPU_FAN_SPEED:
+            if (arrayIndex >= snapshot.fanSpeedsRpm.size()) {
+                throw Except<AdlException>("ADL array index out of range");
+            }
+            return snapshot.fanSpeedsRpm[(size_t)arrayIndex];
+        case PM_METRIC_GPU_FAN_SPEED_PERCENT:
+            if (arrayIndex >= snapshot.fanSpeedRatios.size()) {
+                throw Except<AdlException>("ADL array index out of range");
+            }
+            return snapshot.fanSpeedRatios[(size_t)arrayIndex];
+        default:
+            throw Except<AdlException>("Unsupported metric for ADL provider");
+        }
+    }
+
+    void AdlTelemetryProvider::ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex)
+    {
+        if (arrayIndex != 0) {
+            throw Except<AdlException>("ADL scalar metric queried with nonzero array index");
+        }
+        (void)metricId;
+    }
+
+    uint64_t AdlTelemetryProvider::GetMemorySizeBytes_(const ADLMemoryInfoX4& memoryInfo) noexcept
+    {
+        return memoryInfo.iMemorySize > 0 ? (uint64_t)memoryInfo.iMemorySize : 0ull;
+    }
+
+    uint64_t AdlTelemetryProvider::GetMemoryMaxBandwidthBitsPerSecond_(const ADLMemoryInfoX4& memoryInfo) noexcept
+    {
+        if (memoryInfo.iMemoryBitRateX2 > 0) {
+            return (uint64_t)memoryInfo.iMemoryBitRateX2;
+        }
+        if (memoryInfo.iMemoryBandwidthX2 > 0) {
+            return (uint64_t)memoryInfo.iMemoryBandwidthX2 * 8ull;
+        }
+        if (memoryInfo.iMemoryBandwidth > 0) {
+            return (uint64_t)memoryInfo.iMemoryBandwidth * 8ull * 1000000ull;
+        }
+        return 0ull;
+    }
+
+    bool AdlTelemetryProvider::TryGetPmLogSensorValue_(
+        const ADLPMLogDataOutput& data,
+        int sensorIndex,
+        int& value) noexcept
+    {
+        if (sensorIndex < 0 || sensorIndex >= ADL_PMLOG_MAX_SENSORS) {
+            value = 0;
+            return false;
+        }
+
+        const auto& sensor = data.sensors[(size_t)sensorIndex];
+        if (!sensor.supported) {
+            value = 0;
+            return false;
+        }
+
+        value = sensor.value;
+        return true;
+    }
+
+    bool AdlTelemetryProvider::TryInitializeDevice_(
+        DeviceState_& device,
+        const AdapterInfo& adapterInfo) const
+    {
+        device.adlAdapterIndex = adapterInfo.iAdapterIndex;
+        device.fingerprint.deviceType = PM_DEVICE_TYPE_GRAPHICS_ADAPTER;
+        device.fingerprint.vendor = PM_DEVICE_VENDOR_AMD;
+        device.fingerprint.deviceName =
+            adapterInfo.strAdapterName[0] != '\0' ? adapterInfo.strAdapterName : "Unknown AMD Adapter";
+        device.fingerprint.pciBusId = (uint32_t)adapterInfo.iBusNumber;
+
+        int asicTypes = 0;
+        int asicValids = 0;
+        const auto asicResult = pAdl_->Adapter_ASICFamilyType_Get(
+            device.adlAdapterIndex,
+            &asicTypes,
+            &asicValids);
+        if (Adl2Wrapper::Ok(asicResult)) {
+            device.fingerprint.isIntegratedAdapter =
+                HasFlag_(asicTypes, ADL_ASIC_INTEGRATED) ||
+                HasFlag_(asicTypes, ADL_ASIC_FUSION);
+            pmlog_verb(v::tele_gpu)("ADL2_Adapter_ASICFamilyType_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(asicTypes)
+                .pmwatch(asicValids)
+                .pmwatch(device.fingerprint.isIntegratedAdapter);
+        }
+        else {
+            pmlog_warn("ADL2_Adapter_ASICFamilyType_Get failed").code(asicResult)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        int overdriveSupported = 0;
+        int overdriveEnabled = 0;
+        int overdriveVersion = 0;
+        const auto capsResult = pAdl_->Overdrive_Caps(
+            device.adlAdapterIndex,
+            &overdriveSupported,
+            &overdriveEnabled,
+            &overdriveVersion);
+        if (!Adl2Wrapper::Ok(capsResult)) {
+            pmlog_warn("ADL2_Overdrive_Caps failed").code(capsResult)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return false;
+        }
+        pmlog_verb(v::tele_gpu)("ADL2_Overdrive_Caps output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(overdriveSupported)
+            .pmwatch(overdriveEnabled)
+            .pmwatch(overdriveVersion);
+
+        if (!overdriveSupported || !overdriveEnabled) {
+            pmlog_warn("Skipping AMD adapter without enabled Overdrive telemetry")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(overdriveSupported)
+                .pmwatch(overdriveEnabled);
+            return false;
+        }
+
+        if (overdriveVersion < kOverdriveVersionMin_ || overdriveVersion > kOverdriveVersionMax_) {
+            pmlog_warn("Skipping AMD adapter with unsupported Overdrive version")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(overdriveVersion);
+            return false;
+        }
+
+        device.overdriveVersion = overdriveVersion;
+        if (device.overdriveVersion == 5) {
+            EnumerateOd5ThermalControllers_(device);
+        }
+
+        return true;
+    }
+
+    void AdlTelemetryProvider::EnumerateOd5ThermalControllers_(DeviceState_& device) const
+    {
+        device.od5ThermalControllerIndices.clear();
+
+        for (int thermalControllerIndex = 0; thermalControllerIndex < 10; ++thermalControllerIndex) {
+            ADLThermalControllerInfo thermalInfo{ .iSize = sizeof(ADLThermalControllerInfo) };
+            const auto result = pAdl_->Overdrive5_ThermalDevices_Enum(
+                device.adlAdapterIndex,
+                thermalControllerIndex,
+                &thermalInfo);
+            if (!Adl2Wrapper::Ok(result)) {
+                if (result != ADL_ERR_INVALID_CONTROLLER_IDX && result != ADL_ERR) {
+                    pmlog_warn("ADL2_Overdrive5_ThermalDevices_Enum failed").code(result)
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName)
+                        .pmwatch(thermalControllerIndex);
+                }
+                break;
+            }
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_ThermalDevices_Enum output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(thermalControllerIndex)
+                .pmwatch(ref::DumpGenerated(thermalInfo));
+            if (thermalInfo.iThermalDomain == ADL_DL_THERMAL_DOMAIN_GPU) {
+                device.od5ThermalControllerIndices.push_back(thermalControllerIndex);
+            }
+        }
+    }
+
+    ipc::MetricCapabilities AdlTelemetryProvider::BuildCapsForDevice_(DeviceState_& device) const
+    {
+        ipc::MetricCapabilities caps{};
+        const auto requestQpc = GetCurrentTimestamp();
+
+        caps.Set(PM_METRIC_GPU_VENDOR, 1);
+        caps.Set(PM_METRIC_GPU_NAME, 1);
+
+        if (QuerySustainedPowerLimit_(device)) {
+            caps.Set(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, 1);
+        }
+
+        if (const auto pMemoryInfo = QueryMemoryInfo_(device); pMemoryInfo != nullptr) {
+            const auto memSize = GetMemorySizeBytes_(*pMemoryInfo);
+            const auto memBw = GetMemoryMaxBandwidthBitsPerSecond_(*pMemoryInfo);
+            if (memSize != 0) {
+                caps.Set(PM_METRIC_GPU_MEM_SIZE, 1);
+            }
+            if (memBw != 0) {
+                caps.Set(PM_METRIC_GPU_MEM_MAX_BANDWIDTH, 1);
+            }
+        }
+
+        const auto& snapshot = PollDynamicSnapshot_(device, requestQpc);
+        if (snapshot.hasGpuPower) {
+            caps.Set(PM_METRIC_GPU_POWER, 1);
+        }
+        if (snapshot.hasGpuVoltage) {
+            caps.Set(PM_METRIC_GPU_VOLTAGE, 1);
+        }
+        if (snapshot.hasGpuFrequency) {
+            caps.Set(PM_METRIC_GPU_FREQUENCY, 1);
+        }
+        if (snapshot.hasGpuTemperature) {
+            caps.Set(PM_METRIC_GPU_TEMPERATURE, 1);
+        }
+        if (snapshot.hasGpuUtilization) {
+            caps.Set(PM_METRIC_GPU_UTILIZATION, 1);
+        }
+        if (snapshot.hasGpuMemFrequency) {
+            caps.Set(PM_METRIC_GPU_MEM_FREQUENCY, 1);
+        }
+        if (snapshot.hasGpuMemUsed) {
+            caps.Set(PM_METRIC_GPU_MEM_USED, 1);
+            if (const auto pMemoryInfo = QueryMemoryInfo_(device);
+                pMemoryInfo != nullptr && GetMemorySizeBytes_(*pMemoryInfo) != 0) {
+                caps.Set(PM_METRIC_GPU_MEM_UTILIZATION, 1);
+            }
+        }
+        if (snapshot.hasGpuMemTemperature) {
+            caps.Set(PM_METRIC_GPU_MEM_TEMPERATURE, 1);
+        }
+        if (snapshot.hasGpuMemVoltage) {
+            caps.Set(PM_METRIC_GPU_MEM_VOLTAGE, 1);
+        }
+        if (!snapshot.fanSpeedsRpm.empty()) {
+            caps.Set(PM_METRIC_GPU_FAN_SPEED, (uint32_t)snapshot.fanSpeedsRpm.size());
+        }
+        if (!snapshot.fanSpeedRatios.empty()) {
+            caps.Set(PM_METRIC_GPU_FAN_SPEED_PERCENT, (uint32_t)snapshot.fanSpeedRatios.size());
+        }
+        if (snapshot.hasThrottleStatus) {
+            caps.Set(PM_METRIC_GPU_POWER_LIMITED, 1);
+            caps.Set(PM_METRIC_GPU_TEMPERATURE_LIMITED, 1);
+            caps.Set(PM_METRIC_GPU_CURRENT_LIMITED, 1);
+        }
+
+        return caps;
+    }
+
+    const ADLMemoryInfoX4* AdlTelemetryProvider::QueryMemoryInfo_(DeviceState_& device) const
+    {
+        if (device.memoryInfoQueried) {
+            return device.memoryInfo ? &*device.memoryInfo : nullptr;
+        }
+
+        device.memoryInfoQueried = true;
+        ADLMemoryInfoX4 memoryInfo{};
+        const auto result = pAdl_->Adapter_MemoryInfoX4_Get(device.adlAdapterIndex, &memoryInfo);
+        if (!Adl2Wrapper::Ok(result)) {
+            pmlog_warn("ADL2_Adapter_MemoryInfoX4_Get failed").code(result)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return nullptr;
+        }
+        pmlog_verb(v::tele_gpu)("ADL2_Adapter_MemoryInfoX4_Get output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(memoryInfo));
+
+        device.memoryInfo = memoryInfo;
+        return &*device.memoryInfo;
+    }
+
+    std::optional<double> AdlTelemetryProvider::QuerySustainedPowerLimit_(const DeviceState_& device) const
+    {
+        switch (device.overdriveVersion) {
+        case 5:
+        {
+            int powerControlSupported = 0;
+            auto result = pAdl_->Overdrive5_PowerControl_Caps(
+                device.adlAdapterIndex,
+                &powerControlSupported);
+            if (!Adl2Wrapper::Ok(result)) {
+                pmlog_warn("ADL2_Overdrive5_PowerControl_Caps failed").code(result)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+                return {};
+            }
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_PowerControl_Caps output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(powerControlSupported);
+            if (!powerControlSupported) {
+                return {};
+            }
+
+            int powerControlCurrent = 0;
+            int powerControlDefault = 0;
+            result = pAdl_->Overdrive5_PowerControl_Get(
+                device.adlAdapterIndex,
+                &powerControlCurrent,
+                &powerControlDefault);
+            if (!Adl2Wrapper::Ok(result)) {
+                pmlog_warn("ADL2_Overdrive5_PowerControl_Get failed").code(result)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+                return {};
+            }
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_PowerControl_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(powerControlCurrent)
+                .pmwatch(powerControlDefault);
+
+            (void)powerControlDefault;
+            return (double)powerControlCurrent;
+        }
+        case 6:
+        {
+            int powerControlSupported = 0;
+            auto result = pAdl_->Overdrive6_PowerControl_Caps(
+                device.adlAdapterIndex,
+                &powerControlSupported);
+            if (!Adl2Wrapper::Ok(result)) {
+                pmlog_warn("ADL2_Overdrive6_PowerControl_Caps failed").code(result)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+                return {};
+            }
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_PowerControl_Caps output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(powerControlSupported);
+            if (!powerControlSupported) {
+                return {};
+            }
+
+            int powerControlCurrent = 0;
+            int powerControlDefault = 0;
+            result = pAdl_->Overdrive6_PowerControl_Get(
+                device.adlAdapterIndex,
+                &powerControlCurrent,
+                &powerControlDefault);
+            if (!Adl2Wrapper::Ok(result)) {
+                pmlog_warn("ADL2_Overdrive6_PowerControl_Get failed").code(result)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+                return {};
+            }
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_PowerControl_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(powerControlCurrent)
+                .pmwatch(powerControlDefault);
+
+            (void)powerControlDefault;
+            return (double)powerControlCurrent;
+        }
+        default:
+            return {};
+        }
+    }
+
+    const AdlTelemetryProvider::DynamicSnapshot_& AdlTelemetryProvider::PollDynamicSnapshot_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.dynamicSnapshotCache;
+        if (cache.Matches(requestQpc)) {
+            return cache.output;
+        }
+
+        cache.output = {};
+        cache.requestQpc = requestQpc;
+        auto& snapshot = cache.output;
+
+        int vramUsageMb = 0;
+        const auto vramUsageResult = pAdl_->Adapter_DedicatedVRAMUsage_Get(device.adlAdapterIndex, &vramUsageMb);
+        if (Adl2Wrapper::Ok(vramUsageResult)) {
+            snapshot.hasGpuMemUsed = true;
+            snapshot.gpuMemUsedBytes = (uint64_t)vramUsageMb * 1000000ull;
+            pmlog_verb(v::tele_gpu)("ADL2_Adapter_DedicatedVRAMUsage_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(vramUsageMb);
+        }
+        else {
+            pmlog_warn("ADL2_Adapter_DedicatedVRAMUsage_Get failed").code(vramUsageResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        switch (device.overdriveVersion) {
+        case 5:
+            PopulateOverdrive5Snapshot_(device, snapshot);
+            break;
+        case 6:
+            PopulateOverdrive6Snapshot_(device, snapshot);
+            break;
+        case 7:
+            PopulateOverdrive7Snapshot_(device, snapshot);
+            break;
+        case 8:
+            PopulateOverdrive8Snapshot_(device, snapshot);
+            break;
+        default:
+            pmlog_warn("Unexpected ADL Overdrive version while polling snapshot")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(device.overdriveVersion);
+            break;
+        }
+
+        return cache.output;
+    }
+
+    void AdlTelemetryProvider::PopulateOverdrive5Snapshot_(
+        DeviceState_& device,
+        DynamicSnapshot_& snapshot) const
+    {
+        for (const auto thermalControllerIndex : device.od5ThermalControllerIndices) {
+            ADLTemperature temperature{ .iSize = sizeof(ADLTemperature) };
+            const auto tempResult = pAdl_->Overdrive5_Temperature_Get(
+                device.adlAdapterIndex,
+                thermalControllerIndex,
+                &temperature);
+            if (Adl2Wrapper::Ok(tempResult)) {
+                if (!snapshot.hasGpuTemperature) {
+                    snapshot.gpuTemperatureC = (double)temperature.iTemperature / 1000.0;
+                    snapshot.hasGpuTemperature = true;
+                }
+                pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_Temperature_Get output")
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(thermalControllerIndex)
+                    .pmwatch(ref::DumpGenerated(temperature));
+            }
+            else {
+                pmlog_warn("ADL2_Overdrive5_Temperature_Get failed").code(tempResult).every(60s)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(thermalControllerIndex);
+            }
+
+            ADLFanSpeedInfo fanInfo{ .iSize = sizeof(ADLFanSpeedInfo) };
+            const auto fanInfoResult = pAdl_->Overdrive5_FanSpeedInfo_Get(
+                device.adlAdapterIndex,
+                thermalControllerIndex,
+                &fanInfo);
+            if (!Adl2Wrapper::Ok(fanInfoResult)) {
+                pmlog_warn("ADL2_Overdrive5_FanSpeedInfo_Get failed").code(fanInfoResult).every(60s)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(thermalControllerIndex);
+                continue;
+            }
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_FanSpeedInfo_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(thermalControllerIndex)
+                .pmwatch(ref::DumpGenerated(fanInfo));
+
+            if (HasFlag_(fanInfo.iFlags, ADL_DL_FANCTRL_SUPPORTS_RPM_READ)) {
+                ADLFanSpeedValue fanValue{
+                    .iSize = sizeof(ADLFanSpeedValue),
+                    .iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM,
+                };
+                const auto fanResult = pAdl_->Overdrive5_FanSpeed_Get(
+                    device.adlAdapterIndex,
+                    thermalControllerIndex,
+                    &fanValue);
+                if (Adl2Wrapper::Ok(fanResult)) {
+                    snapshot.fanSpeedsRpm.push_back((double)fanValue.iFanSpeed);
+                    pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_FanSpeed_Get output")
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName)
+                        .pmwatch(thermalControllerIndex)
+                        .pmwatch(ref::DumpGenerated(fanValue));
+                }
+                else {
+                    pmlog_warn("ADL2_Overdrive5_FanSpeed_Get failed for RPM").code(fanResult).every(60s)
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName)
+                        .pmwatch(thermalControllerIndex);
+                }
+            }
+
+            if (HasFlag_(fanInfo.iFlags, ADL_DL_FANCTRL_SUPPORTS_PERCENT_READ)) {
+                ADLFanSpeedValue fanValue{
+                    .iSize = sizeof(ADLFanSpeedValue),
+                    .iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_PERCENT,
+                };
+                const auto fanResult = pAdl_->Overdrive5_FanSpeed_Get(
+                    device.adlAdapterIndex,
+                    thermalControllerIndex,
+                    &fanValue);
+                if (Adl2Wrapper::Ok(fanResult)) {
+                    snapshot.fanSpeedRatios.push_back((double)fanValue.iFanSpeed / 100.0);
+                    pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_FanSpeed_Get output")
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName)
+                        .pmwatch(thermalControllerIndex)
+                        .pmwatch(ref::DumpGenerated(fanValue));
+                }
+                else {
+                    pmlog_warn("ADL2_Overdrive5_FanSpeed_Get failed for percent").code(fanResult).every(60s)
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName)
+                        .pmwatch(thermalControllerIndex);
+                }
+            }
+        }
+
+        ADLPMActivity activity{ .iSize = sizeof(ADLPMActivity) };
+        const auto activityResult = pAdl_->Overdrive5_CurrentActivity_Get(
+            device.adlAdapterIndex,
+            &activity);
+        if (Adl2Wrapper::Ok(activityResult)) {
+            snapshot.gpuUtilizationPercent = (double)activity.iActivityPercent;
+            snapshot.hasGpuUtilization = true;
+
+            snapshot.gpuFrequencyMhz = (double)activity.iEngineClock / 100.0;
+            snapshot.hasGpuFrequency = true;
+
+            snapshot.gpuMemFrequencyMhz = (double)activity.iMemoryClock / 100.0;
+            snapshot.hasGpuMemFrequency = true;
+
+            snapshot.gpuVoltageV = (double)activity.iVddc;
+            snapshot.hasGpuVoltage = true;
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive5_CurrentActivity_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(ref::DumpGenerated(activity));
+        }
+        else {
+            pmlog_warn("ADL2_Overdrive5_CurrentActivity_Get failed").code(activityResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+    }
+
+    void AdlTelemetryProvider::PopulateOverdrive6Snapshot_(
+        DeviceState_& device,
+        DynamicSnapshot_& snapshot) const
+    {
+        ADLOD6ThermalControllerCaps thermalCaps{};
+        const auto thermalCapsResult = pAdl_->Overdrive6_ThermalController_Caps(
+            device.adlAdapterIndex,
+            &thermalCaps);
+        if (Adl2Wrapper::Ok(thermalCapsResult)) {
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_ThermalController_Caps output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(ref::DumpGenerated(thermalCaps));
+            if (HasFlag_(thermalCaps.iCapabilities, ADL_OD6_TCCAPS_THERMAL_CONTROLLER)) {
+                int temperature = 0;
+                const auto tempResult = pAdl_->Overdrive6_Temperature_Get(device.adlAdapterIndex, &temperature);
+                if (Adl2Wrapper::Ok(tempResult)) {
+                    snapshot.gpuTemperatureC = (double)temperature / 1000.0;
+                    snapshot.hasGpuTemperature = true;
+                    pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_Temperature_Get output")
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName)
+                        .pmwatch(temperature);
+                }
+                else {
+                    pmlog_warn("ADL2_Overdrive6_Temperature_Get failed").code(tempResult).every(60s)
+                        .pmwatch(device.providerDeviceId)
+                        .pmwatch(device.fingerprint.deviceName);
+                }
+            }
+
+            ADLOD6FanSpeedInfo fanInfo{};
+            const auto fanResult = pAdl_->Overdrive6_FanSpeed_Get(device.adlAdapterIndex, &fanInfo);
+            if (Adl2Wrapper::Ok(fanResult)) {
+                pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_FanSpeed_Get output")
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(ref::DumpGenerated(fanInfo));
+                if (HasFlag_(fanInfo.iSpeedType, ADL_OD6_FANSPEED_TYPE_RPM)) {
+                    snapshot.fanSpeedsRpm.push_back((double)fanInfo.iFanSpeedRPM);
+                }
+                if (HasFlag_(fanInfo.iSpeedType, ADL_OD6_FANSPEED_TYPE_PERCENT)) {
+                    snapshot.fanSpeedRatios.push_back((double)fanInfo.iFanSpeedPercent / 100.0);
+                }
+            }
+            else {
+                pmlog_warn("ADL2_Overdrive6_FanSpeed_Get failed").code(fanResult).every(60s)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+            }
+        }
+        else {
+            pmlog_warn("ADL2_Overdrive6_ThermalController_Caps failed").code(thermalCapsResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        ADLOD6CurrentStatus currentStatus{};
+        const auto currentStatusResult = pAdl_->Overdrive6_CurrentStatus_Get(device.adlAdapterIndex, &currentStatus);
+        if (Adl2Wrapper::Ok(currentStatusResult)) {
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_CurrentStatus_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(ref::DumpGenerated(currentStatus));
+            snapshot.gpuFrequencyMhz = (double)currentStatus.iEngineClock / 100.0;
+            snapshot.hasGpuFrequency = true;
+
+            snapshot.gpuMemFrequencyMhz = (double)currentStatus.iMemoryClock / 100.0;
+            snapshot.hasGpuMemFrequency = true;
+
+            ADLOD6Capabilities capabilities{};
+            const auto capResult = pAdl_->Overdrive6_Capabilities_Get(device.adlAdapterIndex, &capabilities);
+            if (Adl2Wrapper::Ok(capResult)) {
+                pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_Capabilities_Get output")
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(ref::DumpGenerated(capabilities));
+                if (HasFlag_(capabilities.iCapabilities, ADL_OD6_CAPABILITY_GPU_ACTIVITY_MONITOR)) {
+                    snapshot.gpuUtilizationPercent = (double)currentStatus.iActivityPercent;
+                    snapshot.hasGpuUtilization = true;
+                }
+            }
+            else {
+                pmlog_warn("ADL2_Overdrive6_Capabilities_Get failed").code(capResult).every(60s)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+            }
+        }
+        else {
+            pmlog_warn("ADL2_Overdrive6_CurrentStatus_Get failed").code(currentStatusResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        int currentPower = 0;
+        const auto powerResult = pAdl_->Overdrive6_CurrentPower_Get(device.adlAdapterIndex, 0, &currentPower);
+        if (Adl2Wrapper::Ok(powerResult)) {
+            snapshot.gpuPowerW = (double)currentPower / 256.0;
+            snapshot.hasGpuPower = true;
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_CurrentPower_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(currentPower);
+        }
+        else {
+            pmlog_warn("ADL2_Overdrive6_CurrentPower_Get failed").code(powerResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+    }
+
+    void AdlTelemetryProvider::PopulateOverdrive7Snapshot_(
+        DeviceState_& device,
+        DynamicSnapshot_& snapshot) const
+    {
+        ADLODNCapabilitiesX2 capabilities{};
+        const auto capsResult = pAdl_->OverdriveN_CapabilitiesX2_Get(device.adlAdapterIndex, &capabilities);
+        if (!Adl2Wrapper::Ok(capsResult)) {
+            pmlog_warn("ADL2_OverdriveN_CapabilitiesX2_Get failed").code(capsResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return;
+        }
+        pmlog_verb(v::tele_gpu)("ADL2_OverdriveN_CapabilitiesX2_Get output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(capabilities));
+
+        ADLODNPerformanceStatus performanceStatus{};
+        const auto statusResult = pAdl_->OverdriveN_PerformanceStatus_Get(device.adlAdapterIndex, &performanceStatus);
+        if (Adl2Wrapper::Ok(statusResult)) {
+            pmlog_verb(v::tele_gpu)("ADL2_OverdriveN_PerformanceStatus_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(ref::DumpGenerated(performanceStatus));
+            snapshot.gpuFrequencyMhz = (double)performanceStatus.iCoreClock / 100.0;
+            snapshot.hasGpuFrequency = true;
+
+            snapshot.gpuMemFrequencyMhz = (double)performanceStatus.iMemoryClock / 100.0;
+            snapshot.hasGpuMemFrequency = true;
+
+            snapshot.gpuVoltageV = (double)performanceStatus.iVDDC / 1000.0;
+            snapshot.hasGpuVoltage = true;
+
+            snapshot.gpuUtilizationPercent = (double)performanceStatus.iGPUActivityPercent;
+            snapshot.hasGpuUtilization = true;
+        }
+        else {
+            pmlog_warn("ADL2_OverdriveN_PerformanceStatus_Get failed").code(statusResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        int temperature = 0;
+        const auto tempResult = pAdl_->OverdriveN_Temperature_Get(
+            device.adlAdapterIndex,
+            kOdnGpuTemperatureSensor_,
+            &temperature);
+        if (Adl2Wrapper::Ok(tempResult)) {
+            snapshot.gpuTemperatureC = (double)temperature / 1000.0;
+            snapshot.hasGpuTemperature = true;
+            pmlog_verb(v::tele_gpu)("ADL2_OverdriveN_Temperature_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(temperature);
+        }
+        else {
+            pmlog_warn("ADL2_OverdriveN_Temperature_Get failed").code(tempResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        ADLODNFanControl fanControl{};
+        const auto fanResult = pAdl_->OverdriveN_FanControl_Get(device.adlAdapterIndex, &fanControl);
+        if (Adl2Wrapper::Ok(fanResult)) {
+            pmlog_verb(v::tele_gpu)("ADL2_OverdriveN_FanControl_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(ref::DumpGenerated(fanControl));
+            if (HasFlag_(fanControl.iCurrentFanSpeedMode, ADL_OD6_FANSPEED_TYPE_RPM)) {
+                snapshot.fanSpeedsRpm.push_back((double)fanControl.iCurrentFanSpeed);
+            }
+            else if (HasFlag_(fanControl.iCurrentFanSpeedMode, ADL_OD6_FANSPEED_TYPE_PERCENT)) {
+                snapshot.fanSpeedRatios.push_back((double)fanControl.iCurrentFanSpeed / 100.0);
+            }
+            else {
+                snapshot.fanSpeedsRpm.push_back((double)fanControl.iCurrentFanSpeed);
+            }
+        }
+        else {
+            pmlog_warn("ADL2_OverdriveN_FanControl_Get failed").code(fanResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        int currentPower = 0;
+        const auto powerResult = pAdl_->Overdrive6_CurrentPower_Get(device.adlAdapterIndex, 0, &currentPower);
+        if (Adl2Wrapper::Ok(powerResult)) {
+            snapshot.gpuPowerW = (double)currentPower / 256.0;
+            snapshot.hasGpuPower = true;
+            pmlog_verb(v::tele_gpu)("ADL2_Overdrive6_CurrentPower_Get output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(currentPower);
+        }
+        else {
+            pmlog_warn("ADL2_Overdrive6_CurrentPower_Get failed").code(powerResult).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        (void)capabilities;
+    }
+
+    void AdlTelemetryProvider::PopulateOverdrive8Snapshot_(
+        DeviceState_& device,
+        DynamicSnapshot_& snapshot) const
+    {
+        ADLPMLogDataOutput dataOutput{};
+        dataOutput.size = sizeof(ADLPMLogDataOutput);
+        const auto result = pAdl_->New_QueryPMLogData_Get(device.adlAdapterIndex, &dataOutput);
+        if (!Adl2Wrapper::Ok(result)) {
+            pmlog_warn("ADL2_New_QueryPMLogData_Get failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return;
+        }
+        pmlog_verb(v::tele_gpu)("ADL2_New_QueryPMLogData_Get output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(dataOutput));
+
+        int value = 0;
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_CLK_GFXCLK, value)) {
+            snapshot.gpuFrequencyMhz = (double)value;
+            snapshot.hasGpuFrequency = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_CLK_MEMCLK, value)) {
+            snapshot.gpuMemFrequencyMhz = (double)value;
+            snapshot.hasGpuMemFrequency = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_FAN_RPM, value)) {
+            snapshot.fanSpeedsRpm.push_back((double)value);
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_FAN_PERCENTAGE, value)) {
+            snapshot.fanSpeedRatios.push_back((double)value / 100.0);
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_TEMPERATURE_EDGE, value)) {
+            snapshot.gpuTemperatureC = (double)value;
+            snapshot.hasGpuTemperature = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_INFO_ACTIVITY_GFX, value)) {
+            snapshot.gpuUtilizationPercent = (double)value;
+            snapshot.hasGpuUtilization = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_GFX_VOLTAGE, value)) {
+            snapshot.gpuVoltageV = (double)value / 1000.0;
+            snapshot.hasGpuVoltage = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_ASIC_POWER, value)) {
+            snapshot.gpuPowerW = (double)value;
+            snapshot.hasGpuPower = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_TEMPERATURE_MEM, value)) {
+            snapshot.gpuMemTemperatureC = (double)value;
+            snapshot.hasGpuMemTemperature = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_MEM_VOLTAGE, value)) {
+            snapshot.gpuMemVoltageV = (double)value / 1000.0;
+            snapshot.hasGpuMemVoltage = true;
+        }
+        if (TryGetPmLogSensorValue_(dataOutput, PMLOG_THROTTLER_STATUS, value)) {
+            snapshot.hasThrottleStatus = true;
+            snapshot.gpuPowerLimited = HasFlag_(value, ADL_PMLOG_THROTTLE_POWER);
+            snapshot.gpuTemperatureLimited = HasFlag_(value, ADL_PMLOG_THROTTLE_THERMAL);
+            snapshot.gpuCurrentLimited = HasFlag_(value, ADL_PMLOG_THROTTLE_CURRENT);
+        }
+    }
+}
diff --git a/IntelPresentMon/ControlLib/adl/AdlTelemetryProvider.h b/IntelPresentMon/ControlLib/adl/AdlTelemetryProvider.h
new file mode 100644
index 000000000..390d43a9f
--- /dev/null
+++ b/IntelPresentMon/ControlLib/adl/AdlTelemetryProvider.h
@@ -0,0 +1,121 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../EndpointCache.h"
+#include "../TelemetryProvider.h"
+#include "Adl2Wrapper.h"
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <unordered_map>
+#include <vector>
+
+namespace pmon::tel::adl
+{
+    class AdlTelemetryProvider : public TelemetryProvider
+    {
+    public:
+        AdlTelemetryProvider();
+        ~AdlTelemetryProvider() override = default;
+        ProviderCapabilityMap GetCaps() override;
+        const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const override;
+        TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) override;
+
+    private:
+        struct DynamicSnapshot_
+        {
+            bool hasGpuPower = false;
+            double gpuPowerW = 0.0;
+
+            bool hasGpuVoltage = false;
+            double gpuVoltageV = 0.0;
+
+            bool hasGpuFrequency = false;
+            double gpuFrequencyMhz = 0.0;
+
+            bool hasGpuTemperature = false;
+            double gpuTemperatureC = 0.0;
+
+            bool hasGpuUtilization = false;
+            double gpuUtilizationPercent = 0.0;
+
+            bool hasGpuMemFrequency = false;
+            double gpuMemFrequencyMhz = 0.0;
+
+            bool hasGpuMemUsed = false;
+            uint64_t gpuMemUsedBytes = 0;
+
+            bool hasGpuMemTemperature = false;
+            double gpuMemTemperatureC = 0.0;
+
+            bool hasGpuMemVoltage = false;
+            double gpuMemVoltageV = 0.0;
+
+            bool hasThrottleStatus = false;
+            bool gpuPowerLimited = false;
+            bool gpuTemperatureLimited = false;
+            bool gpuCurrentLimited = false;
+
+            std::vector<double> fanSpeedsRpm{};
+            std::vector<double> fanSpeedRatios{};
+        };
+
+        struct DeviceState_
+        {
+            ProviderDeviceId providerDeviceId = 0;
+            TelemetryDeviceFingerprint fingerprint{};
+            ipc::MetricCapabilities caps{};
+
+            int adlAdapterIndex = -1;
+            int overdriveVersion = 0;
+            std::vector<int> od5ThermalControllerIndices{};
+
+            bool memoryInfoQueried = false;
+            std::optional<ADLMemoryInfoX4> memoryInfo{};
+
+            pmon::tele::EndpointCache<DynamicSnapshot_> dynamicSnapshotCache{};
+        };
+
+        static void ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex);
+        static uint64_t GetMemorySizeBytes_(const ADLMemoryInfoX4& memoryInfo) noexcept;
+        static uint64_t GetMemoryMaxBandwidthBitsPerSecond_(const ADLMemoryInfoX4& memoryInfo) noexcept;
+        static bool TryGetPmLogSensorValue_(
+            const ADLPMLogDataOutput& data,
+            int sensorIndex,
+            int& value) noexcept;
+
+        bool TryInitializeDevice_(DeviceState_& device, const AdapterInfo& adapterInfo) const;
+        void EnumerateOd5ThermalControllers_(DeviceState_& device) const;
+        ipc::MetricCapabilities BuildCapsForDevice_(DeviceState_& device) const;
+
+        const ADLMemoryInfoX4* QueryMemoryInfo_(DeviceState_& device) const;
+        std::optional<double> QuerySustainedPowerLimit_(const DeviceState_& device) const;
+        const DynamicSnapshot_& PollDynamicSnapshot_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+
+        void PopulateOverdrive5Snapshot_(
+            DeviceState_& device,
+            DynamicSnapshot_& snapshot) const;
+        void PopulateOverdrive6Snapshot_(
+            DeviceState_& device,
+            DynamicSnapshot_& snapshot) const;
+        void PopulateOverdrive7Snapshot_(
+            DeviceState_& device,
+            DynamicSnapshot_& snapshot) const;
+        void PopulateOverdrive8Snapshot_(
+            DeviceState_& device,
+            DynamicSnapshot_& snapshot) const;
+
+    private:
+        std::unique_ptr<Adl2Wrapper> pAdl_{};
+        std::unordered_map<ProviderDeviceId, DeviceState_> devicesById_{};
+        ProviderDeviceId nextProviderDeviceId_ = 1;
+    };
+}
diff --git a/IntelPresentMon/ControlLib/adl_defines.h b/IntelPresentMon/ControlLib/adl/adl_defines.h
similarity index 99%
rename from IntelPresentMon/ControlLib/adl_defines.h
rename to IntelPresentMon/ControlLib/adl/adl_defines.h
index 720732b4a..03a81f981 100644
--- a/IntelPresentMon/ControlLib/adl_defines.h
+++ b/IntelPresentMon/ControlLib/adl/adl_defines.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2016 - 2022 Advanced Micro Devices, Inc. All rights reserved.
 //
 // MIT LICENSE:
diff --git a/IntelPresentMon/ControlLib/adl_sdk.h b/IntelPresentMon/ControlLib/adl/adl_sdk.h
similarity index 99%
rename from IntelPresentMon/ControlLib/adl_sdk.h
rename to IntelPresentMon/ControlLib/adl/adl_sdk.h
index 964e2c01d..93dcb423a 100644
--- a/IntelPresentMon/ControlLib/adl_sdk.h
+++ b/IntelPresentMon/ControlLib/adl/adl_sdk.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2016 - 2022 Advanced Micro Devices, Inc. All rights reserved.
 //
 // MIT LICENSE:
diff --git a/IntelPresentMon/ControlLib/adl_structures.h b/IntelPresentMon/ControlLib/adl/adl_structures.h
similarity index 99%
rename from IntelPresentMon/ControlLib/adl_structures.h
rename to IntelPresentMon/ControlLib/adl/adl_structures.h
index 9edb6495f..2082e2bbb 100644
--- a/IntelPresentMon/ControlLib/adl_structures.h
+++ b/IntelPresentMon/ControlLib/adl/adl_structures.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2016 - 2022 Advanced Micro Devices, Inc. All rights reserved.
 //
 // MIT LICENSE:
diff --git a/IntelPresentMon/ControlLib/IgclErrorCodeProvider.cpp b/IntelPresentMon/ControlLib/igcl/IgclErrorCodeProvider.cpp
similarity index 70%
rename from IntelPresentMon/ControlLib/IgclErrorCodeProvider.cpp
rename to IntelPresentMon/ControlLib/igcl/IgclErrorCodeProvider.cpp
index f4045345d..4d79c0b22 100644
--- a/IntelPresentMon/ControlLib/IgclErrorCodeProvider.cpp
+++ b/IntelPresentMon/ControlLib/igcl/IgclErrorCodeProvider.cpp
@@ -1,11 +1,11 @@
-#include "IgclErrorCodeProvider.h"
-#include "../CommonUtilities/log/ErrorCode.h"
-#include "../CommonUtilities/ref/GeneratedReflection.h"
+#include "IgclErrorCodeProvider.h"
+#include "../../CommonUtilities/log/ErrorCode.h"
+#include "../../CommonUtilities/ref/GeneratedReflection.h"
 #include "igcl_api.h"
 
 using namespace pmon::util;
 
-namespace pwr::intel
+namespace pmon::tel::igcl
 {
 	std::type_index IgclErrorCodeProvider::GetTargetType() const
 	{
@@ -18,4 +18,4 @@ namespace pwr::intel
 			.symbol = ref::DumpGenerated((ctl_result_t)*ec.AsSigned()),
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/IgclErrorCodeProvider.h b/IntelPresentMon/ControlLib/igcl/IgclErrorCodeProvider.h
similarity index 70%
rename from IntelPresentMon/ControlLib/IgclErrorCodeProvider.h
rename to IntelPresentMon/ControlLib/igcl/IgclErrorCodeProvider.h
index 2e2eb74e5..995735cfc 100644
--- a/IntelPresentMon/ControlLib/IgclErrorCodeProvider.h
+++ b/IntelPresentMon/ControlLib/igcl/IgclErrorCodeProvider.h
@@ -1,7 +1,7 @@
-#pragma once
-#include "../CommonUtilities/log/IErrorCodeProvider.h"
+#pragma once
+#include "../../CommonUtilities/log/IErrorCodeProvider.h"
 
-namespace pwr::intel
+namespace pmon::tel::igcl
 {
 	class IgclErrorCodeProvider : public pmon::util::log::IErrorCodeProvider
 	{
@@ -9,4 +9,4 @@ namespace pwr::intel
 		std::type_index GetTargetType() const override;
 		pmon::util::log::IErrorCodeResolver::Strings Resolve(const pmon::util::log::ErrorCode&) const override;
 	};
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/igcl/IgclTelemetryProvider.cpp b/IntelPresentMon/ControlLib/igcl/IgclTelemetryProvider.cpp
new file mode 100644
index 000000000..a95239eb4
--- /dev/null
+++ b/IntelPresentMon/ControlLib/igcl/IgclTelemetryProvider.cpp
@@ -0,0 +1,1019 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "IgclTelemetryProvider.h"
+
+#include "../Exceptions.h"
+#include "../Logging.h"
+#include "../../CommonUtilities/Qpc.h"
+#include "../../CommonUtilities/ref/GeneratedReflection.h"
+
+#include <algorithm>
+#include <chrono>
+#include <regex>
+#include <string>
+
+using namespace pmon;
+using namespace util;
+using namespace std::literals;
+using v = log::V;
+
+namespace pmon::tel::igcl
+{
+    IgclTelemetryProvider::TelemetrySampleBuffer_::TelemetrySampleBuffer_() noexcept
+        : samples_{ MakeEmptySample_(), MakeEmptySample_() }
+    {}
+
+    bool IgclTelemetryProvider::TelemetrySampleBuffer_::Matches(int64_t requestQpc) const noexcept
+    {
+        return hasCurrent_ && requestQpcs_[currentIndex_] == requestQpc;
+    }
+
+    ctl_power_telemetry_t& IgclTelemetryProvider::TelemetrySampleBuffer_::PrepareForWrite(int64_t requestQpc) noexcept
+    {
+        if (hasCurrent_ && requestQpcs_[currentIndex_] != requestQpc) {
+            previousIndex_ = currentIndex_;
+            currentIndex_ = currentIndex_ == 0 ? 1u : 0u;
+            hasPrevious_ = true;
+        }
+
+        hasCurrent_ = true;
+        requestQpcs_[currentIndex_] = requestQpc;
+        samples_[currentIndex_] = MakeEmptySample_();
+        return samples_[currentIndex_];
+    }
+
+    const ctl_power_telemetry_t& IgclTelemetryProvider::TelemetrySampleBuffer_::Current() const noexcept
+    {
+        return samples_[currentIndex_];
+    }
+
+    const ctl_power_telemetry_t* IgclTelemetryProvider::TelemetrySampleBuffer_::Previous() const noexcept
+    {
+        if (!hasPrevious_) {
+            return nullptr;
+        }
+        return &samples_[previousIndex_];
+    }
+
+    int64_t IgclTelemetryProvider::TelemetrySampleBuffer_::PreviousRequestQpc() const noexcept
+    {
+        if (!hasPrevious_) {
+            return 0;
+        }
+        return requestQpcs_[previousIndex_];
+    }
+
+    ctl_power_telemetry_t IgclTelemetryProvider::TelemetrySampleBuffer_::MakeEmptySample_() noexcept
+    {
+        return {
+            .Size = sizeof(ctl_power_telemetry_t),
+            .Version = 1,
+        };
+    }
+
+    IgclTelemetryProvider::IgclTelemetryProvider()
+    {
+        ctl_init_args_t ctlInitArgs{
+            .Size = sizeof(ctl_init_args_t),
+            .AppVersion = CTL_MAKE_VERSION(CTL_IMPL_MAJOR_VERSION, CTL_IMPL_MINOR_VERSION),
+            .flags = CTL_INIT_FLAG_USE_LEVEL_ZERO,
+        };
+
+        const auto initResult = ctlInit(&ctlInitArgs, &apiHandle_);
+        if (initResult != CTL_RESULT_SUCCESS) {
+            if (initResult != CTL_RESULT_ERROR_NOT_INITIALIZED) {
+                pmlog_error("ctlInit failed").code(initResult);
+            }
+            throw Except<TelemetrySubsystemAbsent>("Unable to initialize Intel Graphics Control Library");
+        }
+        pmlog_verb(v::tele_gpu)("ctlInit input args")
+            .pmwatch(ref::DumpGenerated(ctlInitArgs));
+
+        std::vector<ctl_device_adapter_handle_t> handles{};
+        {
+            uint32_t count = 0;
+            const auto enumCountResult = ctlEnumerateDevices(apiHandle_, &count, nullptr);
+            if (enumCountResult != CTL_RESULT_SUCCESS) {
+                pmlog_error("ctlEnumerateDevices(count) failed").code(enumCountResult);
+                throw Except<IgclException>("IGCL device enumeration (count) failed");
+            }
+            pmlog_verb(v::tele_gpu)("ctlEnumerateDevices(count) output")
+                .pmwatch(count);
+
+            handles.resize((size_t)count);
+            const auto enumListResult = ctlEnumerateDevices(apiHandle_, &count, handles.data());
+            if (enumListResult != CTL_RESULT_SUCCESS) {
+                pmlog_error("ctlEnumerateDevices(list) failed").code(enumListResult);
+                throw Except<IgclException>("IGCL device enumeration (list) failed");
+            }
+        }
+
+        for (const auto handle : handles) {
+            const auto providerDeviceId = nextProviderDeviceId_;
+            const auto emplaceResult = devicesById_.try_emplace(providerDeviceId);
+            if (!emplaceResult.second) {
+                throw Except<IgclException>("Duplicate IGCL provider device id encountered");
+            }
+
+            auto& device = emplaceResult.first->second;
+            device.providerDeviceId = providerDeviceId;
+            if (!TryInitializeDevice_(device, handle)) {
+                devicesById_.erase(emplaceResult.first);
+                continue;
+            }
+
+            device.caps = BuildCapsForDevice_(device);
+            ++nextProviderDeviceId_;
+        }
+    }
+
+    IgclTelemetryProvider::~IgclTelemetryProvider()
+    {
+        devicesById_.clear();
+        if (apiHandle_ != nullptr) {
+            ctlClose(apiHandle_);
+            apiHandle_ = nullptr;
+        }
+    }
+
+    ProviderCapabilityMap IgclTelemetryProvider::GetCaps()
+    {
+        ProviderCapabilityMap capsByDeviceId{};
+        for (const auto& entry : devicesById_) {
+            capsByDeviceId.emplace(entry.first, entry.second.caps);
+        }
+        return capsByDeviceId;
+    }
+
+    const TelemetryDeviceFingerprint& IgclTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        return devicesById_.at(providerDeviceId).fingerprint;
+    }
+
+    TelemetryMetricValue IgclTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<IgclException>("IGCL provider device not found");
+        }
+
+        auto& device = iDevice->second;
+
+        switch (metricId) {
+        case PM_METRIC_GPU_VENDOR:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return (int)device.fingerprint.vendor;
+        case PM_METRIC_GPU_NAME:
+            throw Except<IgclException>("PM_METRIC_GPU_NAME is static-only and is not served by poll path");
+        case PM_METRIC_GPU_SUSTAINED_POWER_LIMIT:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto limits = PollPowerLimitsEndpoint_(device);
+            if (!limits || !limits->sustainedPowerLimit.enabled) {
+                return 0.0;
+            }
+            return (double)limits->sustainedPowerLimit.power / 1000.0;
+        }
+        case PM_METRIC_GPU_MEM_SIZE:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pMemState = PollMemoryStateEndpoint_(device, requestQpc);
+            if (pMemState == nullptr) {
+                return (uint64_t)0;
+            }
+            return (uint64_t)pMemState->size;
+        }
+        case PM_METRIC_GPU_MEM_USED:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pMemState = PollMemoryStateEndpoint_(device, requestQpc);
+            if (pMemState == nullptr) {
+                return (uint64_t)0;
+            }
+            return (uint64_t)(pMemState->size - pMemState->free);
+        }
+        case PM_METRIC_GPU_MEM_UTILIZATION:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pMemState = PollMemoryStateEndpoint_(device, requestQpc);
+            if (pMemState == nullptr || pMemState->size == 0) {
+                return 0.0;
+            }
+            return 100.0 * ((double)(pMemState->size - pMemState->free) / (double)pMemState->size);
+        }
+        case PM_METRIC_GPU_MEM_MAX_BANDWIDTH:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto memBandwidth = PollMemoryBandwidthEndpoint_(device);
+            if (!memBandwidth) {
+                return (uint64_t)0;
+            }
+            return (uint64_t)memBandwidth->maxBandwidth;
+        }
+        default:
+            return PollTelemetryMetric_(device, metricId, arrayIndex, requestQpc);
+        }
+    }
+
+    void IgclTelemetryProvider::ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex)
+    {
+        if (arrayIndex != 0) {
+            throw Except<IgclException>("IGCL scalar metric queried with nonzero array index");
+        }
+        (void)metricId;
+    }
+
+    bool IgclTelemetryProvider::TryInitializeDevice_(
+        DeviceState_& device,
+        ctl_device_adapter_handle_t handle) const
+    {
+        device.handle = handle;
+        device.deviceLuid.resize(sizeof(LUID));
+        device.properties = {
+            .Size = sizeof(ctl_device_adapter_properties_t),
+            .pDeviceID = device.deviceLuid.empty() ? nullptr : device.deviceLuid.data(),
+            .device_id_size = (uint32_t)device.deviceLuid.size(),
+        };
+
+        const auto propertiesResult = ctlGetDeviceProperties(device.handle, &device.properties);
+        if (propertiesResult != CTL_RESULT_SUCCESS) {
+            pmlog_error("ctlGetDeviceProperties failed").code(propertiesResult);
+            return false;
+        }
+        pmlog_verb(v::tele_gpu)("ctlGetDeviceProperties output")
+            .pmwatch(device.properties.name)
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(ref::DumpGenerated(device.properties));
+
+        if (device.properties.device_type != CTL_DEVICE_TYPE_GRAPHICS) {
+            return false;
+        }
+
+        device.fingerprint.deviceType = PM_DEVICE_TYPE_GRAPHICS_ADAPTER;
+        device.fingerprint.vendor = PM_DEVICE_VENDOR_INTEL;
+        device.fingerprint.deviceName = device.properties.name;
+        device.fingerprint.isIntegratedAdapter =
+            (device.properties.graphics_adapter_properties & CTL_ADAPTER_PROPERTIES_FLAG_INTEGRATED) != 0;
+        if (!device.deviceLuid.empty()) {
+            device.fingerprint.luid = device.deviceLuid;
+        }
+
+        device.isAlchemist = std::regex_search(device.fingerprint.deviceName, std::regex{ R"(Arc.*A\d{3})" });
+        pmlog_verb(v::tele_gpu)("Alchemist detection")
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.isAlchemist);
+
+        EnumerateMemoryModules_(device);
+        EnumeratePowerDomains_(device);
+        EnumerateFans_(device);
+
+        return true;
+    }
+
+    void IgclTelemetryProvider::EnumerateMemoryModules_(DeviceState_& device) const
+    {
+        uint32_t memoryModuleCount = 0;
+        const auto enumCountResult = ctlEnumMemoryModules(device.handle, &memoryModuleCount, nullptr);
+        if (enumCountResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlEnumMemoryModules(count) failed").code(enumCountResult)
+                .pmwatch(device.fingerprint.deviceName);
+            return;
+        }
+
+        device.memoryModules.resize((size_t)memoryModuleCount);
+        const auto enumListResult = ctlEnumMemoryModules(
+            device.handle, &memoryModuleCount, device.memoryModules.data());
+        if (enumListResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlEnumMemoryModules(list) failed").code(enumListResult)
+                .pmwatch(device.fingerprint.deviceName);
+            device.memoryModules.clear();
+            return;
+        }
+        pmlog_verb(v::tele_gpu)("ctlEnumMemoryModules output")
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(ref::DumpGenerated(device.memoryModules));
+    }
+
+    void IgclTelemetryProvider::EnumeratePowerDomains_(DeviceState_& device) const
+    {
+        uint32_t powerDomainCount = 0;
+        const auto enumCountResult = ctlEnumPowerDomains(device.handle, &powerDomainCount, nullptr);
+        if (enumCountResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlEnumPowerDomains(count) failed").code(enumCountResult)
+                .pmwatch(device.fingerprint.deviceName);
+            return;
+        }
+
+        device.powerDomains.resize((size_t)powerDomainCount);
+        const auto enumListResult = ctlEnumPowerDomains(
+            device.handle, &powerDomainCount, device.powerDomains.data());
+        if (enumListResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlEnumPowerDomains(list) failed").code(enumListResult)
+                .pmwatch(device.fingerprint.deviceName);
+            device.powerDomains.clear();
+            return;
+        }
+        pmlog_verb(v::tele_gpu)("ctlEnumPowerDomains(output)")
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(ref::DumpGenerated(device.powerDomains));
+    }
+
+    void IgclTelemetryProvider::EnumerateFans_(DeviceState_& device) const
+    {
+        device.maxFanSpeedsRpm.clear();
+        device.maxFanSpeedsRpm.resize((size_t)CTL_FAN_COUNT, 0);
+
+        uint32_t fanCount = 0;
+        const auto enumCountResult = ctlEnumFans(device.handle, &fanCount, nullptr);
+        if (enumCountResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlEnumFans(count) failed").code(enumCountResult)
+                .pmwatch(device.fingerprint.deviceName);
+            return;
+        }
+
+        if (fanCount == 0) {
+            return;
+        }
+
+        std::vector<ctl_fan_handle_t> fanHandles{};
+        fanHandles.resize((size_t)fanCount);
+        const auto enumListResult = ctlEnumFans(device.handle, &fanCount, fanHandles.data());
+        if (enumListResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlEnumFans(list) failed").code(enumListResult)
+                .pmwatch(device.fingerprint.deviceName);
+            return;
+        }
+
+        const auto fanCountToRead = (uint32_t)std::min((size_t)fanCount, (size_t)CTL_FAN_COUNT);
+        for (uint32_t iFan = 0; iFan < fanCountToRead; ++iFan) {
+            const auto hFan = fanHandles[(size_t)iFan];
+            if (hFan == nullptr) {
+                continue;
+            }
+
+            ctl_fan_properties_t fanProperties{ .Size = sizeof(ctl_fan_properties_t) };
+            const auto fanPropsResult = ctlFanGetProperties(hFan, &fanProperties);
+            if (fanPropsResult != CTL_RESULT_SUCCESS) {
+                pmlog_warn("ctlFanGetProperties failed").code(fanPropsResult)
+                    .pmwatch(device.fingerprint.deviceName).pmwatch(iFan);
+                continue;
+            }
+            pmlog_verb(v::tele_gpu)("ctlFanGetProperties output")
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(iFan)
+                .pmwatch(ref::DumpGenerated(fanProperties));
+
+            device.maxFanSpeedsRpm[(size_t)iFan] = fanProperties.maxRPM;
+        }
+    }
+
+    ipc::MetricCapabilities IgclTelemetryProvider::BuildCapsForDevice_(DeviceState_& device) const
+    {
+        ipc::MetricCapabilities caps{};
+        const auto requestQpc = GetCurrentTimestamp();
+
+        // Static capabilities can exist even if they do not route through dynamic polling.
+        caps.Set(PM_METRIC_GPU_VENDOR, 1);
+        caps.Set(PM_METRIC_GPU_NAME, 1);
+
+        const auto powerLimits = PollPowerLimitsEndpoint_(device);
+        if (powerLimits && powerLimits->sustainedPowerLimit.enabled) {
+            caps.Set(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, 1);
+        }
+
+        const auto* pMemoryState = PollMemoryStateEndpoint_(device, requestQpc);
+        if (pMemoryState != nullptr) {
+            caps.Set(PM_METRIC_GPU_MEM_SIZE, 1);
+            caps.Set(PM_METRIC_GPU_MEM_USED, 1);
+            caps.Set(PM_METRIC_GPU_MEM_UTILIZATION, 1);
+        }
+
+        const auto memoryBandwidth = PollMemoryBandwidthEndpoint_(device);
+        if (memoryBandwidth) {
+            caps.Set(PM_METRIC_GPU_MEM_MAX_BANDWIDTH, 1);
+            device.gpuMemMaxBwCacheValueBps = memoryBandwidth->maxBandwidth;
+        }
+
+        const auto& sample = PollTelemetryEndpoint_(device, requestQpc);
+
+        if (IsUsageTelemetryItemSupported_(sample.gpuEnergyCounter)) {
+            caps.Set(PM_METRIC_GPU_POWER, 1);
+        }
+        if (IsUsageTelemetryItemSupported_(sample.totalCardEnergyCounter)) {
+            caps.Set(PM_METRIC_GPU_CARD_POWER, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuVoltage)) {
+            caps.Set(PM_METRIC_GPU_VOLTAGE, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuCurrentClockFrequency)) {
+            caps.Set(PM_METRIC_GPU_FREQUENCY, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuCurrentTemperature)) {
+            caps.Set(PM_METRIC_GPU_TEMPERATURE, 1);
+        }
+        if (IsUsagePercentTelemetryItemSupported_(sample.globalActivityCounter)) {
+            caps.Set(PM_METRIC_GPU_UTILIZATION, 1);
+        }
+        if (IsUsagePercentTelemetryItemSupported_(sample.renderComputeActivityCounter)) {
+            caps.Set(PM_METRIC_GPU_RENDER_COMPUTE_UTILIZATION, 1);
+        }
+        if (IsUsagePercentTelemetryItemSupported_(sample.mediaActivityCounter)) {
+            caps.Set(PM_METRIC_GPU_MEDIA_UTILIZATION, 1);
+        }
+
+        caps.Set(PM_METRIC_GPU_POWER_LIMITED, 1);
+        caps.Set(PM_METRIC_GPU_TEMPERATURE_LIMITED, 1);
+        caps.Set(PM_METRIC_GPU_VOLTAGE_LIMITED, 1);
+        caps.Set(PM_METRIC_GPU_UTILIZATION_LIMITED, 1);
+        if (device.isAlchemist) {
+            caps.Set(PM_METRIC_GPU_CURRENT_LIMITED, 1);
+        }
+
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuEffectiveClock)) {
+            caps.Set(PM_METRIC_GPU_EFFECTIVE_FREQUENCY, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuVrTemp)) {
+            caps.Set(PM_METRIC_GPU_VOLTAGE_REGULATOR_TEMPERATURE, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.vramCurrentEffectiveFrequency)) {
+            caps.Set(PM_METRIC_GPU_MEM_EFFECTIVE_FREQUENCY, 1);
+            caps.Set(PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuOverVoltagePercent)) {
+            caps.Set(PM_METRIC_GPU_OVERVOLTAGE_PERCENT, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuTemperaturePercent)) {
+            caps.Set(PM_METRIC_GPU_TEMPERATURE_PERCENT, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.gpuPowerPercent)) {
+            caps.Set(PM_METRIC_GPU_POWER_PERCENT, 1);
+        }
+
+        if (IsUsageTelemetryItemSupported_(sample.vramEnergyCounter)) {
+            caps.Set(PM_METRIC_GPU_MEM_POWER, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.vramVoltage)) {
+            caps.Set(PM_METRIC_GPU_MEM_VOLTAGE, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.vramCurrentClockFrequency)) {
+            caps.Set(PM_METRIC_GPU_MEM_FREQUENCY, 1);
+        }
+        if (IsInstantaneousTelemetryItemSupported_(sample.vramCurrentTemperature)) {
+            caps.Set(PM_METRIC_GPU_MEM_TEMPERATURE, 1);
+        }
+
+        const bool hasV1ReadBandwidth = IsInstantaneousTelemetryItemSupported_(sample.vramReadBandwidth);
+        const bool hasV1WriteBandwidth = IsInstantaneousTelemetryItemSupported_(sample.vramWriteBandwidth);
+        const bool hasCounterReadBandwidth = IsUsageTelemetryItemSupported_(sample.vramReadBandwidthCounter);
+        const bool hasCounterWriteBandwidth = IsUsageTelemetryItemSupported_(sample.vramWriteBandwidthCounter);
+        if (hasV1ReadBandwidth && hasV1WriteBandwidth) {
+            device.useNewBandwidthTelemetry = true;
+            caps.Set(PM_METRIC_GPU_MEM_READ_BANDWIDTH, 1);
+            caps.Set(PM_METRIC_GPU_MEM_WRITE_BANDWIDTH, 1);
+        }
+        else if (hasCounterReadBandwidth && hasCounterWriteBandwidth) {
+            device.useNewBandwidthTelemetry = false;
+            caps.Set(PM_METRIC_GPU_MEM_READ_BANDWIDTH, 1);
+            caps.Set(PM_METRIC_GPU_MEM_WRITE_BANDWIDTH, 1);
+        }
+
+        device.fanSpeedCount = 0;
+        while (device.fanSpeedCount < CTL_FAN_COUNT &&
+            IsInstantaneousTelemetryItemSupported_(sample.fanSpeed[(size_t)device.fanSpeedCount])) {
+            ++device.fanSpeedCount;
+        }
+        for (uint32_t iFan = device.fanSpeedCount; iFan < CTL_FAN_COUNT; ++iFan) {
+            if (IsInstantaneousTelemetryItemSupported_(sample.fanSpeed[(size_t)iFan])) {
+                pmlog_warn("Detected sparse fan-speed telemetry population; assuming dense indices")
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(device.fanSpeedCount)
+                    .pmwatch(iFan);
+                break;
+            }
+        }
+
+        device.fanSpeedPercentCount = 0;
+        while (device.fanSpeedPercentCount < device.fanSpeedCount &&
+            device.fanSpeedPercentCount < (uint32_t)device.maxFanSpeedsRpm.size() &&
+            device.maxFanSpeedsRpm[(size_t)device.fanSpeedPercentCount] > 0) {
+            ++device.fanSpeedPercentCount;
+        }
+        for (uint32_t iFan = device.fanSpeedPercentCount; iFan < device.fanSpeedCount; ++iFan) {
+            if (iFan < (uint32_t)device.maxFanSpeedsRpm.size() &&
+                device.maxFanSpeedsRpm[(size_t)iFan] > 0) {
+                pmlog_warn("Detected sparse fan-speed-percent telemetry population; assuming dense indices")
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(device.fanSpeedPercentCount)
+                    .pmwatch(iFan);
+                break;
+            }
+        }
+
+        if (device.fanSpeedCount > 0) {
+            caps.Set(PM_METRIC_GPU_FAN_SPEED, device.fanSpeedCount);
+        }
+        if (device.fanSpeedPercentCount > 0) {
+            caps.Set(PM_METRIC_GPU_FAN_SPEED_PERCENT, device.fanSpeedPercentCount);
+        }
+
+        return caps;
+    }
+
+    const ctl_power_telemetry_t& IgclTelemetryProvider::PollTelemetryEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        if (device.telemetrySamples.Matches(requestQpc)) {
+            return device.telemetrySamples.Current();
+        }
+
+        auto& currentSample = device.telemetrySamples.PrepareForWrite(requestQpc);
+
+        pmlog_verb(v::tele_gpu)("telemetry poll tick")
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(device.providerDeviceId);
+        const auto pollResult = ctlPowerTelemetryGet(device.handle, &currentSample);
+        if (pollResult != CTL_RESULT_SUCCESS) {
+            pmlog_warn("ctlPowerTelemetryGet failed").code(pollResult).every(60s)
+                .pmwatch(device.fingerprint.deviceName);
+            currentSample = {
+                .Size = sizeof(ctl_power_telemetry_t),
+                .Version = 1,
+            };
+        }
+        pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet output")
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(ref::DumpGenerated(currentSample));
+
+        return device.telemetrySamples.Current();
+    }
+
+    const ctl_mem_state_t* IgclTelemetryProvider::PollMemoryStateEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.memoryStateEndpointCache;
+        if (cache.Matches(requestQpc)) {
+            return cache.output.Size == sizeof(ctl_mem_state_t) ? &cache.output : nullptr;
+        }
+
+        cache.output = { .Size = sizeof(ctl_mem_state_t) };
+        cache.requestQpc = requestQpc;
+
+        if (!device.memoryModules.empty()) {
+            const auto result = ctlMemoryGetState(device.memoryModules[0], &cache.output);
+            if (result != CTL_RESULT_SUCCESS) {
+                pmlog_warn("ctlMemoryGetState failed").code(result).every(60s)
+                    .pmwatch(device.fingerprint.deviceName);
+                cache.output.Size = 0;
+            }
+            pmlog_verb(v::tele_gpu)("ctlMemoryGetState output")
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(ref::DumpGenerated(cache.output));
+        }
+        else {
+            cache.output.Size = 0;
+        }
+        return cache.output.Size == sizeof(ctl_mem_state_t) ? &cache.output : nullptr;
+    }
+
+    std::optional<ctl_mem_bandwidth_t> IgclTelemetryProvider::PollMemoryBandwidthEndpoint_(
+        DeviceState_& device) const
+    {
+        ctl_mem_bandwidth_t memoryBandwidth{
+            .Size = sizeof(ctl_mem_bandwidth_t),
+            .Version = 1,
+        };
+
+        if (!device.memoryModules.empty()) {
+            const auto result = ctlMemoryGetBandwidth(device.memoryModules[0], &memoryBandwidth);
+            if (result == CTL_RESULT_SUCCESS) {
+                device.gpuMemMaxBwCacheValueBps = memoryBandwidth.maxBandwidth;
+                pmlog_verb(v::tele_gpu)("ctlMemoryGetBandwidth output")
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(ref::DumpGenerated(memoryBandwidth));
+                return memoryBandwidth;
+            }
+            else {
+                pmlog_warn("ctlMemoryGetBandwidth failed").code(result).every(60s)
+                    .pmwatch(device.fingerprint.deviceName);
+            }
+            pmlog_verb(v::tele_gpu)("ctlMemoryGetBandwidth output")
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(ref::DumpGenerated(memoryBandwidth));
+        }
+
+        return {};
+    }
+
+    std::optional<ctl_power_limits_t> IgclTelemetryProvider::PollPowerLimitsEndpoint_(
+        DeviceState_& device) const
+    {
+        ctl_power_limits_t powerLimits{
+            .Size = sizeof(ctl_power_limits_t),
+        };
+
+        if (!device.powerDomains.empty()) {
+            const auto result = ctlPowerGetLimits(device.powerDomains[0], &powerLimits);
+            if (result == CTL_RESULT_SUCCESS) {
+                pmlog_verb(v::tele_gpu)("ctlPowerGetLimits output")
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(ref::DumpGenerated(powerLimits));
+                return powerLimits;
+            }
+            else {
+                pmlog_warn("ctlPowerGetLimits failed").code(result).every(60s)
+                    .pmwatch(device.fingerprint.deviceName);
+            }
+        }
+
+        return {};
+    }
+
+    TelemetryMetricValue IgclTelemetryProvider::PollTelemetryMetric_(
+        DeviceState_& device,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc) const
+    {
+        const auto& currentSample = PollTelemetryEndpoint_(device, requestQpc);
+        const auto* pPreviousSample = device.telemetrySamples.Previous();
+        double timeDelta = 0.0;
+        if (device.telemetrySamples.PreviousRequestQpc() != 0 &&
+            pPreviousSample != nullptr &&
+            currentSample.timeStamp.type == CTL_DATA_TYPE_DOUBLE &&
+            pPreviousSample->timeStamp.type == CTL_DATA_TYPE_DOUBLE) {
+            timeDelta = currentSample.timeStamp.value.datadouble -
+                pPreviousSample->timeStamp.value.datadouble;
+        }
+
+        double value = 0.0;
+
+        switch (metricId) {
+        case PM_METRIC_GPU_POWER:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (pPreviousSample &&
+                TryGetUsageTelemetryItem_(
+                    device, metricId, currentSample.gpuEnergyCounter, pPreviousSample->gpuEnergyCounter, timeDelta, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_CARD_POWER:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (pPreviousSample &&
+                TryGetUsageTelemetryItem_(
+                    device, metricId, currentSample.totalCardEnergyCounter, pPreviousSample->totalCardEnergyCounter, timeDelta, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_VOLTAGE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuVoltage, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_FREQUENCY:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuCurrentClockFrequency, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_TEMPERATURE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuCurrentTemperature, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_UTILIZATION:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (pPreviousSample &&
+                TryGetUsagePercentTelemetryItem_(
+                    currentSample.globalActivityCounter, pPreviousSample->globalActivityCounter, timeDelta, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_RENDER_COMPUTE_UTILIZATION:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (pPreviousSample &&
+                TryGetUsagePercentTelemetryItem_(
+                    currentSample.renderComputeActivityCounter, pPreviousSample->renderComputeActivityCounter, timeDelta, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEDIA_UTILIZATION:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (pPreviousSample &&
+                TryGetUsagePercentTelemetryItem_(
+                    currentSample.mediaActivityCounter, pPreviousSample->mediaActivityCounter, timeDelta, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_POWER_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return currentSample.gpuPowerLimited;
+        case PM_METRIC_GPU_TEMPERATURE_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return currentSample.gpuTemperatureLimited;
+        case PM_METRIC_GPU_CURRENT_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return currentSample.gpuCurrentLimited;
+        case PM_METRIC_GPU_VOLTAGE_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return currentSample.gpuVoltageLimited;
+        case PM_METRIC_GPU_UTILIZATION_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return currentSample.gpuUtilizationLimited;
+        case PM_METRIC_GPU_MEM_POWER:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (pPreviousSample &&
+                TryGetUsageTelemetryItem_(
+                    device, metricId, currentSample.vramEnergyCounter, pPreviousSample->vramEnergyCounter, timeDelta, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_VOLTAGE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.vramVoltage, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_FREQUENCY:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.vramCurrentClockFrequency, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_EFFECTIVE_FREQUENCY:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.vramCurrentEffectiveFrequency, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_TEMPERATURE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.vramCurrentTemperature, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_WRITE_BANDWIDTH:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (device.useNewBandwidthTelemetry) {
+                pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet VRAM bandwidth V1 path")
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(device.providerDeviceId);
+                if (TryGetInstantaneousTelemetryItem_(currentSample.vramWriteBandwidth, value)) {
+                    return ConvertMegabytesPerSecondToBitsPerSecond_(value);
+                }
+                device.useNewBandwidthTelemetry = false;
+            }
+            pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet VRAM bandwidth counter path")
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(device.providerDeviceId);
+            if (pPreviousSample &&
+                TryGetUsageTelemetryItem_(
+                    device,
+                    metricId,
+                    currentSample.vramWriteBandwidthCounter,
+                    pPreviousSample->vramWriteBandwidthCounter,
+                    timeDelta,
+                    value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_READ_BANDWIDTH:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (device.useNewBandwidthTelemetry) {
+                pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet VRAM bandwidth V1 path")
+                    .pmwatch(device.fingerprint.deviceName)
+                    .pmwatch(device.providerDeviceId);
+                if (TryGetInstantaneousTelemetryItem_(currentSample.vramReadBandwidth, value)) {
+                    return ConvertMegabytesPerSecondToBitsPerSecond_(value);
+                }
+                device.useNewBandwidthTelemetry = false;
+            }
+            pmlog_verb(v::tele_gpu)("ctlPowerTelemetryGet VRAM bandwidth counter path")
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(device.providerDeviceId);
+            if (pPreviousSample &&
+                TryGetUsageTelemetryItem_(
+                    device,
+                    metricId,
+                    currentSample.vramReadBandwidthCounter,
+                    pPreviousSample->vramReadBandwidthCounter,
+                    timeDelta,
+                    value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_EFFECTIVE_FREQUENCY:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuEffectiveClock, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_VOLTAGE_REGULATOR_TEMPERATURE:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuVrTemp, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.vramCurrentEffectiveFrequency, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_OVERVOLTAGE_PERCENT:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuOverVoltagePercent, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_TEMPERATURE_PERCENT:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuTemperaturePercent, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_POWER_PERCENT:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            if (TryGetInstantaneousTelemetryItem_(currentSample.gpuPowerPercent, value)) {
+                return value;
+            }
+            return 0.0;
+        case PM_METRIC_GPU_FAN_SPEED:
+        {
+            if (arrayIndex >= device.fanSpeedCount) {
+                throw Except<IgclException>("IGCL array index out of range");
+            }
+            if (TryGetInstantaneousTelemetryItem_(currentSample.fanSpeed[(size_t)arrayIndex], value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_FAN_SPEED_PERCENT:
+        {
+            if (arrayIndex >= device.fanSpeedPercentCount) {
+                throw Except<IgclException>("IGCL array index out of range");
+            }
+            if (!TryGetInstantaneousTelemetryItem_(currentSample.fanSpeed[(size_t)arrayIndex], value)) {
+                return 0.0;
+            }
+            if (arrayIndex >= (uint32_t)device.maxFanSpeedsRpm.size()) {
+                return 0.0;
+            }
+            const auto maxFanRpm = device.maxFanSpeedsRpm[(size_t)arrayIndex];
+            if (maxFanRpm <= 0) {
+                return 0.0;
+            }
+            return value / (double)maxFanRpm;
+        }
+        case PM_METRIC_GPU_MEM_POWER_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return false;
+        case PM_METRIC_GPU_MEM_TEMPERATURE_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return false;
+        case PM_METRIC_GPU_MEM_CURRENT_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return false;
+        case PM_METRIC_GPU_MEM_VOLTAGE_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return false;
+        case PM_METRIC_GPU_MEM_UTILIZATION_LIMITED:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return false;
+        default:
+            throw Except<IgclException>("Unsupported metric for IGCL provider");
+        }
+    }
+
+    bool IgclTelemetryProvider::TryGetInstantaneousTelemetryItem_(
+        const ctl_oc_telemetry_item_t& telemetryItem,
+        double& value)
+    {
+        if (telemetryItem.bSupported && telemetryItem.type == CTL_DATA_TYPE_DOUBLE) {
+            value = telemetryItem.value.datadouble;
+            return true;
+        }
+
+        value = 0.0;
+        return false;
+    }
+
+    bool IgclTelemetryProvider::TryGetUsagePercentTelemetryItem_(
+        const ctl_oc_telemetry_item_t& currentItem,
+        const ctl_oc_telemetry_item_t& previousItem,
+        double timeDelta,
+        double& value)
+    {
+        if (!currentItem.bSupported || currentItem.type != CTL_DATA_TYPE_DOUBLE || timeDelta <= 0.0) {
+            value = 0.0;
+            return false;
+        }
+
+        const auto dataDelta = currentItem.value.datadouble - previousItem.value.datadouble;
+        value = (dataDelta / timeDelta) * 100.0;
+        return true;
+    }
+
+    bool IgclTelemetryProvider::TryGetUsageTelemetryItem_(
+        DeviceState_& device,
+        PM_METRIC metricId,
+        const ctl_oc_telemetry_item_t& currentItem,
+        const ctl_oc_telemetry_item_t& previousItem,
+        double timeDelta,
+        double& value)
+    {
+        if (!currentItem.bSupported || timeDelta <= 0.0) {
+            value = 0.0;
+            return false;
+        }
+
+        if (currentItem.type == CTL_DATA_TYPE_DOUBLE) {
+            const auto dataDelta = currentItem.value.datadouble - previousItem.value.datadouble;
+            value = dataDelta / timeDelta;
+
+            if (metricId == PM_METRIC_GPU_MEM_POWER) {
+                if (currentItem.value.datadouble < previousItem.value.datadouble) {
+                    value = device.gpuMemPowerCacheValueW;
+                }
+                else {
+                    device.gpuMemPowerCacheValueW = value;
+                }
+            }
+
+            return true;
+        }
+
+        if (currentItem.type == CTL_DATA_TYPE_INT64) {
+            const auto dataDelta = currentItem.value.data64 - previousItem.value.data64;
+            value = (double)dataDelta / timeDelta;
+            return true;
+        }
+
+        if (currentItem.type == CTL_DATA_TYPE_UINT64) {
+            const auto dataDelta = currentItem.value.datau64 - previousItem.value.datau64;
+            value = (double)dataDelta / timeDelta;
+
+            if (metricId == PM_METRIC_GPU_MEM_READ_BANDWIDTH && !device.useNewBandwidthTelemetry) {
+                const auto overflowOrWrap = currentItem.value.datau64 < previousItem.value.datau64;
+                const auto overMax = dataDelta > device.gpuMemMaxBwCacheValueBps;
+                if (overflowOrWrap || overMax) {
+                    value = device.gpuMemReadBwCacheValueBps;
+                }
+                else {
+                    device.gpuMemReadBwCacheValueBps = value;
+                }
+            }
+
+            return true;
+        }
+
+        value = 0.0;
+        return false;
+    }
+
+    bool IgclTelemetryProvider::IsInstantaneousTelemetryItemSupported_(
+        const ctl_oc_telemetry_item_t& telemetryItem)
+    {
+        return telemetryItem.bSupported && telemetryItem.type == CTL_DATA_TYPE_DOUBLE;
+    }
+
+    bool IgclTelemetryProvider::IsUsageTelemetryItemSupported_(
+        const ctl_oc_telemetry_item_t& telemetryItem)
+    {
+        if (!telemetryItem.bSupported) {
+            return false;
+        }
+
+        return telemetryItem.type == CTL_DATA_TYPE_DOUBLE ||
+            telemetryItem.type == CTL_DATA_TYPE_INT64 ||
+            telemetryItem.type == CTL_DATA_TYPE_UINT64;
+    }
+
+    bool IgclTelemetryProvider::IsUsagePercentTelemetryItemSupported_(
+        const ctl_oc_telemetry_item_t& telemetryItem)
+    {
+        return telemetryItem.bSupported && telemetryItem.type == CTL_DATA_TYPE_DOUBLE;
+    }
+
+    double IgclTelemetryProvider::ConvertMegabytesPerSecondToBitsPerSecond_(double megabytesPerSecond)
+    {
+        return megabytesPerSecond * 8.0 * 1000000.0;
+    }
+}
diff --git a/IntelPresentMon/ControlLib/igcl/IgclTelemetryProvider.h b/IntelPresentMon/ControlLib/igcl/IgclTelemetryProvider.h
new file mode 100644
index 000000000..72d2e8fc4
--- /dev/null
+++ b/IntelPresentMon/ControlLib/igcl/IgclTelemetryProvider.h
@@ -0,0 +1,130 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+#include "../../CommonUtilities/win/WinAPI.h"
+
+#include "../EndpointCache.h"
+#include "../TelemetryProvider.h"
+#include "igcl_api.h"
+
+#include <cstdint>
+#include <optional>
+#include <unordered_map>
+#include <vector>
+
+namespace pmon::tel::igcl
+{
+    class IgclTelemetryProvider : public TelemetryProvider
+    {
+    public:
+        IgclTelemetryProvider();
+        ~IgclTelemetryProvider() override;
+        ProviderCapabilityMap GetCaps() override;
+        const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const override;
+        TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) override;
+
+    private:
+        class TelemetrySampleBuffer_
+        {
+        public:
+            TelemetrySampleBuffer_() noexcept;
+            bool Matches(int64_t requestQpc) const noexcept;
+            ctl_power_telemetry_t& PrepareForWrite(int64_t requestQpc) noexcept;
+            const ctl_power_telemetry_t& Current() const noexcept;
+            const ctl_power_telemetry_t* Previous() const noexcept;
+            int64_t PreviousRequestQpc() const noexcept;
+
+        private:
+            static ctl_power_telemetry_t MakeEmptySample_() noexcept;
+
+        private:
+            ctl_power_telemetry_t samples_[2]{};
+            int64_t requestQpcs_[2]{};
+            uint32_t currentIndex_ = 0;
+            uint32_t previousIndex_ = 1;
+            bool hasCurrent_ = false;
+            bool hasPrevious_ = false;
+        };
+
+        struct DeviceState_
+        {
+            ProviderDeviceId providerDeviceId = 0;
+            TelemetryDeviceFingerprint fingerprint{};
+            ipc::MetricCapabilities caps{};
+
+            ctl_device_adapter_handle_t handle = nullptr;
+            std::vector<uint8_t> deviceLuid{};
+            ctl_device_adapter_properties_t properties{};
+            std::vector<ctl_mem_handle_t> memoryModules{};
+            std::vector<ctl_pwr_handle_t> powerDomains{};
+            std::vector<int32_t> maxFanSpeedsRpm{};
+            uint32_t fanSpeedCount = 0;
+            uint32_t fanSpeedPercentCount = 0;
+            bool isAlchemist = false;
+
+            bool useNewBandwidthTelemetry = true;
+
+            TelemetrySampleBuffer_ telemetrySamples{};
+            pmon::tele::EndpointCache<ctl_mem_state_t> memoryStateEndpointCache{};
+
+            // Runtime telemetry workarounds carried over from the legacy Intel path.
+            double gpuMemReadBwCacheValueBps = 0.0;
+            uint64_t gpuMemMaxBwCacheValueBps = 0;
+            double gpuMemPowerCacheValueW = 0.0;
+        };
+
+        static void ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex);
+        bool TryInitializeDevice_(DeviceState_& device, ctl_device_adapter_handle_t handle) const;
+        void EnumerateMemoryModules_(DeviceState_& device) const;
+        void EnumeratePowerDomains_(DeviceState_& device) const;
+        void EnumerateFans_(DeviceState_& device) const;
+        ipc::MetricCapabilities BuildCapsForDevice_(DeviceState_& device) const;
+
+        const ctl_power_telemetry_t& PollTelemetryEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        const ctl_mem_state_t* PollMemoryStateEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        std::optional<ctl_mem_bandwidth_t> PollMemoryBandwidthEndpoint_(
+            DeviceState_& device) const;
+        std::optional<ctl_power_limits_t> PollPowerLimitsEndpoint_(
+            DeviceState_& device) const;
+
+        TelemetryMetricValue PollTelemetryMetric_(
+            DeviceState_& device,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) const;
+
+        static bool TryGetInstantaneousTelemetryItem_(
+            const ctl_oc_telemetry_item_t& telemetryItem,
+            double& value);
+        static bool TryGetUsagePercentTelemetryItem_(
+            const ctl_oc_telemetry_item_t& currentItem,
+            const ctl_oc_telemetry_item_t& previousItem,
+            double timeDelta,
+            double& value);
+        static bool TryGetUsageTelemetryItem_(
+            DeviceState_& device,
+            PM_METRIC metricId,
+            const ctl_oc_telemetry_item_t& currentItem,
+            const ctl_oc_telemetry_item_t& previousItem,
+            double timeDelta,
+            double& value);
+
+        static bool IsInstantaneousTelemetryItemSupported_(const ctl_oc_telemetry_item_t& telemetryItem);
+        static bool IsUsageTelemetryItemSupported_(const ctl_oc_telemetry_item_t& telemetryItem);
+        static bool IsUsagePercentTelemetryItemSupported_(const ctl_oc_telemetry_item_t& telemetryItem);
+        static double ConvertMegabytesPerSecondToBitsPerSecond_(double megabytesPerSecond);
+
+    private:
+        ctl_api_handle_t apiHandle_ = nullptr;
+        std::unordered_map<ProviderDeviceId, DeviceState_> devicesById_{};
+        ProviderDeviceId nextProviderDeviceId_ = 1;
+    };
+}
diff --git a/IntelPresentMon/ControlLib/cApiWrapper.cpp b/IntelPresentMon/ControlLib/igcl/cApiWrapper.cpp
similarity index 99%
rename from IntelPresentMon/ControlLib/cApiWrapper.cpp
rename to IntelPresentMon/ControlLib/igcl/cApiWrapper.cpp
index 492a5832e..8bd953c95 100644
--- a/IntelPresentMon/ControlLib/cApiWrapper.cpp
+++ b/IntelPresentMon/ControlLib/igcl/cApiWrapper.cpp
@@ -1,4 +1,4 @@
-//===========================================================================
+//===========================================================================
 //Copyright (C) 2025 Intel Corporation
 //
 // 
diff --git a/IntelPresentMon/ControlLib/igcl_api.h b/IntelPresentMon/ControlLib/igcl/igcl_api.h
similarity index 99%
rename from IntelPresentMon/ControlLib/igcl_api.h
rename to IntelPresentMon/ControlLib/igcl/igcl_api.h
index f1fefb026..2b1e6e06e 100644
--- a/IntelPresentMon/ControlLib/igcl_api.h
+++ b/IntelPresentMon/ControlLib/igcl/igcl_api.h
@@ -1,4 +1,4 @@
-//===========================================================================
+//===========================================================================
 // Copyright (C) 2025 Intel Corporation
 // This software and the related documents are Intel copyrighted materials, and
 // your use of them is governed by the express license under which they were
diff --git a/IntelPresentMon/ControlLib/ipf_sdk_version.h b/IntelPresentMon/ControlLib/ipf_sdk_version.h
deleted file mode 100644
index cc966e492..000000000
--- a/IntelPresentMon/ControlLib/ipf_sdk_version.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
-** Copyright (c) 2013-2022 Intel Corporation All Rights Reserved
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); you may not
-** use this file except in compliance with the License.
-**
-** You may obtain a copy of the License at
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-** WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-**
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-******************************************************************************/
-
-#pragma once
-
-#include "esif_ccb.h"
-#include "esif_ccb_rc.h"
-#include <string.h>
-#include <stdlib.h>
-
-// Current IPF SDK Version: Major.Minor.Revision where same Major.Minor compatible with other Revisions, but not newer Major.Minor
-#define IPF_SDK_VERSION		"1.0.11100"
-
-typedef u64 ipfsdk_version_t;	// IPF SDK Encoded Version Number
-
-// IPF SDK Encoded Version Number Helper Macros
-#define IPFSDK_VERSION(major, minor, revision)	((((ipfsdk_version_t)(major) & 0xffff) << 32) | (((ipfsdk_version_t)(minor) & 0xffff) << 16) | ((ipfsdk_version_t)(revision) & 0xffff))
-#define IPFSDK_GETMAJOR(ver)					((u32)(((ver) & 0x0000ffff00000000) >> 32))
-#define IPFSDK_GETMINOR(ver)					(((u32)(ver) & 0xffff0000) >> 16)
-#define IPFSDK_GETRELEASE(ver)					((u32)(((ver) & 0x0000ffffffff0000) >> 16))
-#define IPFSDK_GETREVISION(ver)					((u32)(ver) & 0x0000ffff)
-
-// Convert an IPF SDK Version string to an Encoded Version Number that can be directly compared with another
-static ESIF_INLINE ipfsdk_version_t IpfSdk_VersionFromString(const char *str) {
-	ipfsdk_version_t ver = 0;
-	if (str) {
-		const char *dot = strchr(str, '.');
-		const char *dotdot = (dot ? strchr(dot + 1, '.') : NULL);
-		u32 major = atoi(str);
-		u32 minor = (dot ? atoi(dot + 1) : 0);
-		u32 revision = (dotdot ? atoi(dotdot + 1) : 0);
-		ver = IPFSDK_VERSION(major, minor, revision);
-	}
-	return ver;
-}
diff --git a/IntelPresentMon/ControlLib/ipf_version.h b/IntelPresentMon/ControlLib/ipf_version.h
deleted file mode 100644
index 08d4d02bc..000000000
--- a/IntelPresentMon/ControlLib/ipf_version.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
-** Copyright (c) 2013-2022 Intel Corporation All Rights Reserved
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); you may not
-** use this file except in compliance with the License.
-**
-** You may obtain a copy of the License at
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-** WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-**
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-******************************************************************************/
-
-#pragma once
-
-#include "Ver.h"
-
-#define STR(arg) #arg
-#define STR2(arg) STR(##arg)
-#define EXPAND_TOSTR(arg) STR(arg)
-
-//
-// TODO:  Modify to set version during build process via automation
-//
-#define IPF_VER_MAJOR        VER_MAJOR
-#define IPF_VER_MINOR        VER_MINOR
-#define IPF_VER_HOTFIX       VER_HOTFIX
-#define IPF_VER_BUILD        VER_BUILD
-
-#define IPF_APP_VERSION EXPAND_TOSTR(IPF_VER_MAJOR.IPF_VER_MINOR.IPF_VER_HOTFIX.IPF_VER_BUILD)
diff --git a/IntelPresentMon/ControlLib/nvapi/NvapiTelemetryProvider.cpp b/IntelPresentMon/ControlLib/nvapi/NvapiTelemetryProvider.cpp
new file mode 100644
index 000000000..fdff1448a
--- /dev/null
+++ b/IntelPresentMon/ControlLib/nvapi/NvapiTelemetryProvider.cpp
@@ -0,0 +1,493 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "../../CommonUtilities/win/WinAPI.h"
+#include "NvapiTelemetryProvider.h"
+
+#include "../Exceptions.h"
+#include "../Logging.h"
+#include "../../CommonUtilities/Qpc.h"
+#include "../../CommonUtilities/ref/GeneratedReflection.h"
+
+#include <algorithm>
+#include <chrono>
+
+using namespace pmon;
+using namespace util;
+using namespace std::literals;
+using v = log::V;
+
+namespace pmon::tel::nvapi
+{
+    NvapiTelemetryProvider::NvapiTelemetryProvider()
+    {
+        pNvapi_ = std::make_unique<NvapiWrapper>();
+
+        std::vector<NvPhysicalGpuHandle> handles((size_t)NVAPI_MAX_PHYSICAL_GPUS);
+        NvU32 count = (NvU32)handles.size();
+        const auto enumResult = pNvapi_->EnumPhysicalGPUs(handles.data(), &count);
+        if (enumResult == NVAPI_NVIDIA_DEVICE_NOT_FOUND) {
+            return;
+        }
+        if (!NvapiWrapper::Ok(enumResult)) {
+            pmlog_error("NvAPI_EnumPhysicalGPUs failed").code(enumResult);
+            throw Except<NvapiException>("NVAPI physical GPU enumeration failed");
+        }
+        pmlog_verb(v::tele_gpu)("NvAPI_EnumPhysicalGPUs output")
+            .pmwatch(count);
+
+        handles.resize((size_t)count);
+        for (const auto handle : handles) {
+            const auto providerDeviceId = nextProviderDeviceId_;
+            const auto emplaceResult = devicesById_.try_emplace(providerDeviceId);
+            if (!emplaceResult.second) {
+                throw Except<NvapiException>("Duplicate NVAPI provider device id encountered");
+            }
+
+            auto& device = emplaceResult.first->second;
+            device.providerDeviceId = providerDeviceId;
+            if (!TryInitializeDevice_(device, handle)) {
+                devicesById_.erase(emplaceResult.first);
+                continue;
+            }
+
+            device.caps = BuildCapsForDevice_(device);
+            ++nextProviderDeviceId_;
+        }
+    }
+
+    ProviderCapabilityMap NvapiTelemetryProvider::GetCaps()
+    {
+        ProviderCapabilityMap capsByDeviceId{};
+        for (const auto& entry : devicesById_) {
+            capsByDeviceId.emplace(entry.first, entry.second.caps);
+        }
+        return capsByDeviceId;
+    }
+
+    const TelemetryDeviceFingerprint& NvapiTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<NvapiException>("NVAPI provider device not found");
+        }
+        return iDevice->second.fingerprint;
+    }
+
+    TelemetryMetricValue NvapiTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<NvapiException>("NVAPI provider device not found");
+        }
+
+        auto& device = iDevice->second;
+
+        switch (metricId) {
+        case PM_METRIC_GPU_VENDOR:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return (int)device.fingerprint.vendor;
+        case PM_METRIC_GPU_NAME:
+            throw Except<NvapiException>("PM_METRIC_GPU_NAME is static-only and is not served by poll path");
+        default:
+            return PollNvapiMetric_(device, metricId, arrayIndex, requestQpc);
+        }
+    }
+
+    void NvapiTelemetryProvider::ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex)
+    {
+        if (arrayIndex != 0) {
+            throw Except<NvapiException>("NVAPI scalar metric queried with nonzero array index");
+        }
+        (void)metricId;
+    }
+
+    bool NvapiTelemetryProvider::TryInitializeDevice_(
+        DeviceState_& device,
+        NvPhysicalGpuHandle handle) const
+    {
+        if (handle == nullptr) {
+            pmlog_warn("Null NVAPI physical GPU handle encountered");
+            return false;
+        }
+
+        device.handle = handle;
+        device.fingerprint.deviceType = PM_DEVICE_TYPE_GRAPHICS_ADAPTER;
+        device.fingerprint.vendor = PM_DEVICE_VENDOR_NVIDIA;
+        device.fingerprint.deviceName = "Unknown NVIDIA Adapter";
+
+        NvAPI_ShortString adapterName{};
+        const auto fullNameResult = pNvapi_->GPU_GetFullName(device.handle, adapterName);
+        if (NvapiWrapper::Ok(fullNameResult)) {
+            device.fingerprint.deviceName = adapterName;
+            pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetFullName output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+        else {
+            pmlog_warn("NvAPI_GPU_GetFullName failed").code(fullNameResult)
+                .pmwatch(device.providerDeviceId);
+        }
+
+        NvU32 deviceId = 0;
+        NvU32 subSystemId = 0;
+        NvU32 revisionId = 0;
+        NvU32 extDeviceId = 0;
+        const auto pciResult = pNvapi_->GPU_GetPCIIdentifiers(
+            device.handle, &deviceId, &subSystemId, &revisionId, &extDeviceId);
+        if (NvapiWrapper::Ok(pciResult)) {
+            device.fingerprint.pciDeviceId = deviceId;
+            device.fingerprint.pciSubSystemId = subSystemId;
+            pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetPCIIdentifiers output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(deviceId)
+                .pmwatch(subSystemId)
+                .pmwatch(revisionId)
+                .pmwatch(extDeviceId);
+        }
+        else {
+            pmlog_warn("NvAPI_GPU_GetPCIIdentifiers failed").code(pciResult)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        NvU32 busId = 0;
+        const auto busResult = pNvapi_->GPU_GetBusId(device.handle, &busId);
+        if (NvapiWrapper::Ok(busResult)) {
+            device.fingerprint.pciBusId = busId;
+            pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetBusId output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(busId);
+        }
+        else {
+            pmlog_warn("NvAPI_GPU_GetBusId failed").code(busResult)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        (void)revisionId;
+        (void)extDeviceId;
+
+        return true;
+    }
+
+    ipc::MetricCapabilities NvapiTelemetryProvider::BuildCapsForDevice_(DeviceState_& device) const
+    {
+        ipc::MetricCapabilities caps{};
+        const auto requestQpc = GetCurrentTimestamp();
+
+        caps.Set(PM_METRIC_GPU_VENDOR, 1);
+        caps.Set(PM_METRIC_GPU_NAME, 1);
+
+        double value = 0.0;
+
+        if (const auto* pThermals = PollThermalEndpoint_(device, requestQpc)) {
+            if (TryGetThermalValue_(*pThermals, NVAPI_THERMAL_TARGET_GPU, true, value)) {
+                caps.Set(PM_METRIC_GPU_TEMPERATURE, 1);
+            }
+            if (TryGetThermalValue_(*pThermals, NVAPI_THERMAL_TARGET_MEMORY, false, value)) {
+                caps.Set(PM_METRIC_GPU_MEM_TEMPERATURE, 1);
+            }
+        }
+
+        if (const auto* pClocks = PollClockEndpoint_(device, requestQpc)) {
+            if (TryGetClockValue_(*pClocks, NVAPI_GPU_PUBLIC_CLOCK_GRAPHICS, value)) {
+                caps.Set(PM_METRIC_GPU_FREQUENCY, 1);
+            }
+            if (TryGetClockValue_(*pClocks, NVAPI_GPU_PUBLIC_CLOCK_MEMORY, value)) {
+                caps.Set(PM_METRIC_GPU_MEM_FREQUENCY, 1);
+            }
+        }
+
+        if (const auto* pUtilization = PollUtilizationEndpoint_(device, requestQpc)) {
+            if (TryGetUtilizationValue_(
+                *pUtilization, NVAPI_GPU_UTILIZATION_DOMAIN_GPU, value)) {
+                caps.Set(PM_METRIC_GPU_UTILIZATION, 1);
+            }
+            if (TryGetUtilizationValue_(
+                *pUtilization, NVAPI_GPU_UTILIZATION_DOMAIN_VID, value)) {
+                caps.Set(PM_METRIC_GPU_MEDIA_UTILIZATION, 1);
+            }
+        }
+
+        if (PollTachEndpoint_(device)) {
+            caps.Set(PM_METRIC_GPU_FAN_SPEED, 1);
+        }
+
+        return caps;
+    }
+
+    const NV_GPU_THERMAL_SETTINGS* NvapiTelemetryProvider::PollThermalEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.thermalEndpointCache;
+        if (cache.Matches(requestQpc)) {
+            return cache.output.version == NV_GPU_THERMAL_SETTINGS_VER_2 ? &cache.output : nullptr;
+        }
+
+        cache.output = {
+            .version = NV_GPU_THERMAL_SETTINGS_VER_2,
+        };
+        cache.requestQpc = requestQpc;
+
+        const auto result = pNvapi_->GPU_GetThermalSettings(
+            device.handle, NVAPI_THERMAL_TARGET_ALL, &cache.output);
+        if (!NvapiWrapper::Ok(result)) {
+            pmlog_warn("NvAPI_GPU_GetThermalSettings failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            cache.output.version = 0;
+            return nullptr;
+        }
+        pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetThermalSettings output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(cache.output));
+
+        return &cache.output;
+    }
+
+    const NV_GPU_CLOCK_FREQUENCIES* NvapiTelemetryProvider::PollClockEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.clockEndpointCache;
+        if (cache.Matches(requestQpc)) {
+            return cache.output.version == NV_GPU_CLOCK_FREQUENCIES_VER_3 ? &cache.output : nullptr;
+        }
+
+        cache.output = {
+            .version = NV_GPU_CLOCK_FREQUENCIES_VER_3,
+        };
+        cache.requestQpc = requestQpc;
+
+        const auto result = pNvapi_->GPU_GetAllClockFrequencies(device.handle, &cache.output);
+        if (!NvapiWrapper::Ok(result)) {
+            pmlog_warn("NvAPI_GPU_GetAllClockFrequencies failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            cache.output.version = 0;
+            return nullptr;
+        }
+        pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetAllClockFrequencies output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(cache.output));
+
+        return &cache.output;
+    }
+
+    const NV_GPU_DYNAMIC_PSTATES_INFO_EX* NvapiTelemetryProvider::PollUtilizationEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.utilizationEndpointCache;
+        if (cache.Matches(requestQpc)) {
+            return cache.output.version == NV_GPU_DYNAMIC_PSTATES_INFO_EX_VER ? &cache.output : nullptr;
+        }
+
+        cache.output = {
+            .version = NV_GPU_DYNAMIC_PSTATES_INFO_EX_VER,
+        };
+        cache.requestQpc = requestQpc;
+
+        const auto result = pNvapi_->GPU_GetDynamicPstatesInfoEx(device.handle, &cache.output);
+        if (!NvapiWrapper::Ok(result)) {
+            pmlog_warn("NvAPI_GPU_GetDynamicPstatesInfoEx failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            cache.output.version = 0;
+            return nullptr;
+        }
+        pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetDynamicPstatesInfoEx output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(cache.output));
+
+        return &cache.output;
+    }
+
+    std::optional<NvU32> NvapiTelemetryProvider::PollTachEndpoint_(const DeviceState_& device) const
+    {
+        NvU32 tach = 0;
+        const auto result = pNvapi_->GPU_GetTachReading(device.handle, &tach);
+        if (!NvapiWrapper::Ok(result)) {
+            pmlog_warn("NvAPI_GPU_GetTachReading failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return {};
+        }
+        pmlog_verb(v::tele_gpu)("NvAPI_GPU_GetTachReading output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(tach);
+
+        return tach;
+    }
+
+    TelemetryMetricValue NvapiTelemetryProvider::PollNvapiMetric_(
+        DeviceState_& device,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc) const
+    {
+        double value = 0.0;
+
+        switch (metricId) {
+        case PM_METRIC_GPU_TEMPERATURE:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pThermals = PollThermalEndpoint_(device, requestQpc);
+            if (pThermals &&
+                TryGetThermalValue_(*pThermals, NVAPI_THERMAL_TARGET_GPU, true, value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_MEM_TEMPERATURE:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pThermals = PollThermalEndpoint_(device, requestQpc);
+            if (pThermals &&
+                TryGetThermalValue_(*pThermals, NVAPI_THERMAL_TARGET_MEMORY, false, value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_FREQUENCY:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pClocks = PollClockEndpoint_(device, requestQpc);
+            if (pClocks &&
+                TryGetClockValue_(*pClocks, NVAPI_GPU_PUBLIC_CLOCK_GRAPHICS, value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_MEM_FREQUENCY:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pClocks = PollClockEndpoint_(device, requestQpc);
+            if (pClocks &&
+                TryGetClockValue_(*pClocks, NVAPI_GPU_PUBLIC_CLOCK_MEMORY, value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_FAN_SPEED:
+        {
+            if (arrayIndex != 0) {
+                throw Except<NvapiException>("NVAPI array index out of range");
+            }
+            const auto tach = PollTachEndpoint_(device);
+            if (tach) {
+                return (double)*tach;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_UTILIZATION:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pUtilization = PollUtilizationEndpoint_(device, requestQpc);
+            if (pUtilization &&
+                TryGetUtilizationValue_(
+                    *pUtilization, NVAPI_GPU_UTILIZATION_DOMAIN_GPU, value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        case PM_METRIC_GPU_MEDIA_UTILIZATION:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pUtilization = PollUtilizationEndpoint_(device, requestQpc);
+            if (pUtilization &&
+                TryGetUtilizationValue_(
+                    *pUtilization, NVAPI_GPU_UTILIZATION_DOMAIN_VID, value)) {
+                return value;
+            }
+            return 0.0;
+        }
+        default:
+            throw Except<NvapiException>("Unsupported metric for NVAPI provider");
+        }
+    }
+
+    bool NvapiTelemetryProvider::TryGetThermalValue_(
+        const NV_GPU_THERMAL_SETTINGS& thermalSettings,
+        NV_THERMAL_TARGET target,
+        bool requireInternalController,
+        double& value)
+    {
+        const auto sensorCount = (uint32_t)std::min(
+            (size_t)thermalSettings.count, (size_t)NVAPI_MAX_THERMAL_SENSORS_PER_GPU);
+
+        if (requireInternalController) {
+            for (uint32_t i = 0; i < sensorCount; ++i) {
+                const auto& sensor = thermalSettings.sensor[(size_t)i];
+                if (sensor.target == target &&
+                    sensor.controller == NVAPI_THERMAL_CONTROLLER_GPU_INTERNAL) {
+                    value = (double)sensor.currentTemp;
+                    return true;
+                }
+            }
+        }
+
+        for (uint32_t i = 0; i < sensorCount; ++i) {
+            const auto& sensor = thermalSettings.sensor[(size_t)i];
+            if (sensor.target == target && !requireInternalController) {
+                value = (double)sensor.currentTemp;
+                return true;
+            }
+        }
+
+        value = 0.0;
+        return false;
+    }
+
+    bool NvapiTelemetryProvider::TryGetClockValue_(
+        const NV_GPU_CLOCK_FREQUENCIES& clockFrequencies,
+        NV_GPU_PUBLIC_CLOCK_ID clockDomain,
+        double& value)
+    {
+        if ((size_t)clockDomain >= (size_t)NVAPI_MAX_GPU_PUBLIC_CLOCKS) {
+            value = 0.0;
+            return false;
+        }
+
+        const auto& domain = clockFrequencies.domain[(size_t)clockDomain];
+        if (!domain.bIsPresent) {
+            value = 0.0;
+            return false;
+        }
+
+        value = (double)domain.frequency / 1000.0;
+        return true;
+    }
+
+    bool NvapiTelemetryProvider::TryGetUtilizationValue_(
+        const NV_GPU_DYNAMIC_PSTATES_INFO_EX& utilization,
+        NVAPI_GPU_UTILIZATION_DOMAIN utilizationDomain,
+        double& value)
+    {
+        if ((size_t)utilizationDomain >= (size_t)NVAPI_MAX_GPU_UTILIZATIONS) {
+            value = 0.0;
+            return false;
+        }
+
+        const auto& domain = utilization.utilization[(size_t)utilizationDomain];
+        if (!domain.bIsPresent) {
+            value = 0.0;
+            return false;
+        }
+
+        value = (double)domain.percentage;
+        return true;
+    }
+}
diff --git a/IntelPresentMon/ControlLib/nvapi/NvapiTelemetryProvider.h b/IntelPresentMon/ControlLib/nvapi/NvapiTelemetryProvider.h
new file mode 100644
index 000000000..1e84953ef
--- /dev/null
+++ b/IntelPresentMon/ControlLib/nvapi/NvapiTelemetryProvider.h
@@ -0,0 +1,84 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../EndpointCache.h"
+#include "../TelemetryProvider.h"
+#include "NvapiWrapper.h"
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <unordered_map>
+#include <vector>
+
+namespace pmon::tel::nvapi
+{
+    class NvapiTelemetryProvider : public TelemetryProvider
+    {
+    public:
+        NvapiTelemetryProvider();
+        ~NvapiTelemetryProvider() override = default;
+        ProviderCapabilityMap GetCaps() override;
+        const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const override;
+        TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) override;
+
+    private:
+        struct DeviceState_
+        {
+            ProviderDeviceId providerDeviceId = 0;
+            TelemetryDeviceFingerprint fingerprint{};
+            ipc::MetricCapabilities caps{};
+
+            NvPhysicalGpuHandle handle = nullptr;
+
+            pmon::tele::EndpointCache<NV_GPU_THERMAL_SETTINGS> thermalEndpointCache{};
+            pmon::tele::EndpointCache<NV_GPU_CLOCK_FREQUENCIES> clockEndpointCache{};
+            pmon::tele::EndpointCache<NV_GPU_DYNAMIC_PSTATES_INFO_EX> utilizationEndpointCache{};
+        };
+
+        static void ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex);
+        bool TryInitializeDevice_(DeviceState_& device, NvPhysicalGpuHandle handle) const;
+        ipc::MetricCapabilities BuildCapsForDevice_(DeviceState_& device) const;
+
+        const NV_GPU_THERMAL_SETTINGS* PollThermalEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        const NV_GPU_CLOCK_FREQUENCIES* PollClockEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        const NV_GPU_DYNAMIC_PSTATES_INFO_EX* PollUtilizationEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        std::optional<NvU32> PollTachEndpoint_(const DeviceState_& device) const;
+
+        TelemetryMetricValue PollNvapiMetric_(
+            DeviceState_& device,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) const;
+
+        static bool TryGetThermalValue_(
+            const NV_GPU_THERMAL_SETTINGS& thermalSettings,
+            NV_THERMAL_TARGET target,
+            bool requireInternalController,
+            double& value);
+        static bool TryGetClockValue_(
+            const NV_GPU_CLOCK_FREQUENCIES& clockFrequencies,
+            NV_GPU_PUBLIC_CLOCK_ID clockDomain,
+            double& value);
+        static bool TryGetUtilizationValue_(
+            const NV_GPU_DYNAMIC_PSTATES_INFO_EX& utilization,
+            NVAPI_GPU_UTILIZATION_DOMAIN utilizationDomain,
+            double& value);
+
+    private:
+        std::unique_ptr<NvapiWrapper> pNvapi_{};
+        std::unordered_map<ProviderDeviceId, DeviceState_> devicesById_{};
+        ProviderDeviceId nextProviderDeviceId_ = 1;
+    };
+}
diff --git a/IntelPresentMon/ControlLib/NvapiWrapper.cpp b/IntelPresentMon/ControlLib/nvapi/NvapiWrapper.cpp
similarity index 75%
rename from IntelPresentMon/ControlLib/NvapiWrapper.cpp
rename to IntelPresentMon/ControlLib/nvapi/NvapiWrapper.cpp
index 6f4965c09..dcc81fdc1 100644
--- a/IntelPresentMon/ControlLib/NvapiWrapper.cpp
+++ b/IntelPresentMon/ControlLib/nvapi/NvapiWrapper.cpp
@@ -1,10 +1,11 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "NvapiWrapper.h"
 #include "nvapi_interface_table.h"
 #include <algorithm>
+#include <string>
 
-namespace pwr::nv
+namespace pmon::tel::nvapi
 {
 	NvapiWrapper::NvapiWrapper()
 	{
@@ -12,7 +13,7 @@ namespace pwr::nv
 		const auto QueryInterface = static_cast<void*(*)(unsigned int)>(dll.GetProcAddress("nvapi_QueryInterface"));
 		if (!QueryInterface)
 		{
-			throw std::runtime_error{ "Failed to get query proc in nvapi dll" };
+			throw Except<TelemetrySubsystemAbsent>("Failed to get nvapi_QueryInterface proc");
 		}
 
 		// Query for all endpoints in NVW_ENDPOINT_LIST using the QueryInterface endpoint
@@ -40,12 +41,12 @@ namespace pwr::nv
 		{
 			if (!Ok(pInitialize()))
 			{
-				throw std::runtime_error{ "Call to nvapi initialize failed" };
+				throw Except<TelemetrySubsystemAbsent>("NvAPI_Initialize call failed");
 			}
 		}
 		else
 		{
-			throw std::runtime_error{ "Failed to query nvapi initialization endpoint" };
+			throw Except<TelemetrySubsystemAbsent>("Failed to query NvAPI_Initialize endpoint");
 		}
 
 		// load the private endpoint for unloading api
@@ -62,22 +63,6 @@ namespace pwr::nv
 		}
 	}
 
-	NvapiAdapterSignature NvapiWrapper::GetAdapterSignature(NvPhysicalGpuHandle adapter) const noexcept
-	{
-		NvapiAdapterSignature signature{};
-
-		// TODO: log failure
-		GPU_GetPCIIdentifiers(adapter,
-			&signature.deviceId, &signature.subSystemId,
-			&signature.revisionId, &signature.extDeviceId
-		);
-
-		// TODO log failure
-		GPU_GetBusId(adapter, &signature.busId);
-
-		return signature;
-	}
-
 	// definition of wrapper functions
 	// calls function pointer if exists, otherwise return NvAPI error [NVAPI_FUNCTION_NOT_FOUND]
 #define X_(name, ...) NvAPI_Status NvapiWrapper::name(NVW_ARGS(__VA_ARGS__)) const noexcept \
@@ -87,4 +72,4 @@ namespace pwr::nv
 }
 	NVW_NVAPI_ENDPOINT_LIST
 #undef X_
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/NvapiWrapper.h b/IntelPresentMon/ControlLib/nvapi/NvapiWrapper.h
similarity index 86%
rename from IntelPresentMon/ControlLib/NvapiWrapper.h
rename to IntelPresentMon/ControlLib/nvapi/NvapiWrapper.h
index e67df6b9e..dc262bed4 100644
--- a/IntelPresentMon/ControlLib/NvapiWrapper.h
+++ b/IntelPresentMon/ControlLib/nvapi/NvapiWrapper.h
@@ -1,11 +1,9 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
-#define NOMINMAX
-#include <Windows.h>
+#include "../DllModule.h"
+#include "../MacroHelpers.h"
 #include "nvapi.h"
-#include "MacroHelpers.h"
-#include "DllModule.h"
 
 // goals: single source of truth, automatic id lookup, parameter names in intellisense, easy updates
 // means: x-macros, macro length overload w/ pairwise operation (up to 6 params)
@@ -24,7 +22,7 @@ X_(GPU_GetPCIIdentifiers, NvPhysicalGpuHandle, hPhysicalGpu, NvU32*, pDeviceId,
 X_(GPU_GetBusId, NvPhysicalGpuHandle, hPhysicalGpu, NvU32*, pBusId)
 
 
-namespace pwr::nv
+namespace pmon::tel::nvapi
 {
 	// utilization domains are not defined in the public nvapi header
 	enum NVAPI_GPU_UTILIZATION_DOMAIN
@@ -35,15 +33,6 @@ namespace pwr::nv
 		NVAPI_GPU_UTILIZATION_DOMAIN_BUS,
 	};
 
-	struct NvapiAdapterSignature
-	{
-		NvU32 deviceId;
-		NvU32 revisionId;
-		NvU32 subSystemId;
-		NvU32 extDeviceId;
-		NvU32 busId;
-	};
-
 	class NvapiWrapper
 	{
 	public:
@@ -56,7 +45,6 @@ namespace pwr::nv
 		NVW_NVAPI_ENDPOINT_LIST
 #undef X_
 		static bool Ok(NvAPI_Status sta) noexcept { return sta == NVAPI_OK; }
-		NvapiAdapterSignature GetAdapterSignature(NvPhysicalGpuHandle adapter) const noexcept;
 		
 	private:
 		DllModule dll{ { "nvapi64.dll", "nvapi32.dll" } };
@@ -67,4 +55,4 @@ namespace pwr::nv
 		// private endpoint pointer
 		NvAPI_Status (*pUnload)() = nullptr;
 	};
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/nvapi.h b/IntelPresentMon/ControlLib/nvapi/nvapi.h
similarity index 99%
rename from IntelPresentMon/ControlLib/nvapi.h
rename to IntelPresentMon/ControlLib/nvapi/nvapi.h
index 19207664b..fa1ca3127 100644
--- a/IntelPresentMon/ControlLib/nvapi.h
+++ b/IntelPresentMon/ControlLib/nvapi/nvapi.h
@@ -1,4 +1,4 @@
-/*****************************************************************************\
+/*****************************************************************************\
 |*                                                                             *|
 |* Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.           *|
 |*                                                                             *|
diff --git a/IntelPresentMon/ControlLib/nvapi_interface_table.h b/IntelPresentMon/ControlLib/nvapi/nvapi_interface_table.h
similarity index 99%
rename from IntelPresentMon/ControlLib/nvapi_interface_table.h
rename to IntelPresentMon/ControlLib/nvapi/nvapi_interface_table.h
index 4e6dc29a0..e02682278 100644
--- a/IntelPresentMon/ControlLib/nvapi_interface_table.h
+++ b/IntelPresentMon/ControlLib/nvapi/nvapi_interface_table.h
@@ -1,4 +1,4 @@
-/*****************************************************************************\
+/*****************************************************************************\
 |*                                                                             *|
 |* Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.           *|
 |*                                                                             *|
diff --git a/IntelPresentMon/ControlLib/nvml/NvmlTelemetryProvider.cpp b/IntelPresentMon/ControlLib/nvml/NvmlTelemetryProvider.cpp
new file mode 100644
index 000000000..87c387530
--- /dev/null
+++ b/IntelPresentMon/ControlLib/nvml/NvmlTelemetryProvider.cpp
@@ -0,0 +1,310 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "NvmlTelemetryProvider.h"
+
+#include "../Exceptions.h"
+#include "../Logging.h"
+#include "../../CommonUtilities/Qpc.h"
+#include "../../CommonUtilities/ref/GeneratedReflection.h"
+
+#include <chrono>
+
+using namespace pmon;
+using namespace util;
+using namespace std::literals;
+using v = log::V;
+
+namespace pmon::tel::nvml
+{
+    NvmlTelemetryProvider::NvmlTelemetryProvider()
+    {
+        pNvml_ = std::make_unique<NvmlWrapper>();
+
+        unsigned int count = 0;
+        const auto countResult = pNvml_->DeviceGetCount_v2(&count);
+        if (!NvmlWrapper::Ok(countResult)) {
+            pmlog_error("nvmlDeviceGetCount_v2 failed").code(countResult);
+            throw Except<NvmlException>("NVML device count query failed");
+        }
+        pmlog_verb(v::tele_gpu)("nvmlDeviceGetCount_v2 output")
+            .pmwatch(count);
+
+        for (unsigned int i = 0; i < count; ++i) {
+            nvmlDevice_t handle = nullptr;
+            const auto handleResult = pNvml_->DeviceGetHandleByIndex_v2(i, &handle);
+            if (!NvmlWrapper::Ok(handleResult)) {
+                pmlog_warn("nvmlDeviceGetHandleByIndex_v2 failed").code(handleResult)
+                    .pmwatch(i);
+                continue;
+            }
+            pmlog_verb(v::tele_gpu)("nvmlDeviceGetHandleByIndex_v2 output")
+                .pmwatch(i)
+                .pmwatch((const void*)handle);
+
+            const auto providerDeviceId = nextProviderDeviceId_;
+            const auto emplaceResult = devicesById_.try_emplace(providerDeviceId);
+            if (!emplaceResult.second) {
+                throw Except<NvmlException>("Duplicate NVML provider device id encountered");
+            }
+
+            auto& device = emplaceResult.first->second;
+            device.providerDeviceId = providerDeviceId;
+            if (!TryInitializeDevice_(device, handle)) {
+                devicesById_.erase(emplaceResult.first);
+                continue;
+            }
+
+            device.caps = BuildCapsForDevice_(device);
+            ++nextProviderDeviceId_;
+        }
+    }
+
+    ProviderCapabilityMap NvmlTelemetryProvider::GetCaps()
+    {
+        ProviderCapabilityMap capsByDeviceId{};
+        for (const auto& entry : devicesById_) {
+            capsByDeviceId.emplace(entry.first, entry.second.caps);
+        }
+        return capsByDeviceId;
+    }
+
+    const TelemetryDeviceFingerprint& NvmlTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<NvmlException>("NVML provider device not found");
+        }
+        return iDevice->second.fingerprint;
+    }
+
+    TelemetryMetricValue NvmlTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<NvmlException>("NVML provider device not found");
+        }
+
+        auto& device = iDevice->second;
+
+        switch (metricId) {
+        case PM_METRIC_GPU_VENDOR:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return (int)device.fingerprint.vendor;
+        case PM_METRIC_GPU_NAME:
+            throw Except<NvmlException>("PM_METRIC_GPU_NAME is static-only and is not served by poll path");
+        case PM_METRIC_GPU_POWER:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto powerMw = PollPowerEndpoint_(device);
+            if (!powerMw) {
+                return 0.0;
+            }
+            return (double)*powerMw / 1000.0;
+        }
+        case PM_METRIC_GPU_SUSTAINED_POWER_LIMIT:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto limitMw = PollPowerLimitEndpoint_(device);
+            if (!limitMw) {
+                return 0.0;
+            }
+            return (double)*limitMw / 1000.0;
+        }
+        case PM_METRIC_GPU_MEM_SIZE:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pMemoryInfo = PollMemoryInfoEndpoint_(device, requestQpc);
+            if (pMemoryInfo == nullptr) {
+                return (uint64_t)0;
+            }
+            return GetLegacyTotalMemoryBytes_(*pMemoryInfo);
+        }
+        case PM_METRIC_GPU_MEM_USED:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pMemoryInfo = PollMemoryInfoEndpoint_(device, requestQpc);
+            if (pMemoryInfo == nullptr) {
+                return (uint64_t)0;
+            }
+            return (uint64_t)pMemoryInfo->used;
+        }
+        case PM_METRIC_GPU_MEM_UTILIZATION:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pMemoryInfo = PollMemoryInfoEndpoint_(device, requestQpc);
+            if (pMemoryInfo == nullptr) {
+                return 0.0;
+            }
+
+            const auto totalBytes = GetLegacyTotalMemoryBytes_(*pMemoryInfo);
+            if (totalBytes == 0) {
+                return 0.0;
+            }
+            return 100.0 * ((double)pMemoryInfo->used / (double)totalBytes);
+        }
+        default:
+            throw Except<NvmlException>("Unsupported metric for NVML provider");
+        }
+    }
+
+    void NvmlTelemetryProvider::ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex)
+    {
+        if (arrayIndex != 0) {
+            throw Except<NvmlException>("NVML scalar metric queried with nonzero array index");
+        }
+        (void)metricId;
+    }
+
+    uint64_t NvmlTelemetryProvider::GetLegacyTotalMemoryBytes_(const nvmlMemory_t& memoryInfo) noexcept
+    {
+        return (uint64_t)memoryInfo.free;
+    }
+
+    bool NvmlTelemetryProvider::TryInitializeDevice_(DeviceState_& device, nvmlDevice_t handle) const
+    {
+        if (handle == nullptr) {
+            pmlog_warn("Null NVML device handle encountered");
+            return false;
+        }
+
+        device.handle = handle;
+        device.fingerprint.deviceType = PM_DEVICE_TYPE_GRAPHICS_ADAPTER;
+        device.fingerprint.vendor = PM_DEVICE_VENDOR_NVIDIA;
+        device.fingerprint.deviceName = "Unknown NVIDIA Adapter";
+
+        char adapterName[NVML_DEVICE_NAME_BUFFER_SIZE]{};
+        const auto nameResult = pNvml_->DeviceGetName(
+            device.handle, adapterName, (unsigned int)NVML_DEVICE_NAME_BUFFER_SIZE);
+        if (!NvmlWrapper::Ok(nameResult)) {
+            pmlog_warn("nvmlDeviceGetName failed").code(nameResult)
+                .pmwatch(device.providerDeviceId);
+        }
+        else if (adapterName[0] != '\0') {
+            device.fingerprint.deviceName = adapterName;
+            pmlog_verb(v::tele_gpu)("nvmlDeviceGetName output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+        else {
+            pmlog_warn("nvmlDeviceGetName returned empty adapter name")
+                .pmwatch(device.providerDeviceId);
+        }
+
+        nvmlPciInfo_t pciInfo{};
+        const auto pciResult = pNvml_->DeviceGetPciInfo_v3(device.handle, &pciInfo);
+        if (NvmlWrapper::Ok(pciResult)) {
+            device.fingerprint.pciDeviceId = pciInfo.pciDeviceId;
+            device.fingerprint.pciSubSystemId = pciInfo.pciSubSystemId;
+            device.fingerprint.pciBusId = pciInfo.bus;
+            pmlog_verb(v::tele_gpu)("nvmlDeviceGetPciInfo_v3 output")
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName)
+                .pmwatch(ref::DumpGenerated(pciInfo));
+        }
+        else {
+            pmlog_warn("nvmlDeviceGetPciInfo_v3 failed").code(pciResult)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+        }
+
+        return true;
+    }
+
+    ipc::MetricCapabilities NvmlTelemetryProvider::BuildCapsForDevice_(DeviceState_& device) const
+    {
+        ipc::MetricCapabilities caps{};
+        const auto requestQpc = GetCurrentTimestamp();
+
+        caps.Set(PM_METRIC_GPU_VENDOR, 1);
+        caps.Set(PM_METRIC_GPU_NAME, 1);
+
+        if (PollPowerEndpoint_(device)) {
+            caps.Set(PM_METRIC_GPU_POWER, 1);
+        }
+
+        if (PollPowerLimitEndpoint_(device)) {
+            caps.Set(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, 1);
+        }
+
+        if (const auto* pMemoryInfo = PollMemoryInfoEndpoint_(device, requestQpc)) {
+            const auto totalBytes = GetLegacyTotalMemoryBytes_(*pMemoryInfo);
+            if (totalBytes != 0) {
+                caps.Set(PM_METRIC_GPU_MEM_SIZE, 1);
+                caps.Set(PM_METRIC_GPU_MEM_USED, 1);
+                caps.Set(PM_METRIC_GPU_MEM_UTILIZATION, 1);
+            }
+        }
+
+        return caps;
+    }
+
+    const nvmlMemory_t* NvmlTelemetryProvider::PollMemoryInfoEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.memoryInfoEndpointCache;
+        if (cache.Matches(requestQpc)) {
+            return cache.output ? &*cache.output : nullptr;
+        }
+
+        cache.output.reset();
+        cache.requestQpc = requestQpc;
+
+        nvmlMemory_t memoryInfo{};
+        const auto result = pNvml_->DeviceGetMemoryInfo(device.handle, &memoryInfo);
+        if (!NvmlWrapper::Ok(result)) {
+            pmlog_warn("nvmlDeviceGetMemoryInfo failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return nullptr;
+        }
+        pmlog_verb(v::tele_gpu)("nvmlDeviceGetMemoryInfo output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(ref::DumpGenerated(memoryInfo));
+
+        cache.output = memoryInfo;
+        return &*cache.output;
+    }
+
+    std::optional<unsigned int> NvmlTelemetryProvider::PollPowerEndpoint_(const DeviceState_& device) const
+    {
+        unsigned int powerMw = 0;
+        const auto result = pNvml_->DeviceGetPowerUsage(device.handle, &powerMw);
+        if (!NvmlWrapper::Ok(result)) {
+            pmlog_warn("nvmlDeviceGetPowerUsage failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return {};
+        }
+        pmlog_verb(v::tele_gpu)("nvmlDeviceGetPowerUsage output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(powerMw);
+
+        return powerMw;
+    }
+
+    std::optional<unsigned int> NvmlTelemetryProvider::PollPowerLimitEndpoint_(const DeviceState_& device) const
+    {
+        unsigned int limitMw = 0;
+        const auto result = pNvml_->DeviceGetPowerManagementLimit(device.handle, &limitMw);
+        if (!NvmlWrapper::Ok(result)) {
+            pmlog_warn("nvmlDeviceGetPowerManagementLimit failed").code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            return {};
+        }
+        pmlog_verb(v::tele_gpu)("nvmlDeviceGetPowerManagementLimit output")
+            .pmwatch(device.providerDeviceId)
+            .pmwatch(device.fingerprint.deviceName)
+            .pmwatch(limitMw);
+
+        return limitMw;
+    }
+}
diff --git a/IntelPresentMon/ControlLib/nvml/NvmlTelemetryProvider.h b/IntelPresentMon/ControlLib/nvml/NvmlTelemetryProvider.h
new file mode 100644
index 000000000..80a110a12
--- /dev/null
+++ b/IntelPresentMon/ControlLib/nvml/NvmlTelemetryProvider.h
@@ -0,0 +1,58 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../EndpointCache.h"
+#include "../TelemetryProvider.h"
+#include "NvmlWrapper.h"
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <unordered_map>
+
+namespace pmon::tel::nvml
+{
+    class NvmlTelemetryProvider : public TelemetryProvider
+    {
+    public:
+        NvmlTelemetryProvider();
+        ~NvmlTelemetryProvider() override = default;
+        ProviderCapabilityMap GetCaps() override;
+        const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const override;
+        TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) override;
+
+    private:
+        struct DeviceState_
+        {
+            ProviderDeviceId providerDeviceId = 0;
+            TelemetryDeviceFingerprint fingerprint{};
+            ipc::MetricCapabilities caps{};
+
+            nvmlDevice_t handle = nullptr;
+
+            pmon::tele::EndpointCache<std::optional<nvmlMemory_t>> memoryInfoEndpointCache{};
+        };
+
+        static void ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex);
+        static uint64_t GetLegacyTotalMemoryBytes_(const nvmlMemory_t& memoryInfo) noexcept;
+
+        bool TryInitializeDevice_(DeviceState_& device, nvmlDevice_t handle) const;
+        ipc::MetricCapabilities BuildCapsForDevice_(DeviceState_& device) const;
+
+        const nvmlMemory_t* PollMemoryInfoEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        std::optional<unsigned int> PollPowerEndpoint_(const DeviceState_& device) const;
+        std::optional<unsigned int> PollPowerLimitEndpoint_(const DeviceState_& device) const;
+
+    private:
+        std::unique_ptr<NvmlWrapper> pNvml_{};
+        std::unordered_map<ProviderDeviceId, DeviceState_> devicesById_{};
+        ProviderDeviceId nextProviderDeviceId_ = 1;
+    };
+}
diff --git a/IntelPresentMon/ControlLib/NvmlWrapper.cpp b/IntelPresentMon/ControlLib/nvml/NvmlWrapper.cpp
similarity index 51%
rename from IntelPresentMon/ControlLib/NvmlWrapper.cpp
rename to IntelPresentMon/ControlLib/nvml/NvmlWrapper.cpp
index f176dd87f..3c7683dd8 100644
--- a/IntelPresentMon/ControlLib/NvmlWrapper.cpp
+++ b/IntelPresentMon/ControlLib/nvml/NvmlWrapper.cpp
@@ -1,9 +1,8 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "NvmlWrapper.h"
-#include <regex>
 
-namespace pwr::nv
+namespace pmon::tel::nvml
 {
 	NvmlWrapper::NvmlWrapper()
 	{
@@ -11,7 +10,7 @@ namespace pwr::nv
 		const auto pInit_v2 = static_cast<nvmlReturn_t(*)()>(dll.GetProcAddress("nvmlInit_v2"));
 		if (!pInit_v2)
 		{
-			throw std::runtime_error{ "Failed to get init proc for nvml" };
+			throw Except<TelemetrySubsystemAbsent>("Failed to get nvmlInit_v2 proc");
 		}
 
 		// get shutdown proc, but don't throw if not found (non-critical)
@@ -27,7 +26,7 @@ namespace pwr::nv
 		// initialize nvml
 		if (!Ok(pInit_v2()))
 		{
-			throw std::runtime_error{ "nvml init call failed" };
+			throw Except<TelemetrySubsystemAbsent>("nvmlInit_v2 call failed");
 		}
 	}
 
@@ -40,43 +39,6 @@ namespace pwr::nv
 		}
 	}
 
-	NvmlAdapterSignature NvmlWrapper::GetAdapterSignature(nvmlDevice_t adapter) const
-	{
-		// get pci information
-		nvmlPciInfo_t pciInfo{};
-		if (!Ok(DeviceGetPciInfo_v3(adapter, &pciInfo)))
-		{
-			// TODO: log failure of this function
-			return {};
-		}
-
-		// fill directly fillable information into signature
-		NvmlAdapterSignature signature{
-			.pciDeviceId = pciInfo.pciDeviceId,
-			.pciSubSystemId = pciInfo.pciSubSystemId,
-		};
-
-		// extract out necessary components from pciInfo.
-		// pciInfo.busId is a string with format = Domain:Bus:PciFunction.Id
-		try {
-			const std::regex expr{ "(.*?):(.*?):(.*?)\\.(.*)" };
-			std::cmatch results;
-			if (std::regex_match(pciInfo.busId, results, expr))
-			{
-				if (results[1].length() > 0)
-				{
-					signature.busIdDomain = std::stoul(results[1]);
-				}
-				if (results[2].length() > 0)
-				{
-					signature.busIdBus = std::stoul(results[2]);
-				}
-			}
-		} catch (...) {}
-
-		return signature;
-	}
-
 	// definition of wrapper functions
 	// calls function pointer if exists, otherwise return NVML error [NVML_ERROR_FUNCTION_NOT_FOUND]
 #define X_(name, ...) nvmlReturn_t NvmlWrapper::name(NVW_ARGS(__VA_ARGS__)) const noexcept \
@@ -86,4 +48,4 @@ namespace pwr::nv
 }
 	NVW_NVML_ENDPOINT_LIST
 #undef X_
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/NvmlWrapper.h b/IntelPresentMon/ControlLib/nvml/NvmlWrapper.h
similarity index 86%
rename from IntelPresentMon/ControlLib/NvmlWrapper.h
rename to IntelPresentMon/ControlLib/nvml/NvmlWrapper.h
index effc83b07..358aa832c 100644
--- a/IntelPresentMon/ControlLib/NvmlWrapper.h
+++ b/IntelPresentMon/ControlLib/nvml/NvmlWrapper.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
+#include "../DllModule.h"
+#include "../MacroHelpers.h"
 #include "nvml.h"
-#include "DllModule.h"
-#include "MacroHelpers.h"
 
 // goals: single source of truth, automatic id lookup, parameter names in intellisense, easy updates
 // means: x-macros, macro length overload w/ pairwise operation (up to 6 params)
@@ -11,6 +11,7 @@
 #define NVW_NVML_ENDPOINT_LIST \
 X_(DeviceGetCount_v2, unsigned int*, deviceCount) \
 X_(DeviceGetHandleByIndex_v2, unsigned int, index, nvmlDevice_t*, device) \
+X_(DeviceGetName, nvmlDevice_t, device, char*, name, unsigned int, length) \
 X_(DeviceGetPciInfo_v3, nvmlDevice_t, device, nvmlPciInfo_t*, pci) \
 X_(DeviceGetClock, nvmlDevice_t, device, nvmlClockType_t, clockType, nvmlClockId_t, clockId, unsigned int*, clockMHz) \
 X_(DeviceGetMemoryInfo, nvmlDevice_t, device, nvmlMemory_t*, memory) \
@@ -22,22 +23,13 @@ X_(DeviceGetEnforcedPowerLimit, nvmlDevice_t, device, unsigned int*, limit) \
 X_(DeviceGetPowerManagementLimit, nvmlDevice_t, device, unsigned int*, limit) \
 X_(DeviceGetViolationStatus, nvmlDevice_t, device, nvmlPerfPolicyType_t, perfPolicyType, nvmlViolationTime_t*, violTime)
 
-namespace pwr::nv
+namespace pmon::tel::nvml
 {
-	struct NvmlAdapterSignature
-	{
-		uint32_t busIdDomain;
-		uint32_t busIdBus;
-		uint32_t pciDeviceId;
-		uint32_t pciSubSystemId;
-	};
-
 	class NvmlWrapper
 	{
 	public:
 		NvmlWrapper();
 		~NvmlWrapper();
-		NvmlAdapterSignature GetAdapterSignature(nvmlDevice_t adapter) const;
 		static bool Ok(nvmlReturn_t sta) noexcept { return sta == nvmlReturn_t::NVML_SUCCESS; }
 		// endpoint wrapper functions
 #define X_(name, ...) nvmlReturn_t name(NVW_ARGS(__VA_ARGS__)) const noexcept;
@@ -54,4 +46,4 @@ namespace pwr::nv
 		// private endpoint pointer
 		nvmlReturn_t(*pShutdown)() = nullptr;
 	};
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/ControlLib/nvml.h b/IntelPresentMon/ControlLib/nvml/nvml.h
similarity index 97%
rename from IntelPresentMon/ControlLib/nvml.h
rename to IntelPresentMon/ControlLib/nvml/nvml.h
index c85383acd..ada7517bc 100644
--- a/IntelPresentMon/ControlLib/nvml.h
+++ b/IntelPresentMon/ControlLib/nvml/nvml.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
 
@@ -95,6 +95,7 @@ union nvmlValue_t {
 // Opaque nvml device handle
 typedef struct _nvmlDevice_t* nvmlDevice_t;
 
+#define NVML_DEVICE_NAME_BUFFER_SIZE 64
 #define NVML_DEVICE_PCI_BUS_ID_BUFFER_SIZE 32
 #define NVML_DEVICE_PCI_BUS_ID_BUFFER_V2_SIZE 16
 
@@ -128,4 +129,4 @@ struct nvmlSample_t {
 struct nvmlViolationTime_t {
 	unsigned long long referenceTime;
 	unsigned long long violationTime;
-};
\ No newline at end of file
+};
diff --git a/IntelPresentMon/ControlLib/uci/.gitignore b/IntelPresentMon/ControlLib/uci/.gitignore
new file mode 100644
index 000000000..f8ac450d8
--- /dev/null
+++ b/IntelPresentMon/ControlLib/uci/.gitignore
@@ -0,0 +1,2 @@
+dist/
+external/
diff --git a/IntelPresentMon/ControlLib/uci/UciSdk.h b/IntelPresentMon/ControlLib/uci/UciSdk.h
new file mode 100644
index 000000000..ce20c10d0
--- /dev/null
+++ b/IntelPresentMon/ControlLib/uci/UciSdk.h
@@ -0,0 +1,11 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#if __has_include(<uci/uci.h>) && __has_include(<uci/uci-data-records.h>) && __has_include(<uci/uci-versions.h>)
+#define PMON_HAS_UCI_SDK 1
+#include <uci/uci-data-records.h>
+#include <uci/uci.h>
+#else
+#define PMON_HAS_UCI_SDK 0
+#endif
diff --git a/IntelPresentMon/ControlLib/uci/UciTelemetryProvider.cpp b/IntelPresentMon/ControlLib/uci/UciTelemetryProvider.cpp
new file mode 100644
index 000000000..0372e98f8
--- /dev/null
+++ b/IntelPresentMon/ControlLib/uci/UciTelemetryProvider.cpp
@@ -0,0 +1,908 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "UciTelemetryProvider.h"
+
+#include "../Exceptions.h"
+#include "../Logging.h"
+#include "../../CommonUtilities/Exception.h"
+#include "../../CommonUtilities/log/GlobalPolicy.h"
+#include "../../CommonUtilities/str/String.h"
+#include "../../CommonUtilities/win/Privileges.h"
+
+#include <algorithm>
+#include <exception>
+#include <format>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+using namespace pmon;
+using namespace std::literals;
+
+#if PMON_HAS_UCI_SDK
+
+#include <uci/uci-versions.h>
+
+namespace pmon::tel::uci
+{
+    namespace
+    {
+        using v = util::log::V;
+
+        struct UciApi_
+        {
+            HMODULE module = nullptr;
+            decltype(&::uciGetCollectorFromIdentifier) uciGetCollectorFromIdentifier = nullptr;
+            decltype(&::uciInitialize) uciInitialize = nullptr;
+            decltype(&::uciDestroy) uciDestroy = nullptr;
+            decltype(&::uciEnumerateMetrics) uciEnumerateMetrics = nullptr;
+            decltype(&::uciGetMetricContainerMetrics) uciGetMetricContainerMetrics = nullptr;
+            decltype(&::uciGetMetricId) uciGetMetricId = nullptr;
+            decltype(&::uciGetMetricName) uciGetMetricName = nullptr;
+            decltype(&::uciGetMetricDescription) uciGetMetricDescription = nullptr;
+            decltype(&::uciGetMetricEvents) uciGetMetricEvents = nullptr;
+            decltype(&::uciGetEventId) uciGetEventId = nullptr;
+            decltype(&::uciGetMetricEventName) uciGetMetricEventName = nullptr;
+            decltype(&::uciGetMetricEventDescription) uciGetMetricEventDescription = nullptr;
+            decltype(&::uciGetMetricContainerGroups) uciGetMetricContainerGroups = nullptr;
+            decltype(&::uciGetMetricGroupId) uciGetMetricGroupId = nullptr;
+            decltype(&::uciGetMetricGroupName) uciGetMetricGroupName = nullptr;
+            decltype(&::uciGetMetricGroupDescription) uciGetMetricGroupDescription = nullptr;
+            decltype(&::uciGetMetricsInGroup) uciGetMetricsInGroup = nullptr;
+            decltype(&::uciGetMetricContainerEvents) uciGetMetricContainerEvents = nullptr;
+            decltype(&::uciFreeMetricContainer) uciFreeMetricContainer = nullptr;
+            decltype(&::uciMetricRecordGetMetricName) uciMetricRecordGetMetricName = nullptr;
+            decltype(&::uciMetricRecordGetEntity) uciMetricRecordGetEntity = nullptr;
+            decltype(&::uciMetricRecordGetDescriptor) uciMetricRecordGetDescriptor = nullptr;
+            decltype(&::uciMetricRecordGetUnit) uciMetricRecordGetUnit = nullptr;
+            decltype(&::uciMetricRecordGetSample) uciMetricRecordGetSample = nullptr;
+            decltype(&::uciMetricRecordGetRecordTimestamp) uciMetricRecordGetRecordTimestamp = nullptr;
+            decltype(&::uciMetricRecordGetRecordDuration) uciMetricRecordGetRecordDuration = nullptr;
+            decltype(&::uciConfigureCollection) uciConfigureCollection = nullptr;
+            decltype(&::uciSetDataCallback) uciSetDataCallback = nullptr;
+            decltype(&::uciStartCollection) uciStartCollection = nullptr;
+            decltype(&::uciStopCollection) uciStopCollection = nullptr;
+
+            UciApi_()
+            {
+                module = LoadLibraryW(L"unified-collector-interface.dll");
+                if (module == nullptr) {
+                    throw Except<TelemetrySubsystemAbsent>(std::format(
+                        "UCI telemetry provider unavailable because unified-collector-interface.dll is not present; error={}",
+                        GetLastError()));
+                }
+
+                LoadProc_(uciGetCollectorFromIdentifier, "uciGetCollectorFromIdentifier");
+                LoadProc_(uciInitialize, "uciInitialize");
+                LoadProc_(uciDestroy, "uciDestroy");
+                LoadProc_(uciEnumerateMetrics, "uciEnumerateMetrics");
+                LoadProc_(uciGetMetricContainerMetrics, "uciGetMetricContainerMetrics");
+                LoadProc_(uciGetMetricId, "uciGetMetricId");
+                LoadProc_(uciGetMetricName, "uciGetMetricName");
+                LoadProc_(uciGetMetricDescription, "uciGetMetricDescription");
+                LoadProc_(uciGetMetricEvents, "uciGetMetricEvents");
+                LoadProc_(uciGetEventId, "uciGetEventId");
+                LoadProc_(uciGetMetricEventName, "uciGetMetricEventName");
+                LoadProc_(uciGetMetricEventDescription, "uciGetMetricEventDescription");
+                LoadProc_(uciGetMetricContainerGroups, "uciGetMetricContainerGroups");
+                LoadProc_(uciGetMetricGroupId, "uciGetMetricGroupId");
+                LoadProc_(uciGetMetricGroupName, "uciGetMetricGroupName");
+                LoadProc_(uciGetMetricGroupDescription, "uciGetMetricGroupDescription");
+                LoadProc_(uciGetMetricsInGroup, "uciGetMetricsInGroup");
+                LoadProc_(uciGetMetricContainerEvents, "uciGetMetricContainerEvents");
+                LoadProc_(uciFreeMetricContainer, "uciFreeMetricContainer");
+                LoadProc_(uciMetricRecordGetMetricName, "uciMetricRecordGetMetricName");
+                LoadProc_(uciMetricRecordGetEntity, "uciMetricRecordGetEntity");
+                LoadProc_(uciMetricRecordGetDescriptor, "uciMetricRecordGetDescriptor");
+                LoadProc_(uciMetricRecordGetUnit, "uciMetricRecordGetUnit");
+                LoadProc_(uciMetricRecordGetSample, "uciMetricRecordGetSample");
+                LoadProc_(uciMetricRecordGetRecordTimestamp, "uciMetricRecordGetRecordTimestamp");
+                LoadProc_(uciMetricRecordGetRecordDuration, "uciMetricRecordGetRecordDuration");
+                LoadProc_(uciConfigureCollection, "uciConfigureCollection");
+                LoadProc_(uciSetDataCallback, "uciSetDataCallback");
+                LoadProc_(uciStartCollection, "uciStartCollection");
+                LoadProc_(uciStopCollection, "uciStopCollection");
+            }
+
+            template<class T>
+            void LoadProc_(T& proc, const char* name)
+            {
+                proc = reinterpret_cast<T>(GetProcAddress(module, name));
+                if (proc == nullptr) {
+                    throw Except<TelemetrySubsystemAbsent>(std::format(
+                        "UCI telemetry provider unavailable because {} is missing from unified-collector-interface.dll",
+                        name));
+                }
+            }
+        };
+
+        UciApi_& Api_()
+        {
+            static UciApi_ api;
+            return api;
+        }
+
+#define uciConfigureCollection Api_().uciConfigureCollection
+#define uciDestroy Api_().uciDestroy
+#define uciEnumerateMetrics Api_().uciEnumerateMetrics
+#define uciFreeMetricContainer Api_().uciFreeMetricContainer
+#define uciGetCollectorFromIdentifier Api_().uciGetCollectorFromIdentifier
+#define uciGetEventId Api_().uciGetEventId
+#define uciGetMetricContainerEvents Api_().uciGetMetricContainerEvents
+#define uciGetMetricContainerGroups Api_().uciGetMetricContainerGroups
+#define uciGetMetricContainerMetrics Api_().uciGetMetricContainerMetrics
+#define uciGetMetricDescription Api_().uciGetMetricDescription
+#define uciGetMetricEventDescription Api_().uciGetMetricEventDescription
+#define uciGetMetricEventName Api_().uciGetMetricEventName
+#define uciGetMetricEvents Api_().uciGetMetricEvents
+#define uciGetMetricGroupDescription Api_().uciGetMetricGroupDescription
+#define uciGetMetricGroupId Api_().uciGetMetricGroupId
+#define uciGetMetricGroupName Api_().uciGetMetricGroupName
+#define uciGetMetricId Api_().uciGetMetricId
+#define uciGetMetricName Api_().uciGetMetricName
+#define uciGetMetricsInGroup Api_().uciGetMetricsInGroup
+#define uciInitialize Api_().uciInitialize
+#define uciMetricRecordGetDescriptor Api_().uciMetricRecordGetDescriptor
+#define uciMetricRecordGetEntity Api_().uciMetricRecordGetEntity
+#define uciMetricRecordGetMetricName Api_().uciMetricRecordGetMetricName
+#define uciMetricRecordGetRecordDuration Api_().uciMetricRecordGetRecordDuration
+#define uciMetricRecordGetRecordTimestamp Api_().uciMetricRecordGetRecordTimestamp
+#define uciMetricRecordGetSample Api_().uciMetricRecordGetSample
+#define uciMetricRecordGetUnit Api_().uciMetricRecordGetUnit
+#define uciSetDataCallback Api_().uciSetDataCallback
+#define uciStartCollection Api_().uciStartCollection
+#define uciStopCollection Api_().uciStopCollection
+
+        constexpr std::string_view kCpuPowerMetricName_ = "pkg-pwr";
+        constexpr std::string_view kCpuTemperatureMetricName_ = "core-temp";
+        constexpr std::string_view kCpuPowerRecordMetricName_ = "PKG-PWR";
+        constexpr std::string_view kCpuTemperatureRecordMetricName_ = "TEMP";
+        constexpr std::string_view kCoreEntityPrefix_ = "Core_";
+
+        struct MetricContainerGuard_
+        {
+            uciMetricContainerHandle handle = nullptr;
+
+            MetricContainerGuard_() = default;
+            MetricContainerGuard_(const MetricContainerGuard_&) = delete;
+            MetricContainerGuard_& operator=(const MetricContainerGuard_&) = delete;
+            MetricContainerGuard_(MetricContainerGuard_&&) = delete;
+            MetricContainerGuard_& operator=(MetricContainerGuard_&&) = delete;
+
+            ~MetricContainerGuard_()
+            {
+                if (handle != nullptr) {
+                    uciFreeMetricContainer(handle);
+                }
+            }
+        };
+
+        [[noreturn]] void ThrowUciError_(uc_result_t result, const char* call, bool subsystemAbsent)
+        {
+            const auto message = std::format("UCI call [{}] failed with code [{}]", call, (int)result);
+            if (subsystemAbsent) {
+                throw Except<TelemetrySubsystemAbsent>(message);
+            }
+            throw Except<UciException>(message);
+        }
+
+        void CheckUciCall_(uc_result_t result, const char* call, bool subsystemAbsent = false)
+        {
+            if (result != UC_SUCCESS) {
+                ThrowUciError_(result, call, subsystemAbsent);
+            }
+        }
+
+        bool TryGetString_(auto getter, auto handle, std::string& value)
+        {
+            char* pText = nullptr;
+            if (getter(handle, &pText) != UC_SUCCESS || pText == nullptr) {
+                value.clear();
+                return false;
+            }
+            value = pText;
+            return true;
+        }
+
+        void DumpDataCallback_(uciDataBundle* dataBundle)
+        {
+            if (dataBundle == nullptr) {
+                pmlog_verb(v::uci)("UCI callback received null data bundle");
+                return;
+            }
+
+            std::string dump = std::format(
+                "UCI callback received numRecords={}\n",
+                dataBundle->num_records);
+            if (dataBundle->records == nullptr) {
+                pmlog_verb(v::uci)("records array pointer is null");
+                return;
+            }
+
+            for (uint16_t i = 0; i < dataBundle->num_records; ++i) {
+                const auto record = dataBundle->records[i];
+                dump += std::format("record[{}]\n", i);
+                if (record == nullptr) {
+                    pmlog_verb(v::uci)("record pointer is null");
+                    continue;
+                }
+
+                std::string metricName;
+                std::string entity;
+                std::string descriptor;
+                std::string unit;
+                double sample = 0.0;
+                uint64_t timestamp = 0;
+                uint64_t duration = 0;
+
+                if (TryGetString_(uciMetricRecordGetMetricName, record, metricName)) {
+                    dump += std::format("record[{}].metricName=\"{}\"\n", i, metricName);
+                }
+                if (TryGetString_(uciMetricRecordGetEntity, record, entity)) {
+                    dump += std::format("record[{}].entity=\"{}\"\n", i, entity);
+                }
+                if (TryGetString_(uciMetricRecordGetDescriptor, record, descriptor)) {
+                    dump += std::format("record[{}].descriptor=\"{}\"\n", i, descriptor);
+                }
+                if (TryGetString_(uciMetricRecordGetUnit, record, unit)) {
+                    dump += std::format("record[{}].unit=\"{}\"\n", i, unit);
+                }
+                if (uciMetricRecordGetSample(record, &sample) == UC_SUCCESS) {
+                    dump += std::format("record[{}].sample={}\n", i, sample);
+                }
+                if (uciMetricRecordGetRecordTimestamp(record, &timestamp) == UC_SUCCESS) {
+                    dump += std::format("record[{}].timestamp={}\n", i, timestamp);
+                }
+                if (uciMetricRecordGetRecordDuration(record, &duration) == UC_SUCCESS) {
+                    dump += std::format("record[{}].duration={}\n", i, duration);
+                }
+            }
+
+            pmlog_verb(v::uci)(dump);
+        }
+
+        std::optional<uint32_t> TryParseCoreIndex_(std::string_view entity)
+        {
+            if (!entity.starts_with(kCoreEntityPrefix_)) {
+                pmlog_dbg("unexpected core entity").pmwatch(entity);
+                return std::nullopt;
+            }
+
+            const auto suffix = entity.substr(kCoreEntityPrefix_.size());
+            if (suffix.empty()) {
+                pmlog_dbg("missing core index").pmwatch(entity);
+                return std::nullopt;
+            }
+
+            try {
+                const std::string suffixString{ suffix };
+                size_t parsedChars = 0;
+                const auto value = std::stoul(suffixString, &parsedChars);
+                if (parsedChars != suffixString.size() || value > uint32_t(-1)) {
+                    pmlog_dbg("unexpected parsed chars or value")
+                        .pmwatch(entity).pmwatch(parsedChars).pmwatch(value);
+                    return std::nullopt;
+                }
+                return (uint32_t)value;
+            }
+            catch (const std::exception&) {
+                pmlog_dbg(util::ReportException("Parse failure"));
+                return std::nullopt;
+            }
+        }
+
+        void AppendQuotedMetricName_(std::string& metricsJson, std::string_view metricName)
+        {
+            if (!metricsJson.empty()) {
+                metricsJson += ", ";
+            }
+            metricsJson += std::format("\"{}\"", metricName);
+        }
+    }
+
+    std::atomic<UciTelemetryProvider*> UciTelemetryProvider::activeProvider_{ nullptr };
+
+    UciTelemetryProvider::UciTelemetryProvider()
+    {
+        if (!util::win::WeAreElevated()) {
+            throw Except<TelemetrySubsystemAbsent>("UCI telemetry provider disabled because service is not elevated");
+        }
+
+        CheckUciCall_(
+            uciGetCollectorFromIdentifier(SoCWatchIdentifier, &collector_),
+            "uciGetCollectorFromIdentifier",
+            true);
+        CheckUciCall_(uciInitialize(collector_), "uciInitialize", true);
+
+        systemDevice_.providerDeviceId = kProviderDeviceId_;
+        systemDevice_.physicalCoreCount = CountPhysicalCores_();
+        systemDevice_.fingerprint = BuildFingerprint_();
+        const auto enumeratedMetricNames = EnumerateMetrics_();
+        systemDevice_.caps = BuildCaps_(enumeratedMetricNames, systemDevice_.physicalCoreCount);
+        systemDevice_.cpuCoreTemperaturesSample.resize(systemDevice_.physicalCoreCount);
+
+        pmlog_info(std::format(
+            "UCI telemetry provider initialized successfully; physicalCores={} enumeratedMetrics={}",
+            systemDevice_.physicalCoreCount,
+            enumeratedMetricNames.size()));
+    }
+
+    UciTelemetryProvider::~UciTelemetryProvider()
+    {
+        StopCollection_();
+        auto* expected = this;
+        activeProvider_.compare_exchange_strong(expected, nullptr);
+        if (collector_) {
+            uciDestroy(collector_);
+        }
+    }
+
+    ProviderCapabilityMap UciTelemetryProvider::GetCaps()
+    {
+        ProviderCapabilityMap capsByDeviceId{};
+        capsByDeviceId.emplace(kProviderDeviceId_, systemDevice_.caps);
+        return capsByDeviceId;
+    }
+
+    const TelemetryDeviceFingerprint& UciTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        if (providerDeviceId == kProviderDeviceId_) {
+            return systemDevice_.fingerprint;
+        }
+        throw Except<UciException>("UCI provider device not found");
+    }
+
+    TelemetryMetricValue UciTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        (void)requestQpc;
+
+        if (providerDeviceId != kProviderDeviceId_) {
+            throw Except<UciException>("UCI provider device not found");
+        }
+
+        std::lock_guard dataLock{ dataMutex_ };
+        ValidateMetricIndex_(systemDevice_, metricId, arrayIndex);
+
+        switch (metricId) {
+        case PM_METRIC_CPU_POWER:
+            return systemDevice_.cpuPowerSample.value_or(0.0);
+        case PM_METRIC_CPU_TEMPERATURE:
+            return ComputeAverageCpuTemperature_(systemDevice_).value_or(0.0);
+        case PM_METRIC_CPU_CORE_TEMPERATURE:
+            return systemDevice_.cpuCoreTemperaturesSample[arrayIndex].value_or(0.0);
+        default:
+            throw Except<UciException>("Unsupported metric for UCI provider");
+        }
+    }
+
+    void UciTelemetryProvider::SetPollRate(uint32_t pollRateMs)
+    {
+        std::lock_guard configLock{ configMutex_ };
+        const auto effectivePollRateMs = std::max(pollRateMs, 1u);
+        if (pollRateMs_ == effectivePollRateMs) {
+            return;
+        }
+
+        pollRateMs_ = effectivePollRateMs;
+        ReconfigureCollection_();
+    }
+
+    void UciTelemetryProvider::SetMetricUse(const svc::DeviceMetricUse& metricUse)
+    {
+        std::lock_guard configLock{ configMutex_ };
+        bool wantsCpuPower = false;
+        bool wantsCpuTemperature = false;
+        bool wantsCpuCoreTemperature = false;
+        if (const auto it = metricUse.find(ipc::kSystemDeviceId); it != metricUse.end()) {
+            for (const auto& use : it->second) {
+                if (use.metricId == PM_METRIC_CPU_POWER &&
+                    systemDevice_.caps.Check(PM_METRIC_CPU_POWER) != 0) {
+                    wantsCpuPower = true;
+                }
+                else if (use.metricId == PM_METRIC_CPU_TEMPERATURE &&
+                    systemDevice_.caps.Check(PM_METRIC_CPU_TEMPERATURE) != 0) {
+                    wantsCpuTemperature = true;
+                }
+                else if (use.metricId == PM_METRIC_CPU_CORE_TEMPERATURE &&
+                    systemDevice_.caps.Check(PM_METRIC_CPU_CORE_TEMPERATURE) != 0) {
+                    wantsCpuCoreTemperature = true;
+                }
+            }
+        }
+
+        if (wantsCpuPower_ == wantsCpuPower &&
+            wantsCpuTemperature_ == wantsCpuTemperature &&
+            wantsCpuCoreTemperature_ == wantsCpuCoreTemperature) {
+            return;
+        }
+
+        wantsCpuPower_ = wantsCpuPower;
+        wantsCpuTemperature_ = wantsCpuTemperature;
+        wantsCpuCoreTemperature_ = wantsCpuCoreTemperature;
+        ReconfigureCollection_();
+    }
+
+    void UciTelemetryProvider::StaticDataCallback_(uciDataBundle* dataBundle)
+    {
+        if (auto* pProvider = activeProvider_.load(std::memory_order_acquire)) {
+            pProvider->OnDataCallback_(dataBundle);
+        }
+        else {
+            pmlog_warn("UCI callback fired with no provider set").every(10s);
+        }
+    }
+
+    uint32_t UciTelemetryProvider::CountPhysicalCores_()
+    {
+        DWORD bytes = 0;
+        GetLogicalProcessorInformationEx(RelationProcessorCore, nullptr, &bytes);
+        if (GetLastError() != ERROR_INSUFFICIENT_BUFFER || bytes == 0) {
+            return 0;
+        }
+
+        std::vector<uint8_t> buffer(bytes);
+        if (!GetLogicalProcessorInformationEx(
+            RelationProcessorCore,
+            (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX)buffer.data(),
+            &bytes)) {
+            return 0;
+        }
+
+        uint32_t coreCount = 0;
+        for (DWORD offset = 0; offset < bytes;) {
+            const auto* pInfo =
+                (const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(buffer.data() + offset);
+            if (pInfo->Relationship == RelationProcessorCore) {
+                ++coreCount;
+            }
+            offset += pInfo->Size;
+        }
+
+        return coreCount;
+    }
+
+    std::optional<double> UciTelemetryProvider::ComputeAverageCpuTemperature_(const DeviceState_& device)
+    {
+        double sum = 0.0;
+        uint32_t sampleCount = 0;
+        for (const auto& sample : device.cpuCoreTemperaturesSample) {
+            if (!sample) {
+                continue;
+            }
+            sum += *sample;
+            ++sampleCount;
+        }
+
+        if (sampleCount == 0) {
+            return std::nullopt;
+        }
+
+        return sum / (double)sampleCount;
+    }
+
+    void UciTelemetryProvider::ValidateMetricIndex_(
+        const DeviceState_& device,
+        PM_METRIC metricId,
+        uint32_t arrayIndex)
+    {
+        switch (metricId) {
+        case PM_METRIC_CPU_POWER:
+        case PM_METRIC_CPU_TEMPERATURE:
+            if (arrayIndex != 0) {
+                throw Except<UciException>("UCI scalar metric queried with nonzero array index");
+            }
+            return;
+        case PM_METRIC_CPU_CORE_TEMPERATURE:
+            if (arrayIndex >= device.cpuCoreTemperaturesSample.size()) {
+                throw Except<UciException>("UCI CPU core temperature queried with out-of-range array index");
+            }
+            return;
+        default:
+            throw Except<UciException>("Unsupported UCI metric queried");
+        }
+    }
+
+    TelemetryDeviceFingerprint UciTelemetryProvider::BuildFingerprint_()
+    {
+        TelemetryDeviceFingerprint fingerprint{};
+        fingerprint.deviceType = PM_DEVICE_TYPE_SYSTEM;
+        return fingerprint;
+    }
+
+    ipc::MetricCapabilities UciTelemetryProvider::BuildCaps_(
+        const std::unordered_set<std::string>& enumeratedMetricNames,
+        uint32_t physicalCoreCount)
+    {
+        ipc::MetricCapabilities caps{};
+        if (enumeratedMetricNames.contains(std::string{ kCpuPowerMetricName_ })) {
+            caps.Set(PM_METRIC_CPU_POWER, 1);
+        }
+        if (physicalCoreCount != 0 &&
+            enumeratedMetricNames.contains(std::string{ kCpuTemperatureMetricName_ })) {
+            caps.Set(PM_METRIC_CPU_TEMPERATURE, 1);
+            caps.Set(PM_METRIC_CPU_CORE_TEMPERATURE, physicalCoreCount);
+        }
+        return caps;
+    }
+
+    std::unordered_set<std::string> UciTelemetryProvider::EnumerateMetrics_()
+    {
+        MetricContainerGuard_ metricContainer{};
+        CheckUciCall_(uciEnumerateMetrics(collector_, &metricContainer.handle), "uciEnumerateMetrics");
+
+        if (util::log::GlobalPolicy::VCheck(v::uci)) {
+            DumpMetricEnumeration_(metricContainer.handle);
+        }
+
+        uint32_t metricCount = 0;
+        uciMetricHandle* pMetrics = nullptr;
+        CheckUciCall_(
+            uciGetMetricContainerMetrics(metricContainer.handle, &metricCount, &pMetrics),
+            "uciGetMetricContainerMetrics");
+
+        std::unordered_set<std::string> enumeratedMetricNames{};
+        for (uint32_t i = 0; i < metricCount; ++i) {
+            std::string metricName;
+            if (!TryGetString_(uciGetMetricName, pMetrics[i], metricName) || metricName.empty()) {
+                continue;
+            }
+
+            enumeratedMetricNames.emplace(util::str::ToLower(metricName));
+        }
+
+        return enumeratedMetricNames;
+    }
+
+    void UciTelemetryProvider::DumpMetricEnumeration_(uciMetricContainerHandle metricContainer) const
+    {
+        std::string dump = "UCI metric enumeration dump\n";
+
+        uint32_t metricCount = 0;
+        uciMetricHandle* pMetrics = nullptr;
+        auto result = uciGetMetricContainerMetrics(metricContainer, &metricCount, &pMetrics);
+        dump += std::format("metrics.result={} metrics.count={}\n", (int)result, metricCount);
+        if (result == UC_SUCCESS && pMetrics != nullptr) {
+            for (uint32_t i = 0; i < metricCount; ++i) {
+                uint32_t metricId = 0;
+                std::string metricName;
+                std::string metricDescription;
+                auto metricIdResult = uciGetMetricId(pMetrics[i], &metricId);
+                TryGetString_(uciGetMetricName, pMetrics[i], metricName);
+                TryGetString_(uciGetMetricDescription, pMetrics[i], metricDescription);
+                dump += std::format(
+                    "metric[{}] id.result={} id={} name=\"{}\" description=\"{}\"\n",
+                    i,
+                    (int)metricIdResult,
+                    metricId,
+                    metricName,
+                    metricDescription);
+
+                uint32_t eventCount = 0;
+                uciMetricEventHandle* pEvents = nullptr;
+                auto eventResult = uciGetMetricEvents(pMetrics[i], &eventCount, &pEvents);
+                dump += std::format(
+                    "metric[{}].events.result={} metric[{}].events.count={}\n",
+                    i,
+                    (int)eventResult,
+                    i,
+                    eventCount);
+                if (eventResult == UC_SUCCESS && pEvents != nullptr) {
+                    for (uint32_t j = 0; j < eventCount; ++j) {
+                        uint32_t eventId = 0;
+                        std::string eventName;
+                        std::string eventDescription;
+                        auto eventIdResult = uciGetEventId(pEvents[j], &eventId);
+                        TryGetString_(uciGetMetricEventName, pEvents[j], eventName);
+                        TryGetString_(uciGetMetricEventDescription, pEvents[j], eventDescription);
+                        dump += std::format(
+                            "metric[{}].event[{}] id.result={} id={} name=\"{}\" description=\"{}\"\n",
+                            i,
+                            j,
+                            (int)eventIdResult,
+                            eventId,
+                            eventName,
+                            eventDescription);
+                    }
+                }
+            }
+        }
+
+        uint32_t groupCount = 0;
+        uciMetricGroupHandle* pGroups = nullptr;
+        result = uciGetMetricContainerGroups(metricContainer, &groupCount, &pGroups);
+        dump += std::format("groups.result={} groups.count={}\n", (int)result, groupCount);
+        if (result == UC_SUCCESS && pGroups != nullptr) {
+            for (uint32_t i = 0; i < groupCount; ++i) {
+                uint32_t groupId = 0;
+                std::string groupName;
+                std::string groupDescription;
+                auto groupIdResult = uciGetMetricGroupId(pGroups[i], &groupId);
+                TryGetString_(uciGetMetricGroupName, pGroups[i], groupName);
+                TryGetString_(uciGetMetricGroupDescription, pGroups[i], groupDescription);
+                dump += std::format(
+                    "group[{}] id.result={} id={} name=\"{}\" description=\"{}\"\n",
+                    i,
+                    (int)groupIdResult,
+                    groupId,
+                    groupName,
+                    groupDescription);
+
+                uint32_t groupMetricCount = 0;
+                uciMetricHandle* pGroupMetrics = nullptr;
+                auto groupMetricResult =
+                    uciGetMetricsInGroup(pGroups[i], &groupMetricCount, &pGroupMetrics);
+                dump += std::format(
+                    "group[{}].metrics.result={} group[{}].metrics.count={}\n",
+                    i,
+                    (int)groupMetricResult,
+                    i,
+                    groupMetricCount);
+                if (groupMetricResult == UC_SUCCESS && pGroupMetrics != nullptr) {
+                    for (uint32_t j = 0; j < groupMetricCount; ++j) {
+                        std::string groupMetricName;
+                        std::string groupMetricDescription;
+                        TryGetString_(uciGetMetricName, pGroupMetrics[j], groupMetricName);
+                        TryGetString_(uciGetMetricDescription, pGroupMetrics[j], groupMetricDescription);
+                        dump += std::format(
+                            "group[{}].metric[{}] name=\"{}\" description=\"{}\"\n",
+                            i,
+                            j,
+                            groupMetricName,
+                            groupMetricDescription);
+                    }
+                }
+            }
+        }
+
+        uint32_t containerEventCount = 0;
+        uciMetricEventHandle* pContainerEvents = nullptr;
+        result = uciGetMetricContainerEvents(
+            metricContainer,
+            &containerEventCount,
+            &pContainerEvents);
+        dump += std::format(
+            "container.events.result={} container.events.count={}\n",
+            (int)result,
+            containerEventCount);
+        if (result == UC_SUCCESS && pContainerEvents != nullptr) {
+            for (uint32_t i = 0; i < containerEventCount; ++i) {
+                uint32_t eventId = 0;
+                std::string eventName;
+                std::string eventDescription;
+                auto eventIdResult = uciGetEventId(pContainerEvents[i], &eventId);
+                TryGetString_(uciGetMetricEventName, pContainerEvents[i], eventName);
+                TryGetString_(uciGetMetricEventDescription, pContainerEvents[i], eventDescription);
+                dump += std::format(
+                    "container.event[{}] id.result={} id={} name=\"{}\" description=\"{}\"\n",
+                    i,
+                    (int)eventIdResult,
+                    eventId,
+                    eventName,
+                    eventDescription);
+            }
+        }
+
+        pmlog_verb(v::uci)(dump);
+    }
+
+    void UciTelemetryProvider::OnDataCallback_(uciDataBundle* dataBundle)
+    {
+        if (util::log::GlobalPolicy::VCheck(v::uci)) {
+            DumpDataCallback_(dataBundle);
+        }
+
+        if (dataBundle == nullptr || dataBundle->records == nullptr || dataBundle->num_records == 0) {
+            return;
+        }
+
+        std::lock_guard dataLock{ dataMutex_ };
+        for (uint16_t i = 0; i < dataBundle->num_records; ++i) {
+            ApplyMetricRecord_(systemDevice_, dataBundle->records[i]);
+        }
+    }
+
+    void UciTelemetryProvider::ApplyMetricRecord_(DeviceState_& device, void* recordHandle)
+    {
+        const auto record = (uciMetricRecordHandle)recordHandle;
+        std::string metricName;
+        if (!TryGetString_(uciMetricRecordGetMetricName, record, metricName) || metricName.empty()) {
+            pmlog_dbg("Could not get record metric name");
+            return;
+        }
+
+        double sample = 0.0;
+        if (uciMetricRecordGetSample(record, &sample) != UC_SUCCESS) {
+            pmlog_dbg("Could not get record sample");
+            return;
+        }
+
+        if (metricName == kCpuPowerRecordMetricName_) {
+            uint64_t duration = 0;
+            if (uciMetricRecordGetRecordDuration(record, &duration) != UC_SUCCESS || duration == 0) {
+                pmlog_dbg("Could not get record duration");
+                return;
+            }
+
+            const auto durationSeconds = double(duration) / 1'000'000'000.0;
+            if (durationSeconds <= 0.0) {
+                pmlog_dbg("Negative duration").pmwatch(durationSeconds);
+                return;
+            }
+
+            device.cpuPowerSample = (sample / durationSeconds) / 1000.0;
+            return;
+        }
+
+        std::string entity;
+        TryGetString_(uciMetricRecordGetEntity, record, entity);
+
+        if (metricName != kCpuTemperatureRecordMetricName_) {
+            return;
+        }
+
+        if (const auto coreIndex = TryParseCoreIndex_(entity)) {
+            if (*coreIndex < device.cpuCoreTemperaturesSample.size()) {
+                device.cpuCoreTemperaturesSample[*coreIndex] = sample;
+            }
+        }
+        return;
+    }
+
+    void UciTelemetryProvider::ReconfigureCollection_()
+    {
+        if (!collector_) {
+            pmlog_error("no collector");
+            return;
+        }
+
+        const auto wantsCpuPower = wantsCpuPower_;
+        const auto wantsCpuTemperature = wantsCpuTemperature_;
+        const auto wantsCpuCoreTemperature = wantsCpuCoreTemperature_;
+        const bool wantsCollection = wantsCpuPower || wantsCpuTemperature || wantsCpuCoreTemperature;
+        pmlog_dbg(std::format(
+            "Configuring UCI collection; pollRateMs={} wantsCpuPower={} wantsCpuTemperature={} wantsCpuCoreTemperature={} collectionStarted={}",
+            pollRateMs_,
+            wantsCpuPower,
+            wantsCpuTemperature,
+            wantsCpuCoreTemperature,
+            collectionStarted_));
+
+        if (!wantsCollection) {
+            pmlog_dbg("Stopping UCI collection because no supported UCI metrics are requested");
+            StopCollection_();
+            std::lock_guard dataLock{ dataMutex_ };
+            systemDevice_.cpuPowerSample.reset();
+            std::fill(
+                systemDevice_.cpuCoreTemperaturesSample.begin(),
+                systemDevice_.cpuCoreTemperaturesSample.end(),
+                std::nullopt);
+            return;
+        }
+
+        StopCollection_();
+
+        std::string metricsJson;
+        if (wantsCpuPower) {
+            AppendQuotedMetricName_(metricsJson, kCpuPowerMetricName_);
+        }
+        if (wantsCpuTemperature || wantsCpuCoreTemperature) {
+            AppendQuotedMetricName_(metricsJson, kCpuTemperatureMetricName_);
+        }
+
+        const auto configJson = std::format(
+            R"json(
+{{
+  "collectorIdentifier": {{
+    "name": "socwatch",
+    "guid": "54B46B56-5439-4D29-8B07-15863D1F6EC6",
+    "version": "0.1.0"
+  }},
+  "collectionParams": {{
+    "samplingInterval": {},
+    "isContinuous": true,
+    "maxDetail": true
+  }},
+  "metrics": [ {} ],
+  "outputParams": {{
+    "outputFormats": [ "data-callback" ],
+    "outputPath": "UCI_metrics"
+  }}
+}}
+)json",
+            pollRateMs_,
+            metricsJson);
+
+        pmlog_dbg(std::format(
+            "Applying UCI collection configuration; pollRateMs={} metrics=[{}]",
+            pollRateMs_,
+            metricsJson));
+        pmlog_verb(v::uci)(std::format("UCI collection config JSON:\n{}", configJson));
+
+        CheckUciCall_(uciConfigureCollection(collector_, configJson.c_str()), "uciConfigureCollection");
+        CheckUciCall_(uciSetDataCallback(collector_, &StaticDataCallback_), "uciSetDataCallback");
+
+        auto* expected = (UciTelemetryProvider*)nullptr;
+        if (!activeProvider_.compare_exchange_strong(expected, this, std::memory_order_acq_rel)) {
+            activeProvider_.store(this, std::memory_order_release);
+        }
+
+        pmlog_dbg(std::format(
+            "Starting UCI collection; pollRateMs={} wantsCpuPower={} wantsCpuTemperature={} wantsCpuCoreTemperature={}",
+            pollRateMs_,
+            wantsCpuPower,
+            wantsCpuTemperature,
+            wantsCpuCoreTemperature));
+        CheckUciCall_(uciStartCollection(collector_), "uciStartCollection");
+        collectionStarted_ = true;
+    }
+
+    void UciTelemetryProvider::StopCollection_() noexcept
+    {
+        if (!collectionStarted_ || !collector_) {
+            return;
+        }
+
+        pmlog_dbg("Stopping UCI collection");
+        const auto result = uciStopCollection(collector_);
+        if (result != UC_SUCCESS &&
+            result != UC_ERROR_COLLECTION_NOT_RUNNING) {
+            pmlog_warn("uciStopCollection failed").pmwatch((int)result);
+        }
+        collectionStarted_ = false;
+    }
+}
+
+#else
+
+namespace pmon::tel::uci
+{
+    UciTelemetryProvider::UciTelemetryProvider()
+    {
+        throw Except<TelemetrySubsystemAbsent>("UCI telemetry provider unavailable because service was built without UCI dependency present.");
+    }
+
+    UciTelemetryProvider::~UciTelemetryProvider() = default;
+
+    ProviderCapabilityMap UciTelemetryProvider::GetCaps()
+    {
+        return {};
+    }
+
+    const TelemetryDeviceFingerprint& UciTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        (void)providerDeviceId;
+        throw Except<UciException>("UCI provider device not found");
+    }
+
+    TelemetryMetricValue UciTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        (void)providerDeviceId;
+        (void)metricId;
+        (void)arrayIndex;
+        (void)requestQpc;
+        throw Except<UciException>("UCI provider unavailable");
+    }
+
+    void UciTelemetryProvider::SetPollRate(uint32_t pollRateMs)
+    {
+        (void)pollRateMs;
+    }
+
+    void UciTelemetryProvider::SetMetricUse(const svc::DeviceMetricUse& metricUse)
+    {
+        (void)metricUse;
+    }
+}
+
+#endif
diff --git a/IntelPresentMon/ControlLib/uci/UciTelemetryProvider.h b/IntelPresentMon/ControlLib/uci/UciTelemetryProvider.h
new file mode 100644
index 000000000..83f4328d2
--- /dev/null
+++ b/IntelPresentMon/ControlLib/uci/UciTelemetryProvider.h
@@ -0,0 +1,82 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../../CommonUtilities/win/WinAPI.h"
+#include "../../Interprocess/source/SystemDeviceId.h"
+#include "../TelemetryProvider.h"
+#include "UciSdk.h"
+
+#include <atomic>
+#include <cstdint>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+namespace pmon::tel::uci
+{
+    class UciTelemetryProvider : public TelemetryProvider
+    {
+    public:
+        UciTelemetryProvider();
+        ~UciTelemetryProvider() override;
+        ProviderCapabilityMap GetCaps() override;
+        const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const override;
+        TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) override;
+        void SetPollRate(uint32_t pollRateMs) override;
+        void SetMetricUse(const svc::DeviceMetricUse& metricUse) override;
+
+    private:
+        struct DeviceState_
+        {
+            ProviderDeviceId providerDeviceId = 0;
+            TelemetryDeviceFingerprint fingerprint{};
+            ipc::MetricCapabilities caps{};
+            uint32_t physicalCoreCount = 1;
+            std::optional<double> cpuPowerSample{};
+            std::vector<std::optional<double>> cpuCoreTemperaturesSample{};
+        };
+
+        static uint32_t CountPhysicalCores_();
+        static std::optional<double> ComputeAverageCpuTemperature_(const DeviceState_& device);
+        static void ValidateMetricIndex_(const DeviceState_& device, PM_METRIC metricId, uint32_t arrayIndex);
+        static TelemetryDeviceFingerprint BuildFingerprint_();
+        static ipc::MetricCapabilities BuildCaps_(
+            const std::unordered_set<std::string>& enumeratedMetricNames,
+            uint32_t physicalCoreCount);
+
+#if PMON_HAS_UCI_SDK
+        static void StaticDataCallback_(uciDataBundle* dataBundle);
+        void OnDataCallback_(uciDataBundle* dataBundle);
+        void ApplyMetricRecord_(DeviceState_& device, void* recordHandle);
+        std::unordered_set<std::string> EnumerateMetrics_();
+        void DumpMetricEnumeration_(uciMetricContainerHandle metricContainer) const;
+        void ReconfigureCollection_();
+        void StopCollection_() noexcept;
+#endif
+
+    private:
+        static constexpr ProviderDeviceId kProviderDeviceId_ = 1;
+#if PMON_HAS_UCI_SDK
+        uciCollectorHandle collector_ = nullptr;
+#endif
+        DeviceState_ systemDevice_{};
+        std::mutex configMutex_{};
+        std::mutex dataMutex_{};
+        uint32_t pollRateMs_ = 1000;
+        bool collectionStarted_ = false;
+        bool wantsCpuPower_ = false;
+        bool wantsCpuTemperature_ = false;
+        bool wantsCpuCoreTemperature_ = false;
+
+#if PMON_HAS_UCI_SDK
+        static std::atomic<UciTelemetryProvider*> activeProvider_;
+#endif
+    };
+}
diff --git a/IntelPresentMon/ControlLib/wmi/WmiTelemetryProvider.cpp b/IntelPresentMon/ControlLib/wmi/WmiTelemetryProvider.cpp
new file mode 100644
index 000000000..beffde712
--- /dev/null
+++ b/IntelPresentMon/ControlLib/wmi/WmiTelemetryProvider.cpp
@@ -0,0 +1,398 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#include "WmiTelemetryProvider.h"
+
+#include "../Exceptions.h"
+#include "../Logging.h"
+#include "../../CommonUtilities/Qpc.h"
+#include "../../CommonUtilities/Exception.h"
+#include "../../CommonUtilities/str/String.h"
+#include "../../CommonUtilities/win/com/ComPtr.h"
+#include "../../CommonUtilities/win/com/Comdef.h"
+#include "../../CommonUtilities/win/com/WbemConnection.h"
+
+#include <Wbemidl.h>
+
+#include <chrono>
+#include <string>
+#include <string_view>
+
+using namespace pmon;
+using namespace util;
+using namespace std::literals;
+
+namespace pmon::tel::wmi
+{
+    namespace
+    {
+        constexpr wchar_t kCpuIdentityQuery_[] = L"SELECT Name, Manufacturer FROM Win32_Processor";
+        constexpr wchar_t kProcessorFrequencyCounter_[] =
+            L"\\Processor Information(_Total)\\Processor Frequency";
+        constexpr wchar_t kProcessorPerformanceCounter_[] =
+            L"\\Processor Information(_Total)\\% Processor Performance";
+        constexpr wchar_t kProcessorIdleTimeCounter_[] =
+            L"\\Processor(_Total)\\% Idle Time";
+
+        std::string ReadWmiStringProperty_(IWbemClassObject& object, const wchar_t* propertyName)
+        {
+            VARIANT variant{};
+            VariantInit(&variant);
+
+            const auto result = object.Get(propertyName, 0, &variant, nullptr, nullptr);
+            if (FAILED(result)) {
+                pmlog_warn("IWbemClassObject::Get failed").hr(result)
+                    .pmwatch(str::ToNarrow(std::wstring{ propertyName }));
+                VariantClear(&variant);
+                return {};
+            }
+
+            std::string value{};
+            if (variant.vt == VT_BSTR && variant.bstrVal != nullptr) {
+                value = str::TrimWhitespace(
+                    str::ToNarrow(std::wstring{ variant.bstrVal, SysStringLen(variant.bstrVal) }));
+            }
+            else if (variant.vt != VT_NULL && variant.vt != VT_EMPTY) {
+                pmlog_warn("Unexpected VARIANT type for WMI string property")
+                    .pmwatch(str::ToNarrow(std::wstring{ propertyName }))
+                    .pmwatch((int)variant.vt);
+            }
+
+            VariantClear(&variant);
+            return value;
+        }
+
+        PM_DEVICE_VENDOR ResolveCpuVendor_(std::string_view manufacturer, std::string_view cpuName)
+        {
+            const auto matchVendor = [](std::string_view value) {
+                const auto lowerValue = str::ToLower(std::string{ value });
+                if (lowerValue.contains("intel")) {
+                    return PM_DEVICE_VENDOR_INTEL;
+                }
+                if (lowerValue.contains("amd")) {
+                    return PM_DEVICE_VENDOR_AMD;
+                }
+                return PM_DEVICE_VENDOR_UNKNOWN;
+            };
+
+            const auto manufacturerVendor = matchVendor(manufacturer);
+            if (manufacturerVendor != PM_DEVICE_VENDOR_UNKNOWN) {
+                return manufacturerVendor;
+            }
+
+            return matchVendor(cpuName);
+        }
+    }
+
+    void WmiTelemetryProvider::QueryDeleter_::operator()(PDH_HQUERY query) const noexcept
+    {
+        if (query != nullptr) {
+            PdhCloseQuery(query);
+        }
+    }
+
+    WmiTelemetryProvider::WmiTelemetryProvider()
+    {
+        const auto providerDeviceId = nextProviderDeviceId_;
+        const auto emplaceResult = devicesById_.try_emplace(providerDeviceId);
+        if (!emplaceResult.second) {
+            throw Except<WmiException>("Duplicate WMI provider device id encountered");
+        }
+
+        auto& device = emplaceResult.first->second;
+        device.providerDeviceId = providerDeviceId;
+        device.fingerprint.deviceType = PM_DEVICE_TYPE_SYSTEM;
+        device.fingerprint.vendor = PM_DEVICE_VENDOR_UNKNOWN;
+        device.fingerprint.deviceName = "UNKNOWN_CPU";
+
+        InitializeDevice_(device);
+        device.caps = BuildCapsForDevice_(device);
+        ++nextProviderDeviceId_;
+    }
+
+    ProviderCapabilityMap WmiTelemetryProvider::GetCaps()
+    {
+        ProviderCapabilityMap capsByDeviceId{};
+        for (const auto& entry : devicesById_) {
+            capsByDeviceId.emplace(entry.first, entry.second.caps);
+        }
+        return capsByDeviceId;
+    }
+
+    const TelemetryDeviceFingerprint& WmiTelemetryProvider::GetFingerPrint(
+        ProviderDeviceId providerDeviceId) const
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<WmiException>("WMI provider device not found");
+        }
+        return iDevice->second.fingerprint;
+    }
+
+    TelemetryMetricValue WmiTelemetryProvider::PollMetric(
+        ProviderDeviceId providerDeviceId,
+        PM_METRIC metricId,
+        uint32_t arrayIndex,
+        int64_t requestQpc)
+    {
+        const auto iDevice = devicesById_.find(providerDeviceId);
+        if (iDevice == devicesById_.end()) {
+            throw Except<WmiException>("WMI provider device not found");
+        }
+
+        auto& device = iDevice->second;
+
+        switch (metricId) {
+        case PM_METRIC_CPU_VENDOR:
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            return (int)device.fingerprint.vendor;
+        case PM_METRIC_CPU_NAME:
+            throw Except<WmiException>("PM_METRIC_CPU_NAME is static-only and is not served by poll path");
+        case PM_METRIC_CPU_FREQUENCY:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pSample = PollCounterSampleEndpoint_(device, requestQpc);
+            if (pSample == nullptr || !pSample->hasFrequency) {
+                return 0.0;
+            }
+            return pSample->frequencyMhz;
+        }
+        case PM_METRIC_CPU_UTILIZATION:
+        {
+            ValidateScalarMetricIndex_(metricId, arrayIndex);
+            const auto* pSample = PollCounterSampleEndpoint_(device, requestQpc);
+            if (pSample == nullptr || !pSample->hasUtilization) {
+                return 0.0;
+            }
+            return pSample->utilizationPercent;
+        }
+        default:
+            throw Except<WmiException>("Unsupported metric for WMI provider");
+        }
+    }
+
+    void WmiTelemetryProvider::ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex)
+    {
+        if (arrayIndex != 0) {
+            throw Except<WmiException>("WMI scalar metric queried with nonzero array index");
+        }
+        (void)metricId;
+    }
+
+    void WmiTelemetryProvider::InitializeDevice_(DeviceState_& device) const
+    {
+        PopulateFingerprintFromWmi_(device);
+
+        PDH_HQUERY tempQuery = nullptr;
+        const auto openResult = PdhOpenQueryW(nullptr, 0, &tempQuery);
+        if (openResult != ERROR_SUCCESS) {
+            pmlog_error("PdhOpenQueryW failed").code(openResult);
+            throw Except<TelemetrySubsystemAbsent>("Unable to initialize WMI telemetry provider");
+        }
+        device.query.reset(tempQuery);
+
+        const auto addCounter = [&](const wchar_t* path, HCOUNTER& counter, const char* label) {
+            const auto addResult = PdhAddEnglishCounterW(device.query.get(), path, 0, &counter);
+            if (addResult != ERROR_SUCCESS) {
+                pmlog_warn(label).code(addResult)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+                counter = nullptr;
+            }
+        };
+
+        addCounter(
+            kProcessorFrequencyCounter_,
+            device.processorFrequencyCounter,
+            "PdhAddEnglishCounterW failed for processor frequency");
+        addCounter(
+            kProcessorPerformanceCounter_,
+            device.processorPerformanceCounter,
+            "PdhAddEnglishCounterW failed for processor performance");
+        addCounter(
+            kProcessorIdleTimeCounter_,
+            device.processorIdleTimeCounter,
+            "PdhAddEnglishCounterW failed for processor idle time");
+
+        const auto collectResult = PdhCollectQueryData(device.query.get());
+        if (collectResult != ERROR_SUCCESS) {
+            pmlog_error("PdhCollectQueryData initial collect failed").code(collectResult)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            throw Except<TelemetrySubsystemAbsent>("Unable to initialize WMI telemetry provider");
+        }
+
+        device.qpcFrequency = GetTimestampFrequencyUint64();
+        // Seed the gate to "now" so the first post-init probe performs the
+        // second PDH collection needed for formatted CPU counters.
+        device.nextSampleQpc = GetCurrentTimestamp();
+    }
+
+    void WmiTelemetryProvider::PopulateFingerprintFromWmi_(DeviceState_& device) const
+    {
+        try {
+            win::com::WbemConnection connection;
+            auto* pServices = connection.GetServices();
+            if (pServices == nullptr) {
+                pmlog_warn("WMI services connection was null")
+                    .pmwatch(device.providerDeviceId);
+                return;
+            }
+
+            win::com::ComPtr<IEnumWbemClassObject> pEnumerator;
+            const auto queryResult = pServices->ExecQuery(
+                bstr_t(L"WQL"),
+                bstr_t(kCpuIdentityQuery_),
+                WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
+                nullptr,
+                pEnumerator.ReleaseAndGetAddressOf());
+            if (FAILED(queryResult)) {
+                pmlog_warn("IWbemServices::ExecQuery failed").hr(queryResult)
+                    .pmwatch(device.providerDeviceId);
+                return;
+            }
+
+            DWORD returned = 0;
+            win::com::ComPtr<IWbemClassObject> pClassObject;
+            const auto nextResult = pEnumerator->Next(
+                WBEM_INFINITE,
+                1,
+                pClassObject.ReleaseAndGetAddressOf(),
+                &returned);
+            if (FAILED(nextResult) || returned == 0) {
+                pmlog_warn("IEnumWbemClassObject::Next failed").hr(nextResult)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(returned);
+                return;
+            }
+
+            if (const auto cpuName = ReadWmiStringProperty_(*pClassObject.Get(), L"Name");
+                !cpuName.empty()) {
+                device.fingerprint.deviceName = cpuName;
+            }
+            else {
+                pmlog_warn("WMI CPU name query returned empty result")
+                    .pmwatch(device.providerDeviceId);
+            }
+
+            const auto manufacturer = ReadWmiStringProperty_(*pClassObject.Get(), L"Manufacturer");
+            device.fingerprint.vendor = ResolveCpuVendor_(manufacturer, device.fingerprint.deviceName);
+            if (device.fingerprint.vendor == PM_DEVICE_VENDOR_UNKNOWN) {
+                pmlog_warn("Unable to resolve CPU vendor from WMI")
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(manufacturer)
+                    .pmwatch(device.fingerprint.deviceName);
+            }
+        }
+        catch (...) {
+            pmlog_warn(util::ReportException("WMI CPU identity query failed"))
+                .pmwatch(device.providerDeviceId);
+        }
+    }
+
+    ipc::MetricCapabilities WmiTelemetryProvider::BuildCapsForDevice_(DeviceState_& device) const
+    {
+        ipc::MetricCapabilities caps{};
+        const auto requestQpc = GetCurrentTimestamp();
+
+        caps.Set(PM_METRIC_CPU_VENDOR, 1);
+        caps.Set(PM_METRIC_CPU_NAME, 1);
+
+        const auto* pSample = PollCounterSampleEndpoint_(device, requestQpc);
+        if (pSample != nullptr && pSample->hasFrequency) {
+            caps.Set(PM_METRIC_CPU_FREQUENCY, 1);
+        }
+        if (pSample != nullptr && pSample->hasUtilization) {
+            caps.Set(PM_METRIC_CPU_UTILIZATION, 1);
+        }
+
+        return caps;
+    }
+
+    const WmiTelemetryProvider::CounterSample_* WmiTelemetryProvider::PollCounterSampleEndpoint_(
+        DeviceState_& device,
+        int64_t requestQpc) const
+    {
+        auto& cache = device.counterSampleEndpointCache;
+        if (cache.Matches(requestQpc)) {
+            return &cache.output;
+        }
+
+        cache.output = {};
+        cache.requestQpc = requestQpc;
+
+        const auto sampleQpc = requestQpc != 0 ? requestQpc : GetCurrentTimestamp();
+        if (device.query &&
+            (device.nextSampleQpc == 0 || sampleQpc >= device.nextSampleQpc)) {
+            const auto collectResult = PdhCollectQueryData(device.query.get());
+            if (collectResult != ERROR_SUCCESS) {
+                pmlog_warn("PdhCollectQueryData failed").code(collectResult).every(60s)
+                    .pmwatch(device.providerDeviceId)
+                    .pmwatch(device.fingerprint.deviceName);
+            }
+            else if (device.qpcFrequency != 0) {
+                device.nextSampleQpc = sampleQpc + (int64_t)device.qpcFrequency;
+            }
+            else {
+                device.nextSampleQpc = sampleQpc;
+            }
+        }
+
+        double value = 0.0;
+        if (TryReadCounterValue_(
+            device.processorFrequencyCounter,
+            "PdhGetFormattedCounterValue failed for processor frequency",
+            device,
+            value)) {
+            double performancePercent = 0.0;
+            if (TryReadCounterValue_(
+                device.processorPerformanceCounter,
+                "PdhGetFormattedCounterValue failed for processor performance",
+                device,
+                performancePercent)) {
+                cache.output.frequencyMhz = value * (performancePercent / 100.0);
+                cache.output.hasFrequency = true;
+            }
+        }
+
+        if (TryReadCounterValue_(
+            device.processorIdleTimeCounter,
+            "PdhGetFormattedCounterValue failed for processor idle time",
+            device,
+            value)) {
+            cache.output.utilizationPercent = 100.0 - value;
+            cache.output.hasUtilization = true;
+        }
+
+        return &cache.output;
+    }
+
+    bool WmiTelemetryProvider::TryReadCounterValue_(
+        HCOUNTER counter,
+        const char* label,
+        const DeviceState_& device,
+        double& value)
+    {
+        if (counter == nullptr) {
+            value = 0.0;
+            return false;
+        }
+
+        PDH_FMT_COUNTERVALUE counterValue{};
+        DWORD counterType = 0;
+        const auto result = PdhGetFormattedCounterValue(
+            counter,
+            PDH_FMT_DOUBLE,
+            &counterType,
+            &counterValue);
+        if (result != ERROR_SUCCESS) {
+            pmlog_warn(label).code(result).every(60s)
+                .pmwatch(device.providerDeviceId)
+                .pmwatch(device.fingerprint.deviceName);
+            value = 0.0;
+            return false;
+        }
+
+        value = counterValue.doubleValue;
+        return true;
+    }
+}
diff --git a/IntelPresentMon/ControlLib/wmi/WmiTelemetryProvider.h b/IntelPresentMon/ControlLib/wmi/WmiTelemetryProvider.h
new file mode 100644
index 000000000..c6ba163b5
--- /dev/null
+++ b/IntelPresentMon/ControlLib/wmi/WmiTelemetryProvider.h
@@ -0,0 +1,78 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "../../CommonUtilities/win/WinAPI.h"
+#include "../EndpointCache.h"
+#include "../TelemetryProvider.h"
+
+#include <pdh.h>
+
+#include <cstdint>
+#include <memory>
+#include <type_traits>
+#include <unordered_map>
+
+namespace pmon::tel::wmi
+{
+    class WmiTelemetryProvider : public TelemetryProvider
+    {
+    public:
+        WmiTelemetryProvider();
+        ~WmiTelemetryProvider() override = default;
+        ProviderCapabilityMap GetCaps() override;
+        const TelemetryDeviceFingerprint& GetFingerPrint(ProviderDeviceId providerDeviceId) const override;
+        TelemetryMetricValue PollMetric(
+            ProviderDeviceId providerDeviceId,
+            PM_METRIC metricId,
+            uint32_t arrayIndex,
+            int64_t requestQpc) override;
+
+    private:
+        struct QueryDeleter_
+        {
+            void operator()(PDH_HQUERY query) const noexcept;
+        };
+
+        struct CounterSample_
+        {
+            double frequencyMhz = 0.0;
+            double utilizationPercent = 0.0;
+            bool hasFrequency = false;
+            bool hasUtilization = false;
+        };
+
+        struct DeviceState_
+        {
+            ProviderDeviceId providerDeviceId = 0;
+            TelemetryDeviceFingerprint fingerprint{};
+            ipc::MetricCapabilities caps{};
+
+            std::unique_ptr<std::remove_pointer_t<PDH_HQUERY>, QueryDeleter_> query{};
+            HCOUNTER processorFrequencyCounter = {};
+            HCOUNTER processorPerformanceCounter = {};
+            HCOUNTER processorIdleTimeCounter = {};
+            uint64_t qpcFrequency = 0;
+            int64_t nextSampleQpc = 0;
+
+            pmon::tele::EndpointCache<CounterSample_> counterSampleEndpointCache{};
+        };
+
+        static void ValidateScalarMetricIndex_(PM_METRIC metricId, uint32_t arrayIndex);
+        void InitializeDevice_(DeviceState_& device) const;
+        void PopulateFingerprintFromWmi_(DeviceState_& device) const;
+        ipc::MetricCapabilities BuildCapsForDevice_(DeviceState_& device) const;
+        const CounterSample_* PollCounterSampleEndpoint_(
+            DeviceState_& device,
+            int64_t requestQpc) const;
+        static bool TryReadCounterValue_(
+            HCOUNTER counter,
+            const char* label,
+            const DeviceState_& device,
+            double& value);
+
+    private:
+        std::unordered_map<ProviderDeviceId, DeviceState_> devicesById_{};
+        ProviderDeviceId nextProviderDeviceId_ = 1;
+    };
+}
diff --git a/IntelPresentMon/Core/Core.vcxproj b/IntelPresentMon/Core/Core.vcxproj
index c1ba429ca..3efee15e7 100644
--- a/IntelPresentMon/Core/Core.vcxproj
+++ b/IntelPresentMon/Core/Core.vcxproj
@@ -60,7 +60,6 @@
     <ClInclude Include="source\kernel\DataFetchPack.h" />
     <ClInclude Include="source\kernel\InjectorComplex.h" />
     <ClInclude Include="source\kernel\MetricPackMapper.h" />
-    <ClInclude Include="source\pmon\AdapterInfo.h" />
     <ClInclude Include="source\pmon\DynamicQuery.h" />
     <ClInclude Include="source\pmon\metric\DynamicPollingFetcher.h" />
     <ClInclude Include="source\pmon\MetricFetcherFactory.h" />
@@ -276,4 +275,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/Core/Core.vcxproj.filters b/IntelPresentMon/Core/Core.vcxproj.filters
index 18cc25322..4f713ebee 100644
--- a/IntelPresentMon/Core/Core.vcxproj.filters
+++ b/IntelPresentMon/Core/Core.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClInclude Include="source\win\WndClass.h" />
@@ -72,7 +72,6 @@
     <ClInclude Include="source\win\KernelWindow.h" />
     <ClInclude Include="source\pmon\StatisticsTracker.h" />
     <ClInclude Include="source\win\GpuUtilization.h" />
-    <ClInclude Include="source\pmon\AdapterInfo.h" />
     <ClInclude Include="source\pmon\metric\DynamicPollingFetcher.h" />
     <ClInclude Include="source\pmon\DynamicQuery.h" />
     <ClInclude Include="source\kernel\DataFetchPack.h" />
@@ -147,4 +146,4 @@
   <ItemGroup>
     <None Include="cpp.hint" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/Core/source/kernel/Kernel.cpp b/IntelPresentMon/Core/source/kernel/Kernel.cpp
index 94418a038..c58893f07 100644
--- a/IntelPresentMon/Core/source/kernel/Kernel.cpp
+++ b/IntelPresentMon/Core/source/kernel/Kernel.cpp
@@ -111,21 +111,6 @@ namespace p2c::kern
         return pm->GetDefaultGpuDeviceId();
     }
 
-    std::vector<pmon::AdapterInfo> Kernel::EnumerateAdapters() const
-    {
-        HandleMarshalledException_();
-        std::lock_guard lk{ mtx };
-        if (!pm) {
-            pmlog_warn("presentmon not initialized");
-            return {};
-        }
-        try { return pm->EnumerateAdapters(); }
-        catch (...) { 
-            pmlog_warn("failed to enumerate adapters, returning empty set");
-            return {};
-        }
-    }
-
     void Kernel::SetCapture(bool active)
     {
         HandleMarshalledException_();
diff --git a/IntelPresentMon/Core/source/kernel/Kernel.h b/IntelPresentMon/Core/source/kernel/Kernel.h
index 5bab7fea2..49279fb2d 100644
--- a/IntelPresentMon/Core/source/kernel/Kernel.h
+++ b/IntelPresentMon/Core/source/kernel/Kernel.h
@@ -51,7 +51,6 @@ namespace p2c::kern
             std::optional<std::string> overrideTargetName,
             const GfxLayer::Extension::OverlayConfig& cfg);
         void ClearOverlay();
-        std::vector<pmon::AdapterInfo> EnumerateAdapters() const;
         void SetCapture(bool active);
         void SetEtlLogging(bool active);
         const pmapi::intro::Root& GetIntrospectionRoot() const;
diff --git a/IntelPresentMon/Core/source/pmon/AdapterInfo.h b/IntelPresentMon/Core/source/pmon/AdapterInfo.h
deleted file mode 100644
index 8de15f06a..000000000
--- a/IntelPresentMon/Core/source/pmon/AdapterInfo.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include <cstdint>
-#include <string>
-
-namespace p2c::pmon
-{
-	struct AdapterInfo
-	{
-		uint32_t id;
-		std::string vendor;
-		std::string name;
-	};
-}
\ No newline at end of file
diff --git a/IntelPresentMon/Core/source/pmon/PresentMon.cpp b/IntelPresentMon/Core/source/pmon/PresentMon.cpp
index 6f67ac447..89202196f 100644
--- a/IntelPresentMon/Core/source/pmon/PresentMon.cpp
+++ b/IntelPresentMon/Core/source/pmon/PresentMon.cpp
@@ -71,21 +71,6 @@ namespace p2c::pmon
 	{
 		return telemetrySamplePeriod;
 	}
-	std::vector<AdapterInfo> PresentMon::EnumerateAdapters() const
-	{
-		std::vector<AdapterInfo> infos;
-		for (const auto& info : pIntrospectionRoot->GetDevices()) {
-			if (info.GetType() != PM_DEVICE_TYPE_GRAPHICS_ADAPTER) {
-				continue;
-			}
-			infos.push_back(AdapterInfo{
-				.id = info.GetId(),
-				.vendor = info.IntrospectVendor().GetName(),
-				.name = info.GetName(),
-			});
-		}
-		return infos;
-	}
 	void PresentMon::SetEtlLogging(bool active)
 	{
         pmlog_warn("Ignoring ETL logging request because ETL logging is disabled").pmwatch(active);
@@ -145,42 +130,16 @@ namespace p2c::pmon
 	{
 		const auto& intro = *pIntrospectionRoot;
 		uint32_t bestId = 0;
-		uint64_t bestMem = 0;
 
 		for (const auto& device : intro.GetDevices()) {
 			if (device.GetType() != PM_DEVICE_TYPE_GRAPHICS_ADAPTER) {
 				continue;
 			}
-			uint64_t memSize = 0;
-			bool hasValue = false;
-			try {
-				memSize = pmapi::PollStatic(*pSession,
-					PM_METRIC_GPU_MEM_SIZE, device.GetId(), 0).As<uint64_t>();
-				hasValue = true;
-			}
-			catch (...) {
-				hasValue = false;
-			}
-
-			if (hasValue) {
-				if (memSize > bestMem) {
-					bestMem = memSize;
-					bestId = device.GetId();
-				}
-			}
-			else if (bestId == 0) {
+			if (bestId == 0 || device.GetId() < bestId) {
 				bestId = device.GetId();
 			}
 		}
 
-		if (bestId == 0) {
-			for (const auto& device : intro.GetDevices()) {
-				if (device.GetType() == PM_DEVICE_TYPE_GRAPHICS_ADAPTER) {
-					return device.GetId();
-				}
-			}
-		}
-
 		return bestId;
 	}
 }
diff --git a/IntelPresentMon/Core/source/pmon/PresentMon.h b/IntelPresentMon/Core/source/pmon/PresentMon.h
index cda36ef16..024a69a7c 100644
--- a/IntelPresentMon/Core/source/pmon/PresentMon.h
+++ b/IntelPresentMon/Core/source/pmon/PresentMon.h
@@ -4,7 +4,6 @@
 #include <optional>
 #include <vector>
 #include <memory>
-#include "AdapterInfo.h"
 #include <PresentMonAPIWrapper/ProcessTracker.h>
 #include <PresentMonAPIWrapper/EtlLogger.h>
 
@@ -33,8 +32,6 @@ namespace p2c::pmon
 		uint32_t GetGpuTelemetryPeriod();
 		void SetEtwFlushPeriod(std::optional<uint32_t> periodMs);
 		std::optional<uint32_t> GetEtwFlushPeriod();
-		// std::wstring GetCpuName() const;
-		std::vector<AdapterInfo> EnumerateAdapters() const;
 		void SetEtlLogging(bool active);
 		std::optional<uint32_t> GetPid() const;
 		const pmapi::ProcessTracker& GetTracker() const;
diff --git a/IntelPresentMon/Interprocess/Interprocess.vcxproj b/IntelPresentMon/Interprocess/Interprocess.vcxproj
index 48c9dcd9c..9e2c5b658 100644
--- a/IntelPresentMon/Interprocess/Interprocess.vcxproj
+++ b/IntelPresentMon/Interprocess/Interprocess.vcxproj
@@ -17,7 +17,6 @@
     <ClCompile Include="source\IntrospectionPopulators.cpp" />
     <ClCompile Include="source\metadata\MetadataValidators.cpp" />
     <ClCompile Include="source\MetricCapabilities.cpp" />
-    <ClCompile Include="source\MetricCapabilitiesShim.cpp" />
     <ClCompile Include="source\ShmNamer.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -33,9 +32,7 @@
     <ClInclude Include="source\act\Transfer.h" />
     <ClInclude Include="source\DataStores.h" />
     <ClInclude Include="source\MetricCapabilities.h" />
-    <ClInclude Include="source\MetricCapabilitiesShim.h" />
     <ClInclude Include="source\PmStatusError.h" />
-    <ClInclude Include="source\IntrospectionCapsLookup.h" />
     <ClInclude Include="source\IntrospectionDataTypeMapping.h" />
     <ClInclude Include="source\IntrospectionHelpers.h" />
     <ClInclude Include="source\metadata\EnumFrameType.h" />
@@ -175,4 +172,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/Interprocess/Interprocess.vcxproj.filters b/IntelPresentMon/Interprocess/Interprocess.vcxproj.filters
index 34a524306..82ad79fed 100644
--- a/IntelPresentMon/Interprocess/Interprocess.vcxproj.filters
+++ b/IntelPresentMon/Interprocess/Interprocess.vcxproj.filters
@@ -33,9 +33,6 @@
     <ClCompile Include="source\ShmNamer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="source\MetricCapabilitiesShim.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="source\MetricCapabilities.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -107,9 +104,6 @@
     <ClInclude Include="source\metadata\StatsShortcuts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="source\IntrospectionCapsLookup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="source\IntrospectionHelpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -179,11 +173,8 @@
     <ClInclude Include="source\ViewedDataSegment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="source\MetricCapabilitiesShim.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="source\SystemDeviceId.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/Interprocess/source/Interprocess.h b/IntelPresentMon/Interprocess/source/Interprocess.h
index 3d67d92e8..54074f96f 100644
--- a/IntelPresentMon/Interprocess/source/Interprocess.h
+++ b/IntelPresentMon/Interprocess/source/Interprocess.h
@@ -1,9 +1,7 @@
-#pragma once
+#pragma once
 #include <optional>
 #include <string>
 #include <memory>
-#include "../../ControlLib/PresentMonPowerTelemetry.h"
-#include "../../ControlLib/CpuTelemetryInfo.h"
 #include "../../PresentMonAPI2/PresentMonAPI.h"
 #include "DataStores.h"
 #include "OwnedDataSegment.h"
@@ -56,4 +54,4 @@ namespace pmon::ipc
 		size_t frameRingSamples,
 		size_t telemetryRingSamples);
 	std::unique_ptr<MiddlewareComms> MakeMiddlewareComms(std::string prefix, std::string salt);
-}
\ No newline at end of file
+}
diff --git a/IntelPresentMon/Interprocess/source/IntrospectionCapsLookup.h b/IntelPresentMon/Interprocess/source/IntrospectionCapsLookup.h
deleted file mode 100644
index 1062c9ab9..000000000
--- a/IntelPresentMon/Interprocess/source/IntrospectionCapsLookup.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-#include "IntrospectionMetadata.h"
-#include <array>
-#include "../../ControlLib/PresentMonPowerTelemetry.h"
-#include "../../ControlLib/CpuTelemetryInfo.h"
-
-
-namespace pmon::ipc::intro
-{
-	// mapping of caps to metrics
-	template<PM_METRIC metric> struct IntrospectionCapsLookup { using Universal = std::true_type; };
-	// sentinel metric used for enumeration only (no availability)
-	template<> struct IntrospectionCapsLookup<PM_METRIC_COUNT_> {};
-	// GPU caps
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_POWER> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_power; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_VOLTAGE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_voltage; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_TEMPERATURE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_temperature; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_FREQUENCY> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_frequency; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_EFFECTIVE_FREQUENCY> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_effective_frequency; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_UTILIZATION> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_utilization; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_RENDER_COMPUTE_UTILIZATION> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_render_compute_utilization; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEDIA_UTILIZATION> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_media_utilization; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_POWER> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_power; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_VOLTAGE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_voltage; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_FREQUENCY> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_frequency; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_EFFECTIVE_FREQUENCY> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_effective_frequency; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_TEMPERATURE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_temperature; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_VOLTAGE_REGULATOR_TEMPERATURE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_voltage_regulator_temperature; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_effective_bandwidth; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_OVERVOLTAGE_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_overvoltage_percent; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_TEMPERATURE_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_temperature_percent; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_POWER_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_power_percent; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_CARD_POWER> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_card_power; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_FAN_SPEED> {
-		static constexpr auto gpuCapBitArray = std::array{ GpuTelemetryCapBits::fan_speed_0, GpuTelemetryCapBits::fan_speed_1,
-			GpuTelemetryCapBits::fan_speed_2, GpuTelemetryCapBits::fan_speed_3, GpuTelemetryCapBits::fan_speed_4, };
-	};
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_FAN_SPEED_PERCENT> {
-		using Derived = std::true_type;
-		static constexpr auto gpuCapBitArray = std::array{ GpuTelemetryCapBits::max_fan_speed_0, GpuTelemetryCapBits::max_fan_speed_1,
-			GpuTelemetryCapBits::max_fan_speed_2, GpuTelemetryCapBits::max_fan_speed_3, GpuTelemetryCapBits::max_fan_speed_4, };
-	};
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_USED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_used; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_UTILIZATION> {
-		using Derived = std::true_type;
-		static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_used;
-	};
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_WRITE_BANDWIDTH> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_write_bandwidth; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_READ_BANDWIDTH> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_read_bandwidth; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_POWER_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_power_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_TEMPERATURE_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_temperature_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_CURRENT_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_current_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_VOLTAGE_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_voltage_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_UTILIZATION_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_utilization_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_POWER_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_power_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_TEMPERATURE_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_temperature_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_CURRENT_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_current_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_VOLTAGE_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_voltage_limited; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_UTILIZATION_LIMITED> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_utilization_limited; };
-	// static GPU
-	// TODO: static and cap bit signalling are NOT mutually exclusive!!
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_NAME> { using GpuDeviceStatic = std::true_type; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_VENDOR> { using GpuDeviceStatic = std::true_type; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_SUSTAINED_POWER_LIMIT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_sustained_power_limit; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_SIZE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_size; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_MAX_BANDWIDTH> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_max_bandwidth; };
-	// CPU caps
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_UTILIZATION> { static constexpr auto cpuCapBit = CpuTelemetryCapBits::cpu_utilization; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_POWER> { static constexpr auto cpuCapBit = CpuTelemetryCapBits::cpu_power; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_TEMPERATURE> { static constexpr auto cpuCapBit = CpuTelemetryCapBits::cpu_temperature; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_FREQUENCY> { static constexpr auto cpuCapBit = CpuTelemetryCapBits::cpu_frequency; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_CORE_UTILITY> { using ManualDisable = std::true_type;
-		static constexpr auto cpuCapBit = CpuTelemetryCapBits::cpu_core_utility;
-	};
-	// static CPU
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_POWER_LIMIT> { static constexpr auto cpuCapBit = CpuTelemetryCapBits::cpu_power_limit; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_NAME> { using CpuStatic = std::true_type; };
-	template<> struct IntrospectionCapsLookup<PM_METRIC_CPU_VENDOR> { using CpuStatic = std::true_type; };
-	// TODO: consider additional static CPU metrics beyond name/vendor.
-
-
-	// concepts to help determine device-metric mapping type
-	template<class T> concept IsUniversalMetric = requires { typename T::Universal; };
-	template<class T> concept IsGpuDeviceMetric = requires { T::gpuCapBit; };
-	template<class T> concept IsGpuDeviceMetricArray = requires { T::gpuCapBitArray; };
-	template<class T> concept IsGpuDeviceStaticMetric = requires { typename T::GpuDeviceStatic; };
-	template<class T> concept IsCpuMetric = requires { T::cpuCapBit; };
-	template<class T> concept IsCpuStaticMetric = requires { typename T::CpuStatic; };
-	template<class T> concept IsManualDisableMetric = requires { typename T::ManualDisable; };
-	template<class T> concept IsDerivedMetric = requires { typename T::Derived; };
-}
diff --git a/IntelPresentMon/Interprocess/source/IntrospectionPopulators.cpp b/IntelPresentMon/Interprocess/source/IntrospectionPopulators.cpp
index fcc374306..af3e64fa3 100644
--- a/IntelPresentMon/Interprocess/source/IntrospectionPopulators.cpp
+++ b/IntelPresentMon/Interprocess/source/IntrospectionPopulators.cpp
@@ -1,7 +1,6 @@
-#include "IntrospectionHelpers.h"
+#include "IntrospectionHelpers.h"
 #include "IntrospectionMetadata.h"
 #include "IntrospectionTransfer.h"
-#include "IntrospectionCapsLookup.h"
 #include "MetricCapabilities.h"
 #include "IntrospectionPopulators.h"
 #include "../../CommonUtilities/log/Log.h"
@@ -30,11 +29,10 @@ namespace pmon::ipc::intro
 #undef X_REG_KEYS
 	}
 
-	template<PM_METRIC metricId>
+	template<PM_METRIC metricId, PM_DEVICE_TYPE deviceType>
 	void RegisterUniversalMetricDeviceInfo_(ShmSegmentManager* pSegmentManager, IntrospectionRoot& root, IntrospectionMetric& metric)
 	{
-		using Lookup = IntrospectionCapsLookup<metricId>;
-		if constexpr (IsUniversalMetric<Lookup>) {
+		if constexpr (deviceType == PM_DEVICE_TYPE_INDEPENDENT) {
 			metric.AddDeviceMetricInfo(IntrospectionDeviceMetricInfo{
 				0, PM_METRIC_AVAILABILITY_AVAILABLE, 1 });
 		}
@@ -52,7 +50,7 @@ namespace pmon::ipc::intro
 #define X_REG_METRIC(metric, metric_type, unit, data_type_polled, data_type_frame, enum_id, device_type, ...) { \
 		auto pMetric = ShmMakeUnique<IntrospectionMetric>(pSegmentManager, pSegmentManager, \
 			metric, metric_type, unit, IntrospectionDataTypeInfo{ data_type_polled, data_type_frame, (PM_ENUM)enum_id }, std::vector{ __VA_ARGS__ }); \
-		RegisterUniversalMetricDeviceInfo_<metric>(pSegmentManager, root, *pMetric); \
+		RegisterUniversalMetricDeviceInfo_<metric, device_type>(pSegmentManager, root, *pMetric); \
 		if (preferredMetricOverrides.contains(metric)) pMetric->SetPreferredUnitHint(preferredMetricOverrides[metric]); \
 		root.AddMetric(std::move(pMetric)); }
 
diff --git a/IntelPresentMon/Interprocess/source/MetricCapabilities.cpp b/IntelPresentMon/Interprocess/source/MetricCapabilities.cpp
index bafac4c8c..d057814f4 100644
--- a/IntelPresentMon/Interprocess/source/MetricCapabilities.cpp
+++ b/IntelPresentMon/Interprocess/source/MetricCapabilities.cpp
@@ -1,9 +1,24 @@
 #include "MetricCapabilities.h"
+#include "metadata/MetricList.h"
 #include <sstream>
 #include <type_traits>
 
 namespace pmon::ipc
 {
+    namespace
+    {
+        const char* GetMetricSymbol_(PM_METRIC metricId) noexcept
+        {
+            switch (metricId) {
+#define X_(id_, ...) case id_: return #id_;
+                METRIC_LIST(X_)
+#undef X_
+            default:
+                return "PM_METRIC_UNKNOWN";
+            }
+        }
+    }
+
     void MetricCapabilities::Set(PM_METRIC metricId, size_t arraySize)
     {
         if (arraySize == 0) {
@@ -51,7 +66,8 @@ namespace pmon::ipc
                 oss << indent;
             }
             first = false;
-            oss << "metricId=" << static_cast<std::underlying_type_t<PM_METRIC>>(kv.first)
+            oss << "metric=" << GetMetricSymbol_(kv.first)
+                << " metricId=" << static_cast<std::underlying_type_t<PM_METRIC>>(kv.first)
                 << " arraySize=" << kv.second;
         }
         return oss.str();
diff --git a/IntelPresentMon/Interprocess/source/MetricCapabilitiesShim.cpp b/IntelPresentMon/Interprocess/source/MetricCapabilitiesShim.cpp
deleted file mode 100644
index 373abe982..000000000
--- a/IntelPresentMon/Interprocess/source/MetricCapabilitiesShim.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-#include "MetricCapabilitiesShim.h"
-#include "IntrospectionCapsLookup.h"
-#include "../../CommonUtilities/Meta.h"
-#include <algorithm>
-
-namespace pmon::ipc::intro
-{
-    namespace detail
-    {
-        using MetricEnum = PM_METRIC;
-        // Probe underlying values in [0, COUNT)
-        constexpr auto MaxMetricUnderlying = int(PM_METRIC_COUNT_);
-
-        // xxxCapBits is std::bitset<N>
-        template<typename BitsType, typename Index>
-        bool HasCap(const BitsType& bits, Index index)
-        {
-            return bits.test(static_cast<std::size_t>(index));
-        }
-
-        template<typename ArrayT>
-        size_t CountGpuCaps_(const GpuTelemetryBitset& bits, const ArrayT& caps)
-        {
-            size_t count = 0;
-            for (auto flag : caps) {
-                if (HasCap(bits, flag)) {
-                    ++count;
-                }
-            }
-            return count;
-        }
-
-        // GPU per-metric accumulation (only instantiated for valid enum values)
-        template<MetricEnum Metric>
-        void AccumulateGpuCapability(MetricCapabilities& caps, const GpuTelemetryBitset& bits)
-        {
-            using Lookup = IntrospectionCapsLookup<Metric>;
-
-            if constexpr (IsDerivedMetric<Lookup>) {
-                return;
-            }
-
-            // Single GPU capability bit -> metric present if bit set
-            if constexpr (IsGpuDeviceMetric<Lookup>) {
-                if (HasCap(bits, Lookup::gpuCapBit)) {
-                    caps.Set(Metric, 1);
-                }
-            }
-
-            // Array GPU capability bits (fan speeds, etc.)
-            if constexpr (IsGpuDeviceMetricArray<Lookup> && !IsManualDisableMetric<Lookup>) {
-                std::size_t count = 0;
-                for (auto flag : Lookup::gpuCapBitArray) {
-                    if (HasCap(bits, flag)) {
-                        ++count;
-                    }
-                }
-                if (count > 0) {
-                    caps.Set(Metric, count);
-                }
-            }
-
-            // Static GPU metrics: name/vendor/etc.
-            if constexpr (IsGpuDeviceStaticMetric<Lookup>) {
-                caps.Set(Metric, 1);
-            }
-        }
-
-        void AccumulateDerivedGpuCapabilities_(MetricCapabilities& caps, const GpuTelemetryBitset& bits)
-        {
-            const auto fanCount = caps.Check(PM_METRIC_GPU_FAN_SPEED);
-            const auto maxFanCount = CountGpuCaps_(bits,
-                IntrospectionCapsLookup<PM_METRIC_GPU_FAN_SPEED_PERCENT>::gpuCapBitArray);
-            const auto derivedFanCount = std::min(fanCount, maxFanCount);
-            if (derivedFanCount > 0) {
-                caps.Set(PM_METRIC_GPU_FAN_SPEED_PERCENT, derivedFanCount);
-            }
-
-            if (caps.Check(PM_METRIC_GPU_MEM_USED) > 0 &&
-                caps.Check(PM_METRIC_GPU_MEM_SIZE) > 0) {
-                caps.Set(PM_METRIC_GPU_MEM_UTILIZATION, 1);
-            }
-        }
-
-        // CPU per-metric accumulation (only instantiated for valid enum values)
-        template<MetricEnum Metric>
-        void AccumulateCpuCapability(MetricCapabilities& caps, const CpuTelemetryBitset& bits)
-        {
-            using Lookup = IntrospectionCapsLookup<Metric>;
-
-            // CPU metrics gated by a capability bit
-            if constexpr (IsCpuMetric<Lookup> && !IsManualDisableMetric<Lookup>) {
-                if (HasCap(bits, Lookup::cpuCapBit)) {
-                    caps.Set(Metric, 1);
-                }
-            }
-
-            if constexpr (IsCpuStaticMetric<Lookup>) {
-                caps.Set(Metric, 1);
-            }
-        }
-    } // namespace detail
-
-    MetricCapabilities ConvertBitset(const GpuTelemetryBitset& bits)
-    {
-        MetricCapabilities caps;
-        util::ForEachEnumValue<detail::MetricEnum, detail::MaxMetricUnderlying>(
-            [&]<detail::MetricEnum Metric>() {
-                detail::AccumulateGpuCapability<Metric>(caps, bits);
-            });
-        detail::AccumulateDerivedGpuCapabilities_(caps, bits);
-        return caps;
-    }
-
-    MetricCapabilities ConvertBitset(const CpuTelemetryBitset& bits)
-    {
-        MetricCapabilities caps;
-        util::ForEachEnumValue<detail::MetricEnum, detail::MaxMetricUnderlying>(
-            [&]<detail::MetricEnum Metric>() {
-                detail::AccumulateCpuCapability<Metric>(caps, bits);
-            });
-        return caps;
-    }
-}
diff --git a/IntelPresentMon/Interprocess/source/MetricCapabilitiesShim.h b/IntelPresentMon/Interprocess/source/MetricCapabilitiesShim.h
deleted file mode 100644
index d0fba7268..000000000
--- a/IntelPresentMon/Interprocess/source/MetricCapabilitiesShim.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include "MetricCapabilities.h"
-#include "../../ControlLib/PresentMonPowerTelemetry.h"
-#include "../../ControlLib/CpuTelemetryInfo.h"
-
-namespace pmon::ipc::intro
-{
-    MetricCapabilities ConvertBitset(const GpuTelemetryBitset& bits);
-    MetricCapabilities ConvertBitset(const CpuTelemetryBitset& bits);
-}
\ No newline at end of file
diff --git a/IntelPresentMon/Interprocess/source/TelemetryMap.h b/IntelPresentMon/Interprocess/source/TelemetryMap.h
index 668c9b38d..ee11ef844 100644
--- a/IntelPresentMon/Interprocess/source/TelemetryMap.h
+++ b/IntelPresentMon/Interprocess/source/TelemetryMap.h
@@ -10,6 +10,7 @@ namespace pmon::ipc
     class TelemetryMap
     {
     public:
+        using ScalarValueType = std::variant<double, uint32_t, uint64_t, bool, int>;
         template<typename T>
         using HistoryRingVect = ShmVector<SampleHistoryRing<T>>;
         using MapValueType = std::variant<
diff --git a/IntelPresentMon/Interprocess/source/metadata/MetricList.h b/IntelPresentMon/Interprocess/source/metadata/MetricList.h
index 25c65e544..c39a55980 100644
--- a/IntelPresentMon/Interprocess/source/metadata/MetricList.h
+++ b/IntelPresentMon/Interprocess/source/metadata/MetricList.h
@@ -70,6 +70,7 @@
 		X_(PM_METRIC_CPU_POWER_LIMIT, PM_METRIC_TYPE_STATIC, PM_UNIT_WATTS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_SYSTEM, PM_STAT_NONE) \
 		X_(PM_METRIC_CPU_POWER, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_WATTS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_SYSTEM, FULL_STATS) \
 		X_(PM_METRIC_CPU_TEMPERATURE, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_CELSIUS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_SYSTEM, FULL_STATS) \
+		X_(PM_METRIC_CPU_CORE_TEMPERATURE, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_CELSIUS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_SYSTEM, FULL_STATS) \
 		X_(PM_METRIC_CPU_FREQUENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MEGAHERTZ, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_SYSTEM, FULL_STATS) \
 		X_(PM_METRIC_CPU_CORE_UTILITY, PM_METRIC_TYPE_DYNAMIC, PM_UNIT_PERCENT, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_SYSTEM, FULL_STATS) \
 		X_(PM_METRIC_ALL_INPUT_TO_PHOTON_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, PM_STAT_NON_ZERO_AVG, PM_STAT_PERCENTILE_01, PM_STAT_PERCENTILE_05, PM_STAT_PERCENTILE_10, PM_STAT_MAX) \
@@ -96,4 +97,4 @@
 		X_(PM_METRIC_BETWEEN_APP_START, PM_METRIC_TYPE_FRAME_EVENT, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_VOID, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_FLIP_DELAY, PM_METRIC_TYPE_FRAME_EVENT, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_VOID, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_SESSION_START_QPC, PM_METRIC_TYPE_STATIC, PM_UNIT_QPC, PM_DATA_TYPE_UINT64, PM_DATA_TYPE_UINT64, 0, PM_DEVICE_TYPE_INDEPENDENT, PM_STAT_NONE) \
-		X_(PM_METRIC_COUNT_, PM_METRIC_TYPE_STATIC, PM_UNIT_DIMENSIONLESS, PM_DATA_TYPE_VOID, PM_DATA_TYPE_VOID, PM_ENUM_NULL_ENUM, PM_DEVICE_TYPE_INDEPENDENT, PM_STAT_NONE) \
+		X_(PM_METRIC_COUNT_, PM_METRIC_TYPE_STATIC, PM_UNIT_DIMENSIONLESS, PM_DATA_TYPE_VOID, PM_DATA_TYPE_VOID, PM_ENUM_NULL_ENUM, PM_DEVICE_TYPE_INDEPENDENT, PM_STAT_NONE)
diff --git a/IntelPresentMon/KernelProcess/KernelProcess.args.json b/IntelPresentMon/KernelProcess/KernelProcess.args.json
index 46c0098c0..28f53e19b 100644
--- a/IntelPresentMon/KernelProcess/KernelProcess.args.json
+++ b/IntelPresentMon/KernelProcess/KernelProcess.args.json
@@ -34,7 +34,7 @@
     },
     {
       "Id": "49b6fc1f-b969-4280-b0d8-17a213e80f16",
-      "Command": "--log-verbose-modules procwatch"
+      "Command": "--log-verbose-modules tele_gpu"
     },
     {
       "Id": "bab48d6d-3a48-4b3b-9ed9-903e381824c6",
diff --git a/IntelPresentMon/KernelProcess/KernelProcess.vcxproj b/IntelPresentMon/KernelProcess/KernelProcess.vcxproj
index 3de6e92dd..a94c5e1f0 100644
--- a/IntelPresentMon/KernelProcess/KernelProcess.vcxproj
+++ b/IntelPresentMon/KernelProcess/KernelProcess.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -170,7 +170,6 @@
     <ClInclude Include="kact\AllActions.h" />
     <ClInclude Include="kact\BindHotkey.h" />
     <ClInclude Include="kact\ClearHotkey.h" />
-    <ClInclude Include="kact\EnumerateAdapters.h" />
     <ClInclude Include="kact\Introspect.h" />
     <ClInclude Include="kact\KernelExecutionContext.h" />
     <ClInclude Include="kact\OpenSession.h" />
diff --git a/IntelPresentMon/KernelProcess/KernelProcess.vcxproj.filters b/IntelPresentMon/KernelProcess/KernelProcess.vcxproj.filters
index 311ebca46..50b1f0d2a 100644
--- a/IntelPresentMon/KernelProcess/KernelProcess.vcxproj.filters
+++ b/IntelPresentMon/KernelProcess/KernelProcess.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="kact\AllActions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="kact\EnumerateAdapters.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="kact\Introspect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/IntelPresentMon/KernelProcess/kact/AllActions.h b/IntelPresentMon/KernelProcess/kact/AllActions.h
index f51d9b798..1fbdc605d 100644
--- a/IntelPresentMon/KernelProcess/kact/AllActions.h
+++ b/IntelPresentMon/KernelProcess/kact/AllActions.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "OpenSession.h"
 #include "SetCapture.h"
-#include "EnumerateAdapters.h"
 #include "Introspect.h"
 #include "PushSpecification.h"
 #include "BindHotkey.h"
diff --git a/IntelPresentMon/KernelProcess/kact/EnumerateAdapters.h b/IntelPresentMon/KernelProcess/kact/EnumerateAdapters.h
deleted file mode 100644
index 97619df18..000000000
--- a/IntelPresentMon/KernelProcess/kact/EnumerateAdapters.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-#include "../../Interprocess/source/act/ActionHelper.h"
-#include "KernelExecutionContext.h"
-#include <format>
-#include "../../Core/source/kernel/Kernel.h"
-#include "../../Core/source/pmon/AdapterInfo.h"
-
-#define ACT_NAME EnumerateAdapters
-#define ACT_EXEC_CTX KernelExecutionContext
-#define ACT_TYPE AsyncActionBase_
-#define ACT_NS kproc::kact
-
-
-namespace ACT_NS
-{
-	using namespace ::pmon::ipc::act;
-
-	class ACT_NAME : public ACT_TYPE<ACT_NAME, ACT_EXEC_CTX>
-	{
-	public:
-		static constexpr const char* Identifier = STRINGIFY(ACT_NAME);
-		struct Params
-		{
-			template<class A> void serialize(A& ar) {
-			}
-		};
-		struct Response {
-			std::vector<p2c::pmon::AdapterInfo> adapters;
-			template<class A> void serialize(A& ar) {
-				ar(adapters);
-			}
-		};
-	private:
-		friend class ACT_TYPE<ACT_NAME, ACT_EXEC_CTX>;
-		static Response Execute_(const ACT_EXEC_CTX& ctx, SessionContext& stx, Params&& in)
-		{
-			return { (*ctx.ppKernel)->EnumerateAdapters() };
-		}
-	};
-
-	ACTION_REG();
-}
-
-namespace cereal
-{
-	template<class Archive>
-	void serialize(Archive& archive, p2c::pmon::AdapterInfo& s)
-	{
-		archive(s.id, s.name, s.vendor);
-	}
-}
-
-ACTION_TRAITS_DEF();
-
-#undef ACT_NAME
-#undef ACT_EXEC_CTX
-#undef ACT_NS
-#undef ACT_TYPE
\ No newline at end of file
diff --git a/IntelPresentMon/KernelProcess/kact/Introspect.h b/IntelPresentMon/KernelProcess/kact/Introspect.h
index d06c2295c..a263e13cf 100644
--- a/IntelPresentMon/KernelProcess/kact/Introspect.h
+++ b/IntelPresentMon/KernelProcess/kact/Introspect.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
 #include "KernelExecutionContext.h"
 #include <format>
@@ -78,11 +78,25 @@ namespace ACT_NS
             }
         };
 
+        struct Adapter
+        {
+            uint32_t id;
+            std::string vendor;
+            std::string name;
+
+            template<class A> void serialize(A& ar) {
+                ar(CEREAL_NVP(id),
+                    CEREAL_NVP(vendor),
+                    CEREAL_NVP(name));
+            }
+        };
+
         struct Response
         {
             std::vector<Metric> metrics;
             std::vector<Stat> stats;
             std::vector<Unit> units;
+            std::vector<Adapter> adapters;
             uint32_t systemDeviceId;
             uint32_t defaultAdapterId;
 
@@ -90,6 +104,7 @@ namespace ACT_NS
                 ar(CEREAL_NVP(metrics),
                     CEREAL_NVP(stats),
                     CEREAL_NVP(units),
+                    CEREAL_NVP(adapters),
                     CEREAL_NVP(systemDeviceId),
                     CEREAL_NVP(defaultAdapterId));
             }
@@ -134,6 +149,16 @@ namespace ACT_NS
             Response res;
             res.systemDeviceId = ::pmon::ipc::kSystemDeviceId;
             res.defaultAdapterId = (*ctx.ppKernel)->GetDefaultGpuDeviceId();
+            for (const auto& device : intro.GetDevices()) {
+                if (device.GetType() != PM_DEVICE_TYPE_GRAPHICS_ADAPTER) {
+                    continue;
+                }
+                res.adapters.push_back(Adapter{
+                    .id = device.GetId(),
+                    .vendor = device.IntrospectVendor().GetName(),
+                    .name = device.GetName(),
+                });
+            }
 
             // reserve space for the actual number of metrics
             res.metrics.reserve(rn::distance(intro.GetMetrics() | vi::filter(filterPred)));
diff --git a/IntelPresentMon/PMInstaller/PMInstaller.wixproj b/IntelPresentMon/PMInstaller/PMInstaller.wixproj
index 08dbe85f9..ca18da780 100644
--- a/IntelPresentMon/PMInstaller/PMInstaller.wixproj
+++ b/IntelPresentMon/PMInstaller/PMInstaller.wixproj
@@ -139,7 +139,7 @@
     <!-- Build the wixlib first -->
     <MSBuild Projects="..\PMInstallerLib\PMInstallerLib.wixproj"
              Targets="Build"
-             Properties="Configuration=$(Configuration);Platform=$(Platform)" />
+             Properties="Configuration=$(Configuration);Platform=$(Platform);PMON_UCI_SDK_DIR=$(PMON_UCI_SDK_DIR)" />
     <ItemGroup>
       <WixLibrary Include="$(SolutionDir)build\$(Configuration)\PMInstallerLib.wixlib"
                   Condition="Exists('$(SolutionDir)build\$(Configuration)\PMInstallerLib.wixlib')" />
diff --git a/IntelPresentMon/PMInstallerLib/Library.wxs b/IntelPresentMon/PMInstallerLib/Library.wxs
index 69c7b0231..4edfcbfa6 100644
--- a/IntelPresentMon/PMInstallerLib/Library.wxs
+++ b/IntelPresentMon/PMInstallerLib/Library.wxs
@@ -84,6 +84,7 @@
       <ComponentRef Id="pmon_shared_service_component" />
       <ComponentRef Id="present_mon_shared_dll_component" />
       <ComponentRef Id="pmon_nv_manifest_comp" />
+      <ComponentGroupRef Id="uci_dist_files" />
     </ComponentGroup>
 
   </Fragment>
diff --git a/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj b/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
index 589c359b5..9602d4c51 100644
--- a/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
+++ b/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
@@ -5,6 +5,9 @@
     <OutputName>PMInstallerLib</OutputName>
     <IntermediateOutputPath>$(SolutionDir)build\obj\$(MSBuildProjectName)-$(Platform)-$(Configuration)</IntermediateOutputPath>
     <OutputPath>$(SolutionDir)build\$(Configuration)</OutputPath>
+    <UciSdkDir Condition="'$(PMON_UCI_SDK_DIR)'!=''">$(PMON_UCI_SDK_DIR)</UciSdkDir>
+    <UciSdkDir Condition="'$(UciSdkDir)'==''">$(MSBuildProjectDirectory)\..\ControlLib\uci\external</UciSdkDir>
+    <DefineConstants>$(DefineConstants);UciDistDir=$(UciSdkDir)\bin</DefineConstants>
     <!-- Point these at YOUR WiX 3.x install -->
     <WixToolPath>$(WIX)bin\</WixToolPath>
     <WixTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -14,6 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Library.wxs" />
+    <Compile Include="$(IntermediateOutputPath)\UciDist.wxs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PresentMonAPI2\PresentMonAPI2.vcxproj">
@@ -33,5 +37,9 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <Target Name="GenerateUciDistFragment" BeforeTargets="Compile">
+    <MakeDir Directories="$(IntermediateOutputPath)" />
+    <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(IntermediateOutputPath)\UciDist.wxs&quot;" />
+  </Target>
   <Import Project="$(WixTargetsPath)" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/IntelPresentMon/PMInstallerLib/wix-uci-dist.ps1 b/IntelPresentMon/PMInstallerLib/wix-uci-dist.ps1
new file mode 100644
index 000000000..3c23ab387
--- /dev/null
+++ b/IntelPresentMon/PMInstallerLib/wix-uci-dist.ps1
@@ -0,0 +1,146 @@
+[CmdletBinding()]
+param(
+    [string]$UciSdkDir,
+    [string]$OutPath = 'UciDist.wxs'
+)
+
+function Get-DeterministicGuid {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Name
+    )
+
+    $md5 = [System.Security.Cryptography.MD5]::Create()
+    try {
+        $bytes = $md5.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($Name.ToLowerInvariant()))
+    }
+    finally {
+        $md5.Dispose()
+    }
+
+    $bytes[6] = ($bytes[6] -band 0x0F) -bor 0x30
+    $bytes[8] = ($bytes[8] -band 0x3F) -bor 0x80
+    return (New-Object System.Guid -ArgumentList (, $bytes)).ToString().ToUpperInvariant()
+}
+
+function Write-EmptyUciDistFragment {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$OutPath
+    )
+
+    $settings = New-Object System.Xml.XmlWriterSettings
+    $settings.Encoding = New-Object System.Text.UTF8Encoding($false)
+    $settings.Indent = $true
+    $settings.IndentChars = '    '
+    $settings.NewLineChars = "`r`n"
+    $settings.NewLineHandling = [System.Xml.NewLineHandling]::Replace
+
+    $writer = [System.Xml.XmlWriter]::Create($OutPath, $settings)
+    try {
+        $writer.WriteStartDocument()
+        $writer.WriteStartElement('Wix', 'http://schemas.microsoft.com/wix/2006/wi')
+        $writer.WriteStartElement('Fragment')
+        $writer.WriteStartElement('ComponentGroup')
+        $writer.WriteAttributeString('Id', 'uci_dist_files')
+        $writer.WriteEndElement()
+        $writer.WriteEndElement()
+        $writer.WriteEndElement()
+        $writer.WriteEndDocument()
+    }
+    finally {
+        $writer.Dispose()
+    }
+}
+
+if ([string]::IsNullOrWhiteSpace($UciSdkDir)) {
+    $UciSdkDir = $env:PMON_UCI_SDK_DIR
+}
+if ([string]::IsNullOrWhiteSpace($UciSdkDir)) {
+    $UciSdkDir = Join-Path $PSScriptRoot '..\ControlLib\uci\external'
+}
+
+$distPath = Join-Path $UciSdkDir 'bin'
+$outDir = Split-Path -Parent $OutPath
+if (-not [string]::IsNullOrWhiteSpace($outDir) -and -not (Test-Path $outDir -PathType Container)) {
+    New-Item -Path $outDir -ItemType Directory -Force | Out-Null
+}
+
+Push-Location $PSScriptRoot
+
+if (-not (Test-Path $distPath -PathType Container)) {
+    Pop-Location
+    Write-Warning "UCI dist directory '$distPath' was not found. Skipping UCI payload files."
+    Write-EmptyUciDistFragment -OutPath $OutPath
+    exit 0
+}
+
+if ($null -eq (Get-ChildItem -Path $distPath -Recurse -File -Force | Select-Object -First 1)) {
+    Pop-Location
+    Write-Warning "UCI dist directory '$distPath' contains no files. Skipping UCI payload files."
+    Write-EmptyUciDistFragment -OutPath $OutPath
+    exit 0
+}
+
+if (-not $env:WIX) {
+    Pop-Location
+    Write-Error 'Environment variable WIX is not set. Please install WIX or set WIX to the WiX installation directory.'
+    exit 1
+}
+
+$heatExe = Join-Path $env:WIX 'bin\heat.exe'
+if (-not (Test-Path $heatExe)) {
+    Pop-Location
+    Write-Error "heat.exe not found at '$heatExe'. Verify your WIX environment variable points to the correct location."
+    exit 1
+}
+
+& $heatExe dir $distPath `
+    -srd -sreg -scom `
+    -dr service_folder `
+    -cg uci_dist_files `
+    -var var.UciDistDir `
+    -suid -g1 -ag `
+    -out $OutPath
+
+$code = $LASTEXITCODE
+if ($code -ne 0) {
+    Pop-Location
+    Write-Error "heat.exe failed for '$distPath' (exit code $code)"
+    exit $code
+}
+
+[xml]$doc = Get-Content $OutPath
+$ns = New-Object System.Xml.XmlNamespaceManager($doc.NameTable)
+$ns.AddNamespace('w', 'http://schemas.microsoft.com/wix/2006/wi')
+
+$componentNodes = $doc.SelectNodes('//w:Component', $ns)
+foreach ($componentNode in $componentNodes) {
+    $componentNode.SetAttribute('Win64', 'yes')
+    $fileNode = $componentNode.SelectSingleNode('w:File', $ns)
+    if ($null -eq $fileNode) {
+        Pop-Location
+        Write-Error 'Encountered a harvested component without a File node.'
+        exit 1
+    }
+
+    $source = $fileNode.GetAttribute('Source')
+    $guid = Get-DeterministicGuid -Name $source
+    $componentNode.SetAttribute('Guid', "{$guid}")
+}
+
+$settings = New-Object System.Xml.XmlWriterSettings
+$settings.Encoding = New-Object System.Text.UTF8Encoding($false)
+$settings.Indent = $true
+$settings.IndentChars = '    '
+$settings.NewLineChars = "`r`n"
+$settings.NewLineHandling = [System.Xml.NewLineHandling]::Replace
+
+$writer = [System.Xml.XmlWriter]::Create((Resolve-Path $OutPath), $settings)
+try {
+    $doc.Save($writer)
+}
+finally {
+    $writer.Dispose()
+    Pop-Location
+}
diff --git a/IntelPresentMon/PresentMonAPI2/PresentMonAPI.h b/IntelPresentMon/PresentMonAPI2/PresentMonAPI.h
index 63b538f75..8fc715fd4 100644
--- a/IntelPresentMon/PresentMonAPI2/PresentMonAPI.h
+++ b/IntelPresentMon/PresentMonAPI2/PresentMonAPI.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 
 #define PM_API_VERSION_MAJOR 3
-#define PM_API_VERSION_MINOR 3
+#define PM_API_VERSION_MINOR 4
 
 #define PM_MAX_PATH 260
 
@@ -140,6 +140,7 @@ extern "C" {
 		PM_METRIC_FLIP_DELAY,
 		PM_METRIC_PROCESS_ID,
 		PM_METRIC_SESSION_START_QPC,
+		PM_METRIC_CPU_CORE_TEMPERATURE,
 		PM_METRIC_COUNT_, // sentry to mark end of metric list; not an actual query metric
 	};
 
diff --git a/IntelPresentMon/PresentMonAPI2Tests/InterimBroadcasterTests.cpp b/IntelPresentMon/PresentMonAPI2Tests/InterimBroadcasterTests.cpp
index bacf3442e..0d8bad8b9 100644
--- a/IntelPresentMon/PresentMonAPI2Tests/InterimBroadcasterTests.cpp
+++ b/IntelPresentMon/PresentMonAPI2Tests/InterimBroadcasterTests.cpp
@@ -416,7 +416,7 @@ namespace InterimBroadcasterTests
 
             {
                 // build metric use set from above store results
-                std::unordered_set<svc::acts::MetricUse> uses;
+                std::unordered_set<svc::MetricUse> uses;
                 for (auto&& [met, siz] : storeRings) {
                     if (siz > 0) {
                         uses.insert({ met, ipc::kSystemDeviceId, 0 });
@@ -551,7 +551,7 @@ namespace InterimBroadcasterTests
                 TargetDeviceID,
                 2,
                 "InterimBroadcasterTests.GpuStoreTests.PolledData");
-            std::unordered_set<svc::acts::MetricUse> uses;
+            std::unordered_set<svc::MetricUse> uses;
             for (const auto& choice : metricChoices) {
                 if (choice.introspectionAvailable) {
                     uses.insert({ choice.metric, TargetDeviceID, 0 });
@@ -671,7 +671,7 @@ namespace InterimBroadcasterTests
                         
             {
                 // build metric use set from above introspection results
-                std::unordered_set<svc::acts::MetricUse> uses;
+                std::unordered_set<svc::MetricUse> uses;
                 for (auto&& [met, siz] : introspectionAvailability) {
                     if (siz > 0) {
                         uses.insert({ met, TargetDeviceID, 0 });
@@ -819,7 +819,7 @@ namespace InterimBroadcasterTests
                 TargetDeviceID,
                 2,
                 "InterimBroadcasterTests.NewActivationIsolationTests.GpuOnlyLeavesSystemEmpty");
-            std::unordered_set<svc::acts::MetricUse> uses;
+            std::unordered_set<svc::MetricUse> uses;
             for (const auto& choice : gpuMetricChoices) {
                 if (choice.introspectionAvailable) {
                     uses.insert({ choice.metric, TargetDeviceID, 0 });
diff --git a/IntelPresentMon/PresentMonMiddleware/Middleware.cpp b/IntelPresentMon/PresentMonMiddleware/Middleware.cpp
index c19660b8c..5601f3f30 100644
--- a/IntelPresentMon/PresentMonMiddleware/Middleware.cpp
+++ b/IntelPresentMon/PresentMonMiddleware/Middleware.cpp
@@ -416,12 +416,12 @@ namespace pmon::mid
 
     void Middleware::UpdateMetricUsage_()
     {
-        std::unordered_set<svc::acts::MetricUse> usage;
+        std::unordered_set<svc::MetricUse> usage;
         // TODO: remove intro here as it is not necessary
         const auto& introRoot = GetIntrospectionRoot_();
         for (const auto& [handle, elements] : queryMetricUsage_) {
             for (const auto& element : elements) {
-                usage.insert(svc::acts::MetricUse{
+                usage.insert(svc::MetricUse{
                     .metricId = element.metric,
                     .deviceId = element.deviceId,
                     .arrayIdx = element.arrayIndex,
diff --git a/IntelPresentMon/PresentMonService/ActionExecutionContext.cpp b/IntelPresentMon/PresentMonService/ActionExecutionContext.cpp
index c87450cd6..9b82758ce 100644
--- a/IntelPresentMon/PresentMonService/ActionExecutionContext.cpp
+++ b/IntelPresentMon/PresentMonService/ActionExecutionContext.cpp
@@ -63,21 +63,13 @@ namespace pmon::svc::acts
     }
     void ActionExecutionContext::UpdateMetricUsage() const
     {
-        std::unordered_set<MetricUse> aggregateMetricUsage;
-        std::unordered_set<uint32_t> deviceMetricUsage;
+        auto deviceMetricUsage = std::make_shared<PresentMon::DeviceMetricUsage>();
         auto&& allUsageSets = util::rng::MemberSlice(*pSessionMap, &SessionContextType::metricUsage);
         for (auto&& clientUsageSet : allUsageSets) {
             for (auto&& usage : clientUsageSet) {
-                aggregateMetricUsage.insert(usage);
-                deviceMetricUsage.insert(usage.deviceId);
+                (*deviceMetricUsage)[usage.deviceId].insert(usage);
             }
         }
-        if (!hasLastAggregateMetricUsage || aggregateMetricUsage != lastAggregateMetricUsage) {
-            pmlog_verb(pmon::util::log::V::met_use)("Aggregate metric usage updated")
-                .serialize("aggregateMetricUsage", aggregateMetricUsage);
-            lastAggregateMetricUsage = aggregateMetricUsage;
-            hasLastAggregateMetricUsage = true;
-        }
         pPmon->SetDeviceMetricUsage(std::move(deviceMetricUsage));
     }
 
diff --git a/IntelPresentMon/PresentMonService/ActionExecutionContext.h b/IntelPresentMon/PresentMonService/ActionExecutionContext.h
index fa121edf4..b0fd405d3 100644
--- a/IntelPresentMon/PresentMonService/ActionExecutionContext.h
+++ b/IntelPresentMon/PresentMonService/ActionExecutionContext.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "../Interprocess/source/act/SymmetricActionConnector.h"
 #include "../Interprocess/source/ShmNamer.h"
-#include "../CommonUtilities/Hash.h"
 #include "../CommonUtilities/win/Handle.h"
 #include <memory>
 #include <set>
@@ -13,58 +12,16 @@
 #include <chrono>
 #include <map>
 #include <functional>
-#include <type_traits>
 #include <cereal/cereal.hpp>
 
 #include "PresentMon.h"
 #include "Service.h"
 #include "FrameBroadcaster.h"
+#include "MetricUse.h"
 
 namespace pmon::svc::acts
 {
     struct ActionExecutionContext;
-    // TODO: move this struct into its own header
-    struct MetricUse
-    {
-        PM_METRIC metricId;
-        uint32_t deviceId;
-        uint32_t arrayIdx;
-
-        template<class A>
-        void serialize(A& ar)
-        {
-            ar(CEREAL_NVP(metricId),
-                CEREAL_NVP(deviceId),
-                CEREAL_NVP(arrayIdx));
-        }
-
-        bool operator==(const MetricUse& rhs) const
-        {
-            return metricId == rhs.metricId &&
-                deviceId == rhs.deviceId &&
-                arrayIdx == rhs.arrayIdx;
-        }
-    };
-}
-
-// Must be visible before any std::unordered_set<MetricUse> instantiation
-namespace std
-{
-    template<>
-    struct hash<pmon::svc::acts::MetricUse>
-    {
-        size_t operator()(const pmon::svc::acts::MetricUse& mu) const noexcept
-        {
-            const uint64_t devIdx =
-                (uint64_t(mu.deviceId) << 32) | uint64_t(mu.arrayIdx);
-
-            // Avoid depending on std::hash<PM_METRIC> existing:
-            using Under = std::underlying_type_t<PM_METRIC>;
-            const Under mid = static_cast<Under>(mu.metricId);
-
-            return pmon::util::hash::DualHash(mid, devIdx);
-        }
-    };
 }
 
 namespace pmon::svc::acts
@@ -103,8 +60,6 @@ namespace pmon::svc::acts
         PresentMon* pPmon = nullptr;
         const std::unordered_map<uint32_t, SessionContextType>* pSessionMap = nullptr;
         std::optional<uint32_t> responseWriteTimeoutMs;
-        mutable std::unordered_set<MetricUse> lastAggregateMetricUsage;
-        mutable bool hasLastAggregateMetricUsage = false;
 
         // functions
         void Dispose(SessionContextType& stx);
diff --git a/IntelPresentMon/PresentMonService/AllActions.h b/IntelPresentMon/PresentMonService/AllActions.h
index e2fad16c6..b9fe3b18c 100644
--- a/IntelPresentMon/PresentMonService/AllActions.h
+++ b/IntelPresentMon/PresentMonService/AllActions.h
@@ -1,8 +1,6 @@
 // GENERATED HEADER
 #pragma once
-#include "acts/EnumerateAdapters.h"
 #include "acts/FinishEtlLogging.h"
-#include "acts/GetStaticCpuMetrics.h"
 #include "acts/OpenSession.h"
 #include "acts/ReportFrameReadProgress.h"
 #include "acts/ReportMetricUse.h"
diff --git a/IntelPresentMon/PresentMonService/LogSetup.cpp b/IntelPresentMon/PresentMonService/LogSetup.cpp
index e6592c9a8..7f0fd92c0 100644
--- a/IntelPresentMon/PresentMonService/LogSetup.cpp
+++ b/IntelPresentMon/PresentMonService/LogSetup.cpp
@@ -1,4 +1,4 @@
-#include "LogSetup.h"
+#include "LogSetup.h"
 #include <chrono>
 #include "../CommonUtilities/log/Log.h"
 #include "../CommonUtilities/log/Channel.h"
@@ -16,7 +16,7 @@
 #include "../CommonUtilities/win/HrErrorCodeProvider.h"
 #include "../CommonUtilities/str/String.h"
 #include "../CommonUtilities/Exception.h"
-#include "../ControlLib/IgclErrorCodeProvider.h"
+#include "../ControlLib/igcl/IgclErrorCodeProvider.h"
 #include "../PresentMonAPIWrapperCommon/PmErrorCodeProvider.h"
 #include "CliOptions.h"
 #include "Registry.h"
@@ -33,7 +33,7 @@ namespace pmon::util::log
 			// error resolver
 			auto pErrorResolver = std::make_shared<ErrorCodeResolver>();
 			pErrorResolver->AddProvider(std::make_unique<win::HrErrorCodeProvider>());
-			pErrorResolver->AddProvider(std::make_unique<pwr::intel::IgclErrorCodeProvider>());
+			pErrorResolver->AddProvider(std::make_unique<pmon::tel::igcl::IgclErrorCodeProvider>());
 			pErrorResolver->AddProvider(std::make_unique<pmapi::PmErrorCodeProvider>());
 			// error resolving policy
 			auto pErrPolicy = std::make_shared<ErrorCodeResolvePolicy>();
diff --git a/IntelPresentMon/PresentMonService/MetricUse.h b/IntelPresentMon/PresentMonService/MetricUse.h
new file mode 100644
index 000000000..9a2af2be7
--- /dev/null
+++ b/IntelPresentMon/PresentMonService/MetricUse.h
@@ -0,0 +1,60 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: MIT
+#pragma once
+
+// NOTE: This file must remain header-only because ControlLib depends on these
+// types even though ControlLib does not have a symbol link dependency on the
+// PresentMonService project.
+
+#include "../CommonUtilities/Hash.h"
+#include "../PresentMonAPI2/PresentMonAPI.h"
+#include <cstdint>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <cereal/cereal.hpp>
+
+namespace pmon::svc
+{
+    struct MetricUse
+    {
+        PM_METRIC metricId;
+        uint32_t deviceId;
+        uint32_t arrayIdx;
+
+        template<class A>
+        void serialize(A& ar)
+        {
+            ar(CEREAL_NVP(metricId),
+                CEREAL_NVP(deviceId),
+                CEREAL_NVP(arrayIdx));
+        }
+
+        bool operator==(const MetricUse& rhs) const
+        {
+            return metricId == rhs.metricId &&
+                deviceId == rhs.deviceId &&
+                arrayIdx == rhs.arrayIdx;
+        }
+    };
+
+    using DeviceMetricUse = std::unordered_map<uint32_t, std::unordered_set<MetricUse>>;
+}
+
+namespace std
+{
+    template<>
+    struct hash<pmon::svc::MetricUse>
+    {
+        size_t operator()(const pmon::svc::MetricUse& mu) const noexcept
+        {
+            const uint64_t devIdx =
+                (uint64_t(mu.deviceId) << 32) | uint64_t(mu.arrayIdx);
+
+            using Under = std::underlying_type_t<PM_METRIC>;
+            const Under mid = (Under)mu.metricId;
+
+            return pmon::util::hash::DualHash(mid, devIdx);
+        }
+    };
+}
diff --git a/IntelPresentMon/PresentMonService/PMMainThread.cpp b/IntelPresentMon/PresentMonService/PMMainThread.cpp
index a51d8f0bc..b2bee217a 100644
--- a/IntelPresentMon/PresentMonService/PMMainThread.cpp
+++ b/IntelPresentMon/PresentMonService/PMMainThread.cpp
@@ -4,14 +4,9 @@
 #include "Service.h"
 #include "ActionServer.h"
 #include "PresentMon.h"
-#include "PowerTelemetryContainer.h"
 #include "FrameBroadcaster.h"
-#include "..\ControlLib\WmiCpu.h"
-#include <filesystem>
+#include "..\ControlLib\TelemetryCoordinator.h"
 #include "../Interprocess/source/Interprocess.h"
-#include "../Interprocess/source/ShmNamer.h"
-#include "../Interprocess/source/MetricCapabilitiesShim.h"
-#include "../Interprocess/source/SystemDeviceId.h"
 #include "CliOptions.h"
 #include "Registry.h"
 #include "GlobalIdentifiers.h"
@@ -19,7 +14,6 @@
 #include <ranges>
 #include <tdh.h>
 #include "../CommonUtilities/IntervalWaiter.h"
-#include "../CommonUtilities/PrecisionWaiter.h"
 #include "../CommonUtilities/win/Event.h"
 #include "../CommonUtilities/log/IdentificationTable.h"
 
@@ -32,7 +26,6 @@ using namespace pmon;
 using namespace svc;
 using namespace util;
 using v = log::V;
-namespace vi = std::views;
 
 
 namespace
@@ -115,457 +108,66 @@ void EventFlushThreadEntry_(Service* const srv, PresentMon* const pm)
     }
 }
 
-struct DerivedGpuTelemetry_
-{
-    double memUtilization = 0.0;
-    std::array<double, 5> fanSpeedPercent{};
-    size_t fanSpeedPercentCount = 0;
-};
-
-static DerivedGpuTelemetry_ CalculateDerivedGpuTelemetry_(
-    const ipc::GpuDataStore& store,
-    const PresentMonPowerTelemetryInfo& s) noexcept
-{
-    DerivedGpuTelemetry_ out{};
-    if (store.statics.memSize > 0) {
-        out.memUtilization = 100.0 * (static_cast<double>(s.gpu_mem_used_b) /
-            static_cast<double>(store.statics.memSize));
-    }
-
-    const size_t maxFanCount = store.statics.maxFanSpeedRpm.size();
-    const size_t fanCount = std::min(maxFanCount, s.fan_speed_rpm.size());
-    out.fanSpeedPercentCount = fanCount;
-    for (size_t i = 0; i < fanCount; ++i) {
-        const auto maxRpm = store.statics.maxFanSpeedRpm[i];
-        if (maxRpm > 0) {
-            out.fanSpeedPercent[i] = s.fan_speed_rpm[i] / static_cast<double>(maxRpm);
-        }
-        else {
-            out.fanSpeedPercent[i] = 0.0;
-        }
-    }
-
-    return out;
-}
-
-// Translate a single power-telemetry sample into the rings for one GPU store.
-// This mirrors the CPU placeholder approach but handles double/uint64/bool rings.
-static void PopulateGpuTelemetryRings_(
-    ipc::GpuDataStore& store,
-    const PresentMonPowerTelemetryInfo& s) noexcept
-{
-    const auto derived = CalculateDerivedGpuTelemetry_(store, s);
-    for (auto&& [metric, ringVariant] : store.telemetryData.Rings()) {
-        switch (metric) {
-
-            // -------- double metrics --------
-
-        case PM_METRIC_GPU_POWER:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_power_w, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_VOLTAGE:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_voltage_v, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_FREQUENCY:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_frequency_mhz, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_EFFECTIVE_FREQUENCY:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_effective_frequency_mhz, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_TEMPERATURE:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_temperature_c, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_VOLTAGE_REGULATOR_TEMPERATURE:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_voltage_regulator_temperature_c, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_UTILIZATION:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_utilization, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_RENDER_COMPUTE_UTILIZATION:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_render_compute_utilization, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEDIA_UTILIZATION:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_media_utilization, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_mem_effective_bandwidth_gbps, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_OVERVOLTAGE_PERCENT:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_overvoltage_percent, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_TEMPERATURE_PERCENT:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_temperature_percent, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_POWER_PERCENT:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_power_percent, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_CARD_POWER:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_card_power_w, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_FAN_SPEED:
-        {
-            auto& ringVect =
-                std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant);
-
-            const size_t n = std::min(ringVect.size(), s.fan_speed_rpm.size());
-            for (size_t i = 0; i < n; ++i) {
-                ringVect[i].Push(s.fan_speed_rpm[i], s.qpc);
-            }
-            break;
-        }
-
-        case PM_METRIC_GPU_FAN_SPEED_PERCENT:
-        {
-            auto& ringVect =
-                std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant);
-            const size_t n = std::min(ringVect.size(), derived.fanSpeedPercentCount);
-            for (size_t i = 0; i < n; ++i) {
-                ringVect[i].Push(derived.fanSpeedPercent[i], s.qpc);
-            }
-            break;
-        }
-
-        // VRAM-related doubles
-        case PM_METRIC_GPU_MEM_POWER:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.vram_power_w, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_VOLTAGE:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.vram_voltage_v, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_FREQUENCY:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.vram_frequency_mhz, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_EFFECTIVE_FREQUENCY:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.vram_effective_frequency_gbps, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_TEMPERATURE:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.vram_temperature_c, s.qpc);
-            break;
-
-            // Memory bandwidth doubles
-        case PM_METRIC_GPU_MEM_WRITE_BANDWIDTH:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_mem_write_bandwidth_bps, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_READ_BANDWIDTH:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(s.gpu_mem_read_bandwidth_bps, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_UTILIZATION:
-            std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant)[0]
-                .Push(derived.memUtilization, s.qpc);
-            break;
-
-            // -------- uint64 metrics --------
-        case PM_METRIC_GPU_MEM_USED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<uint64_t>>(ringVariant)[0]
-                .Push(s.gpu_mem_used_b, s.qpc);
-            break;
-
-            // -------- bool metrics --------
-        case PM_METRIC_GPU_POWER_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.gpu_power_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_TEMPERATURE_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.gpu_temperature_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_CURRENT_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.gpu_current_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_VOLTAGE_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.gpu_voltage_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_UTILIZATION_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.gpu_utilization_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_POWER_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.vram_power_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_TEMPERATURE_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.vram_temperature_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_CURRENT_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.vram_current_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_VOLTAGE_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.vram_voltage_limited, s.qpc);
-            break;
-
-        case PM_METRIC_GPU_MEM_UTILIZATION_LIMITED:
-            std::get<ipc::TelemetryMap::HistoryRingVect<bool>>(ringVariant)[0]
-                .Push(s.vram_utilization_limited, s.qpc);
-            break;
-
-        default:
-            pmlog_warn("Unhandled metric").pmwatch((int)metric);
-            break;
-        }
-    }
-}
-
-
-void PowerTelemetryThreadEntry_(Service* const srv, PresentMon* const pm,
-	PowerTelemetryContainer* const ptc, ipc::ServiceComms* const pComms)
+void TelemetryThreadEntry_(Service* const srv, PresentMon* const pm, ipc::ServiceComms* const pComms)
 {
     using util::win::WaitAnyEvent;
     using util::win::WaitAnyEventFor;
+
     try {
-        util::log::IdentificationTable::AddThisThread("tele-gpu");
-        pmlog_dbg("Starting gpu telemetry thread");
-        if (srv == nullptr || pm == nullptr || ptc == nullptr || pComms == nullptr) {
+        util::log::IdentificationTable::AddThisThread("telemetry");
+        pmlog_dbg("Starting telemetry thread");
+        if (srv == nullptr || pm == nullptr || pComms == nullptr) {
             pmlog_error("Required parameter was null");
             return;
         }
 
-        // we first wait for a client control connection before populating telemetry container
-        // after populating, we refresh each adapter to gather availability information
-        // this is deferred until client connection in order to increase the probability that
-        // telemetry metric availability is accurately assessed
-        {
-            if (WaitAnyEvent(srv->GetClientSessionHandle(), srv->GetServiceStopHandle()) == 1) {
-                // if events[1] was signalled, that means service is stopping so exit thread
-                pmlog_dbg("Exiting gpu telemetry thread before initialization");
-                return;
-            }
-            pmon::util::QpcTimer timer;
-            ptc->Repopulate();
-            for (auto&& adapter : ptc->GetPowerTelemetryAdapters()) {
-                const auto deviceId = adapter->GetDeviceId();
-                // refresh 2x here as workaround/kludge because Intel provider misreports 1st sample
-                adapter->Sample();
-                const auto sample = adapter->Sample();
-                // populate luid information for adapter (currently intel-only)
-                uint64_t luid = adapter->GetAdapterId();
-                std::span<const uint8_t> luidBytes;
-                if (luid == 0) {
-                    // if we have no LUID, send empty span
-                    luidBytes = std::span<const uint8_t>{};
-                }
-                else {
-                    luidBytes = std::span<const uint8_t>(reinterpret_cast<const uint8_t*>(&luid), sizeof(luid));
-                }
-                pComms->RegisterGpuDevice(deviceId, adapter->GetVendor(), adapter->GetName(),
-                    ipc::intro::ConvertBitset(adapter->GetPowerTelemetryCapBits()), luidBytes);
-                // after registering, we know that at least the store is available even
-                // if the introspection itself is not complete
-                auto& gpuStore = pComms->GetGpuDataStore(deviceId);
-                // TODO: replace this placeholder routine for populating statics
-                gpuStore.statics.name = adapter->GetName().c_str();
-                gpuStore.statics.vendor = adapter->GetVendor();
-                gpuStore.statics.memSize = adapter->GetDedicatedVideoMemory();
-                gpuStore.statics.maxMemBandwidth = adapter->GetVideoMemoryMaxBandwidth();
-                gpuStore.statics.sustainedPowerLimit = adapter->GetSustainedPowerLimit();
-                // max fanspeed is polled in old system but static in new system, shim here
-                // TODO: make this fully static
-                // infer number of fans by the size of the telemetry ring array for fan speed
-                const auto nFans = gpuStore.telemetryData.ArraySize(PM_METRIC_GPU_FAN_SPEED);
-                for (size_t i = 0; i < nFans; i++) {
-                    gpuStore.statics.maxFanSpeedRpm.push_back(sample.max_fan_speed_rpm[i]);
-                }
-            }
-            pComms->FinalizeGpuDevices();
-            pmlog_info(std::format("Finished populating GPU telemetry introspection, {} seconds elapsed", timer.Mark()));
-        }
-
-        // only start periodic polling when streaming starts
-        // exit polling loop and this thread when service is stopping
-        {
-            IntervalWaiter waiter{ 0.016 };
-            while (true) {
-                pmlog_dbg("(re)starting gpu idle wait");
-                if (WaitAnyEvent(pm->GetDeviceUsageEvent(), srv->GetServiceStopHandle()) == 1) {
-                    pmlog_dbg("gpu telemetry received exit code, thread exiting");
-                    return;
-                }
-                else {
-                    // if any of our gpu telemetry devices are active enter polling loop
-                    bool hasActive = false;
-                    for (auto&& adapter : ptc->GetPowerTelemetryAdapters()) {
-                        const auto deviceId = adapter->GetDeviceId();
-                        if (pm->CheckDeviceMetricUsage(deviceId)) {
-                            pmlog_dbg("detected gpu active").pmwatch(deviceId);
-                            hasActive = true;
-                            break;
-                        }
-                    }
-                    if (!hasActive) {
-                        pmlog_dbg("received device usage event, but no gpu tele device was active");
-                        continue;
-                    }
-                }
-                // otherwise we assume streaming has started and we begin the polling loop
-                // TODO: consider poll loop per device architecture instead of loop all
-                pmlog_dbg("entering gpu tele active poll loop");
-                while (!WaitAnyEventFor(0ms, srv->GetServiceStopHandle())) {
-                    // if device was reset (driver installed etc.) we need to repopulate telemetry
-                    if (WaitAnyEventFor(0ms, srv->GetResetPowerTelemetryHandle())) {
-                        // TODO: log error here or inside of repopulate
-                        ptc->Repopulate();
-                    }
-                    // poll all gpu adapter devices, skipping inactive devices
-                    auto& adapters = ptc->GetPowerTelemetryAdapters();
-                    for (auto&& adapter : adapters) {
-                        const auto deviceId = adapter->GetDeviceId();
-                        if (!pm->CheckDeviceMetricUsage(deviceId)) {
-                            continue;
-                        }
-                        // Get the newest sample from the provider
-                        const auto sample = adapter->Sample();
-
-                        // Retrieve the matching GPU store.
-                        auto& store = pComms->GetGpuDataStore(deviceId);
-
-                        PopulateGpuTelemetryRings_(store, sample);
-                    }
-                    // Convert from the ms to seconds as GetTelemetryPeriod returns back
-                    // ms and SetInterval expects seconds.
-                    waiter.SetInterval(pm->GetGpuTelemetryPeriod() / 1000.);
-                    waiter.Wait();
-                    // conditions for ending active poll and returning to idle state
-                    // go dormant if no gpu devices are in use
-                    const bool anyUsed = std::ranges::any_of(adapters,
-                        [&](const auto& adapter) { return pm->CheckDeviceMetricUsage(adapter->GetDeviceId()); });
-                    if (!anyUsed) {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    catch (...) {
-        pmlog_error(util::ReportException("Exception leaked to top level of gpu telemetry thread"));
-    }
-}
-
-void CpuTelemetryThreadEntry_(Service* const srv, PresentMon* const pm, ipc::ServiceComms* pComms,
-	pwr::cpu::CpuTelemetry* const cpu) noexcept
-{
-    using util::win::WaitAnyEvent;
-    using util::win::WaitAnyEventFor;
-    // we don't expect any exceptions in this system during normal operation
-    // (maybe during initialization at most, not during polling)
-    // but if they do happen, it is a halting condition for the system telemetry
-    // don't let this thread crash the process, just exit with an error for later
-    // diagnosis
-    try {
-        util::log::IdentificationTable::AddThisThread("tele-sys");
-        pmlog_dbg("Starting system telemetry thread");
-        if (srv == nullptr || pm == nullptr || pComms == nullptr || cpu == nullptr) {
-            pmlog_error("Required parameter was null");
+        if (WaitAnyEvent(srv->GetClientSessionHandle(), srv->GetServiceStopHandle()) == 1) {
+            pmlog_dbg("Exiting telemetry thread before initialization");
             return;
         }
 
+        pmon::util::QpcTimer timer;
+        pmon::tel::TelemetryCoordinator coordinator{ pm->GetGpuTelemetryPeriod() };
+        coordinator.RegisterDevicesToIpc(*pComms);
+        coordinator.PopulateStaticsToIpc(*pComms);
+        pmlog_info(std::format(
+            "Finished populating telemetry introspection, {} seconds elapsed",
+            timer.Mark()));
+
         IntervalWaiter waiter{ 0.016 };
         while (true) {
-            pmlog_dbg("(re)starting system idle wait");
+            pmlog_dbg("(re)starting telemetry idle wait");
             if (WaitAnyEvent(pm->GetDeviceUsageEvent(), srv->GetServiceStopHandle()) == 1) {
-                pmlog_dbg("system telemetry received exit code, thread exiting");
+                pmlog_dbg("telemetry received exit code, thread exiting");
                 return;
             }
-            else {
-                // if system telemetry metrics active enter active polling loop
-                if (pm->CheckDeviceMetricUsage(ipc::kSystemDeviceId)) {
-                    pmlog_dbg("detected system active");
-                }
-                else {
-                    pmlog_dbg("received device usage event, but system tele device was not active");
-                    continue;
-                }
+
+            auto pMetricUse = pm->GetDeviceMetricUsageSnapshot();
+            if (!pMetricUse || pMetricUse->empty()) {
+                coordinator.SetMetricUse({});
+                pmlog_dbg("received device usage event, but no telemetry device metrics were active");
+                continue;
             }
+
+            pmlog_dbg("entering telemetry active poll loop");
             while (!WaitAnyEventFor(0ms, srv->GetServiceStopHandle())) {
-                // TODO:streamer replace this flow with a call that populates rings of a store
-                // placeholder routine shim to translate cpu tranfer struct into rings
-                // replace with a direct mapping on PM_METRIC that obviates the switch
-                auto& store = pComms->GetSystemDataStore();
-                const auto sample = cpu->Sample();
-                for (auto&& [metric, ringVariant] : store.telemetryData.Rings()) {
-                    // all cpu telemetry is double
-                    auto& ringVect = std::get<ipc::TelemetryMap::HistoryRingVect<double>>(ringVariant);
-                    switch (metric) {
-                    case PM_METRIC_CPU_FREQUENCY:
-                        ringVect[0].Push(sample.cpu_frequency, sample.qpc);
-                        break;
-                    case PM_METRIC_CPU_UTILIZATION:
-                        ringVect[0].Push(sample.cpu_utilization, sample.qpc);
-                        break;
-                    case PM_METRIC_CPU_POWER:
-                        ringVect[0].Push(sample.cpu_power_w, sample.qpc);
-                        break;
-                    case PM_METRIC_CPU_POWER_LIMIT:
-                        ringVect[0].Push(sample.cpu_power_limit_w, sample.qpc);
-                        break;
-                    case PM_METRIC_CPU_TEMPERATURE:
-                        ringVect[0].Push(sample.cpu_temperature, sample.qpc);
-                        break;
-                    default:
-                        pmlog_warn("Unhandled metric ring").pmwatch((int)metric);
-                        break;
-                    }
+                if (WaitAnyEventFor(0ms, srv->GetResetPowerTelemetryHandle())) {
+                    pmlog_warn("Telemetry provider reset requested; live telemetry reprobe is not yet implemented");
                 }
-                // Convert from the ms to seconds as GetTelemetryPeriod returns back
-                // ms and SetInterval expects seconds.
-                waiter.SetInterval(pm->GetGpuTelemetryPeriod() / 1000.);
-                waiter.Wait();
-                // conditions for ending active poll and returning to idle state
-                if (!pm->CheckDeviceMetricUsage(ipc::kSystemDeviceId)) {
+
+                pMetricUse = pm->GetDeviceMetricUsageSnapshot();
+                if (!pMetricUse || pMetricUse->empty()) {
+                    coordinator.SetMetricUse({});
                     break;
                 }
+
+                const auto telemetryPeriodMs = pm->GetGpuTelemetryPeriod();
+                coordinator.SetPollRate(telemetryPeriodMs);
+                coordinator.SetMetricUse(*pMetricUse);
+                coordinator.PollToIpc(*pMetricUse, *pComms);
+
+                waiter.SetInterval(telemetryPeriodMs / 1000.);
+                waiter.Wait();
             }
         }
     }
@@ -578,15 +180,12 @@ void CpuTelemetryThreadEntry_(Service* const srv, PresentMon* const pm, ipc::Ser
 
 void PresentMonMainThread(Service* const pSvc)
 {
-    namespace rn = std::ranges; namespace vi = rn::views;
-
     assert(pSvc);
 
     // these thread containers need to be created outside of the try scope
     // so that if an exception happens, it won't block during unwinding,
     // trying to join threads that are waiting for a stop signal
-    std::jthread gpuTelemetryThread;
-    std::jthread cpuTelemetryThread;
+    std::jthread telemetryThread;
 
     try {
         LoadNvidiaManifest_();
@@ -596,11 +195,11 @@ void PresentMonMainThread(Service* const pSvc)
         const auto& reg = Reg::Get();
         const auto frameRingSamples = opt.frameRingSamples.AsOptional().value_or(
             reg.frameRingSamples.AsOptional()
-                .transform([](auto val) { return static_cast<size_t>(val); })
+                .transform([](auto val) { return (size_t)val; })
                 .value_or(*opt.frameRingSamples));
         const auto telemetryRingSamples = opt.telemetryRingSamples.AsOptional().value_or(
             reg.telemetryRingSamples.AsOptional()
-                .transform([](auto val) { return static_cast<size_t>(val); })
+                .transform([](auto val) { return (size_t)val; })
                 .value_or(*opt.telemetryRingSamples));
 
         // spin here waiting for debugger to attach, after which debugger should set
@@ -652,72 +251,15 @@ void PresentMonMainThread(Service* const pSvc)
 
         // container for session object
         PresentMon pm{ frameBroadcaster, !opt.etlTestFile };
-        // container for all GPU telemetry providers
-        PowerTelemetryContainer ptc;
-
-        // Set the created power telemetry container 
-        pm.SetPowerTelemetryContainer(&ptc);
 
         // Start named pipe action RPC server (active threaded)
         auto pActionServer = std::make_unique<ActionServer>(pSvc, &pm, opt.controlPipe.AsOptional());
 
         try {
-            gpuTelemetryThread = std::jthread{ PowerTelemetryThreadEntry_, pSvc, &pm, &ptc,
-                pComms.get() };
+            telemetryThread = std::jthread{ TelemetryThreadEntry_, pSvc, &pm, pComms.get() };
         }
         catch (...) {
-            LOG(ERROR) << "failed creating gpu(power) telemetry thread" << std::endl;
-        }
-
-        // Create CPU telemetry
-        std::shared_ptr<pwr::cpu::CpuTelemetry> cpu;
-        try {
-            // Try to use WMI for metrics sampling
-            cpu = std::make_shared<pwr::cpu::wmi::WmiCpu>();
-        }
-        catch (const std::runtime_error& e) {
-            LOG(ERROR) << "failed creating wmi cpu telemetry thread; Status: " << e.what() << std::endl;
-        }
-        catch (...) {
-            LOG(ERROR) << "failed creating wmi cpu telemetry thread" << std::endl;
-        }
-
-        if (cpu) {
-            pm.SetCpu(cpu);
-            // refresh once to populate the cap bits
-            cpu->Sample();
-            // determine vendor based on device name
-            // TODO: move this logic either into system (CPU) provider or
-            // into the ipc components
-            const auto vendor = [&] {
-                const auto lowerNameRn = cpu->GetCpuName() | vi::transform(tolower);
-                const std::string lowerName{ lowerNameRn.begin(), lowerNameRn.end() };
-                if (lowerName.contains("intel")) {
-                    return PM_DEVICE_VENDOR_INTEL;
-                }
-                else if (lowerName.contains("amd")) {
-                    return PM_DEVICE_VENDOR_AMD;
-                }
-                else {
-                    return PM_DEVICE_VENDOR_UNKNOWN;
-                }
-            }();
-            // register cpu
-            pComms->RegisterCpuDevice(vendor, cpu->GetCpuName(), 
-                ipc::intro::ConvertBitset(cpu->GetCpuTelemetryCapBits()));
-            // after registering, we know that at least the store is available even
-            // if the introspection itself is not complete
-            auto& systemStore = pComms->GetSystemDataStore();
-            // TODO: replace this placeholder routine for populating statics
-            systemStore.statics.cpuName = cpu->GetCpuName().c_str();
-            systemStore.statics.cpuPowerLimit = cpu->GetCpuPowerLimit();
-            systemStore.statics.cpuVendor = vendor;
-            cpuTelemetryThread = std::jthread{ CpuTelemetryThreadEntry_, pSvc, &pm, pComms.get(),
-                cpu.get() };
-        } else {
-            // We were unable to determine the cpu.
-            pComms->RegisterCpuDevice(PM_DEVICE_VENDOR_UNKNOWN, "UNKNOWN_CPU",
-                ipc::intro::ConvertBitset(CpuTelemetryBitset{}));
+            LOG(ERROR) << "failed creating telemetry thread" << std::endl;
         }
 
         // start thread for manual ETW event buffer flushing
@@ -737,11 +279,8 @@ void PresentMonMainThread(Service* const pSvc)
         // Stop the PresentMon sessions
         pm.StopTraceSessions();
         // wait for the telemetry threads to exit
-        if (gpuTelemetryThread.joinable()) {
-            gpuTelemetryThread.join();
-        }
-        if (cpuTelemetryThread.joinable()) {
-            cpuTelemetryThread.join();
+        if (telemetryThread.joinable()) {
+            telemetryThread.join();
         }
     }
     catch (...) {
diff --git a/IntelPresentMon/PresentMonService/PowerTelemetryContainer.cpp b/IntelPresentMon/PresentMonService/PowerTelemetryContainer.cpp
deleted file mode 100644
index 2bbb12827..000000000
--- a/IntelPresentMon/PresentMonService/PowerTelemetryContainer.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "PowerTelemetryContainer.h"
-#include "../ControlLib/Exceptions.h"
-#include <algorithm>
-#include <ranges>
-#include <functional>
-
-#include "../CommonUtilities/log/GlogShim.h"
-
-bool PowerTelemetryContainer::Repopulate() {
-	try {
-		telemetry_providers_.clear();
-		telemetry_adapters_.clear();
-
-		// create providers
-		for (int iVendor = 0; iVendor < int(PM_DEVICE_VENDOR_UNKNOWN); iVendor++) {
-			try {
-				if (auto pProvider = pwr::PowerTelemetryProviderFactory::Make(
-					PM_DEVICE_VENDOR(iVendor), device_id_allocator_)) {
-					telemetry_providers_.push_back(std::move(pProvider));
-				}
-			}
-			catch (const TelemetrySubsystemAbsent& e) {
-				LOG(INFO) << "Skipping Telemetry Provider: " << e.what();
-			}
-			catch (const std::runtime_error& e) {
-				LOG(INFO) << "Power Telemetry Failure: " << e.what();
-			}
-			catch (...) {
-				LOG(INFO) << "Unknown Telemetry Failure.";
-			}
-		}
-		// collect all adapters together from providers
-		for (const auto& pProvider : telemetry_providers_) {
-			auto& adapters = pProvider->GetAdapters();
-			telemetry_adapters_.insert(telemetry_adapters_.end(), adapters.begin(),
-				adapters.end());
-		}
-		// bail if there are not adapters
-		if (telemetry_adapters_.size() == 0) {
-			return false;
-		}
-		// Re-sort adapters based on video memory size in an attempt to return back the most
-		// capable adapters
-		constexpr auto ComparisonField = &pwr::PowerTelemetryAdapter::GetDedicatedVideoMemory;
-		std::ranges::sort(telemetry_adapters_, std::greater{}, ComparisonField);
-		return true;
-	}
-	catch (...) {
-		return false;
-	}
-}
diff --git a/IntelPresentMon/PresentMonService/PowerTelemetryContainer.h b/IntelPresentMon/PresentMonService/PowerTelemetryContainer.h
deleted file mode 100644
index 75e199a69..000000000
--- a/IntelPresentMon/PresentMonService/PowerTelemetryContainer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (C) 2022 Intel Corporation
-// SPDX-License-Identifier: MIT
-#pragma once
-#include "../ControlLib/PowerTelemetryProviderFactory.h"
-#include "../ControlLib/DeviceIdAllocator.h"
-
-class PowerTelemetryContainer {
- public:
-  const std::vector<std::shared_ptr<pwr::PowerTelemetryAdapter>>&
-  GetPowerTelemetryAdapters() {
-    return telemetry_adapters_;
-  }
-  bool Repopulate();
- private:
-  std::vector<std::unique_ptr<pwr::PowerTelemetryProvider>> telemetry_providers_;
-  std::vector<std::shared_ptr<pwr::PowerTelemetryAdapter>> telemetry_adapters_;
-  pwr::DeviceIdAllocator device_id_allocator_;
-};
diff --git a/IntelPresentMon/PresentMonService/PresentMon.cpp b/IntelPresentMon/PresentMonService/PresentMon.cpp
index 8d6bdedff..235e1a3f9 100644
--- a/IntelPresentMon/PresentMonService/PresentMon.cpp
+++ b/IntelPresentMon/PresentMonService/PresentMon.cpp
@@ -38,12 +38,6 @@ PM_STATUS PresentMon::UpdateTracking(const std::unordered_set<uint32_t>& tracked
 	return pSession_->UpdateTracking(trackedPids);
 }
 
-std::vector<std::shared_ptr<pwr::PowerTelemetryAdapter>> PresentMon::EnumerateAdapters()
-{
-	// Only the real time trace uses the control libary interface
-	return pSession_->EnumerateAdapters();
-}
-
 void PresentMon::StartPlayback()
 {
 	if (auto pPlaybackSession = dynamic_cast<MockPresentMonSession*>(pSession_.get())) {
diff --git a/IntelPresentMon/PresentMonService/PresentMon.h b/IntelPresentMon/PresentMonService/PresentMon.h
index fbe3a2f6d..21c4473c1 100644
--- a/IntelPresentMon/PresentMonService/PresentMon.h
+++ b/IntelPresentMon/PresentMonService/PresentMon.h
@@ -4,8 +4,8 @@
 #include "PresentMonSession.h"
 #include "EtwLogger.h"
 #include "FrameBroadcaster.h"
+#include "MetricUse.h"
 #include "../CommonUtilities/win/Event.h"
-#include "../CommonUtilities/Hash.h"
 #include <memory>
 #include <span>
 #include <unordered_set>
@@ -14,12 +14,16 @@
 #include <source_location>
 #include <utility>
 #include <cstdint>
+#include <optional>
+#include <atomic>
 
 using namespace pmon;
 
 class PresentMon
 {
 public:
+	using DeviceMetricUsage = svc::DeviceMetricUse;
+
 	PresentMon(svc::FrameBroadcaster& broadcaster, bool isRealtime);
 	~PresentMon();
 
@@ -33,9 +37,6 @@ class PresentMon
 	// Force stop trace sessions
 	void StopTraceSessions();
     PM_STATUS UpdateTracking(const std::unordered_set<uint32_t>& trackedPids);
-	std::vector<std::shared_ptr<pwr::PowerTelemetryAdapter>> EnumerateAdapters();
-	std::string GetCpuName() { return pSession_->GetCpuName(); }
-	double GetCpuPowerLimit() { return pSession_->GetCpuPowerLimit(); }
 	PM_STATUS SetGpuTelemetryPeriod(std::optional<uint32_t> telemetryPeriodRequestsMs)
 	{
 		return pSession_->SetGpuTelemetryPeriod(telemetryPeriodRequestsMs);
@@ -55,11 +56,6 @@ class PresentMon
 		// Only the real time trace sets ETW flush period
 		return pSession_->GetEtwFlushPeriod();
 	}
-	void SetCpu(const std::shared_ptr<pwr::cpu::CpuTelemetry>& pCpu)
-	{
-		// Only the real time trace uses the control libary interface
-		pSession_->SetCpu(pCpu);
-	}
 	HANDLE GetStreamingStartHandle()
 	{
 		return pSession_->GetStreamingStartHandle();
@@ -68,11 +64,6 @@ class PresentMon
 	{
 		return pSession_->HasLiveTargets();
 	}
-	void SetPowerTelemetryContainer(PowerTelemetryContainer* ptc)
-	{
-		// Only the real time trace session uses the control library interface
-		return pSession_->SetPowerTelemetryContainer(ptc);
-	}
 	void FlushEvents()
 	{
 		pSession_->FlushEvents();
@@ -93,21 +84,61 @@ class PresentMon
 	{
 		return !isRealtime_;
 	}
-	bool CheckDeviceMetricUsage(uint32_t deviceId) const
+	bool CheckDeviceMetricUsage(std::optional<uint32_t> deviceId,
+		std::optional<PM_METRIC> metricId = std::nullopt,
+		std::optional<uint32_t> arrayIdx = std::nullopt) const
+	{
+		const auto usageData = metricDeviceUsage_.load(std::memory_order_acquire);
+		if (!usageData) {
+			return false;
+		}
+
+		const auto selectionMatches = [&](const std::unordered_set<svc::MetricUse>& selection) -> bool {
+			if (!metricId) {
+				// array index without metric is not a valid query form
+				if (arrayIdx) {
+					return false;
+				}
+				return !selection.empty();
+			}
+			for (const auto& metricUse : selection) {
+				if (metricUse.metricId != *metricId) {
+					continue;
+				}
+				if (!arrayIdx || metricUse.arrayIdx == *arrayIdx) {
+					return true;
+				}
+			}
+			return false;
+		};
+
+		if (deviceId) {
+			if (auto it = usageData->find(*deviceId); it != usageData->end()) {
+				return selectionMatches(it->second);
+			}
+			return false;
+		}
+
+		for (const auto& usageEntry : *usageData) {
+			if (selectionMatches(usageEntry.second)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	std::shared_ptr<const DeviceMetricUsage> GetDeviceMetricUsageSnapshot() const
 	{
-		std::shared_lock lk{ metricDeviceUsageMtx_ };
-		return metricDeviceUsage_.contains(deviceId);
+		return metricDeviceUsage_.load(std::memory_order_acquire);
 	}
-	void SetDeviceMetricUsage(std::unordered_set<uint32_t> usage)
+	void SetDeviceMetricUsage(std::shared_ptr<const DeviceMetricUsage> usage)
 	{
-		// we need exclusive lock to prevent concurrent access to usage data while being modified
-		{
-			std::lock_guard lk{ metricDeviceUsageMtx_ };
-			metricDeviceUsage_ = std::move(usage);
+		if (!usage) {
+			usage = std::make_shared<DeviceMetricUsage>();
 		}
+		metricDeviceUsage_.store(std::move(usage), std::memory_order_release);
 		// keep shared lock now to prevent modification to event set while we are iterating it
 		// if this were non-shared, it would cause the listeners to block immediately on wake
-		std::shared_lock lk2{ metricDeviceUsageMtx_ };
+		std::shared_lock lk2{ deviceUsageEvtMtx_ };
 		for (auto& kv : deviceUsageEvts_) {
 			kv.second.Set();
 		}
@@ -116,13 +147,13 @@ class PresentMon
 	{
 		const DeviceUsageEvtKey key{ loc.file_name(), (uint32_t)loc.line() };
 		{
-			std::shared_lock lk{ metricDeviceUsageMtx_ };
+			std::shared_lock lk{ deviceUsageEvtMtx_ };
 			if (auto it = deviceUsageEvts_.find(key); it != deviceUsageEvts_.end()) {
 				return it->second.Get();
 			}
 		}
 		// get non-shared lock for modification purposes (add new event)
-		std::lock_guard lk2{ metricDeviceUsageMtx_ };
+		std::lock_guard lk2{ deviceUsageEvtMtx_ };
 		auto it = deviceUsageEvts_.emplace(key, util::win::Event{ false, false }).first;
 		return it->second.Get();
 	}
@@ -133,8 +164,9 @@ class PresentMon
 	svc::EtwLogger etwLogger_;
 	std::unique_ptr<PresentMonSession> pSession_;
 	bool isRealtime_ = true;
-	mutable std::shared_mutex metricDeviceUsageMtx_;
-	std::unordered_set<uint32_t> metricDeviceUsage_;
+	std::atomic<std::shared_ptr<const DeviceMetricUsage>> metricDeviceUsage_{
+		std::make_shared<DeviceMetricUsage>() };
+	mutable std::shared_mutex deviceUsageEvtMtx_;
 	using DeviceUsageEvtKey = std::pair<const char*, uint32_t>;
 	mutable std::unordered_map<DeviceUsageEvtKey, util::win::Event> deviceUsageEvts_;
 };
diff --git a/IntelPresentMon/PresentMonService/PresentMonService.vcxproj b/IntelPresentMon/PresentMonService/PresentMonService.vcxproj
index 0df6be302..85bc9a54a 100644
--- a/IntelPresentMon/PresentMonService/PresentMonService.vcxproj
+++ b/IntelPresentMon/PresentMonService/PresentMonService.vcxproj
@@ -122,7 +122,6 @@
     <ClCompile Include="MockPresentMonSession.cpp" />
     <ClCompile Include="ActionServer.cpp" />
     <ClCompile Include="PMMainThread.cpp" />
-    <ClCompile Include="PowerTelemetryContainer.cpp" />
     <ClCompile Include="RealtimePresentMonSession.cpp" />
     <ClCompile Include="Service.cpp" />
     <ClCompile Include="ServiceMain.cpp" />
@@ -131,9 +130,7 @@
     <ClCompile Include="testing\TestControl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="acts\EnumerateAdapters.h" />
     <ClInclude Include="acts\FinishEtlLogging.h" />
-    <ClInclude Include="acts\GetStaticCpuMetrics.h" />
     <ClInclude Include="acts\OpenSession.h" />
     <ClInclude Include="acts\ReportFrameReadProgress.h" />
     <ClInclude Include="acts\ReportMetricUse.h" />
@@ -153,8 +150,8 @@
     <ClInclude Include="LogSetup.h" />
     <ClInclude Include="MockPresentMonSession.h" />
     <ClInclude Include="LateStageReprojectionData.hpp" />
+    <ClInclude Include="MetricUse.h" />
     <ClInclude Include="ActionServer.h" />
-    <ClInclude Include="PowerTelemetryContainer.h" />
     <ClInclude Include="PresentMon.h" />
     <ClInclude Include="PMMainThread.h" />
     <ClInclude Include="PresentMonSession.h" />
@@ -198,6 +195,12 @@
   <Target Name="CopyNvidiaManifest" AfterTargets="Build">
     <Copy SourceFiles="$(ProjectDir)..\..\PresentMon\ddETWExternal.xml" DestinationFiles="$(OutDir)ddETWExternal.xml" SkipUnchangedFiles="true" />
   </Target>
+  <Target Name="DeployUciRuntime" AfterTargets="Build" Condition="Exists('$(UciSdkBinDir)')">
+    <ItemGroup>
+      <UciRuntimeFiles Include="$(UciSdkBinDir)\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(UciRuntimeFiles)" DestinationFiles="@(UciRuntimeFiles->'$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+  </Target>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
diff --git a/IntelPresentMon/PresentMonService/PresentMonService.vcxproj.filters b/IntelPresentMon/PresentMonService/PresentMonService.vcxproj.filters
index 4b3cbc4a1..1d0e89b39 100644
--- a/IntelPresentMon/PresentMonService/PresentMonService.vcxproj.filters
+++ b/IntelPresentMon/PresentMonService/PresentMonService.vcxproj.filters
@@ -3,7 +3,6 @@
   <ItemGroup>
     <ClCompile Include="ActionServer.cpp" />
     <ClCompile Include="PMMainThread.cpp" />
-    <ClCompile Include="PowerTelemetryContainer.cpp" />
     <ClCompile Include="PresentMon.cpp" />
     <ClCompile Include="Service.cpp" />
     <ClCompile Include="ServiceMain.cpp" />
@@ -20,7 +19,6 @@
   <ItemGroup>
     <ClInclude Include="LateStageReprojectionData.hpp" />
     <ClInclude Include="ActionServer.h" />
-    <ClInclude Include="PowerTelemetryContainer.h" />
     <ClInclude Include="PresentMon.h" />
     <ClInclude Include="Service.h" />
     <ClInclude Include="CliOptions.h" />
@@ -31,10 +29,9 @@
     <ClInclude Include="MockPresentMonSession.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="LogSetup.h" />
+    <ClInclude Include="MetricUse.h" />
     <ClInclude Include="acts\OpenSession.h" />
     <ClInclude Include="acts\StartTracking.h" />
-    <ClInclude Include="acts\GetStaticCpuMetrics.h" />
-    <ClInclude Include="acts\EnumerateAdapters.h" />
     <ClInclude Include="acts\SetTelemetryPeriod.h" />
     <ClInclude Include="acts\StopTracking.h" />
     <ClInclude Include="AllActions.h" />
diff --git a/IntelPresentMon/PresentMonService/PresentMonSession.cpp b/IntelPresentMon/PresentMonService/PresentMonSession.cpp
index f05410ef4..abbfeaa8a 100644
--- a/IntelPresentMon/PresentMonService/PresentMonSession.cpp
+++ b/IntelPresentMon/PresentMonService/PresentMonSession.cpp
@@ -26,37 +26,6 @@ pmon::test::service::Status PresentMonSession::GetTestingStatus() const
     };
 }
 
-void PresentMonSession::SetCpu(const std::shared_ptr<pwr::cpu::CpuTelemetry>& pCpu) {
-    cpu_ = pCpu.get();
-}
-
-std::vector<std::shared_ptr<pwr::PowerTelemetryAdapter>> PresentMonSession::EnumerateAdapters() {
-    if (telemetry_container_) {
-        return telemetry_container_->GetPowerTelemetryAdapters();
-    }
-    else {
-        return {};
-    }
-}
-
-std::string PresentMonSession::GetCpuName() {
-    if (cpu_) {
-        return cpu_->GetCpuName();
-    }
-    else {
-        return std::string{ "UNKOWN_CPU" };
-    }
-}
-
-double PresentMonSession::GetCpuPowerLimit() {
-    if (cpu_) {
-        return cpu_->GetCpuPowerLimit();
-    }
-    else {
-        return 0.;
-    }
-}
-
 PM_STATUS PresentMonSession::SetGpuTelemetryPeriod(std::optional<uint32_t> period_ms)
 {
     gpu_telemetry_period_ms_ = period_ms.value_or(default_gpu_telemetry_period_ms_);
@@ -87,10 +56,6 @@ bool PresentMonSession::HasLiveTargets() const {
     return HasLiveTrackedProcesses();
 }
 
-void PresentMonSession::SetPowerTelemetryContainer(PowerTelemetryContainer* ptc) {
-    telemetry_container_ = ptc;
-}
-
 void PresentMonSession::SyncTrackedPidState(const std::unordered_set<uint32_t>& trackedPids)
 {
     // TODO: consider theoretical rare race condition where exited process is added and never gets
diff --git a/IntelPresentMon/PresentMonService/PresentMonSession.h b/IntelPresentMon/PresentMonService/PresentMonSession.h
index 9545a4ff7..2141fd684 100644
--- a/IntelPresentMon/PresentMonService/PresentMonSession.h
+++ b/IntelPresentMon/PresentMonService/PresentMonSession.h
@@ -14,11 +14,9 @@
 #include <vector>
 #include <VersionHelpers.h>
 
-#include "../ControlLib/PowerTelemetryProvider.h"
-#include "../ControlLib/CpuTelemetry.h"
+#include "../ControlLib/TelemetryCoordinator.h"
 #include "../../PresentData/PresentMonTraceConsumer.hpp"
 #include "../../PresentData/PresentMonTraceSession.hpp"
-#include "PowerTelemetryContainer.h"
 #include "FrameBroadcaster.h"
 
 #include "../PresentMonAPI2Tests/TestCommands.h"
@@ -41,17 +39,12 @@ class PresentMonSession {
     virtual void FlushEvents() {}
     virtual void ResetEtwFlushPeriod() = 0;
 
-    void SetCpu(const std::shared_ptr<pwr::cpu::CpuTelemetry>& pCpu);
-    std::vector<std::shared_ptr<pwr::PowerTelemetryAdapter>> EnumerateAdapters();
-    std::string GetCpuName();
-    double GetCpuPowerLimit();
     pmon::test::service::Status GetTestingStatus() const;
     PM_STATUS SetGpuTelemetryPeriod(std::optional<uint32_t> period_ms);
     PM_STATUS SetEtwFlushPeriod(std::optional<uint32_t> periodMs);
     std::optional<uint32_t> GetEtwFlushPeriod();
     uint32_t GetGpuTelemetryPeriod();
     bool HasLiveTargets() const;
-    void SetPowerTelemetryContainer(PowerTelemetryContainer* ptc);
 
     void MarkProcessExited(uint32_t pid);
     bool IsProcessTracked(uint32_t pid) const;
@@ -65,9 +58,6 @@ class PresentMonSession {
     // data
     std::wstring pm_session_name_;
 
-    pwr::cpu::CpuTelemetry* cpu_ = nullptr;
-    PowerTelemetryContainer* telemetry_container_ = nullptr;
-
     // Set the initial telemetry period to 16ms
     static constexpr uint32_t default_gpu_telemetry_period_ms_ = 16;
     uint32_t gpu_telemetry_period_ms_ = default_gpu_telemetry_period_ms_;
diff --git a/IntelPresentMon/PresentMonService/acts/EnumerateAdapters.h b/IntelPresentMon/PresentMonService/acts/EnumerateAdapters.h
deleted file mode 100644
index a7de1174e..000000000
--- a/IntelPresentMon/PresentMonService/acts/EnumerateAdapters.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-#include "../../Interprocess/source/act/ActionHelper.h"
-#include "../ActionExecutionContext.h"
-#include <format>
-
-#define ACT_NAME EnumerateAdapters
-#define ACT_EXEC_CTX ActionExecutionContext
-#define ACT_NS ::pmon::svc::acts
-#define ACT_TYPE AsyncActionBase_
-
-namespace pmon::svc::acts
-{
-	using namespace ipc::act;
-
-	// TODO: remove this action, it is redundant in light of Introspection
-	class ACT_NAME : public ACT_TYPE<ACT_NAME, ACT_EXEC_CTX>
-	{
-	public:
-		static constexpr const char* Identifier = STRINGIFY(ACT_NAME);
-		struct Params {};
-		struct Response
-		{
-			struct Adapter
-			{
-				uint32_t id;
-				PM_DEVICE_VENDOR vendor;
-				std::string name;
-				double gpuSustainedPowerLimit;
-				uint64_t gpuMemorySize;
-				uint64_t gpuMemoryMaxBandwidth;
-
-				template<class A> void serialize(A& ar) {
-					ar(id, vendor, name, gpuSustainedPowerLimit, gpuMemorySize, gpuMemoryMaxBandwidth);
-				}
-			};
-			std::vector<Adapter> adapters;
-
-			template<class A> void serialize(A& ar) {
-				ar(adapters);
-			}
-		};
-	private:
-		friend class ACT_TYPE<ACT_NAME, ACT_EXEC_CTX>;
-		static Response Execute_(const ACT_EXEC_CTX& ctx, SessionContext& stx, Params&& in)
-		{
-			Response out;
-			for (auto&& adapter : ctx.pPmon->EnumerateAdapters()) {
-				out.adapters.push_back(Response::Adapter{
-					.id = adapter->GetDeviceId(),
-					.vendor = adapter->GetVendor(),
-					.name = adapter->GetName(),
-					.gpuSustainedPowerLimit = adapter->GetSustainedPowerLimit(),
-					.gpuMemorySize = adapter->GetDedicatedVideoMemory(),
-					.gpuMemoryMaxBandwidth = adapter->GetVideoMemoryMaxBandwidth(),
-				});
-			}
-			pmlog_dbg(std::format("{} adapters enumerated", out.adapters.size()));
-			return out;
-		}
-	};
-
-#ifdef PM_ASYNC_ACTION_REGISTRATION_
-	ACTION_REG();
-#endif
-}
-
-ACTION_TRAITS_DEF();
-
-#undef ACT_NAME
-#undef ACT_EXEC_CTX
-#undef ACT_NS
-#undef ACT_TYPE
diff --git a/IntelPresentMon/PresentMonService/acts/FinishEtlLogging.h b/IntelPresentMon/PresentMonService/acts/FinishEtlLogging.h
index cfbdffb64..4fa3b76ab 100644
--- a/IntelPresentMon/PresentMonService/acts/FinishEtlLogging.h
+++ b/IntelPresentMon/PresentMonService/acts/FinishEtlLogging.h
@@ -1,5 +1,6 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 
 #define ACT_NAME FinishEtlLogging
@@ -53,4 +54,4 @@ ACTION_TRAITS_DEF();
 #undef ACT_NAME
 #undef ACT_EXEC_CTX
 #undef ACT_NS
-#undef ACT_TYPE
\ No newline at end of file
+#undef ACT_TYPE
diff --git a/IntelPresentMon/PresentMonService/acts/GetStaticCpuMetrics.h b/IntelPresentMon/PresentMonService/acts/GetStaticCpuMetrics.h
deleted file mode 100644
index d648ae947..000000000
--- a/IntelPresentMon/PresentMonService/acts/GetStaticCpuMetrics.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-#include "../../Interprocess/source/act/ActionHelper.h"
-#include <format>
-
-#define ACT_NAME GetStaticCpuMetrics
-#define ACT_EXEC_CTX ActionExecutionContext
-#define ACT_NS ::pmon::svc::acts
-#define ACT_TYPE AsyncActionBase_
-
-namespace pmon::svc::acts
-{
-	using namespace ipc::act;
-
-	class ACT_NAME : public ACT_TYPE<ACT_NAME, ACT_EXEC_CTX>
-	{
-	public:
-		static constexpr const char* Identifier = STRINGIFY(ACT_NAME);
-		struct Params {};
-		struct Response
-		{
-			std::string cpuName;
-			double cpuPowerLimit;
-
-			template<class A> void serialize(A& ar) {
-				ar(cpuName, cpuPowerLimit);
-			}
-		};
-	private:
-		friend class ACT_TYPE<ACT_NAME, ACT_EXEC_CTX>;
-		static Response Execute_(const ACT_EXEC_CTX& ctx, SessionContext& stx, Params&& in)
-		{
-			const Response out{
-				.cpuName = ctx.pPmon->GetCpuName(),
-				.cpuPowerLimit = ctx.pPmon->GetCpuPowerLimit()
-			};
-			pmlog_dbg(std::format("static CPU metrics gotten for {} @ {}W", out.cpuName, out.cpuPowerLimit));
-			return out;
-		}
-	};
-
-#ifdef PM_ASYNC_ACTION_REGISTRATION_
-	ACTION_REG();
-#endif
-}
-
-ACTION_TRAITS_DEF();
-
-#undef ACT_NAME
-#undef ACT_EXEC_CTX
-#undef ACT_NS
-#undef ACT_TYPE
\ No newline at end of file
diff --git a/IntelPresentMon/PresentMonService/acts/OpenSession.h b/IntelPresentMon/PresentMonService/acts/OpenSession.h
index 0e2831a8f..9ccd3a1e0 100644
--- a/IntelPresentMon/PresentMonService/acts/OpenSession.h
+++ b/IntelPresentMon/PresentMonService/acts/OpenSession.h
@@ -1,5 +1,6 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include "../../Versioning/BuildId.h"
 #include <format>
 
@@ -67,4 +68,4 @@ ACTION_TRAITS_DEF();
 #undef ACT_NAME
 #undef ACT_EXEC_CTX
 #undef ACT_NS
-#undef ACT_TYPE
\ No newline at end of file
+#undef ACT_TYPE
diff --git a/IntelPresentMon/PresentMonService/acts/ReportMetricUse.h b/IntelPresentMon/PresentMonService/acts/ReportMetricUse.h
index 6d42ff1a3..93ff85d1a 100644
--- a/IntelPresentMon/PresentMonService/acts/ReportMetricUse.h
+++ b/IntelPresentMon/PresentMonService/acts/ReportMetricUse.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 #include <cereal/cereal.hpp>
 
diff --git a/IntelPresentMon/PresentMonService/acts/SetEtwFlushPeriod.h b/IntelPresentMon/PresentMonService/acts/SetEtwFlushPeriod.h
index 6a6ac85d2..ca94f0518 100644
--- a/IntelPresentMon/PresentMonService/acts/SetEtwFlushPeriod.h
+++ b/IntelPresentMon/PresentMonService/acts/SetEtwFlushPeriod.h
@@ -1,5 +1,6 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 #include <ranges>
 
diff --git a/IntelPresentMon/PresentMonService/acts/SetTelemetryPeriod.h b/IntelPresentMon/PresentMonService/acts/SetTelemetryPeriod.h
index a1bdcdbff..2c77eb25e 100644
--- a/IntelPresentMon/PresentMonService/acts/SetTelemetryPeriod.h
+++ b/IntelPresentMon/PresentMonService/acts/SetTelemetryPeriod.h
@@ -1,5 +1,6 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 #include <ranges>
 
diff --git a/IntelPresentMon/PresentMonService/acts/StartEtlLogging.h b/IntelPresentMon/PresentMonService/acts/StartEtlLogging.h
index 4a6f609ae..2e88cab68 100644
--- a/IntelPresentMon/PresentMonService/acts/StartEtlLogging.h
+++ b/IntelPresentMon/PresentMonService/acts/StartEtlLogging.h
@@ -1,5 +1,6 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 
 #define ACT_NAME StartEtlLogging
@@ -49,4 +50,4 @@ ACTION_TRAITS_DEF();
 #undef ACT_NAME
 #undef ACT_EXEC_CTX
 #undef ACT_NS
-#undef ACT_TYPE
\ No newline at end of file
+#undef ACT_TYPE
diff --git a/IntelPresentMon/PresentMonService/acts/StartTracking.h b/IntelPresentMon/PresentMonService/acts/StartTracking.h
index 1a498b60f..628431f6a 100644
--- a/IntelPresentMon/PresentMonService/acts/StartTracking.h
+++ b/IntelPresentMon/PresentMonService/acts/StartTracking.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include "../../CommonUtilities/win/Utilities.h"
 #include <format>
 #include <unordered_set>
diff --git a/IntelPresentMon/PresentMonService/acts/StopPlayback.h b/IntelPresentMon/PresentMonService/acts/StopPlayback.h
index 612641229..03b876a8a 100644
--- a/IntelPresentMon/PresentMonService/acts/StopPlayback.h
+++ b/IntelPresentMon/PresentMonService/acts/StopPlayback.h
@@ -1,5 +1,6 @@
-#pragma once
+#pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 
 #define ACT_NAME StopPlayback
@@ -45,4 +46,4 @@ ACTION_TRAITS_DEF();
 #undef ACT_NAME
 #undef ACT_EXEC_CTX
 #undef ACT_NS
-#undef ACT_TYPE
\ No newline at end of file
+#undef ACT_TYPE
diff --git a/IntelPresentMon/PresentMonService/acts/StopTracking.h b/IntelPresentMon/PresentMonService/acts/StopTracking.h
index 81c2b71f0..5d53cf340 100644
--- a/IntelPresentMon/PresentMonService/acts/StopTracking.h
+++ b/IntelPresentMon/PresentMonService/acts/StopTracking.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "../../Interprocess/source/act/ActionHelper.h"
+#include "../ActionExecutionContext.h"
 #include <format>
 #include <unordered_set>
 
diff --git a/IntelPresentMon/metrics.csv b/IntelPresentMon/metrics.csv
index 4c109e472..3ee493e1b 100644
--- a/IntelPresentMon/metrics.csv
+++ b/IntelPresentMon/metrics.csv
@@ -1,4 +1,4 @@
-// WARNING: ensure this file is saved in text CSV format when modifying this file,,,
+// WARNING: ensure this file is saved in text CSV format when modifying this file,,,
 // PM_METRIC,IPM_ONLY,NAME,DESCRIPTION
 ,,,
 PM_METRIC_APPLICATION,,Application,The name of the process that generated the frame.
@@ -78,11 +78,12 @@ PM_METRIC_GPU_MEM_UTILIZATION_LIMITED,1,GPU Memory Utilization Limited,Memory fr
 PM_METRIC_CPU_UTILIZATION,1,CPU Utilization,Amount of CPU processing capacity being used.
 PM_METRIC_CPU_POWER_LIMIT,1,CPU Power Limit,Power limit of the CPU.
 PM_METRIC_CPU_POWER,1,CPU Power,Power consumed by the CPU.
-PM_METRIC_CPU_TEMPERATURE,1,CPU Temperature,Temperature of the CPU.
+PM_METRIC_CPU_TEMPERATURE,1,CPU Temperature,Average temperature across all physical CPU cores with available temperature samples.
+PM_METRIC_CPU_CORE_TEMPERATURE,1,CPU Core Temperature,Temperature of each physical CPU core.
 PM_METRIC_CPU_FREQUENCY,1,CPU Frequency,Clock speed of the CPU.
 PM_METRIC_CPU_CORE_UTILITY,1,CPU Core Utility,Amount of CPU processing utility being used per core.
 ,,,
-PM_METRIC_INSTRUMENTED_LATENCY,,Instrumented Latency,Instrumented Frame Start To Display Latency,How long it took from the instrumented start of this frame until the frame was displayed on the screen.
+PM_METRIC_INSTRUMENTED_LATENCY,,Instrumented Latency,How long it took from the instrumented start of this frame until the frame was displayed on the screen.
 PM_METRIC_GPU_EFFECTIVE_FREQUENCY,1,GPU Effective Frequency,Effective clock speed of the GPU cores.
 PM_METRIC_GPU_VOLTAGE_REGULATOR_TEMPERATURE,1,GPU Voltage Regulator Temperature,Effective clock speed of the GPU cores.
 PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH,1,GPU Memory Effective Bandwidth,Data transfer rate that the memory modules can sustain based on current clock frequency.
diff --git a/Reflector/Program.cs b/Reflector/Program.cs
index 43ae7d18e..930462cb8 100644
--- a/Reflector/Program.cs
+++ b/Reflector/Program.cs
@@ -1,10 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using CppAst;
 using Scriban;
-using Scriban.Runtime;
 
 namespace StructDumperGenerator
 {
@@ -12,97 +11,327 @@ class Program
     {
         static void Main(string[] args)
         {
-            // List of structs and enums with their header files
-            var targetHeaders = new List<string>
+            var repositoryRoot = FindRepositoryRoot();
+            var targets = new List<TargetHeader>
             {
-                "IntelPresentMon/ControlLib/igcl_api.h",
+                new(
+                    "IGCL",
+                    "IntelPresentMon/ControlLib/igcl/igcl_api.h",
+                    new HashSet<string>
+                    {
+                        "ctl_result_t",
+                        "ctl_init_args_t",
+                        "ctl_device_adapter_properties_t",
+                        "ctl_mem_handle_t",
+                        "ctl_pwr_handle_t",
+                        "ctl_fan_properties_t",
+                        "ctl_power_telemetry_t",
+                        "ctl_mem_state_t",
+                        "ctl_mem_bandwidth_t",
+                        "ctl_power_limits_t",
+                    }),
+                new(
+                    "NVAPI",
+                    "IntelPresentMon/ControlLib/nvapi/nvapi.h",
+                    new HashSet<string>
+                    {
+                        "NvAPI_Status",
+                        "NV_GPU_THERMAL_SETTINGS",
+                        "NV_GPU_CLOCK_FREQUENCIES",
+                        "NV_GPU_DYNAMIC_PSTATES_INFO_EX",
+                    }),
+                new(
+                    "NVML",
+                    "IntelPresentMon/ControlLib/nvml/nvml.h",
+                    new HashSet<string>
+                    {
+                        "nvmlReturn_t",
+                        "nvmlPciInfo_t",
+                        "nvmlMemory_t",
+                    }),
+                new(
+                    "ADL",
+                    "IntelPresentMon/ControlLib/adl/adl_sdk.h",
+                    new HashSet<string>
+                    {
+                        "AdapterInfo",
+                        "ADLThermalControllerInfo",
+                        "ADLMemoryInfoX4",
+                        "ADLTemperature",
+                        "ADLFanSpeedInfo",
+                        "ADLFanSpeedValue",
+                        "ADLPMActivity",
+                        "ADLOD6ThermalControllerCaps",
+                        "ADLOD6FanSpeedInfo",
+                        "ADLOD6CurrentStatus",
+                        "ADLOD6Capabilities",
+                        "ADLODNCapabilitiesX2",
+                        "ADLODNPerformanceStatus",
+                        "ADLODNFanControl",
+                        "ADLPMLogDataOutput",
+                    }),
             };
 
-            var compilation = CppParser.ParseFiles(targetHeaders);
+            Console.WriteLine($"Starting reflection generation for {targets.Count} header(s).");
 
-            if (compilation.HasErrors) {
-                foreach (var message in compilation.Diagnostics.Messages) {
-                    Console.WriteLine(message);
+            var parsedHeaders = new List<ParsedHeader>();
+            foreach (var target in targets) {
+                var headerPath = Path.GetFullPath(Path.Combine(repositoryRoot, ToSystemPath_(target.IncludePath)));
+                if (!File.Exists(headerPath)) {
+                    Console.WriteLine($"Target header not found: {headerPath}");
+                    return;
                 }
-                return;
+                var headerDirectory = Path.GetDirectoryName(headerPath)!;
+                Console.WriteLine($"Parsing {target.DisplayName}: {target.IncludePath}");
+
+                var compilation = CppParser.ParseFile(ToClangPath_(headerPath));
+                if (compilation.HasErrors) {
+                    Console.WriteLine($"Parsing failed for {target.DisplayName}:");
+                    foreach (var message in compilation.Diagnostics.Messages) {
+                        Console.WriteLine(message);
+                    }
+                    return;
+                }
+
+                parsedHeaders.Add(new ParsedHeader {
+                    Header = target,
+                    Classes = compilation.Classes
+                        .Where(cppClass =>
+                            cppClass.IsDefinition &&
+                            !cppClass.IsAnonymous &&
+                            !string.IsNullOrWhiteSpace(cppClass.Name) &&
+                            IsDeclaredUnderRoot_(cppClass, headerDirectory))
+                        .ToList(),
+                    Enums = compilation.Enums
+                        .Where(cppEnum =>
+                            !string.IsNullOrWhiteSpace(cppEnum.Name) &&
+                            IsDeclaredUnderRoot_(cppEnum, headerDirectory))
+                        .ToList(),
+                    Typedefs = compilation.Typedefs
+                        .Where(cppTypedef =>
+                            !string.IsNullOrWhiteSpace(cppTypedef.Name) &&
+                            IsDeclaredUnderRoot_(cppTypedef, headerDirectory))
+                        .ToList(),
+                });
             }
 
-            // Collect structs, enums, and their members
-            var structs = new List<StructInfo>();
-            var enums = new List<EnumInfo>();
+            var classesByName = BuildNameMap(
+                parsedHeaders.SelectMany(parsedHeader => parsedHeader.Classes),
+                cppClass => cppClass.Name);
+            var enumsByName = BuildNameMap(
+                parsedHeaders.SelectMany(parsedHeader => parsedHeader.Enums),
+                cppEnum => cppEnum.Name);
+            var typedefsByName = BuildNameMap(
+                parsedHeaders.SelectMany(parsedHeader => parsedHeader.Typedefs),
+                cppTypedef => cppTypedef.Name);
+
+            var includedStructs = new HashSet<string>(StringComparer.Ordinal);
+            var includedEnums = new HashSet<string>(StringComparer.Ordinal);
+            var rootedTypedefSet = new HashSet<string>(StringComparer.Ordinal);
+            var rootedTypedefNames = new List<string>();
 
-            // iterate over all structs (classes, unions)
-            foreach (var cppClass in compilation.Classes) {
-                if (cppClass.IsDefinition) {
-                    ProcessStruct(cppClass, compilation, structs);
+            foreach (var rootTypeName in targets.SelectMany(target => target.RootTypeNames).Distinct()) {
+                if (!IncludeRootType(
+                    rootTypeName,
+                    classesByName,
+                    enumsByName,
+                    typedefsByName,
+                    includedStructs,
+                    includedEnums,
+                    rootedTypedefSet,
+                    rootedTypedefNames)) {
+                    Console.WriteLine($"Warning: rooted dump type not found: {rootTypeName}");
                 }
             }
 
-            // iterate over all enums
-            foreach (var cppEnum in compilation.Enums) {
-                ProcessEnum(cppEnum, compilation, enums);
-            }
+            var typedefs = rootedTypedefNames
+                .Select(name => ProcessTypedef(typedefsByName[name]))
+                .Where(info => info != null)
+                .Cast<TypedefInfo>()
+                .ToList();
+            var structs = parsedHeaders
+                .SelectMany(parsedHeader => parsedHeader.Classes)
+                .Where(cppClass => includedStructs.Contains(cppClass.Name))
+                .Select(ProcessStruct)
+                .ToList();
+            var enumsOut = parsedHeaders
+                .SelectMany(parsedHeader => parsedHeader.Enums)
+                .Where(cppEnum => includedEnums.Contains(cppEnum.Name))
+                .Select(ProcessEnum)
+                .ToList();
+
+            Console.WriteLine(
+                $"Reachable dump surface: {typedefs.Count} rooted typedef(s), {structs.Count} type dumper(s), {enumsOut.Count} enum dumper(s).");
 
-            // Load the Scriban template
-            var templateText = File.ReadAllText("Reflector\\StructDumpers.h.scriban");
+            var templatePath = Path.Combine(repositoryRoot, "Reflector", "StructDumpers.h.scriban");
+            Console.WriteLine($"Loading template: {MakeRepositoryRelativePath_(repositoryRoot, templatePath)}");
+            var templateText = File.ReadAllText(templatePath);
             var template = Template.Parse(templateText);
+            if (template.HasErrors) {
+                Console.WriteLine("Template parse failed:");
+                foreach (var message in template.Messages) {
+                    Console.WriteLine(message);
+                }
+                return;
+            }
 
-            // Prepare the model for the template
             var model = new {
-                includes = new HashSet<string>(targetHeaders),
+                includes = targets.Select(target => target.IncludePath).Distinct().ToList(),
+                typedefs = typedefs,
                 structs = structs,
-                enums = enums
+                enums = enumsOut,
             };
 
-            // Render the template
             var result = template.Render(model, member => member.Name);
 
-            // Output the generated code to a file
-            File.WriteAllText("IntelPresentMon\\CommonUtilities\\ref\\gen\\GeneratedReflection.h", result);
+            var outputPath = Path.Combine(
+                repositoryRoot,
+                "IntelPresentMon",
+                "CommonUtilities",
+                "ref",
+                "gen",
+                "GeneratedReflection.h");
+            Directory.CreateDirectory(Path.GetDirectoryName(outputPath)!);
+            File.WriteAllText(outputPath, result);
 
+            Console.WriteLine($"Wrote {MakeRepositoryRelativePath_(repositoryRoot, outputPath)}");
             Console.WriteLine("Code generation complete.");
         }
 
-        // Recursive method to process structs
-        static void ProcessStruct(CppClass cppClass, CppCompilation compilation, List<StructInfo> structs)
+        static Dictionary<string, T> BuildNameMap<T>(IEnumerable<T> declarations, Func<T, string> getName)
+        {
+            var map = new Dictionary<string, T>(StringComparer.Ordinal);
+            foreach (var declaration in declarations) {
+                var name = getName(declaration);
+                if (string.IsNullOrWhiteSpace(name) || map.ContainsKey(name)) {
+                    continue;
+                }
+                map.Add(name, declaration);
+            }
+            return map;
+        }
+
+        static bool IncludeRootType(
+            string rootTypeName,
+            IReadOnlyDictionary<string, CppClass> classesByName,
+            IReadOnlyDictionary<string, CppEnum> enumsByName,
+            IReadOnlyDictionary<string, CppTypedef> typedefsByName,
+            HashSet<string> includedStructs,
+            HashSet<string> includedEnums,
+            HashSet<string> rootedTypedefSet,
+            List<string> rootedTypedefNames)
+        {
+            if (classesByName.TryGetValue(rootTypeName, out var cppClass)) {
+                IncludeReferencedType(cppClass, includedStructs, includedEnums);
+                return true;
+            }
+            if (enumsByName.TryGetValue(rootTypeName, out var cppEnum)) {
+                includedEnums.Add(cppEnum.Name);
+                return true;
+            }
+            if (!typedefsByName.TryGetValue(rootTypeName, out var cppTypedef)) {
+                return false;
+            }
+
+            var unwrappedType = UnwrapType(cppTypedef);
+            if (unwrappedType is CppClass typedefClass) {
+                IncludeReferencedType(typedefClass, includedStructs, includedEnums);
+            }
+            else if (unwrappedType is CppEnum typedefEnum) {
+                includedEnums.Add(typedefEnum.Name);
+            }
+            else if (rootedTypedefSet.Add(cppTypedef.Name)) {
+                rootedTypedefNames.Add(cppTypedef.Name);
+            }
+
+            IncludeReferencedType(cppTypedef.ElementType, includedStructs, includedEnums);
+            return true;
+        }
+
+        static void IncludeReferencedType(
+            CppType type,
+            HashSet<string> includedStructs,
+            HashSet<string> includedEnums)
+        {
+            switch (type) {
+            case CppQualifiedType qualifiedType:
+                IncludeReferencedType(qualifiedType.ElementType, includedStructs, includedEnums);
+                break;
+            case CppTypedef typedefType:
+                IncludeReferencedType(typedefType.ElementType, includedStructs, includedEnums);
+                break;
+            case CppArrayType arrayType:
+                IncludeReferencedType(arrayType.ElementType, includedStructs, includedEnums);
+                break;
+            case CppClass cppClass when cppClass.IsDefinition && !string.IsNullOrWhiteSpace(cppClass.Name):
+                if (!includedStructs.Add(cppClass.Name)) {
+                    return;
+                }
+                foreach (var field in cppClass.Fields.Where(field => !string.IsNullOrWhiteSpace(field.Name))) {
+                    IncludeReferencedType(field.Type, includedStructs, includedEnums);
+                }
+                break;
+            case CppEnum cppEnum when !string.IsNullOrWhiteSpace(cppEnum.Name):
+                includedEnums.Add(cppEnum.Name);
+                break;
+            }
+        }
+
+        static TypedefInfo? ProcessTypedef(CppTypedef cppTypedef)
+        {
+            var unwrappedType = UnwrapType(cppTypedef);
+            if (unwrappedType is CppClass || unwrappedType is CppEnum) {
+                return null;
+            }
+
+            return new TypedefInfo {
+                Name = cppTypedef.Name,
+                DumpExpression = GetDumpExpression(cppTypedef, "s"),
+            };
+        }
+
+        static StructInfo ProcessStruct(CppClass cppClass)
         {
             var structInfo = new StructInfo {
                 Name = cppClass.Name,
                 Members = new List<MemberInfo>(),
-                Type =  cppClass.ClassKind == CppClassKind.Class ? "class" :
-                        cppClass.ClassKind == CppClassKind.Union ? "union" :
-                        "struct"
+                Type = cppClass.ClassKind == CppClassKind.Class ? "class" :
+                    cppClass.ClassKind == CppClassKind.Union ? "union" :
+                    "struct",
             };
 
-            foreach (var field in cppClass.Fields) {
-                var fieldType = UnwrapType(field.Type);
-                var memberInfo = new MemberInfo {
+            foreach (var field in cppClass.Fields.Where(field => !string.IsNullOrWhiteSpace(field.Name))) {
+                structInfo.Members.Add(new MemberInfo {
                     Name = field.Name,
                     Type = field.Type.GetDisplayName(),
-                    DumpExpression = GetDumpExpression(field.Type, $"s.{field.Name}")
-                };
-                structInfo.Members.Add(memberInfo);
+                    DumpExpression = GetDumpExpression(field.Type, $"s.{field.Name}"),
+                });
             }
 
-            structs.Add(structInfo);
+            return structInfo;
         }
 
-        // Method to process enums
-        static void ProcessEnum(CppEnum cppEnum, CppCompilation compilation, List<EnumInfo> enums)
+        static EnumInfo ProcessEnum(CppEnum cppEnum)
         {
-            
-            var enumInfo = new EnumInfo {
+            return new EnumInfo {
                 Name = cppEnum.Name,
-                Values = cppEnum.Items.DistinctBy(item => item.Value).Select(item => new EnumValue {
-                    Name = item.Name
-                }).ToList()
+                Values = cppEnum.Items
+                    .Where(item => !string.IsNullOrWhiteSpace(item.Name))
+                    .DistinctBy(item => item.Value)
+                    .Select(item => new EnumValue {
+                        Name = item.Name,
+                    })
+                    .ToList(),
             };
-
-            enums.Add(enumInfo);
         }
 
-        // Helper method to generate the dump expression for a field
         static string GetDumpExpression(CppType type, string variableAccess)
+        {
+            var uniqueId = 0;
+            return GetDumpExpression(type, variableAccess, ref uniqueId);
+        }
+
+        static string GetDumpExpression(CppType type, string variableAccess, ref int uniqueId)
         {
             var unwrappedType = UnwrapType(type);
 
@@ -112,31 +341,56 @@ static string GetDumpExpression(CppType type, string variableAccess)
                 }
                 return variableAccess;
             }
-            else if (unwrappedType is CppClass) {
+            else if (unwrappedType is CppClass cppClass) {
+                if (cppClass.IsAnonymous || string.IsNullOrWhiteSpace(cppClass.Name)) {
+                    return BuildInlineClassDumpExpression(cppClass, variableAccess, ref uniqueId);
+                }
                 return $"DumpGenerated({variableAccess})";
             }
-            else if (unwrappedType is CppEnum) {
+            else if (unwrappedType is CppEnum cppEnum) {
+                if (string.IsNullOrWhiteSpace(cppEnum.Name)) {
+                    return $"(int){variableAccess}";
+                }
                 return $"DumpGenerated({variableAccess})";
             }
             else if (unwrappedType is CppArrayType arrayType) {
                 var elementType = UnwrapType(arrayType.ElementType);
-                // special case for char arrays, dump as c-string
                 if (elementType.FullName == "char") {
                     return variableAccess;
                 }
-                // sized arrays can be displayed
                 else {
-                    var isPrimitiveString = elementType is CppPrimitiveType ? "true" : "false";
-                    var name = arrayType.ElementType is CppTypedef typedef ? typedef.Name : arrayType.ElementType.FullName;
-                    return $"DumpArray_<{name}, {arrayType.Size}, {isPrimitiveString}>({variableAccess})";
+                    return BuildInlineArrayDumpExpression(arrayType.ElementType, variableAccess, ref uniqueId);
                 }
             }
-            else if (unwrappedType is CppPointerType pointerType) {
+            else if (unwrappedType is CppPointerType) {
                 return $"({variableAccess} ? std::format(\"0x{{:016X}}\", reinterpret_cast<std::uintptr_t>({variableAccess})) : \"null\"s)";
             }
             return "\"{ unsupported }\"";
         }
 
+        static string BuildInlineClassDumpExpression(CppClass cppClass, string variableAccess, ref int uniqueId)
+        {
+            var ossVar = $"oss_{uniqueId++}";
+            var fieldExpressions = new List<string>();
+            foreach (var field in cppClass.Fields.Where(field => !string.IsNullOrWhiteSpace(field.Name))) {
+                fieldExpressions.Add(
+                    $"{ossVar} << \" .{field.Name} = \" << {GetDumpExpression(field.Type, $"{variableAccess}.{field.Name}", ref uniqueId)};");
+            }
+            var classTypeName = cppClass.ClassKind == CppClassKind.Class ? "class" :
+                cppClass.ClassKind == CppClassKind.Union ? "union" :
+                "struct";
+
+            var body = string.Join(" ", fieldExpressions);
+            return $"([&]() {{ std::ostringstream {ossVar}; {ossVar} << std::boolalpha << \"{classTypeName} {{\"; {body} {ossVar} << \" }}\"; return {ossVar}.str(); }}())";
+        }
+
+        static string BuildInlineArrayDumpExpression(CppType elementType, string variableAccess, ref int uniqueId)
+        {
+            var elementVar = $"elem_{uniqueId++}";
+            var elementExpression = GetDumpExpression(elementType, elementVar, ref uniqueId);
+            return $"DumpArray_({variableAccess}, [&](const auto& {elementVar}) {{ return {elementExpression}; }})";
+        }
+
         static CppType UnwrapType(CppType type)
         {
             while (true) {
@@ -152,30 +406,88 @@ static CppType UnwrapType(CppType type)
             }
             return type;
         }
+
+        static string FindRepositoryRoot()
+        {
+            foreach (var candidate in new[] { Directory.GetCurrentDirectory(), AppContext.BaseDirectory }) {
+                var current = new DirectoryInfo(candidate);
+                while (current != null) {
+                    if (File.Exists(Path.Combine(current.FullName, "PresentMon.sln")) &&
+                        File.Exists(Path.Combine(current.FullName, "Reflector", "StructDumpers.h.scriban"))) {
+                        return current.FullName;
+                    }
+                    current = current.Parent;
+                }
+            }
+
+            throw new DirectoryNotFoundException("Unable to locate repository root.");
+        }
+
+        static string ToSystemPath_(string path)
+        {
+            return path.Replace('/', Path.DirectorySeparatorChar);
+        }
+
+        static string ToClangPath_(string path)
+        {
+            return Path.GetFullPath(path).Replace(Path.DirectorySeparatorChar, '/');
+        }
+
+        static string MakeRepositoryRelativePath_(string repositoryRoot, string path)
+        {
+            return Path.GetRelativePath(repositoryRoot, path).Replace(Path.DirectorySeparatorChar, '/');
+        }
+
+        static bool IsDeclaredUnderRoot_(CppElement element, string rootPath)
+        {
+            var sourceFile = element.SourceFile ?? element.Span.Start.File;
+            if (string.IsNullOrWhiteSpace(sourceFile)) {
+                return false;
+            }
+
+            var normalizedRoot = Path.GetFullPath(rootPath)
+                .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) +
+                Path.DirectorySeparatorChar;
+            var normalizedSourceFile = Path.GetFullPath(sourceFile);
+            return normalizedSourceFile.StartsWith(normalizedRoot, StringComparison.OrdinalIgnoreCase);
+        }
     }
 
-    // Class to represent a header file and its target structs/enums
-    class HeaderStruct
+    class TargetHeader
     {
-        public string HeaderFile { get; }
-        public HashSet<string> StructNames { get; }
-
-        public HeaderStruct(string headerFile, HashSet<string> structNames)
+        public TargetHeader(string displayName, string includePath, HashSet<string> rootTypeNames)
         {
-            HeaderFile = headerFile;
-            StructNames = structNames;
+            DisplayName = displayName;
+            IncludePath = includePath;
+            RootTypeNames = rootTypeNames;
         }
+
+        public string DisplayName { get; }
+        public string IncludePath { get; }
+        public HashSet<string> RootTypeNames { get; }
+    }
+
+    class ParsedHeader
+    {
+        public required TargetHeader Header { get; set; }
+        public required List<CppClass> Classes { get; set; }
+        public required List<CppEnum> Enums { get; set; }
+        public required List<CppTypedef> Typedefs { get; set; }
+    }
+
+    class TypedefInfo
+    {
+        public required string Name { get; set; }
+        public required string DumpExpression { get; set; }
     }
 
-    // Class to hold struct information
     class StructInfo
     {
         public required string Name { get; set; }
-        public required string Type {  get; set; }
+        public required string Type { get; set; }
         public required List<MemberInfo> Members { get; set; }
     }
 
-    // Class to hold member information
     class MemberInfo
     {
         public required string Name { get; set; }
@@ -183,14 +495,12 @@ class MemberInfo
         public required string DumpExpression { get; set; }
     }
 
-    // Class to hold enum information
     class EnumInfo
     {
         public required string Name { get; set; }
         public required List<EnumValue> Values { get; set; }
     }
 
-    // Class to hold enum value information
     class EnumValue
     {
         public required string Name { get; set; }
diff --git a/Reflector/StructDumpers.h.scriban b/Reflector/StructDumpers.h.scriban
index 955fc789b..8caee4790 100644
--- a/Reflector/StructDumpers.h.scriban
+++ b/Reflector/StructDumpers.h.scriban
@@ -20,6 +20,18 @@ namespace pmon::util::ref::gen
 
 	void RegisterDumpers_(std::unordered_map<std::type_index, std::function<std::string(const void*)>>& dumpers)
 	{
+		// rooted typedefs
+{{~ for typedef in typedefs ~}}
+		dumpers[typeid({{ typedef.Name }})] = [](const void* pTypedef) {
+			const auto& s = *static_cast<const {{ typedef.Name }}*>(pTypedef);
+			std::ostringstream oss;
+			oss << std::boolalpha << "typedef {{ typedef.Name }} {"
+				<< " .value = " << {{ typedef.DumpExpression }}
+				<< " }";
+			return oss.str();
+		};
+{{~ end ~}}
+
 		// structs
 {{~ for struct in structs ~}}
 		dumpers[typeid({{ struct.Name }})] = [](const void* pStruct) {
diff --git a/Tools/generate/EnumMetric/metrics.awk b/Tools/generate/EnumMetric/metrics.awk
index b3750f561..560944cbb 100644
--- a/Tools/generate/EnumMetric/metrics.awk
+++ b/Tools/generate/EnumMetric/metrics.awk
@@ -7,6 +7,7 @@ BEGIN{
 }
 {
     n = split($1, a, ",")
+    sub(/^\357\273\277/, "", a[1])
 
     #printf "\n%u:%u: ", NF, n
     #for (i = 1; i <= n; ++i) printf "|%s", a[i]
@@ -16,6 +17,7 @@ BEGIN{
 
     if (a[1] == "") next
     if (substr(a[1], 1, 2) == "//") next
+    if (substr(a[1], 1, 10) != "PM_METRIC_") next
 
     if (NF == 1) {
         name = a[3]