From 141036a733c74b336582fce105b925326854140a Mon Sep 17 00:00:00 2001
From: gdtratnack <geoffrey.tratnack@intel.com>
Date: Tue, 30 Aug 2022 15:21:51 -0400
Subject: [PATCH] VLCLJ-1669: Update to Extensions to return
 ZE_RESULT_ERROR_UNSUPPORTED_FEATURE (#148)

* VLCLJ-1669: Updating Extension and Experimental Features to return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE instead of ZE_RESULT_ERROR_UNINITIALIZED when not found.

Signed-off-by: Tratnack, Geoffrey <geoffrey.tratnack@intel.com>

* VLCLJ-1669: Updating Extension and Experimental Features to return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE instead of ZE_RESULT_ERROR_UNINITIALIZED when not found.

Signed-off-by: Tratnack, Geoffrey <geoffrey.tratnack@intel.com>

* VLCLJ-1669: Updating Tracing Layer to return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE instead of ZE_RESULT_ERROR_UNINITIALIZED when not found.

Signed-off-by: Tratnack, Geoffrey <geoffrey.tratnack@intel.com>

* VLCLJ-1669: Resolving Review Comment.

Signed-off-by: Tratnack, Geoffrey <geoffrey.tratnack@intel.com>

* VLCLJ-1669: Making change in validation layer.

Signed-off-by: Tratnack, Geoffrey <geoffrey.tratnack@intel.com>

Signed-off-by: Tratnack, Geoffrey <geoffrey.tratnack@intel.com>
---
 scripts/templates/libapi.cpp.mako         |    8 +-
 scripts/templates/tracing/trcddi.cpp.mako |    2 +-
 scripts/templates/valddi.cpp.mako         |    2 +-
 source/layers/tracing/ze_trcddi.cpp       |  288 +++---
 source/layers/validation/ze_valddi.cpp    |  288 +++---
 source/layers/validation/zes_valddi.cpp   |  212 ++--
 source/layers/validation/zet_valddi.cpp   |   78 +-
 source/lib/ze_lib.cpp                     |    5 +
 source/lib/ze_lib.h                       |    1 +
 source/lib/ze_libapi.cpp                  | 1152 +++++++++++++++------
 source/lib/zes_libapi.cpp                 |  848 +++++++++++----
 source/lib/zet_libapi.cpp                 |  312 ++++--
 12 files changed, 2181 insertions(+), 1015 deletions(-)

diff --git a/scripts/templates/libapi.cpp.mako b/scripts/templates/libapi.cpp.mako
index 59495c23..35496c30 100644
--- a/scripts/templates/libapi.cpp.mako
+++ b/scripts/templates/libapi.cpp.mako
@@ -65,8 +65,12 @@ ${th.make_func_name(n, tags, obj)}(
 
 %endif
     auto ${th.make_pfn_name(n, tags, obj)} = ${x}_lib::context->${n}DdiTable.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)};
-    if( nullptr == ${th.make_pfn_name(n, tags, obj)} )
-        return ${X}_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == ${th.make_pfn_name(n, tags, obj)} ) {
+        if(!ze_lib::context->isInitialized)
+            return ${X}_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ${X}_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return ${th.make_pfn_name(n, tags, obj)}( ${", ".join(th.make_param_lines(n, tags, obj, format=["name"]))} );
 }
diff --git a/scripts/templates/tracing/trcddi.cpp.mako b/scripts/templates/tracing/trcddi.cpp.mako
index 80f34dab..29e6b5ac 100644
--- a/scripts/templates/tracing/trcddi.cpp.mako
+++ b/scripts/templates/tracing/trcddi.cpp.mako
@@ -38,7 +38,7 @@ namespace tracing_layer
         auto ${th.make_pfn_name(n, tags, obj)} = context.${n}DdiTable.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)};
 
         if( nullptr == ${th.make_pfn_name(n, tags, obj)})
-            return ${X}_RESULT_ERROR_UNINITIALIZED;
+            return ${X}_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.${n}DdiTable.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)}, ${", ".join(th.make_param_lines(n, tags, obj, format=["name"]))});
 
diff --git a/scripts/templates/valddi.cpp.mako b/scripts/templates/valddi.cpp.mako
index c883dc40..6011bf5f 100644
--- a/scripts/templates/valddi.cpp.mako
+++ b/scripts/templates/valddi.cpp.mako
@@ -36,7 +36,7 @@ namespace validation_layer
         auto ${th.make_pfn_name(n, tags, obj)} = context.${n}DdiTable.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)};
 
         if( nullptr == ${th.make_pfn_name(n, tags, obj)} )
-            return ${X}_RESULT_ERROR_UNINITIALIZED;
+            return ${X}_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
diff --git a/source/layers/tracing/ze_trcddi.cpp b/source/layers/tracing/ze_trcddi.cpp
index abbf7199..6779f967 100644
--- a/source/layers/tracing/ze_trcddi.cpp
+++ b/source/layers/tracing/ze_trcddi.cpp
@@ -24,7 +24,7 @@ namespace tracing_layer
         auto pfnInit = context.zeDdiTable.Global.pfnInit;
 
         if( nullptr == pfnInit)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Global.pfnInit, flags);
 
@@ -63,7 +63,7 @@ namespace tracing_layer
         auto pfnGet = context.zeDdiTable.Driver.pfnGet;
 
         if( nullptr == pfnGet)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Driver.pfnGet, pCount, phDrivers);
 
@@ -98,7 +98,7 @@ namespace tracing_layer
         auto pfnGetApiVersion = context.zeDdiTable.Driver.pfnGetApiVersion;
 
         if( nullptr == pfnGetApiVersion)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Driver.pfnGetApiVersion, hDriver, version);
 
@@ -133,7 +133,7 @@ namespace tracing_layer
         auto pfnGetProperties = context.zeDdiTable.Driver.pfnGetProperties;
 
         if( nullptr == pfnGetProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Driver.pfnGetProperties, hDriver, pDriverProperties);
 
@@ -168,7 +168,7 @@ namespace tracing_layer
         auto pfnGetIpcProperties = context.zeDdiTable.Driver.pfnGetIpcProperties;
 
         if( nullptr == pfnGetIpcProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Driver.pfnGetIpcProperties, hDriver, pIpcProperties);
 
@@ -212,7 +212,7 @@ namespace tracing_layer
         auto pfnGetExtensionProperties = context.zeDdiTable.Driver.pfnGetExtensionProperties;
 
         if( nullptr == pfnGetExtensionProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Driver.pfnGetExtensionProperties, hDriver, pCount, pExtensionProperties);
 
@@ -250,7 +250,7 @@ namespace tracing_layer
         auto pfnGetExtensionFunctionAddress = context.zeDdiTable.Driver.pfnGetExtensionFunctionAddress;
 
         if( nullptr == pfnGetExtensionFunctionAddress)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Driver.pfnGetExtensionFunctionAddress, hDriver, name, ppFunctionAddress);
 
@@ -294,7 +294,7 @@ namespace tracing_layer
         auto pfnGet = context.zeDdiTable.Device.pfnGet;
 
         if( nullptr == pfnGet)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGet, hDriver, pCount, phDevices);
 
@@ -338,7 +338,7 @@ namespace tracing_layer
         auto pfnGetSubDevices = context.zeDdiTable.Device.pfnGetSubDevices;
 
         if( nullptr == pfnGetSubDevices)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetSubDevices, hDevice, pCount, phSubdevices);
 
@@ -375,7 +375,7 @@ namespace tracing_layer
         auto pfnGetProperties = context.zeDdiTable.Device.pfnGetProperties;
 
         if( nullptr == pfnGetProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetProperties, hDevice, pDeviceProperties);
 
@@ -410,7 +410,7 @@ namespace tracing_layer
         auto pfnGetComputeProperties = context.zeDdiTable.Device.pfnGetComputeProperties;
 
         if( nullptr == pfnGetComputeProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetComputeProperties, hDevice, pComputeProperties);
 
@@ -445,7 +445,7 @@ namespace tracing_layer
         auto pfnGetModuleProperties = context.zeDdiTable.Device.pfnGetModuleProperties;
 
         if( nullptr == pfnGetModuleProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetModuleProperties, hDevice, pModuleProperties);
 
@@ -490,7 +490,7 @@ namespace tracing_layer
         auto pfnGetCommandQueueGroupProperties = context.zeDdiTable.Device.pfnGetCommandQueueGroupProperties;
 
         if( nullptr == pfnGetCommandQueueGroupProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetCommandQueueGroupProperties, hDevice, pCount, pCommandQueueGroupProperties);
 
@@ -536,7 +536,7 @@ namespace tracing_layer
         auto pfnGetMemoryProperties = context.zeDdiTable.Device.pfnGetMemoryProperties;
 
         if( nullptr == pfnGetMemoryProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetMemoryProperties, hDevice, pCount, pMemProperties);
 
@@ -573,7 +573,7 @@ namespace tracing_layer
         auto pfnGetMemoryAccessProperties = context.zeDdiTable.Device.pfnGetMemoryAccessProperties;
 
         if( nullptr == pfnGetMemoryAccessProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetMemoryAccessProperties, hDevice, pMemAccessProperties);
 
@@ -616,7 +616,7 @@ namespace tracing_layer
         auto pfnGetCacheProperties = context.zeDdiTable.Device.pfnGetCacheProperties;
 
         if( nullptr == pfnGetCacheProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetCacheProperties, hDevice, pCount, pCacheProperties);
 
@@ -653,7 +653,7 @@ namespace tracing_layer
         auto pfnGetImageProperties = context.zeDdiTable.Device.pfnGetImageProperties;
 
         if( nullptr == pfnGetImageProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetImageProperties, hDevice, pImageProperties);
 
@@ -688,7 +688,7 @@ namespace tracing_layer
         auto pfnGetExternalMemoryProperties = context.zeDdiTable.Device.pfnGetExternalMemoryProperties;
 
         if( nullptr == pfnGetExternalMemoryProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetExternalMemoryProperties, hDevice, pExternalMemoryProperties);
 
@@ -724,7 +724,7 @@ namespace tracing_layer
         auto pfnGetP2PProperties = context.zeDdiTable.Device.pfnGetP2PProperties;
 
         if( nullptr == pfnGetP2PProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetP2PProperties, hDevice, hPeerDevice, pP2PProperties);
 
@@ -762,7 +762,7 @@ namespace tracing_layer
         auto pfnCanAccessPeer = context.zeDdiTable.Device.pfnCanAccessPeer;
 
         if( nullptr == pfnCanAccessPeer)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnCanAccessPeer, hDevice, hPeerDevice, value);
 
@@ -798,7 +798,7 @@ namespace tracing_layer
         auto pfnGetStatus = context.zeDdiTable.Device.pfnGetStatus;
 
         if( nullptr == pfnGetStatus)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetStatus, hDevice);
 
@@ -834,7 +834,7 @@ namespace tracing_layer
         auto pfnGetGlobalTimestamps = context.zeDdiTable.Device.pfnGetGlobalTimestamps;
 
         if( nullptr == pfnGetGlobalTimestamps)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnGetGlobalTimestamps, hDevice, hostTimestamp, deviceTimestamp);
 
@@ -872,7 +872,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Context.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnCreate, hDriver, desc, phContext);
 
@@ -917,7 +917,7 @@ namespace tracing_layer
         auto pfnCreateEx = context.zeDdiTable.Context.pfnCreateEx;
 
         if( nullptr == pfnCreateEx)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnCreateEx, hDriver, desc, numDevices, phDevices, phContext);
 
@@ -957,7 +957,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Context.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnDestroy, hContext);
 
@@ -989,7 +989,7 @@ namespace tracing_layer
         auto pfnGetStatus = context.zeDdiTable.Context.pfnGetStatus;
 
         if( nullptr == pfnGetStatus)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnGetStatus, hContext);
 
@@ -1024,7 +1024,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.CommandQueue.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandQueue.pfnCreate, hContext, hDevice, desc, phCommandQueue);
 
@@ -1062,7 +1062,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.CommandQueue.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandQueue.pfnDestroy, hCommandQueue);
 
@@ -1098,7 +1098,7 @@ namespace tracing_layer
         auto pfnExecuteCommandLists = context.zeDdiTable.CommandQueue.pfnExecuteCommandLists;
 
         if( nullptr == pfnExecuteCommandLists)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandQueue.pfnExecuteCommandLists, hCommandQueue, numCommandLists, phCommandLists, hFence);
 
@@ -1143,7 +1143,7 @@ namespace tracing_layer
         auto pfnSynchronize = context.zeDdiTable.CommandQueue.pfnSynchronize;
 
         if( nullptr == pfnSynchronize)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandQueue.pfnSynchronize, hCommandQueue, timeout);
 
@@ -1180,7 +1180,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.CommandList.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnCreate, hContext, hDevice, desc, phCommandList);
 
@@ -1221,7 +1221,7 @@ namespace tracing_layer
         auto pfnCreateImmediate = context.zeDdiTable.CommandList.pfnCreateImmediate;
 
         if( nullptr == pfnCreateImmediate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnCreateImmediate, hContext, hDevice, altdesc, phCommandList);
 
@@ -1259,7 +1259,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.CommandList.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnDestroy, hCommandList);
 
@@ -1291,7 +1291,7 @@ namespace tracing_layer
         auto pfnClose = context.zeDdiTable.CommandList.pfnClose;
 
         if( nullptr == pfnClose)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnClose, hCommandList);
 
@@ -1323,7 +1323,7 @@ namespace tracing_layer
         auto pfnReset = context.zeDdiTable.CommandList.pfnReset;
 
         if( nullptr == pfnReset)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnReset, hCommandList);
 
@@ -1362,7 +1362,7 @@ namespace tracing_layer
         auto pfnAppendWriteGlobalTimestamp = context.zeDdiTable.CommandList.pfnAppendWriteGlobalTimestamp;
 
         if( nullptr == pfnAppendWriteGlobalTimestamp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendWriteGlobalTimestamp, hCommandList, dstptr, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1407,7 +1407,7 @@ namespace tracing_layer
         auto pfnAppendBarrier = context.zeDdiTable.CommandList.pfnAppendBarrier;
 
         if( nullptr == pfnAppendBarrier)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendBarrier, hCommandList, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1453,7 +1453,7 @@ namespace tracing_layer
         auto pfnAppendMemoryRangesBarrier = context.zeDdiTable.CommandList.pfnAppendMemoryRangesBarrier;
 
         if( nullptr == pfnAppendMemoryRangesBarrier)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemoryRangesBarrier, hCommandList, numRanges, pRangeSizes, pRanges, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1498,7 +1498,7 @@ namespace tracing_layer
         auto pfnSystemBarrier = context.zeDdiTable.Context.pfnSystemBarrier;
 
         if( nullptr == pfnSystemBarrier)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnSystemBarrier, hContext, hDevice);
 
@@ -1540,7 +1540,7 @@ namespace tracing_layer
         auto pfnAppendMemoryCopy = context.zeDdiTable.CommandList.pfnAppendMemoryCopy;
 
         if( nullptr == pfnAppendMemoryCopy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemoryCopy, hCommandList, dstptr, srcptr, size, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1593,7 +1593,7 @@ namespace tracing_layer
         auto pfnAppendMemoryFill = context.zeDdiTable.CommandList.pfnAppendMemoryFill;
 
         if( nullptr == pfnAppendMemoryFill)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemoryFill, hCommandList, ptr, pattern, pattern_size, size, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1656,7 +1656,7 @@ namespace tracing_layer
         auto pfnAppendMemoryCopyRegion = context.zeDdiTable.CommandList.pfnAppendMemoryCopyRegion;
 
         if( nullptr == pfnAppendMemoryCopyRegion)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemoryCopyRegion, hCommandList, dstptr, dstRegion, dstPitch, dstSlicePitch, srcptr, srcRegion, srcPitch, srcSlicePitch, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1719,7 +1719,7 @@ namespace tracing_layer
         auto pfnAppendMemoryCopyFromContext = context.zeDdiTable.CommandList.pfnAppendMemoryCopyFromContext;
 
         if( nullptr == pfnAppendMemoryCopyFromContext)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemoryCopyFromContext, hCommandList, dstptr, hContextSrc, srcptr, size, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1772,7 +1772,7 @@ namespace tracing_layer
         auto pfnAppendImageCopy = context.zeDdiTable.CommandList.pfnAppendImageCopy;
 
         if( nullptr == pfnAppendImageCopy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendImageCopy, hCommandList, hDstImage, hSrcImage, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1823,7 +1823,7 @@ namespace tracing_layer
         auto pfnAppendImageCopyRegion = context.zeDdiTable.CommandList.pfnAppendImageCopyRegion;
 
         if( nullptr == pfnAppendImageCopyRegion)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendImageCopyRegion, hCommandList, hDstImage, hSrcImage, pDstRegion, pSrcRegion, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1877,7 +1877,7 @@ namespace tracing_layer
         auto pfnAppendImageCopyToMemory = context.zeDdiTable.CommandList.pfnAppendImageCopyToMemory;
 
         if( nullptr == pfnAppendImageCopyToMemory)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendImageCopyToMemory, hCommandList, dstptr, hSrcImage, pSrcRegion, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1929,7 +1929,7 @@ namespace tracing_layer
         auto pfnAppendImageCopyFromMemory = context.zeDdiTable.CommandList.pfnAppendImageCopyFromMemory;
 
         if( nullptr == pfnAppendImageCopyFromMemory)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendImageCopyFromMemory, hCommandList, hDstImage, srcptr, pDstRegion, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -1975,7 +1975,7 @@ namespace tracing_layer
         auto pfnAppendMemoryPrefetch = context.zeDdiTable.CommandList.pfnAppendMemoryPrefetch;
 
         if( nullptr == pfnAppendMemoryPrefetch)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemoryPrefetch, hCommandList, ptr, size);
 
@@ -2015,7 +2015,7 @@ namespace tracing_layer
         auto pfnAppendMemAdvise = context.zeDdiTable.CommandList.pfnAppendMemAdvise;
 
         if( nullptr == pfnAppendMemAdvise)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendMemAdvise, hCommandList, hDevice, ptr, size, advice);
 
@@ -2063,7 +2063,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.EventPool.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.EventPool.pfnCreate, hContext, desc, numDevices, phDevices, phEventPool);
 
@@ -2103,7 +2103,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.EventPool.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.EventPool.pfnDestroy, hEventPool);
 
@@ -2137,7 +2137,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Event.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnCreate, hEventPool, desc, phEvent);
 
@@ -2173,7 +2173,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Event.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnDestroy, hEvent);
 
@@ -2206,7 +2206,7 @@ namespace tracing_layer
         auto pfnGetIpcHandle = context.zeDdiTable.EventPool.pfnGetIpcHandle;
 
         if( nullptr == pfnGetIpcHandle)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.EventPool.pfnGetIpcHandle, hEventPool, phIpc);
 
@@ -2243,7 +2243,7 @@ namespace tracing_layer
         auto pfnOpenIpcHandle = context.zeDdiTable.EventPool.pfnOpenIpcHandle;
 
         if( nullptr == pfnOpenIpcHandle)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.EventPool.pfnOpenIpcHandle, hContext, hIpc, phEventPool);
 
@@ -2279,7 +2279,7 @@ namespace tracing_layer
         auto pfnCloseIpcHandle = context.zeDdiTable.EventPool.pfnCloseIpcHandle;
 
         if( nullptr == pfnCloseIpcHandle)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.EventPool.pfnCloseIpcHandle, hEventPool);
 
@@ -2312,7 +2312,7 @@ namespace tracing_layer
         auto pfnAppendSignalEvent = context.zeDdiTable.CommandList.pfnAppendSignalEvent;
 
         if( nullptr == pfnAppendSignalEvent)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendSignalEvent, hCommandList, hEvent);
 
@@ -2349,7 +2349,7 @@ namespace tracing_layer
         auto pfnAppendWaitOnEvents = context.zeDdiTable.CommandList.pfnAppendWaitOnEvents;
 
         if( nullptr == pfnAppendWaitOnEvents)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendWaitOnEvents, hCommandList, numEvents, phEvents);
 
@@ -2385,7 +2385,7 @@ namespace tracing_layer
         auto pfnHostSignal = context.zeDdiTable.Event.pfnHostSignal;
 
         if( nullptr == pfnHostSignal)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnHostSignal, hEvent);
 
@@ -2424,7 +2424,7 @@ namespace tracing_layer
         auto pfnHostSynchronize = context.zeDdiTable.Event.pfnHostSynchronize;
 
         if( nullptr == pfnHostSynchronize)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnHostSynchronize, hEvent, timeout);
 
@@ -2458,7 +2458,7 @@ namespace tracing_layer
         auto pfnQueryStatus = context.zeDdiTable.Event.pfnQueryStatus;
 
         if( nullptr == pfnQueryStatus)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnQueryStatus, hEvent);
 
@@ -2491,7 +2491,7 @@ namespace tracing_layer
         auto pfnAppendEventReset = context.zeDdiTable.CommandList.pfnAppendEventReset;
 
         if( nullptr == pfnAppendEventReset)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendEventReset, hCommandList, hEvent);
 
@@ -2525,7 +2525,7 @@ namespace tracing_layer
         auto pfnHostReset = context.zeDdiTable.Event.pfnHostReset;
 
         if( nullptr == pfnHostReset)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnHostReset, hEvent);
 
@@ -2558,7 +2558,7 @@ namespace tracing_layer
         auto pfnQueryKernelTimestamp = context.zeDdiTable.Event.pfnQueryKernelTimestamp;
 
         if( nullptr == pfnQueryKernelTimestamp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Event.pfnQueryKernelTimestamp, hEvent, dstptr);
 
@@ -2604,7 +2604,7 @@ namespace tracing_layer
         auto pfnAppendQueryKernelTimestamps = context.zeDdiTable.CommandList.pfnAppendQueryKernelTimestamps;
 
         if( nullptr == pfnAppendQueryKernelTimestamps)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendQueryKernelTimestamps, hCommandList, numEvents, phEvents, dstptr, pOffsets, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -2652,7 +2652,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Fence.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Fence.pfnCreate, hCommandQueue, desc, phFence);
 
@@ -2688,7 +2688,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Fence.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Fence.pfnDestroy, hFence);
 
@@ -2727,7 +2727,7 @@ namespace tracing_layer
         auto pfnHostSynchronize = context.zeDdiTable.Fence.pfnHostSynchronize;
 
         if( nullptr == pfnHostSynchronize)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Fence.pfnHostSynchronize, hFence, timeout);
 
@@ -2761,7 +2761,7 @@ namespace tracing_layer
         auto pfnQueryStatus = context.zeDdiTable.Fence.pfnQueryStatus;
 
         if( nullptr == pfnQueryStatus)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Fence.pfnQueryStatus, hFence);
 
@@ -2793,7 +2793,7 @@ namespace tracing_layer
         auto pfnReset = context.zeDdiTable.Fence.pfnReset;
 
         if( nullptr == pfnReset)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Fence.pfnReset, hFence);
 
@@ -2827,7 +2827,7 @@ namespace tracing_layer
         auto pfnGetProperties = context.zeDdiTable.Image.pfnGetProperties;
 
         if( nullptr == pfnGetProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Image.pfnGetProperties, hDevice, desc, pImageProperties);
 
@@ -2866,7 +2866,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Image.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Image.pfnCreate, hContext, hDevice, desc, phImage);
 
@@ -2904,7 +2904,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Image.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Image.pfnDestroy, hImage);
 
@@ -2944,7 +2944,7 @@ namespace tracing_layer
         auto pfnAllocShared = context.zeDdiTable.Mem.pfnAllocShared;
 
         if( nullptr == pfnAllocShared)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnAllocShared, hContext, device_desc, host_desc, size, alignment, hDevice, pptr);
 
@@ -2995,7 +2995,7 @@ namespace tracing_layer
         auto pfnAllocDevice = context.zeDdiTable.Mem.pfnAllocDevice;
 
         if( nullptr == pfnAllocDevice)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnAllocDevice, hContext, device_desc, size, alignment, hDevice, pptr);
 
@@ -3043,7 +3043,7 @@ namespace tracing_layer
         auto pfnAllocHost = context.zeDdiTable.Mem.pfnAllocHost;
 
         if( nullptr == pfnAllocHost)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnAllocHost, hContext, host_desc, size, alignment, pptr);
 
@@ -3084,7 +3084,7 @@ namespace tracing_layer
         auto pfnFree = context.zeDdiTable.Mem.pfnFree;
 
         if( nullptr == pfnFree)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnFree, hContext, ptr);
 
@@ -3121,7 +3121,7 @@ namespace tracing_layer
         auto pfnGetAllocProperties = context.zeDdiTable.Mem.pfnGetAllocProperties;
 
         if( nullptr == pfnGetAllocProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnGetAllocProperties, hContext, ptr, pMemAllocProperties, phDevice);
 
@@ -3162,7 +3162,7 @@ namespace tracing_layer
         auto pfnGetAddressRange = context.zeDdiTable.Mem.pfnGetAddressRange;
 
         if( nullptr == pfnGetAddressRange)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnGetAddressRange, hContext, ptr, pBase, pSize);
 
@@ -3202,7 +3202,7 @@ namespace tracing_layer
         auto pfnGetIpcHandle = context.zeDdiTable.Mem.pfnGetIpcHandle;
 
         if( nullptr == pfnGetIpcHandle)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnGetIpcHandle, hContext, ptr, pIpcHandle);
 
@@ -3243,7 +3243,7 @@ namespace tracing_layer
         auto pfnOpenIpcHandle = context.zeDdiTable.Mem.pfnOpenIpcHandle;
 
         if( nullptr == pfnOpenIpcHandle)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnOpenIpcHandle, hContext, hDevice, handle, flags, pptr);
 
@@ -3284,7 +3284,7 @@ namespace tracing_layer
         auto pfnCloseIpcHandle = context.zeDdiTable.Mem.pfnCloseIpcHandle;
 
         if( nullptr == pfnCloseIpcHandle)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnCloseIpcHandle, hContext, ptr);
 
@@ -3322,7 +3322,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Module.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnCreate, hContext, hDevice, desc, phModule, phBuildLog);
 
@@ -3362,7 +3362,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Module.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnDestroy, hModule);
 
@@ -3397,7 +3397,7 @@ namespace tracing_layer
         auto pfnDynamicLink = context.zeDdiTable.Module.pfnDynamicLink;
 
         if( nullptr == pfnDynamicLink)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnDynamicLink, numModules, phModules, phLinkLog);
 
@@ -3433,7 +3433,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.ModuleBuildLog.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.ModuleBuildLog.pfnDestroy, hModuleBuildLog);
 
@@ -3467,7 +3467,7 @@ namespace tracing_layer
         auto pfnGetString = context.zeDdiTable.ModuleBuildLog.pfnGetString;
 
         if( nullptr == pfnGetString)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.ModuleBuildLog.pfnGetString, hModuleBuildLog, pSize, pBuildLog);
 
@@ -3505,7 +3505,7 @@ namespace tracing_layer
         auto pfnGetNativeBinary = context.zeDdiTable.Module.pfnGetNativeBinary;
 
         if( nullptr == pfnGetNativeBinary)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnGetNativeBinary, hModule, pSize, pModuleNativeBinary);
 
@@ -3544,7 +3544,7 @@ namespace tracing_layer
         auto pfnGetGlobalPointer = context.zeDdiTable.Module.pfnGetGlobalPointer;
 
         if( nullptr == pfnGetGlobalPointer)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnGetGlobalPointer, hModule, pGlobalName, pSize, pptr);
 
@@ -3590,7 +3590,7 @@ namespace tracing_layer
         auto pfnGetKernelNames = context.zeDdiTable.Module.pfnGetKernelNames;
 
         if( nullptr == pfnGetKernelNames)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnGetKernelNames, hModule, pCount, pNames);
 
@@ -3627,7 +3627,7 @@ namespace tracing_layer
         auto pfnGetProperties = context.zeDdiTable.Module.pfnGetProperties;
 
         if( nullptr == pfnGetProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnGetProperties, hModule, pModuleProperties);
 
@@ -3663,7 +3663,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Kernel.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnCreate, hModule, desc, phKernel);
 
@@ -3699,7 +3699,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Kernel.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnDestroy, hKernel);
 
@@ -3733,7 +3733,7 @@ namespace tracing_layer
         auto pfnGetFunctionPointer = context.zeDdiTable.Module.pfnGetFunctionPointer;
 
         if( nullptr == pfnGetFunctionPointer)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnGetFunctionPointer, hModule, pFunctionName, pfnFunction);
 
@@ -3772,7 +3772,7 @@ namespace tracing_layer
         auto pfnSetGroupSize = context.zeDdiTable.Kernel.pfnSetGroupSize;
 
         if( nullptr == pfnSetGroupSize)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnSetGroupSize, hKernel, groupSizeX, groupSizeY, groupSizeZ);
 
@@ -3816,7 +3816,7 @@ namespace tracing_layer
         auto pfnSuggestGroupSize = context.zeDdiTable.Kernel.pfnSuggestGroupSize;
 
         if( nullptr == pfnSuggestGroupSize)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnSuggestGroupSize, hKernel, globalSizeX, globalSizeY, globalSizeZ, groupSizeX, groupSizeY, groupSizeZ);
 
@@ -3861,7 +3861,7 @@ namespace tracing_layer
         auto pfnSuggestMaxCooperativeGroupCount = context.zeDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount;
 
         if( nullptr == pfnSuggestMaxCooperativeGroupCount)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount, hKernel, totalGroupCount);
 
@@ -3899,7 +3899,7 @@ namespace tracing_layer
         auto pfnSetArgumentValue = context.zeDdiTable.Kernel.pfnSetArgumentValue;
 
         if( nullptr == pfnSetArgumentValue)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnSetArgumentValue, hKernel, argIndex, argSize, pArgValue);
 
@@ -3938,7 +3938,7 @@ namespace tracing_layer
         auto pfnSetIndirectAccess = context.zeDdiTable.Kernel.pfnSetIndirectAccess;
 
         if( nullptr == pfnSetIndirectAccess)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnSetIndirectAccess, hKernel, flags);
 
@@ -3973,7 +3973,7 @@ namespace tracing_layer
         auto pfnGetIndirectAccess = context.zeDdiTable.Kernel.pfnGetIndirectAccess;
 
         if( nullptr == pfnGetIndirectAccess)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnGetIndirectAccess, hKernel, pFlags);
 
@@ -4011,7 +4011,7 @@ namespace tracing_layer
         auto pfnGetSourceAttributes = context.zeDdiTable.Kernel.pfnGetSourceAttributes;
 
         if( nullptr == pfnGetSourceAttributes)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnGetSourceAttributes, hKernel, pSize, pString);
 
@@ -4049,7 +4049,7 @@ namespace tracing_layer
         auto pfnSetCacheConfig = context.zeDdiTable.Kernel.pfnSetCacheConfig;
 
         if( nullptr == pfnSetCacheConfig)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnSetCacheConfig, hKernel, flags);
 
@@ -4084,7 +4084,7 @@ namespace tracing_layer
         auto pfnGetProperties = context.zeDdiTable.Kernel.pfnGetProperties;
 
         if( nullptr == pfnGetProperties)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnGetProperties, hKernel, pKernelProperties);
 
@@ -4121,7 +4121,7 @@ namespace tracing_layer
         auto pfnGetName = context.zeDdiTable.Kernel.pfnGetName;
 
         if( nullptr == pfnGetName)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Kernel.pfnGetName, hKernel, pSize, pName);
 
@@ -4164,7 +4164,7 @@ namespace tracing_layer
         auto pfnAppendLaunchKernel = context.zeDdiTable.CommandList.pfnAppendLaunchKernel;
 
         if( nullptr == pfnAppendLaunchKernel)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendLaunchKernel, hCommandList, hKernel, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -4213,7 +4213,7 @@ namespace tracing_layer
         auto pfnAppendLaunchCooperativeKernel = context.zeDdiTable.CommandList.pfnAppendLaunchCooperativeKernel;
 
         if( nullptr == pfnAppendLaunchCooperativeKernel)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendLaunchCooperativeKernel, hCommandList, hKernel, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -4263,7 +4263,7 @@ namespace tracing_layer
         auto pfnAppendLaunchKernelIndirect = context.zeDdiTable.CommandList.pfnAppendLaunchKernelIndirect;
 
         if( nullptr == pfnAppendLaunchKernelIndirect)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendLaunchKernelIndirect, hCommandList, hKernel, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -4317,7 +4317,7 @@ namespace tracing_layer
         auto pfnAppendLaunchMultipleKernelsIndirect = context.zeDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect;
 
         if( nullptr == pfnAppendLaunchMultipleKernelsIndirect)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect, hCommandList, numKernels, phKernels, pCountBuffer, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -4366,7 +4366,7 @@ namespace tracing_layer
         auto pfnMakeMemoryResident = context.zeDdiTable.Context.pfnMakeMemoryResident;
 
         if( nullptr == pfnMakeMemoryResident)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnMakeMemoryResident, hContext, hDevice, ptr, size);
 
@@ -4407,7 +4407,7 @@ namespace tracing_layer
         auto pfnEvictMemory = context.zeDdiTable.Context.pfnEvictMemory;
 
         if( nullptr == pfnEvictMemory)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnEvictMemory, hContext, hDevice, ptr, size);
 
@@ -4447,7 +4447,7 @@ namespace tracing_layer
         auto pfnMakeImageResident = context.zeDdiTable.Context.pfnMakeImageResident;
 
         if( nullptr == pfnMakeImageResident)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnMakeImageResident, hContext, hDevice, hImage);
 
@@ -4485,7 +4485,7 @@ namespace tracing_layer
         auto pfnEvictImage = context.zeDdiTable.Context.pfnEvictImage;
 
         if( nullptr == pfnEvictImage)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Context.pfnEvictImage, hContext, hDevice, hImage);
 
@@ -4524,7 +4524,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.Sampler.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Sampler.pfnCreate, hContext, hDevice, desc, phSampler);
 
@@ -4562,7 +4562,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.Sampler.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Sampler.pfnDestroy, hSampler);
 
@@ -4598,7 +4598,7 @@ namespace tracing_layer
         auto pfnReserve = context.zeDdiTable.VirtualMem.pfnReserve;
 
         if( nullptr == pfnReserve)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnReserve, hContext, pStart, size, pptr);
 
@@ -4638,7 +4638,7 @@ namespace tracing_layer
         auto pfnFree = context.zeDdiTable.VirtualMem.pfnFree;
 
         if( nullptr == pfnFree)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnFree, hContext, ptr, size);
 
@@ -4678,7 +4678,7 @@ namespace tracing_layer
         auto pfnQueryPageSize = context.zeDdiTable.VirtualMem.pfnQueryPageSize;
 
         if( nullptr == pfnQueryPageSize)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnQueryPageSize, hContext, hDevice, size, pagesize);
 
@@ -4719,7 +4719,7 @@ namespace tracing_layer
         auto pfnCreate = context.zeDdiTable.PhysicalMem.pfnCreate;
 
         if( nullptr == pfnCreate)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.PhysicalMem.pfnCreate, hContext, hDevice, desc, phPhysicalMemory);
 
@@ -4758,7 +4758,7 @@ namespace tracing_layer
         auto pfnDestroy = context.zeDdiTable.PhysicalMem.pfnDestroy;
 
         if( nullptr == pfnDestroy)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.PhysicalMem.pfnDestroy, hContext, hPhysicalMemory);
 
@@ -4800,7 +4800,7 @@ namespace tracing_layer
         auto pfnMap = context.zeDdiTable.VirtualMem.pfnMap;
 
         if( nullptr == pfnMap)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnMap, hContext, ptr, size, hPhysicalMemory, offset, access);
 
@@ -4844,7 +4844,7 @@ namespace tracing_layer
         auto pfnUnmap = context.zeDdiTable.VirtualMem.pfnUnmap;
 
         if( nullptr == pfnUnmap)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnUnmap, hContext, ptr, size);
 
@@ -4884,7 +4884,7 @@ namespace tracing_layer
         auto pfnSetAccessAttribute = context.zeDdiTable.VirtualMem.pfnSetAccessAttribute;
 
         if( nullptr == pfnSetAccessAttribute)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnSetAccessAttribute, hContext, ptr, size, access);
 
@@ -4927,7 +4927,7 @@ namespace tracing_layer
         auto pfnGetAccessAttribute = context.zeDdiTable.VirtualMem.pfnGetAccessAttribute;
 
         if( nullptr == pfnGetAccessAttribute)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.VirtualMem.pfnGetAccessAttribute, hContext, ptr, size, access, outSize);
 
@@ -4970,7 +4970,7 @@ namespace tracing_layer
         auto pfnSetGlobalOffsetExp = context.zeDdiTable.KernelExp.pfnSetGlobalOffsetExp;
 
         if( nullptr == pfnSetGlobalOffsetExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.KernelExp.pfnSetGlobalOffsetExp, hKernel, offsetX, offsetY, offsetZ);
 
@@ -5013,7 +5013,7 @@ namespace tracing_layer
         auto pfnReserveCacheExt = context.zeDdiTable.Device.pfnReserveCacheExt;
 
         if( nullptr == pfnReserveCacheExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnReserveCacheExt, hDevice, cacheLevel, cacheReservationSize);
 
@@ -5052,7 +5052,7 @@ namespace tracing_layer
         auto pfnSetCacheAdviceExt = context.zeDdiTable.Device.pfnSetCacheAdviceExt;
 
         if( nullptr == pfnSetCacheAdviceExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnSetCacheAdviceExt, hDevice, ptr, regionSize, cacheRegion);
 
@@ -5099,7 +5099,7 @@ namespace tracing_layer
         auto pfnQueryTimestampsExp = context.zeDdiTable.EventExp.pfnQueryTimestampsExp;
 
         if( nullptr == pfnQueryTimestampsExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.EventExp.pfnQueryTimestampsExp, hEvent, hDevice, pCount, pTimestamps);
 
@@ -5138,7 +5138,7 @@ namespace tracing_layer
         auto pfnGetMemoryPropertiesExp = context.zeDdiTable.ImageExp.pfnGetMemoryPropertiesExp;
 
         if( nullptr == pfnGetMemoryPropertiesExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.ImageExp.pfnGetMemoryPropertiesExp, hImage, pMemoryProperties);
 
@@ -5176,7 +5176,7 @@ namespace tracing_layer
         auto pfnViewCreateExp = context.zeDdiTable.ImageExp.pfnViewCreateExp;
 
         if( nullptr == pfnViewCreateExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.ImageExp.pfnViewCreateExp, hContext, hDevice, desc, hImage, phImageView);
 
@@ -5217,7 +5217,7 @@ namespace tracing_layer
         auto pfnSchedulingHintExp = context.zeDdiTable.KernelExp.pfnSchedulingHintExp;
 
         if( nullptr == pfnSchedulingHintExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.KernelExp.pfnSchedulingHintExp, hKernel, pHint);
 
@@ -5252,7 +5252,7 @@ namespace tracing_layer
         auto pfnPciGetPropertiesExt = context.zeDdiTable.Device.pfnPciGetPropertiesExt;
 
         if( nullptr == pfnPciGetPropertiesExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Device.pfnPciGetPropertiesExt, hDevice, pPciProperties);
 
@@ -5298,7 +5298,7 @@ namespace tracing_layer
         auto pfnAppendImageCopyToMemoryExt = context.zeDdiTable.CommandList.pfnAppendImageCopyToMemoryExt;
 
         if( nullptr == pfnAppendImageCopyToMemoryExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendImageCopyToMemoryExt, hCommandList, dstptr, hSrcImage, pSrcRegion, destRowPitch, destSlicePitch, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -5358,7 +5358,7 @@ namespace tracing_layer
         auto pfnAppendImageCopyFromMemoryExt = context.zeDdiTable.CommandList.pfnAppendImageCopyFromMemoryExt;
 
         if( nullptr == pfnAppendImageCopyFromMemoryExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.CommandList.pfnAppendImageCopyFromMemoryExt, hCommandList, hDstImage, srcptr, pDstRegion, srcRowPitch, srcSlicePitch, hSignalEvent, numWaitEvents, phWaitEvents);
 
@@ -5408,7 +5408,7 @@ namespace tracing_layer
         auto pfnGetAllocPropertiesExt = context.zeDdiTable.Image.pfnGetAllocPropertiesExt;
 
         if( nullptr == pfnGetAllocPropertiesExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Image.pfnGetAllocPropertiesExt, hContext, hImage, pImageAllocProperties);
 
@@ -5449,7 +5449,7 @@ namespace tracing_layer
         auto pfnInspectLinkageExt = context.zeDdiTable.Module.pfnInspectLinkageExt;
 
         if( nullptr == pfnInspectLinkageExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Module.pfnInspectLinkageExt, pInspectDesc, numModules, phModules, phLog);
 
@@ -5489,7 +5489,7 @@ namespace tracing_layer
         auto pfnFreeExt = context.zeDdiTable.Mem.pfnFreeExt;
 
         if( nullptr == pfnFreeExt)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.Mem.pfnFreeExt, hContext, pMemFreeDesc, ptr);
 
@@ -5534,7 +5534,7 @@ namespace tracing_layer
         auto pfnGetExp = context.zeDdiTable.FabricVertexExp.pfnGetExp;
 
         if( nullptr == pfnGetExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricVertexExp.pfnGetExp, hDriver, pCount, phVertices);
 
@@ -5579,7 +5579,7 @@ namespace tracing_layer
         auto pfnGetSubVerticesExp = context.zeDdiTable.FabricVertexExp.pfnGetSubVerticesExp;
 
         if( nullptr == pfnGetSubVerticesExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricVertexExp.pfnGetSubVerticesExp, hVertex, pCount, phSubvertices);
 
@@ -5616,7 +5616,7 @@ namespace tracing_layer
         auto pfnGetPropertiesExp = context.zeDdiTable.FabricVertexExp.pfnGetPropertiesExp;
 
         if( nullptr == pfnGetPropertiesExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricVertexExp.pfnGetPropertiesExp, hVertex, pVertexProperties);
 
@@ -5651,7 +5651,7 @@ namespace tracing_layer
         auto pfnGetDeviceExp = context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp;
 
         if( nullptr == pfnGetDeviceExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp, hVertex, phDevice);
 
@@ -5686,7 +5686,7 @@ namespace tracing_layer
         auto pfnGetFabricVertexExp = context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp;
 
         if( nullptr == pfnGetFabricVertexExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp, hDevice, phVertex);
 
@@ -5730,7 +5730,7 @@ namespace tracing_layer
         auto pfnGetExp = context.zeDdiTable.FabricEdgeExp.pfnGetExp;
 
         if( nullptr == pfnGetExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricEdgeExp.pfnGetExp, hVertexA, hVertexB, pCount, phEdges);
 
@@ -5770,7 +5770,7 @@ namespace tracing_layer
         auto pfnGetVerticesExp = context.zeDdiTable.FabricEdgeExp.pfnGetVerticesExp;
 
         if( nullptr == pfnGetVerticesExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricEdgeExp.pfnGetVerticesExp, hEdge, phVertexA, phVertexB);
 
@@ -5807,7 +5807,7 @@ namespace tracing_layer
         auto pfnGetPropertiesExp = context.zeDdiTable.FabricEdgeExp.pfnGetPropertiesExp;
 
         if( nullptr == pfnGetPropertiesExp)
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricEdgeExp.pfnGetPropertiesExp, hEdge, pEdgeProperties);
 
diff --git a/source/layers/validation/ze_valddi.cpp b/source/layers/validation/ze_valddi.cpp
index f18f0e41..c4a636f1 100644
--- a/source/layers/validation/ze_valddi.cpp
+++ b/source/layers/validation/ze_valddi.cpp
@@ -22,7 +22,7 @@ namespace validation_layer
         auto pfnInit = context.zeDdiTable.Global.pfnInit;
 
         if( nullptr == pfnInit )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -51,7 +51,7 @@ namespace validation_layer
         auto pfnGet = context.zeDdiTable.Driver.pfnGet;
 
         if( nullptr == pfnGet )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -74,7 +74,7 @@ namespace validation_layer
         auto pfnGetApiVersion = context.zeDdiTable.Driver.pfnGetApiVersion;
 
         if( nullptr == pfnGetApiVersion )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -100,7 +100,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zeDdiTable.Driver.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -126,7 +126,7 @@ namespace validation_layer
         auto pfnGetIpcProperties = context.zeDdiTable.Driver.pfnGetIpcProperties;
 
         if( nullptr == pfnGetIpcProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -161,7 +161,7 @@ namespace validation_layer
         auto pfnGetExtensionProperties = context.zeDdiTable.Driver.pfnGetExtensionProperties;
 
         if( nullptr == pfnGetExtensionProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -188,7 +188,7 @@ namespace validation_layer
         auto pfnGetExtensionFunctionAddress = context.zeDdiTable.Driver.pfnGetExtensionFunctionAddress;
 
         if( nullptr == pfnGetExtensionFunctionAddress )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -224,7 +224,7 @@ namespace validation_layer
         auto pfnGet = context.zeDdiTable.Device.pfnGet;
 
         if( nullptr == pfnGet )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -257,7 +257,7 @@ namespace validation_layer
         auto pfnGetSubDevices = context.zeDdiTable.Device.pfnGetSubDevices;
 
         if( nullptr == pfnGetSubDevices )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -283,7 +283,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zeDdiTable.Device.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -309,7 +309,7 @@ namespace validation_layer
         auto pfnGetComputeProperties = context.zeDdiTable.Device.pfnGetComputeProperties;
 
         if( nullptr == pfnGetComputeProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -335,7 +335,7 @@ namespace validation_layer
         auto pfnGetModuleProperties = context.zeDdiTable.Device.pfnGetModuleProperties;
 
         if( nullptr == pfnGetModuleProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -371,7 +371,7 @@ namespace validation_layer
         auto pfnGetCommandQueueGroupProperties = context.zeDdiTable.Device.pfnGetCommandQueueGroupProperties;
 
         if( nullptr == pfnGetCommandQueueGroupProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -406,7 +406,7 @@ namespace validation_layer
         auto pfnGetMemoryProperties = context.zeDdiTable.Device.pfnGetMemoryProperties;
 
         if( nullptr == pfnGetMemoryProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -432,7 +432,7 @@ namespace validation_layer
         auto pfnGetMemoryAccessProperties = context.zeDdiTable.Device.pfnGetMemoryAccessProperties;
 
         if( nullptr == pfnGetMemoryAccessProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -466,7 +466,7 @@ namespace validation_layer
         auto pfnGetCacheProperties = context.zeDdiTable.Device.pfnGetCacheProperties;
 
         if( nullptr == pfnGetCacheProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -492,7 +492,7 @@ namespace validation_layer
         auto pfnGetImageProperties = context.zeDdiTable.Device.pfnGetImageProperties;
 
         if( nullptr == pfnGetImageProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -518,7 +518,7 @@ namespace validation_layer
         auto pfnGetExternalMemoryProperties = context.zeDdiTable.Device.pfnGetExternalMemoryProperties;
 
         if( nullptr == pfnGetExternalMemoryProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -545,7 +545,7 @@ namespace validation_layer
         auto pfnGetP2PProperties = context.zeDdiTable.Device.pfnGetP2PProperties;
 
         if( nullptr == pfnGetP2PProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -575,7 +575,7 @@ namespace validation_layer
         auto pfnCanAccessPeer = context.zeDdiTable.Device.pfnCanAccessPeer;
 
         if( nullptr == pfnCanAccessPeer )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -603,7 +603,7 @@ namespace validation_layer
         auto pfnGetStatus = context.zeDdiTable.Device.pfnGetStatus;
 
         if( nullptr == pfnGetStatus )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -629,7 +629,7 @@ namespace validation_layer
         auto pfnGetGlobalTimestamps = context.zeDdiTable.Device.pfnGetGlobalTimestamps;
 
         if( nullptr == pfnGetGlobalTimestamps )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -659,7 +659,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Context.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -699,7 +699,7 @@ namespace validation_layer
         auto pfnCreateEx = context.zeDdiTable.Context.pfnCreateEx;
 
         if( nullptr == pfnCreateEx )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -733,7 +733,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Context.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -755,7 +755,7 @@ namespace validation_layer
         auto pfnGetStatus = context.zeDdiTable.Context.pfnGetStatus;
 
         if( nullptr == pfnGetStatus )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -780,7 +780,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.CommandQueue.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -820,7 +820,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.CommandQueue.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -846,7 +846,7 @@ namespace validation_layer
         auto pfnExecuteCommandLists = context.zeDdiTable.CommandQueue.pfnExecuteCommandLists;
 
         if( nullptr == pfnExecuteCommandLists )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -881,7 +881,7 @@ namespace validation_layer
         auto pfnSynchronize = context.zeDdiTable.CommandQueue.pfnSynchronize;
 
         if( nullptr == pfnSynchronize )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -906,7 +906,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.CommandList.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -943,7 +943,7 @@ namespace validation_layer
         auto pfnCreateImmediate = context.zeDdiTable.CommandList.pfnCreateImmediate;
 
         if( nullptr == pfnCreateImmediate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -983,7 +983,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.CommandList.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1005,7 +1005,7 @@ namespace validation_layer
         auto pfnClose = context.zeDdiTable.CommandList.pfnClose;
 
         if( nullptr == pfnClose )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1027,7 +1027,7 @@ namespace validation_layer
         auto pfnReset = context.zeDdiTable.CommandList.pfnReset;
 
         if( nullptr == pfnReset )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1056,7 +1056,7 @@ namespace validation_layer
         auto pfnAppendWriteGlobalTimestamp = context.zeDdiTable.CommandList.pfnAppendWriteGlobalTimestamp;
 
         if( nullptr == pfnAppendWriteGlobalTimestamp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1089,7 +1089,7 @@ namespace validation_layer
         auto pfnAppendBarrier = context.zeDdiTable.CommandList.pfnAppendBarrier;
 
         if( nullptr == pfnAppendBarrier )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1122,7 +1122,7 @@ namespace validation_layer
         auto pfnAppendMemoryRangesBarrier = context.zeDdiTable.CommandList.pfnAppendMemoryRangesBarrier;
 
         if( nullptr == pfnAppendMemoryRangesBarrier )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1154,7 +1154,7 @@ namespace validation_layer
         auto pfnSystemBarrier = context.zeDdiTable.Context.pfnSystemBarrier;
 
         if( nullptr == pfnSystemBarrier )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1187,7 +1187,7 @@ namespace validation_layer
         auto pfnAppendMemoryCopy = context.zeDdiTable.CommandList.pfnAppendMemoryCopy;
 
         if( nullptr == pfnAppendMemoryCopy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1227,7 +1227,7 @@ namespace validation_layer
         auto pfnAppendMemoryFill = context.zeDdiTable.CommandList.pfnAppendMemoryFill;
 
         if( nullptr == pfnAppendMemoryFill )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1275,7 +1275,7 @@ namespace validation_layer
         auto pfnAppendMemoryCopyRegion = context.zeDdiTable.CommandList.pfnAppendMemoryCopyRegion;
 
         if( nullptr == pfnAppendMemoryCopyRegion )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1321,7 +1321,7 @@ namespace validation_layer
         auto pfnAppendMemoryCopyFromContext = context.zeDdiTable.CommandList.pfnAppendMemoryCopyFromContext;
 
         if( nullptr == pfnAppendMemoryCopyFromContext )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1362,7 +1362,7 @@ namespace validation_layer
         auto pfnAppendImageCopy = context.zeDdiTable.CommandList.pfnAppendImageCopy;
 
         if( nullptr == pfnAppendImageCopy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1402,7 +1402,7 @@ namespace validation_layer
         auto pfnAppendImageCopyRegion = context.zeDdiTable.CommandList.pfnAppendImageCopyRegion;
 
         if( nullptr == pfnAppendImageCopyRegion )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1441,7 +1441,7 @@ namespace validation_layer
         auto pfnAppendImageCopyToMemory = context.zeDdiTable.CommandList.pfnAppendImageCopyToMemory;
 
         if( nullptr == pfnAppendImageCopyToMemory )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1480,7 +1480,7 @@ namespace validation_layer
         auto pfnAppendImageCopyFromMemory = context.zeDdiTable.CommandList.pfnAppendImageCopyFromMemory;
 
         if( nullptr == pfnAppendImageCopyFromMemory )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1513,7 +1513,7 @@ namespace validation_layer
         auto pfnAppendMemoryPrefetch = context.zeDdiTable.CommandList.pfnAppendMemoryPrefetch;
 
         if( nullptr == pfnAppendMemoryPrefetch )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1542,7 +1542,7 @@ namespace validation_layer
         auto pfnAppendMemAdvise = context.zeDdiTable.CommandList.pfnAppendMemAdvise;
 
         if( nullptr == pfnAppendMemAdvise )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1581,7 +1581,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.EventPool.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1618,7 +1618,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.EventPool.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1642,7 +1642,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Event.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1676,7 +1676,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Event.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1699,7 +1699,7 @@ namespace validation_layer
         auto pfnGetIpcHandle = context.zeDdiTable.EventPool.pfnGetIpcHandle;
 
         if( nullptr == pfnGetIpcHandle )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1727,7 +1727,7 @@ namespace validation_layer
         auto pfnOpenIpcHandle = context.zeDdiTable.EventPool.pfnOpenIpcHandle;
 
         if( nullptr == pfnOpenIpcHandle )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1752,7 +1752,7 @@ namespace validation_layer
         auto pfnCloseIpcHandle = context.zeDdiTable.EventPool.pfnCloseIpcHandle;
 
         if( nullptr == pfnCloseIpcHandle )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1775,7 +1775,7 @@ namespace validation_layer
         auto pfnAppendSignalEvent = context.zeDdiTable.CommandList.pfnAppendSignalEvent;
 
         if( nullptr == pfnAppendSignalEvent )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1803,7 +1803,7 @@ namespace validation_layer
         auto pfnAppendWaitOnEvents = context.zeDdiTable.CommandList.pfnAppendWaitOnEvents;
 
         if( nullptr == pfnAppendWaitOnEvents )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1828,7 +1828,7 @@ namespace validation_layer
         auto pfnHostSignal = context.zeDdiTable.Event.pfnHostSignal;
 
         if( nullptr == pfnHostSignal )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1857,7 +1857,7 @@ namespace validation_layer
         auto pfnHostSynchronize = context.zeDdiTable.Event.pfnHostSynchronize;
 
         if( nullptr == pfnHostSynchronize )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1879,7 +1879,7 @@ namespace validation_layer
         auto pfnQueryStatus = context.zeDdiTable.Event.pfnQueryStatus;
 
         if( nullptr == pfnQueryStatus )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1902,7 +1902,7 @@ namespace validation_layer
         auto pfnAppendEventReset = context.zeDdiTable.CommandList.pfnAppendEventReset;
 
         if( nullptr == pfnAppendEventReset )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1927,7 +1927,7 @@ namespace validation_layer
         auto pfnHostReset = context.zeDdiTable.Event.pfnHostReset;
 
         if( nullptr == pfnHostReset )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1950,7 +1950,7 @@ namespace validation_layer
         auto pfnQueryKernelTimestamp = context.zeDdiTable.Event.pfnQueryKernelTimestamp;
 
         if( nullptr == pfnQueryKernelTimestamp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1987,7 +1987,7 @@ namespace validation_layer
         auto pfnAppendQueryKernelTimestamps = context.zeDdiTable.CommandList.pfnAppendQueryKernelTimestamps;
 
         if( nullptr == pfnAppendQueryKernelTimestamps )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2020,7 +2020,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Fence.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2051,7 +2051,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Fence.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2080,7 +2080,7 @@ namespace validation_layer
         auto pfnHostSynchronize = context.zeDdiTable.Fence.pfnHostSynchronize;
 
         if( nullptr == pfnHostSynchronize )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2102,7 +2102,7 @@ namespace validation_layer
         auto pfnQueryStatus = context.zeDdiTable.Fence.pfnQueryStatus;
 
         if( nullptr == pfnQueryStatus )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2124,7 +2124,7 @@ namespace validation_layer
         auto pfnReset = context.zeDdiTable.Fence.pfnReset;
 
         if( nullptr == pfnReset )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2148,7 +2148,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zeDdiTable.Image.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2185,7 +2185,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Image.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2222,7 +2222,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Image.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2252,7 +2252,7 @@ namespace validation_layer
         auto pfnAllocShared = context.zeDdiTable.Mem.pfnAllocShared;
 
         if( nullptr == pfnAllocShared )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2302,7 +2302,7 @@ namespace validation_layer
         auto pfnAllocDevice = context.zeDdiTable.Mem.pfnAllocDevice;
 
         if( nullptr == pfnAllocDevice )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2348,7 +2348,7 @@ namespace validation_layer
         auto pfnAllocHost = context.zeDdiTable.Mem.pfnAllocHost;
 
         if( nullptr == pfnAllocHost )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2386,7 +2386,7 @@ namespace validation_layer
         auto pfnFree = context.zeDdiTable.Mem.pfnFree;
 
         if( nullptr == pfnFree )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2414,7 +2414,7 @@ namespace validation_layer
         auto pfnGetAllocProperties = context.zeDdiTable.Mem.pfnGetAllocProperties;
 
         if( nullptr == pfnGetAllocProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2445,7 +2445,7 @@ namespace validation_layer
         auto pfnGetAddressRange = context.zeDdiTable.Mem.pfnGetAddressRange;
 
         if( nullptr == pfnGetAddressRange )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2472,7 +2472,7 @@ namespace validation_layer
         auto pfnGetIpcHandle = context.zeDdiTable.Mem.pfnGetIpcHandle;
 
         if( nullptr == pfnGetIpcHandle )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2505,7 +2505,7 @@ namespace validation_layer
         auto pfnOpenIpcHandle = context.zeDdiTable.Mem.pfnOpenIpcHandle;
 
         if( nullptr == pfnOpenIpcHandle )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2537,7 +2537,7 @@ namespace validation_layer
         auto pfnCloseIpcHandle = context.zeDdiTable.Mem.pfnCloseIpcHandle;
 
         if( nullptr == pfnCloseIpcHandle )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2566,7 +2566,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Module.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2606,7 +2606,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Module.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2631,7 +2631,7 @@ namespace validation_layer
         auto pfnDynamicLink = context.zeDdiTable.Module.pfnDynamicLink;
 
         if( nullptr == pfnDynamicLink )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2653,7 +2653,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.ModuleBuildLog.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2677,7 +2677,7 @@ namespace validation_layer
         auto pfnGetString = context.zeDdiTable.ModuleBuildLog.pfnGetString;
 
         if( nullptr == pfnGetString )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2704,7 +2704,7 @@ namespace validation_layer
         auto pfnGetNativeBinary = context.zeDdiTable.Module.pfnGetNativeBinary;
 
         if( nullptr == pfnGetNativeBinary )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2732,7 +2732,7 @@ namespace validation_layer
         auto pfnGetGlobalPointer = context.zeDdiTable.Module.pfnGetGlobalPointer;
 
         if( nullptr == pfnGetGlobalPointer )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2765,7 +2765,7 @@ namespace validation_layer
         auto pfnGetKernelNames = context.zeDdiTable.Module.pfnGetKernelNames;
 
         if( nullptr == pfnGetKernelNames )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2791,7 +2791,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zeDdiTable.Module.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2818,7 +2818,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Kernel.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2852,7 +2852,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Kernel.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2876,7 +2876,7 @@ namespace validation_layer
         auto pfnGetFunctionPointer = context.zeDdiTable.Module.pfnGetFunctionPointer;
 
         if( nullptr == pfnGetFunctionPointer )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2907,7 +2907,7 @@ namespace validation_layer
         auto pfnSetGroupSize = context.zeDdiTable.Kernel.pfnSetGroupSize;
 
         if( nullptr == pfnSetGroupSize )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2935,7 +2935,7 @@ namespace validation_layer
         auto pfnSuggestGroupSize = context.zeDdiTable.Kernel.pfnSuggestGroupSize;
 
         if( nullptr == pfnSuggestGroupSize )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2967,7 +2967,7 @@ namespace validation_layer
         auto pfnSuggestMaxCooperativeGroupCount = context.zeDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount;
 
         if( nullptr == pfnSuggestMaxCooperativeGroupCount )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2996,7 +2996,7 @@ namespace validation_layer
         auto pfnSetArgumentValue = context.zeDdiTable.Kernel.pfnSetArgumentValue;
 
         if( nullptr == pfnSetArgumentValue )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3019,7 +3019,7 @@ namespace validation_layer
         auto pfnSetIndirectAccess = context.zeDdiTable.Kernel.pfnSetIndirectAccess;
 
         if( nullptr == pfnSetIndirectAccess )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3045,7 +3045,7 @@ namespace validation_layer
         auto pfnGetIndirectAccess = context.zeDdiTable.Kernel.pfnGetIndirectAccess;
 
         if( nullptr == pfnGetIndirectAccess )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3074,7 +3074,7 @@ namespace validation_layer
         auto pfnGetSourceAttributes = context.zeDdiTable.Kernel.pfnGetSourceAttributes;
 
         if( nullptr == pfnGetSourceAttributes )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3104,7 +3104,7 @@ namespace validation_layer
         auto pfnSetCacheConfig = context.zeDdiTable.Kernel.pfnSetCacheConfig;
 
         if( nullptr == pfnSetCacheConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3130,7 +3130,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zeDdiTable.Kernel.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3158,7 +3158,7 @@ namespace validation_layer
         auto pfnGetName = context.zeDdiTable.Kernel.pfnGetName;
 
         if( nullptr == pfnGetName )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3190,7 +3190,7 @@ namespace validation_layer
         auto pfnAppendLaunchKernel = context.zeDdiTable.CommandList.pfnAppendLaunchKernel;
 
         if( nullptr == pfnAppendLaunchKernel )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3228,7 +3228,7 @@ namespace validation_layer
         auto pfnAppendLaunchCooperativeKernel = context.zeDdiTable.CommandList.pfnAppendLaunchCooperativeKernel;
 
         if( nullptr == pfnAppendLaunchCooperativeKernel )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3267,7 +3267,7 @@ namespace validation_layer
         auto pfnAppendLaunchKernelIndirect = context.zeDdiTable.CommandList.pfnAppendLaunchKernelIndirect;
 
         if( nullptr == pfnAppendLaunchKernelIndirect )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3310,7 +3310,7 @@ namespace validation_layer
         auto pfnAppendLaunchMultipleKernelsIndirect = context.zeDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect;
 
         if( nullptr == pfnAppendLaunchMultipleKernelsIndirect )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3347,7 +3347,7 @@ namespace validation_layer
         auto pfnMakeMemoryResident = context.zeDdiTable.Context.pfnMakeMemoryResident;
 
         if( nullptr == pfnMakeMemoryResident )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3378,7 +3378,7 @@ namespace validation_layer
         auto pfnEvictMemory = context.zeDdiTable.Context.pfnEvictMemory;
 
         if( nullptr == pfnEvictMemory )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3408,7 +3408,7 @@ namespace validation_layer
         auto pfnMakeImageResident = context.zeDdiTable.Context.pfnMakeImageResident;
 
         if( nullptr == pfnMakeImageResident )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3438,7 +3438,7 @@ namespace validation_layer
         auto pfnEvictImage = context.zeDdiTable.Context.pfnEvictImage;
 
         if( nullptr == pfnEvictImage )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3469,7 +3469,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.Sampler.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3506,7 +3506,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.Sampler.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3532,7 +3532,7 @@ namespace validation_layer
         auto pfnReserve = context.zeDdiTable.VirtualMem.pfnReserve;
 
         if( nullptr == pfnReserve )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3565,7 +3565,7 @@ namespace validation_layer
         auto pfnFree = context.zeDdiTable.VirtualMem.pfnFree;
 
         if( nullptr == pfnFree )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3597,7 +3597,7 @@ namespace validation_layer
         auto pfnQueryPageSize = context.zeDdiTable.VirtualMem.pfnQueryPageSize;
 
         if( nullptr == pfnQueryPageSize )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3631,7 +3631,7 @@ namespace validation_layer
         auto pfnCreate = context.zeDdiTable.PhysicalMem.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3669,7 +3669,7 @@ namespace validation_layer
         auto pfnDestroy = context.zeDdiTable.PhysicalMem.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3702,7 +3702,7 @@ namespace validation_layer
         auto pfnMap = context.zeDdiTable.VirtualMem.pfnMap;
 
         if( nullptr == pfnMap )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3738,7 +3738,7 @@ namespace validation_layer
         auto pfnUnmap = context.zeDdiTable.VirtualMem.pfnUnmap;
 
         if( nullptr == pfnUnmap )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3770,7 +3770,7 @@ namespace validation_layer
         auto pfnSetAccessAttribute = context.zeDdiTable.VirtualMem.pfnSetAccessAttribute;
 
         if( nullptr == pfnSetAccessAttribute )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3806,7 +3806,7 @@ namespace validation_layer
         auto pfnGetAccessAttribute = context.zeDdiTable.VirtualMem.pfnGetAccessAttribute;
 
         if( nullptr == pfnGetAccessAttribute )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3843,7 +3843,7 @@ namespace validation_layer
         auto pfnSetGlobalOffsetExp = context.zeDdiTable.KernelExp.pfnSetGlobalOffsetExp;
 
         if( nullptr == pfnSetGlobalOffsetExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3870,7 +3870,7 @@ namespace validation_layer
         auto pfnReserveCacheExt = context.zeDdiTable.Device.pfnReserveCacheExt;
 
         if( nullptr == pfnReserveCacheExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3895,7 +3895,7 @@ namespace validation_layer
         auto pfnSetCacheAdviceExt = context.zeDdiTable.Device.pfnSetCacheAdviceExt;
 
         if( nullptr == pfnSetCacheAdviceExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3932,7 +3932,7 @@ namespace validation_layer
         auto pfnQueryTimestampsExp = context.zeDdiTable.EventExp.pfnQueryTimestampsExp;
 
         if( nullptr == pfnQueryTimestampsExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3961,7 +3961,7 @@ namespace validation_layer
         auto pfnGetMemoryPropertiesExp = context.zeDdiTable.ImageExp.pfnGetMemoryPropertiesExp;
 
         if( nullptr == pfnGetMemoryPropertiesExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3990,7 +3990,7 @@ namespace validation_layer
         auto pfnViewCreateExp = context.zeDdiTable.ImageExp.pfnViewCreateExp;
 
         if( nullptr == pfnViewCreateExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4031,7 +4031,7 @@ namespace validation_layer
         auto pfnSchedulingHintExp = context.zeDdiTable.KernelExp.pfnSchedulingHintExp;
 
         if( nullptr == pfnSchedulingHintExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4060,7 +4060,7 @@ namespace validation_layer
         auto pfnPciGetPropertiesExt = context.zeDdiTable.Device.pfnPciGetPropertiesExt;
 
         if( nullptr == pfnPciGetPropertiesExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4097,7 +4097,7 @@ namespace validation_layer
         auto pfnAppendImageCopyToMemoryExt = context.zeDdiTable.CommandList.pfnAppendImageCopyToMemoryExt;
 
         if( nullptr == pfnAppendImageCopyToMemoryExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4140,7 +4140,7 @@ namespace validation_layer
         auto pfnAppendImageCopyFromMemoryExt = context.zeDdiTable.CommandList.pfnAppendImageCopyFromMemoryExt;
 
         if( nullptr == pfnAppendImageCopyFromMemoryExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4173,7 +4173,7 @@ namespace validation_layer
         auto pfnGetAllocPropertiesExt = context.zeDdiTable.Image.pfnGetAllocPropertiesExt;
 
         if( nullptr == pfnGetAllocPropertiesExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4206,7 +4206,7 @@ namespace validation_layer
         auto pfnInspectLinkageExt = context.zeDdiTable.Module.pfnInspectLinkageExt;
 
         if( nullptr == pfnInspectLinkageExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4239,7 +4239,7 @@ namespace validation_layer
         auto pfnFreeExt = context.zeDdiTable.Mem.pfnFreeExt;
 
         if( nullptr == pfnFreeExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4279,7 +4279,7 @@ namespace validation_layer
         auto pfnGetExp = context.zeDdiTable.FabricVertexExp.pfnGetExp;
 
         if( nullptr == pfnGetExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4313,7 +4313,7 @@ namespace validation_layer
         auto pfnGetSubVerticesExp = context.zeDdiTable.FabricVertexExp.pfnGetSubVerticesExp;
 
         if( nullptr == pfnGetSubVerticesExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4339,7 +4339,7 @@ namespace validation_layer
         auto pfnGetPropertiesExp = context.zeDdiTable.FabricVertexExp.pfnGetPropertiesExp;
 
         if( nullptr == pfnGetPropertiesExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4365,7 +4365,7 @@ namespace validation_layer
         auto pfnGetDeviceExp = context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp;
 
         if( nullptr == pfnGetDeviceExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4391,7 +4391,7 @@ namespace validation_layer
         auto pfnGetFabricVertexExp = context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp;
 
         if( nullptr == pfnGetFabricVertexExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4426,7 +4426,7 @@ namespace validation_layer
         auto pfnGetExp = context.zeDdiTable.FabricEdgeExp.pfnGetExp;
 
         if( nullptr == pfnGetExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4456,7 +4456,7 @@ namespace validation_layer
         auto pfnGetVerticesExp = context.zeDdiTable.FabricEdgeExp.pfnGetVerticesExp;
 
         if( nullptr == pfnGetVerticesExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -4485,7 +4485,7 @@ namespace validation_layer
         auto pfnGetPropertiesExp = context.zeDdiTable.FabricEdgeExp.pfnGetPropertiesExp;
 
         if( nullptr == pfnGetPropertiesExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
diff --git a/source/layers/validation/zes_valddi.cpp b/source/layers/validation/zes_valddi.cpp
index 726f51a4..31b04e83 100644
--- a/source/layers/validation/zes_valddi.cpp
+++ b/source/layers/validation/zes_valddi.cpp
@@ -22,7 +22,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Device.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -48,7 +48,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Device.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -75,7 +75,7 @@ namespace validation_layer
         auto pfnReset = context.zesDdiTable.Device.pfnReset;
 
         if( nullptr == pfnReset )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -107,7 +107,7 @@ namespace validation_layer
         auto pfnProcessesGetState = context.zesDdiTable.Device.pfnProcessesGetState;
 
         if( nullptr == pfnProcessesGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -133,7 +133,7 @@ namespace validation_layer
         auto pfnPciGetProperties = context.zesDdiTable.Device.pfnPciGetProperties;
 
         if( nullptr == pfnPciGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -159,7 +159,7 @@ namespace validation_layer
         auto pfnPciGetState = context.zesDdiTable.Device.pfnPciGetState;
 
         if( nullptr == pfnPciGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -193,7 +193,7 @@ namespace validation_layer
         auto pfnPciGetBars = context.zesDdiTable.Device.pfnPciGetBars;
 
         if( nullptr == pfnPciGetBars )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -219,7 +219,7 @@ namespace validation_layer
         auto pfnPciGetStats = context.zesDdiTable.Device.pfnPciGetStats;
 
         if( nullptr == pfnPciGetStats )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -255,7 +255,7 @@ namespace validation_layer
         auto pfnEnumDiagnosticTestSuites = context.zesDdiTable.Device.pfnEnumDiagnosticTestSuites;
 
         if( nullptr == pfnEnumDiagnosticTestSuites )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -282,7 +282,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Diagnostics.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -316,7 +316,7 @@ namespace validation_layer
         auto pfnGetTests = context.zesDdiTable.Diagnostics.pfnGetTests;
 
         if( nullptr == pfnGetTests )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -346,7 +346,7 @@ namespace validation_layer
         auto pfnRunTests = context.zesDdiTable.Diagnostics.pfnRunTests;
 
         if( nullptr == pfnRunTests )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -372,7 +372,7 @@ namespace validation_layer
         auto pfnEccAvailable = context.zesDdiTable.Device.pfnEccAvailable;
 
         if( nullptr == pfnEccAvailable )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -398,7 +398,7 @@ namespace validation_layer
         auto pfnEccConfigurable = context.zesDdiTable.Device.pfnEccConfigurable;
 
         if( nullptr == pfnEccConfigurable )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -424,7 +424,7 @@ namespace validation_layer
         auto pfnGetEccState = context.zesDdiTable.Device.pfnGetEccState;
 
         if( nullptr == pfnGetEccState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -451,7 +451,7 @@ namespace validation_layer
         auto pfnSetEccState = context.zesDdiTable.Device.pfnSetEccState;
 
         if( nullptr == pfnSetEccState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -493,7 +493,7 @@ namespace validation_layer
         auto pfnEnumEngineGroups = context.zesDdiTable.Device.pfnEnumEngineGroups;
 
         if( nullptr == pfnEnumEngineGroups )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -519,7 +519,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Engine.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -546,7 +546,7 @@ namespace validation_layer
         auto pfnGetActivity = context.zesDdiTable.Engine.pfnGetActivity;
 
         if( nullptr == pfnGetActivity )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -572,7 +572,7 @@ namespace validation_layer
         auto pfnEventRegister = context.zesDdiTable.Device.pfnEventRegister;
 
         if( nullptr == pfnEventRegister )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -614,7 +614,7 @@ namespace validation_layer
         auto pfnEventListen = context.zesDdiTable.Driver.pfnEventListen;
 
         if( nullptr == pfnEventListen )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -662,7 +662,7 @@ namespace validation_layer
         auto pfnEventListenEx = context.zesDdiTable.Driver.pfnEventListenEx;
 
         if( nullptr == pfnEventListenEx )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -704,7 +704,7 @@ namespace validation_layer
         auto pfnEnumFabricPorts = context.zesDdiTable.Device.pfnEnumFabricPorts;
 
         if( nullptr == pfnEnumFabricPorts )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -730,7 +730,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.FabricPort.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -757,7 +757,7 @@ namespace validation_layer
         auto pfnGetLinkType = context.zesDdiTable.FabricPort.pfnGetLinkType;
 
         if( nullptr == pfnGetLinkType )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -783,7 +783,7 @@ namespace validation_layer
         auto pfnGetConfig = context.zesDdiTable.FabricPort.pfnGetConfig;
 
         if( nullptr == pfnGetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -809,7 +809,7 @@ namespace validation_layer
         auto pfnSetConfig = context.zesDdiTable.FabricPort.pfnSetConfig;
 
         if( nullptr == pfnSetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -835,7 +835,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.FabricPort.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -861,7 +861,7 @@ namespace validation_layer
         auto pfnGetThroughput = context.zesDdiTable.FabricPort.pfnGetThroughput;
 
         if( nullptr == pfnGetThroughput )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -897,7 +897,7 @@ namespace validation_layer
         auto pfnEnumFans = context.zesDdiTable.Device.pfnEnumFans;
 
         if( nullptr == pfnEnumFans )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -923,7 +923,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Fan.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -949,7 +949,7 @@ namespace validation_layer
         auto pfnGetConfig = context.zesDdiTable.Fan.pfnGetConfig;
 
         if( nullptr == pfnGetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -974,7 +974,7 @@ namespace validation_layer
         auto pfnSetDefaultMode = context.zesDdiTable.Fan.pfnSetDefaultMode;
 
         if( nullptr == pfnSetDefaultMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -997,7 +997,7 @@ namespace validation_layer
         auto pfnSetFixedSpeedMode = context.zesDdiTable.Fan.pfnSetFixedSpeedMode;
 
         if( nullptr == pfnSetFixedSpeedMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1023,7 +1023,7 @@ namespace validation_layer
         auto pfnSetSpeedTableMode = context.zesDdiTable.Fan.pfnSetSpeedTableMode;
 
         if( nullptr == pfnSetSpeedTableMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1052,7 +1052,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Fan.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1091,7 +1091,7 @@ namespace validation_layer
         auto pfnEnumFirmwares = context.zesDdiTable.Device.pfnEnumFirmwares;
 
         if( nullptr == pfnEnumFirmwares )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1118,7 +1118,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Firmware.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1145,7 +1145,7 @@ namespace validation_layer
         auto pfnFlash = context.zesDdiTable.Firmware.pfnFlash;
 
         if( nullptr == pfnFlash )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1181,7 +1181,7 @@ namespace validation_layer
         auto pfnEnumFrequencyDomains = context.zesDdiTable.Device.pfnEnumFrequencyDomains;
 
         if( nullptr == pfnEnumFrequencyDomains )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1207,7 +1207,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Frequency.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1241,7 +1241,7 @@ namespace validation_layer
         auto pfnGetAvailableClocks = context.zesDdiTable.Frequency.pfnGetAvailableClocks;
 
         if( nullptr == pfnGetAvailableClocks )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1268,7 +1268,7 @@ namespace validation_layer
         auto pfnGetRange = context.zesDdiTable.Frequency.pfnGetRange;
 
         if( nullptr == pfnGetRange )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1295,7 +1295,7 @@ namespace validation_layer
         auto pfnSetRange = context.zesDdiTable.Frequency.pfnSetRange;
 
         if( nullptr == pfnSetRange )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1321,7 +1321,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Frequency.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1348,7 +1348,7 @@ namespace validation_layer
         auto pfnGetThrottleTime = context.zesDdiTable.Frequency.pfnGetThrottleTime;
 
         if( nullptr == pfnGetThrottleTime )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1375,7 +1375,7 @@ namespace validation_layer
         auto pfnOcGetCapabilities = context.zesDdiTable.Frequency.pfnOcGetCapabilities;
 
         if( nullptr == pfnOcGetCapabilities )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1403,7 +1403,7 @@ namespace validation_layer
         auto pfnOcGetFrequencyTarget = context.zesDdiTable.Frequency.pfnOcGetFrequencyTarget;
 
         if( nullptr == pfnOcGetFrequencyTarget )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1431,7 +1431,7 @@ namespace validation_layer
         auto pfnOcSetFrequencyTarget = context.zesDdiTable.Frequency.pfnOcSetFrequencyTarget;
 
         if( nullptr == pfnOcSetFrequencyTarget )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1459,7 +1459,7 @@ namespace validation_layer
         auto pfnOcGetVoltageTarget = context.zesDdiTable.Frequency.pfnOcGetVoltageTarget;
 
         if( nullptr == pfnOcGetVoltageTarget )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1493,7 +1493,7 @@ namespace validation_layer
         auto pfnOcSetVoltageTarget = context.zesDdiTable.Frequency.pfnOcSetVoltageTarget;
 
         if( nullptr == pfnOcSetVoltageTarget )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1516,7 +1516,7 @@ namespace validation_layer
         auto pfnOcSetMode = context.zesDdiTable.Frequency.pfnOcSetMode;
 
         if( nullptr == pfnOcSetMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1542,7 +1542,7 @@ namespace validation_layer
         auto pfnOcGetMode = context.zesDdiTable.Frequency.pfnOcGetMode;
 
         if( nullptr == pfnOcGetMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1569,7 +1569,7 @@ namespace validation_layer
         auto pfnOcGetIccMax = context.zesDdiTable.Frequency.pfnOcGetIccMax;
 
         if( nullptr == pfnOcGetIccMax )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1595,7 +1595,7 @@ namespace validation_layer
         auto pfnOcSetIccMax = context.zesDdiTable.Frequency.pfnOcSetIccMax;
 
         if( nullptr == pfnOcSetIccMax )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1619,7 +1619,7 @@ namespace validation_layer
         auto pfnOcGetTjMax = context.zesDdiTable.Frequency.pfnOcGetTjMax;
 
         if( nullptr == pfnOcGetTjMax )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1645,7 +1645,7 @@ namespace validation_layer
         auto pfnOcSetTjMax = context.zesDdiTable.Frequency.pfnOcSetTjMax;
 
         if( nullptr == pfnOcSetTjMax )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1678,7 +1678,7 @@ namespace validation_layer
         auto pfnEnumLeds = context.zesDdiTable.Device.pfnEnumLeds;
 
         if( nullptr == pfnEnumLeds )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1704,7 +1704,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Led.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1730,7 +1730,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Led.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1756,7 +1756,7 @@ namespace validation_layer
         auto pfnSetState = context.zesDdiTable.Led.pfnSetState;
 
         if( nullptr == pfnSetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1779,7 +1779,7 @@ namespace validation_layer
         auto pfnSetColor = context.zesDdiTable.Led.pfnSetColor;
 
         if( nullptr == pfnSetColor )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1815,7 +1815,7 @@ namespace validation_layer
         auto pfnEnumMemoryModules = context.zesDdiTable.Device.pfnEnumMemoryModules;
 
         if( nullptr == pfnEnumMemoryModules )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1841,7 +1841,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Memory.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1867,7 +1867,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Memory.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1894,7 +1894,7 @@ namespace validation_layer
         auto pfnGetBandwidth = context.zesDdiTable.Memory.pfnGetBandwidth;
 
         if( nullptr == pfnGetBandwidth )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1930,7 +1930,7 @@ namespace validation_layer
         auto pfnEnumPerformanceFactorDomains = context.zesDdiTable.Device.pfnEnumPerformanceFactorDomains;
 
         if( nullptr == pfnEnumPerformanceFactorDomains )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1957,7 +1957,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.PerformanceFactor.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1984,7 +1984,7 @@ namespace validation_layer
         auto pfnGetConfig = context.zesDdiTable.PerformanceFactor.pfnGetConfig;
 
         if( nullptr == pfnGetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2010,7 +2010,7 @@ namespace validation_layer
         auto pfnSetConfig = context.zesDdiTable.PerformanceFactor.pfnSetConfig;
 
         if( nullptr == pfnSetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2043,7 +2043,7 @@ namespace validation_layer
         auto pfnEnumPowerDomains = context.zesDdiTable.Device.pfnEnumPowerDomains;
 
         if( nullptr == pfnEnumPowerDomains )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2069,7 +2069,7 @@ namespace validation_layer
         auto pfnGetCardPowerDomain = context.zesDdiTable.Device.pfnGetCardPowerDomain;
 
         if( nullptr == pfnGetCardPowerDomain )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2095,7 +2095,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Power.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2122,7 +2122,7 @@ namespace validation_layer
         auto pfnGetEnergyCounter = context.zesDdiTable.Power.pfnGetEnergyCounter;
 
         if( nullptr == pfnGetEnergyCounter )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2153,7 +2153,7 @@ namespace validation_layer
         auto pfnGetLimits = context.zesDdiTable.Power.pfnGetLimits;
 
         if( nullptr == pfnGetLimits )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2181,7 +2181,7 @@ namespace validation_layer
         auto pfnSetLimits = context.zesDdiTable.Power.pfnSetLimits;
 
         if( nullptr == pfnSetLimits )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2205,7 +2205,7 @@ namespace validation_layer
         auto pfnGetEnergyThreshold = context.zesDdiTable.Power.pfnGetEnergyThreshold;
 
         if( nullptr == pfnGetEnergyThreshold )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2231,7 +2231,7 @@ namespace validation_layer
         auto pfnSetEnergyThreshold = context.zesDdiTable.Power.pfnSetEnergyThreshold;
 
         if( nullptr == pfnSetEnergyThreshold )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2264,7 +2264,7 @@ namespace validation_layer
         auto pfnEnumPsus = context.zesDdiTable.Device.pfnEnumPsus;
 
         if( nullptr == pfnEnumPsus )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2290,7 +2290,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Psu.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2316,7 +2316,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Psu.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2352,7 +2352,7 @@ namespace validation_layer
         auto pfnEnumRasErrorSets = context.zesDdiTable.Device.pfnEnumRasErrorSets;
 
         if( nullptr == pfnEnumRasErrorSets )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2378,7 +2378,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Ras.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2405,7 +2405,7 @@ namespace validation_layer
         auto pfnGetConfig = context.zesDdiTable.Ras.pfnGetConfig;
 
         if( nullptr == pfnGetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2431,7 +2431,7 @@ namespace validation_layer
         auto pfnSetConfig = context.zesDdiTable.Ras.pfnSetConfig;
 
         if( nullptr == pfnSetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2458,7 +2458,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Ras.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2494,7 +2494,7 @@ namespace validation_layer
         auto pfnEnumSchedulers = context.zesDdiTable.Device.pfnEnumSchedulers;
 
         if( nullptr == pfnEnumSchedulers )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2520,7 +2520,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Scheduler.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2546,7 +2546,7 @@ namespace validation_layer
         auto pfnGetCurrentMode = context.zesDdiTable.Scheduler.pfnGetCurrentMode;
 
         if( nullptr == pfnGetCurrentMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2574,7 +2574,7 @@ namespace validation_layer
         auto pfnGetTimeoutModeProperties = context.zesDdiTable.Scheduler.pfnGetTimeoutModeProperties;
 
         if( nullptr == pfnGetTimeoutModeProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2602,7 +2602,7 @@ namespace validation_layer
         auto pfnGetTimesliceModeProperties = context.zesDdiTable.Scheduler.pfnGetTimesliceModeProperties;
 
         if( nullptr == pfnGetTimesliceModeProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2630,7 +2630,7 @@ namespace validation_layer
         auto pfnSetTimeoutMode = context.zesDdiTable.Scheduler.pfnSetTimeoutMode;
 
         if( nullptr == pfnSetTimeoutMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2661,7 +2661,7 @@ namespace validation_layer
         auto pfnSetTimesliceMode = context.zesDdiTable.Scheduler.pfnSetTimesliceMode;
 
         if( nullptr == pfnSetTimesliceMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2691,7 +2691,7 @@ namespace validation_layer
         auto pfnSetExclusiveMode = context.zesDdiTable.Scheduler.pfnSetExclusiveMode;
 
         if( nullptr == pfnSetExclusiveMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2718,7 +2718,7 @@ namespace validation_layer
         auto pfnSetComputeUnitDebugMode = context.zesDdiTable.Scheduler.pfnSetComputeUnitDebugMode;
 
         if( nullptr == pfnSetComputeUnitDebugMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2754,7 +2754,7 @@ namespace validation_layer
         auto pfnEnumStandbyDomains = context.zesDdiTable.Device.pfnEnumStandbyDomains;
 
         if( nullptr == pfnEnumStandbyDomains )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2780,7 +2780,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Standby.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2806,7 +2806,7 @@ namespace validation_layer
         auto pfnGetMode = context.zesDdiTable.Standby.pfnGetMode;
 
         if( nullptr == pfnGetMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2832,7 +2832,7 @@ namespace validation_layer
         auto pfnSetMode = context.zesDdiTable.Standby.pfnSetMode;
 
         if( nullptr == pfnSetMode )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2868,7 +2868,7 @@ namespace validation_layer
         auto pfnEnumTemperatureSensors = context.zesDdiTable.Device.pfnEnumTemperatureSensors;
 
         if( nullptr == pfnEnumTemperatureSensors )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2894,7 +2894,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zesDdiTable.Temperature.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2920,7 +2920,7 @@ namespace validation_layer
         auto pfnGetConfig = context.zesDdiTable.Temperature.pfnGetConfig;
 
         if( nullptr == pfnGetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2946,7 +2946,7 @@ namespace validation_layer
         auto pfnSetConfig = context.zesDdiTable.Temperature.pfnSetConfig;
 
         if( nullptr == pfnSetConfig )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -2973,7 +2973,7 @@ namespace validation_layer
         auto pfnGetState = context.zesDdiTable.Temperature.pfnGetState;
 
         if( nullptr == pfnGetState )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3007,7 +3007,7 @@ namespace validation_layer
         auto pfnGetLimitsExt = context.zesDdiTable.Power.pfnGetLimitsExt;
 
         if( nullptr == pfnGetLimitsExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -3034,7 +3034,7 @@ namespace validation_layer
         auto pfnSetLimitsExt = context.zesDdiTable.Power.pfnSetLimitsExt;
 
         if( nullptr == pfnSetLimitsExt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
diff --git a/source/layers/validation/zet_valddi.cpp b/source/layers/validation/zet_valddi.cpp
index 4f3767e2..f1693286 100644
--- a/source/layers/validation/zet_valddi.cpp
+++ b/source/layers/validation/zet_valddi.cpp
@@ -24,7 +24,7 @@ namespace validation_layer
         auto pfnGetDebugInfo = context.zetDdiTable.Module.pfnGetDebugInfo;
 
         if( nullptr == pfnGetDebugInfo )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -53,7 +53,7 @@ namespace validation_layer
         auto pfnGetDebugProperties = context.zetDdiTable.Device.pfnGetDebugProperties;
 
         if( nullptr == pfnGetDebugProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -80,7 +80,7 @@ namespace validation_layer
         auto pfnAttach = context.zetDdiTable.Debug.pfnAttach;
 
         if( nullptr == pfnAttach )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -108,7 +108,7 @@ namespace validation_layer
         auto pfnDetach = context.zetDdiTable.Debug.pfnDetach;
 
         if( nullptr == pfnDetach )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -138,7 +138,7 @@ namespace validation_layer
         auto pfnReadEvent = context.zetDdiTable.Debug.pfnReadEvent;
 
         if( nullptr == pfnReadEvent )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -164,7 +164,7 @@ namespace validation_layer
         auto pfnAcknowledgeEvent = context.zetDdiTable.Debug.pfnAcknowledgeEvent;
 
         if( nullptr == pfnAcknowledgeEvent )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -190,7 +190,7 @@ namespace validation_layer
         auto pfnInterrupt = context.zetDdiTable.Debug.pfnInterrupt;
 
         if( nullptr == pfnInterrupt )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -213,7 +213,7 @@ namespace validation_layer
         auto pfnResume = context.zetDdiTable.Debug.pfnResume;
 
         if( nullptr == pfnResume )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -239,7 +239,7 @@ namespace validation_layer
         auto pfnReadMemory = context.zetDdiTable.Debug.pfnReadMemory;
 
         if( nullptr == pfnReadMemory )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -274,7 +274,7 @@ namespace validation_layer
         auto pfnWriteMemory = context.zetDdiTable.Debug.pfnWriteMemory;
 
         if( nullptr == pfnWriteMemory )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -315,7 +315,7 @@ namespace validation_layer
         auto pfnGetRegisterSetProperties = context.zetDdiTable.Debug.pfnGetRegisterSetProperties;
 
         if( nullptr == pfnGetRegisterSetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -347,7 +347,7 @@ namespace validation_layer
         auto pfnReadRegisters = context.zetDdiTable.Debug.pfnReadRegisters;
 
         if( nullptr == pfnReadRegisters )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -376,7 +376,7 @@ namespace validation_layer
         auto pfnWriteRegisters = context.zetDdiTable.Debug.pfnWriteRegisters;
 
         if( nullptr == pfnWriteRegisters )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -407,7 +407,7 @@ namespace validation_layer
         auto pfnGet = context.zetDdiTable.MetricGroup.pfnGet;
 
         if( nullptr == pfnGet )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -433,7 +433,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zetDdiTable.MetricGroup.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -470,7 +470,7 @@ namespace validation_layer
         auto pfnCalculateMetricValues = context.zetDdiTable.MetricGroup.pfnCalculateMetricValues;
 
         if( nullptr == pfnCalculateMetricValues )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -509,7 +509,7 @@ namespace validation_layer
         auto pfnGet = context.zetDdiTable.Metric.pfnGet;
 
         if( nullptr == pfnGet )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -535,7 +535,7 @@ namespace validation_layer
         auto pfnGetProperties = context.zetDdiTable.Metric.pfnGetProperties;
 
         if( nullptr == pfnGetProperties )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -567,7 +567,7 @@ namespace validation_layer
         auto pfnActivateMetricGroups = context.zetDdiTable.Context.pfnActivateMetricGroups;
 
         if( nullptr == pfnActivateMetricGroups )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -600,7 +600,7 @@ namespace validation_layer
         auto pfnOpen = context.zetDdiTable.MetricStreamer.pfnOpen;
 
         if( nullptr == pfnOpen )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -636,7 +636,7 @@ namespace validation_layer
         auto pfnAppendMetricStreamerMarker = context.zetDdiTable.CommandList.pfnAppendMetricStreamerMarker;
 
         if( nullptr == pfnAppendMetricStreamerMarker )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -661,7 +661,7 @@ namespace validation_layer
         auto pfnClose = context.zetDdiTable.MetricStreamer.pfnClose;
 
         if( nullptr == pfnClose )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -694,7 +694,7 @@ namespace validation_layer
         auto pfnReadData = context.zetDdiTable.MetricStreamer.pfnReadData;
 
         if( nullptr == pfnReadData )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -723,7 +723,7 @@ namespace validation_layer
         auto pfnCreate = context.zetDdiTable.MetricQueryPool.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -760,7 +760,7 @@ namespace validation_layer
         auto pfnDestroy = context.zetDdiTable.MetricQueryPool.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -784,7 +784,7 @@ namespace validation_layer
         auto pfnCreate = context.zetDdiTable.MetricQuery.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -809,7 +809,7 @@ namespace validation_layer
         auto pfnDestroy = context.zetDdiTable.MetricQuery.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -831,7 +831,7 @@ namespace validation_layer
         auto pfnReset = context.zetDdiTable.MetricQuery.pfnReset;
 
         if( nullptr == pfnReset )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -854,7 +854,7 @@ namespace validation_layer
         auto pfnAppendMetricQueryBegin = context.zetDdiTable.CommandList.pfnAppendMetricQueryBegin;
 
         if( nullptr == pfnAppendMetricQueryBegin )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -883,7 +883,7 @@ namespace validation_layer
         auto pfnAppendMetricQueryEnd = context.zetDdiTable.CommandList.pfnAppendMetricQueryEnd;
 
         if( nullptr == pfnAppendMetricQueryEnd )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -914,7 +914,7 @@ namespace validation_layer
         auto pfnAppendMetricMemoryBarrier = context.zetDdiTable.CommandList.pfnAppendMetricMemoryBarrier;
 
         if( nullptr == pfnAppendMetricMemoryBarrier )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -945,7 +945,7 @@ namespace validation_layer
         auto pfnGetData = context.zetDdiTable.MetricQuery.pfnGetData;
 
         if( nullptr == pfnGetData )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -971,7 +971,7 @@ namespace validation_layer
         auto pfnGetProfileInfo = context.zetDdiTable.Kernel.pfnGetProfileInfo;
 
         if( nullptr == pfnGetProfileInfo )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -998,7 +998,7 @@ namespace validation_layer
         auto pfnCreate = context.zetDdiTable.TracerExp.pfnCreate;
 
         if( nullptr == pfnCreate )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1029,7 +1029,7 @@ namespace validation_layer
         auto pfnDestroy = context.zetDdiTable.TracerExp.pfnDestroy;
 
         if( nullptr == pfnDestroy )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1052,7 +1052,7 @@ namespace validation_layer
         auto pfnSetPrologues = context.zetDdiTable.TracerExp.pfnSetPrologues;
 
         if( nullptr == pfnSetPrologues )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1078,7 +1078,7 @@ namespace validation_layer
         auto pfnSetEpilogues = context.zetDdiTable.TracerExp.pfnSetEpilogues;
 
         if( nullptr == pfnSetEpilogues )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1104,7 +1104,7 @@ namespace validation_layer
         auto pfnSetEnabled = context.zetDdiTable.TracerExp.pfnSetEnabled;
 
         if( nullptr == pfnSetEnabled )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
@@ -1148,7 +1148,7 @@ namespace validation_layer
         auto pfnCalculateMultipleMetricValuesExp = context.zetDdiTable.MetricGroupExp.pfnCalculateMultipleMetricValuesExp;
 
         if( nullptr == pfnCalculateMultipleMetricValuesExp )
-            return ZE_RESULT_ERROR_UNINITIALIZED;
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
         if( context.enableParameterValidation )
         {
diff --git a/source/lib/ze_lib.cpp b/source/lib/ze_lib.cpp
index 29a0997f..b08da989 100644
--- a/source/lib/ze_lib.cpp
+++ b/source/lib/ze_lib.cpp
@@ -88,6 +88,11 @@ namespace ze_lib
             result = zelLoaderDriverCheck(flags);
         }
 
+        if( ZE_RESULT_SUCCESS == result )
+        {
+            isInitialized = true;
+        }
+
         return result;
     }
 
diff --git a/source/lib/ze_lib.h b/source/lib/ze_lib.h
index f48237b2..4057c55a 100644
--- a/source/lib/ze_lib.h
+++ b/source/lib/ze_lib.h
@@ -50,6 +50,7 @@ namespace ze_lib
         zel_tracing_dditable_t  zelTracingDdiTable = {};
 
         HMODULE tracing_lib = nullptr;
+        bool isInitialized = false;
     };
 
     extern context_t *context;
diff --git a/source/lib/ze_libapi.cpp b/source/lib/ze_libapi.cpp
index 9bbf9b96..ccb57a7f 100644
--- a/source/lib/ze_libapi.cpp
+++ b/source/lib/ze_libapi.cpp
@@ -52,8 +52,12 @@ zeInit(
         return result;
 
     auto pfnInit = ze_lib::context->zeDdiTable.Global.pfnInit;
-    if( nullptr == pfnInit )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnInit ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnInit( flags );
 }
@@ -93,8 +97,12 @@ zeDriverGet(
     )
 {
     auto pfnGet = ze_lib::context->zeDdiTable.Driver.pfnGet;
-    if( nullptr == pfnGet )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGet ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGet( pCount, phDrivers );
 }
@@ -121,8 +129,12 @@ zeDriverGetApiVersion(
     )
 {
     auto pfnGetApiVersion = ze_lib::context->zeDdiTable.Driver.pfnGetApiVersion;
-    if( nullptr == pfnGetApiVersion )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetApiVersion ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetApiVersion( hDriver, version );
 }
@@ -153,8 +165,12 @@ zeDriverGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zeDdiTable.Driver.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hDriver, pDriverProperties );
 }
@@ -181,8 +197,12 @@ zeDriverGetIpcProperties(
     )
 {
     auto pfnGetIpcProperties = ze_lib::context->zeDdiTable.Driver.pfnGetIpcProperties;
-    if( nullptr == pfnGetIpcProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetIpcProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetIpcProperties( hDriver, pIpcProperties );
 }
@@ -222,8 +242,12 @@ zeDriverGetExtensionProperties(
     )
 {
     auto pfnGetExtensionProperties = ze_lib::context->zeDdiTable.Driver.pfnGetExtensionProperties;
-    if( nullptr == pfnGetExtensionProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetExtensionProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetExtensionProperties( hDriver, pCount, pExtensionProperties );
 }
@@ -253,8 +277,12 @@ zeDriverGetExtensionFunctionAddress(
     )
 {
     auto pfnGetExtensionFunctionAddress = ze_lib::context->zeDdiTable.Driver.pfnGetExtensionFunctionAddress;
-    if( nullptr == pfnGetExtensionFunctionAddress )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetExtensionFunctionAddress ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetExtensionFunctionAddress( hDriver, name, ppFunctionAddress );
 }
@@ -293,8 +321,12 @@ zeDeviceGet(
     )
 {
     auto pfnGet = ze_lib::context->zeDdiTable.Device.pfnGet;
-    if( nullptr == pfnGet )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGet ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGet( hDriver, pCount, phDevices );
 }
@@ -336,8 +368,12 @@ zeDeviceGetSubDevices(
     )
 {
     auto pfnGetSubDevices = ze_lib::context->zeDdiTable.Device.pfnGetSubDevices;
-    if( nullptr == pfnGetSubDevices )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetSubDevices ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetSubDevices( hDevice, pCount, phSubdevices );
 }
@@ -368,8 +404,12 @@ zeDeviceGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zeDdiTable.Device.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hDevice, pDeviceProperties );
 }
@@ -400,8 +440,12 @@ zeDeviceGetComputeProperties(
     )
 {
     auto pfnGetComputeProperties = ze_lib::context->zeDdiTable.Device.pfnGetComputeProperties;
-    if( nullptr == pfnGetComputeProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetComputeProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetComputeProperties( hDevice, pComputeProperties );
 }
@@ -428,8 +472,12 @@ zeDeviceGetModuleProperties(
     )
 {
     auto pfnGetModuleProperties = ze_lib::context->zeDdiTable.Device.pfnGetModuleProperties;
-    if( nullptr == pfnGetModuleProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetModuleProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetModuleProperties( hDevice, pModuleProperties );
 }
@@ -476,8 +524,12 @@ zeDeviceGetCommandQueueGroupProperties(
     )
 {
     auto pfnGetCommandQueueGroupProperties = ze_lib::context->zeDdiTable.Device.pfnGetCommandQueueGroupProperties;
-    if( nullptr == pfnGetCommandQueueGroupProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetCommandQueueGroupProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetCommandQueueGroupProperties( hDevice, pCount, pCommandQueueGroupProperties );
 }
@@ -523,8 +575,12 @@ zeDeviceGetMemoryProperties(
     )
 {
     auto pfnGetMemoryProperties = ze_lib::context->zeDdiTable.Device.pfnGetMemoryProperties;
-    if( nullptr == pfnGetMemoryProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetMemoryProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetMemoryProperties( hDevice, pCount, pMemProperties );
 }
@@ -555,8 +611,12 @@ zeDeviceGetMemoryAccessProperties(
     )
 {
     auto pfnGetMemoryAccessProperties = ze_lib::context->zeDdiTable.Device.pfnGetMemoryAccessProperties;
-    if( nullptr == pfnGetMemoryAccessProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetMemoryAccessProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetMemoryAccessProperties( hDevice, pMemAccessProperties );
 }
@@ -595,8 +655,12 @@ zeDeviceGetCacheProperties(
     )
 {
     auto pfnGetCacheProperties = ze_lib::context->zeDdiTable.Device.pfnGetCacheProperties;
-    if( nullptr == pfnGetCacheProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetCacheProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetCacheProperties( hDevice, pCount, pCacheProperties );
 }
@@ -624,8 +688,12 @@ zeDeviceGetImageProperties(
     )
 {
     auto pfnGetImageProperties = ze_lib::context->zeDdiTable.Device.pfnGetImageProperties;
-    if( nullptr == pfnGetImageProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetImageProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetImageProperties( hDevice, pImageProperties );
 }
@@ -652,8 +720,12 @@ zeDeviceGetExternalMemoryProperties(
     )
 {
     auto pfnGetExternalMemoryProperties = ze_lib::context->zeDdiTable.Device.pfnGetExternalMemoryProperties;
-    if( nullptr == pfnGetExternalMemoryProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetExternalMemoryProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetExternalMemoryProperties( hDevice, pExternalMemoryProperties );
 }
@@ -683,8 +755,12 @@ zeDeviceGetP2PProperties(
     )
 {
     auto pfnGetP2PProperties = ze_lib::context->zeDdiTable.Device.pfnGetP2PProperties;
-    if( nullptr == pfnGetP2PProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetP2PProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetP2PProperties( hDevice, hPeerDevice, pP2PProperties );
 }
@@ -727,8 +803,12 @@ zeDeviceCanAccessPeer(
     )
 {
     auto pfnCanAccessPeer = ze_lib::context->zeDdiTable.Device.pfnCanAccessPeer;
-    if( nullptr == pfnCanAccessPeer )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCanAccessPeer ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCanAccessPeer( hDevice, hPeerDevice, value );
 }
@@ -759,8 +839,12 @@ zeDeviceGetStatus(
     )
 {
     auto pfnGetStatus = ze_lib::context->zeDdiTable.Device.pfnGetStatus;
-    if( nullptr == pfnGetStatus )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetStatus ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetStatus( hDevice );
 }
@@ -792,8 +876,12 @@ zeDeviceGetGlobalTimestamps(
     )
 {
     auto pfnGetGlobalTimestamps = ze_lib::context->zeDdiTable.Device.pfnGetGlobalTimestamps;
-    if( nullptr == pfnGetGlobalTimestamps )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetGlobalTimestamps ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetGlobalTimestamps( hDevice, hostTimestamp, deviceTimestamp );
 }
@@ -828,8 +916,12 @@ zeContextCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Context.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hDriver, desc, phContext );
 }
@@ -873,8 +965,12 @@ zeContextCreateEx(
     )
 {
     auto pfnCreateEx = ze_lib::context->zeDdiTable.Context.pfnCreateEx;
-    if( nullptr == pfnCreateEx )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreateEx ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreateEx( hDriver, desc, numDevices, phDevices, phContext );
 }
@@ -904,8 +1000,12 @@ zeContextDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Context.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hContext );
 }
@@ -934,8 +1034,12 @@ zeContextGetStatus(
     )
 {
     auto pfnGetStatus = ze_lib::context->zeDdiTable.Context.pfnGetStatus;
-    if( nullptr == pfnGetStatus )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetStatus ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetStatus( hContext );
 }
@@ -980,8 +1084,12 @@ zeCommandQueueCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.CommandQueue.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, desc, phCommandQueue );
 }
@@ -1017,8 +1125,12 @@ zeCommandQueueDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.CommandQueue.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hCommandQueue );
 }
@@ -1069,8 +1181,12 @@ zeCommandQueueExecuteCommandLists(
     )
 {
     auto pfnExecuteCommandLists = ze_lib::context->zeDdiTable.CommandQueue.pfnExecuteCommandLists;
-    if( nullptr == pfnExecuteCommandLists )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnExecuteCommandLists ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnExecuteCommandLists( hCommandQueue, numCommandLists, phCommandLists, hFence );
 }
@@ -1103,8 +1219,12 @@ zeCommandQueueSynchronize(
     )
 {
     auto pfnSynchronize = ze_lib::context->zeDdiTable.CommandQueue.pfnSynchronize;
-    if( nullptr == pfnSynchronize )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSynchronize ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSynchronize( hCommandQueue, timeout );
 }
@@ -1144,8 +1264,12 @@ zeCommandListCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.CommandList.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, desc, phCommandList );
 }
@@ -1189,8 +1313,12 @@ zeCommandListCreateImmediate(
     )
 {
     auto pfnCreateImmediate = ze_lib::context->zeDdiTable.CommandList.pfnCreateImmediate;
-    if( nullptr == pfnCreateImmediate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreateImmediate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreateImmediate( hContext, hDevice, altdesc, phCommandList );
 }
@@ -1220,8 +1348,12 @@ zeCommandListDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.CommandList.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hCommandList );
 }
@@ -1246,8 +1378,12 @@ zeCommandListClose(
     )
 {
     auto pfnClose = ze_lib::context->zeDdiTable.CommandList.pfnClose;
-    if( nullptr == pfnClose )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnClose ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnClose( hCommandList );
 }
@@ -1275,8 +1411,12 @@ zeCommandListReset(
     )
 {
     auto pfnReset = ze_lib::context->zeDdiTable.CommandList.pfnReset;
-    if( nullptr == pfnReset )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReset ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReset( hCommandList );
 }
@@ -1324,8 +1464,12 @@ zeCommandListAppendWriteGlobalTimestamp(
     )
 {
     auto pfnAppendWriteGlobalTimestamp = ze_lib::context->zeDdiTable.CommandList.pfnAppendWriteGlobalTimestamp;
-    if( nullptr == pfnAppendWriteGlobalTimestamp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendWriteGlobalTimestamp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendWriteGlobalTimestamp( hCommandList, dstptr, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1372,8 +1516,12 @@ zeCommandListAppendBarrier(
     )
 {
     auto pfnAppendBarrier = ze_lib::context->zeDdiTable.CommandList.pfnAppendBarrier;
-    if( nullptr == pfnAppendBarrier )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendBarrier ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendBarrier( hCommandList, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1420,8 +1568,12 @@ zeCommandListAppendMemoryRangesBarrier(
     )
 {
     auto pfnAppendMemoryRangesBarrier = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemoryRangesBarrier;
-    if( nullptr == pfnAppendMemoryRangesBarrier )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemoryRangesBarrier ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemoryRangesBarrier( hCommandList, numRanges, pRangeSizes, pRanges, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1453,8 +1605,12 @@ zeContextSystemBarrier(
     )
 {
     auto pfnSystemBarrier = ze_lib::context->zeDdiTable.Context.pfnSystemBarrier;
-    if( nullptr == pfnSystemBarrier )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSystemBarrier ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSystemBarrier( hContext, hDevice );
 }
@@ -1509,8 +1665,12 @@ zeCommandListAppendMemoryCopy(
     )
 {
     auto pfnAppendMemoryCopy = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemoryCopy;
-    if( nullptr == pfnAppendMemoryCopy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemoryCopy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemoryCopy( hCommandList, dstptr, srcptr, size, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1568,8 +1728,12 @@ zeCommandListAppendMemoryFill(
     )
 {
     auto pfnAppendMemoryFill = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemoryFill;
-    if( nullptr == pfnAppendMemoryFill )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemoryFill ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemoryFill( hCommandList, ptr, pattern, pattern_size, size, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1633,8 +1797,12 @@ zeCommandListAppendMemoryCopyRegion(
     )
 {
     auto pfnAppendMemoryCopyRegion = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemoryCopyRegion;
-    if( nullptr == pfnAppendMemoryCopyRegion )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemoryCopyRegion ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemoryCopyRegion( hCommandList, dstptr, dstRegion, dstPitch, dstSlicePitch, srcptr, srcRegion, srcPitch, srcSlicePitch, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1685,8 +1853,12 @@ zeCommandListAppendMemoryCopyFromContext(
     )
 {
     auto pfnAppendMemoryCopyFromContext = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemoryCopyFromContext;
-    if( nullptr == pfnAppendMemoryCopyFromContext )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemoryCopyFromContext ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemoryCopyFromContext( hCommandList, dstptr, hContextSrc, srcptr, size, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1733,8 +1905,12 @@ zeCommandListAppendImageCopy(
     )
 {
     auto pfnAppendImageCopy = ze_lib::context->zeDdiTable.CommandList.pfnAppendImageCopy;
-    if( nullptr == pfnAppendImageCopy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendImageCopy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendImageCopy( hCommandList, hDstImage, hSrcImage, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1783,8 +1959,12 @@ zeCommandListAppendImageCopyRegion(
     )
 {
     auto pfnAppendImageCopyRegion = ze_lib::context->zeDdiTable.CommandList.pfnAppendImageCopyRegion;
-    if( nullptr == pfnAppendImageCopyRegion )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendImageCopyRegion ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendImageCopyRegion( hCommandList, hDstImage, hSrcImage, pDstRegion, pSrcRegion, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1838,8 +2018,12 @@ zeCommandListAppendImageCopyToMemory(
     )
 {
     auto pfnAppendImageCopyToMemory = ze_lib::context->zeDdiTable.CommandList.pfnAppendImageCopyToMemory;
-    if( nullptr == pfnAppendImageCopyToMemory )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendImageCopyToMemory ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendImageCopyToMemory( hCommandList, dstptr, hSrcImage, pSrcRegion, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1893,8 +2077,12 @@ zeCommandListAppendImageCopyFromMemory(
     )
 {
     auto pfnAppendImageCopyFromMemory = ze_lib::context->zeDdiTable.CommandList.pfnAppendImageCopyFromMemory;
-    if( nullptr == pfnAppendImageCopyFromMemory )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendImageCopyFromMemory ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendImageCopyFromMemory( hCommandList, hDstImage, srcptr, pDstRegion, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1944,8 +2132,12 @@ zeCommandListAppendMemoryPrefetch(
     )
 {
     auto pfnAppendMemoryPrefetch = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemoryPrefetch;
-    if( nullptr == pfnAppendMemoryPrefetch )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemoryPrefetch ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemoryPrefetch( hCommandList, ptr, size );
 }
@@ -1995,8 +2187,12 @@ zeCommandListAppendMemAdvise(
     )
 {
     auto pfnAppendMemAdvise = ze_lib::context->zeDdiTable.CommandList.pfnAppendMemAdvise;
-    if( nullptr == pfnAppendMemAdvise )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMemAdvise ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMemAdvise( hCommandList, hDevice, ptr, size, advice );
 }
@@ -2040,8 +2236,12 @@ zeEventPoolCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.EventPool.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, desc, numDevices, phDevices, phEventPool );
 }
@@ -2073,8 +2273,12 @@ zeEventPoolDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.EventPool.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hEventPool );
 }
@@ -2117,8 +2321,12 @@ zeEventCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Event.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hEventPool, desc, phEvent );
 }
@@ -2153,8 +2361,12 @@ zeEventDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Event.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hEvent );
 }
@@ -2183,8 +2395,12 @@ zeEventPoolGetIpcHandle(
     )
 {
     auto pfnGetIpcHandle = ze_lib::context->zeDdiTable.EventPool.pfnGetIpcHandle;
-    if( nullptr == pfnGetIpcHandle )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetIpcHandle ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetIpcHandle( hEventPool, phIpc );
 }
@@ -2217,8 +2433,12 @@ zeEventPoolOpenIpcHandle(
     )
 {
     auto pfnOpenIpcHandle = ze_lib::context->zeDdiTable.EventPool.pfnOpenIpcHandle;
-    if( nullptr == pfnOpenIpcHandle )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOpenIpcHandle ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOpenIpcHandle( hContext, hIpc, phEventPool );
 }
@@ -2244,8 +2464,12 @@ zeEventPoolCloseIpcHandle(
     )
 {
     auto pfnCloseIpcHandle = ze_lib::context->zeDdiTable.EventPool.pfnCloseIpcHandle;
-    if( nullptr == pfnCloseIpcHandle )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCloseIpcHandle ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCloseIpcHandle( hEventPool );
 }
@@ -2286,8 +2510,12 @@ zeCommandListAppendSignalEvent(
     )
 {
     auto pfnAppendSignalEvent = ze_lib::context->zeDdiTable.CommandList.pfnAppendSignalEvent;
-    if( nullptr == pfnAppendSignalEvent )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendSignalEvent ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendSignalEvent( hCommandList, hEvent );
 }
@@ -2322,8 +2550,12 @@ zeCommandListAppendWaitOnEvents(
     )
 {
     auto pfnAppendWaitOnEvents = ze_lib::context->zeDdiTable.CommandList.pfnAppendWaitOnEvents;
-    if( nullptr == pfnAppendWaitOnEvents )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendWaitOnEvents ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendWaitOnEvents( hCommandList, numEvents, phEvents );
 }
@@ -2356,8 +2588,12 @@ zeEventHostSignal(
     )
 {
     auto pfnHostSignal = ze_lib::context->zeDdiTable.Event.pfnHostSignal;
-    if( nullptr == pfnHostSignal )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnHostSignal ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnHostSignal( hEvent );
 }
@@ -2395,8 +2631,12 @@ zeEventHostSynchronize(
     )
 {
     auto pfnHostSynchronize = ze_lib::context->zeDdiTable.Event.pfnHostSynchronize;
-    if( nullptr == pfnHostSynchronize )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnHostSynchronize ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnHostSynchronize( hEvent, timeout );
 }
@@ -2428,8 +2668,12 @@ zeEventQueryStatus(
     )
 {
     auto pfnQueryStatus = ze_lib::context->zeDdiTable.Event.pfnQueryStatus;
-    if( nullptr == pfnQueryStatus )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnQueryStatus ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnQueryStatus( hEvent );
 }
@@ -2466,8 +2710,12 @@ zeCommandListAppendEventReset(
     )
 {
     auto pfnAppendEventReset = ze_lib::context->zeDdiTable.CommandList.pfnAppendEventReset;
-    if( nullptr == pfnAppendEventReset )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendEventReset ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendEventReset( hCommandList, hEvent );
 }
@@ -2496,8 +2744,12 @@ zeEventHostReset(
     )
 {
     auto pfnHostReset = ze_lib::context->zeDdiTable.Event.pfnHostReset;
-    if( nullptr == pfnHostReset )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnHostReset ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnHostReset( hEvent );
 }
@@ -2531,8 +2783,12 @@ zeEventQueryKernelTimestamp(
     )
 {
     auto pfnQueryKernelTimestamp = ze_lib::context->zeDdiTable.Event.pfnQueryKernelTimestamp;
-    if( nullptr == pfnQueryKernelTimestamp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnQueryKernelTimestamp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnQueryKernelTimestamp( hEvent, dstptr );
 }
@@ -2588,8 +2844,12 @@ zeCommandListAppendQueryKernelTimestamps(
     )
 {
     auto pfnAppendQueryKernelTimestamps = ze_lib::context->zeDdiTable.CommandList.pfnAppendQueryKernelTimestamps;
-    if( nullptr == pfnAppendQueryKernelTimestamps )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendQueryKernelTimestamps ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendQueryKernelTimestamps( hCommandList, numEvents, phEvents, dstptr, pOffsets, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -2630,8 +2890,12 @@ zeFenceCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Fence.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hCommandQueue, desc, phFence );
 }
@@ -2665,8 +2929,12 @@ zeFenceDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Fence.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hFence );
 }
@@ -2704,8 +2972,12 @@ zeFenceHostSynchronize(
     )
 {
     auto pfnHostSynchronize = ze_lib::context->zeDdiTable.Fence.pfnHostSynchronize;
-    if( nullptr == pfnHostSynchronize )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnHostSynchronize ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnHostSynchronize( hFence, timeout );
 }
@@ -2736,8 +3008,12 @@ zeFenceQueryStatus(
     )
 {
     auto pfnQueryStatus = ze_lib::context->zeDdiTable.Fence.pfnQueryStatus;
-    if( nullptr == pfnQueryStatus )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnQueryStatus ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnQueryStatus( hFence );
 }
@@ -2765,8 +3041,12 @@ zeFenceReset(
     )
 {
     auto pfnReset = ze_lib::context->zeDdiTable.Fence.pfnReset;
-    if( nullptr == pfnReset )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReset ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReset( hFence );
 }
@@ -2798,8 +3078,12 @@ zeImageGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zeDdiTable.Image.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hDevice, desc, pImageProperties );
 }
@@ -2842,8 +3126,12 @@ zeImageCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Image.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, desc, phImage );
 }
@@ -2873,8 +3161,12 @@ zeImageDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Image.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hImage );
 }
@@ -2935,8 +3227,12 @@ zeMemAllocShared(
     )
 {
     auto pfnAllocShared = ze_lib::context->zeDdiTable.Mem.pfnAllocShared;
-    if( nullptr == pfnAllocShared )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAllocShared ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAllocShared( hContext, device_desc, host_desc, size, alignment, hDevice, pptr );
 }
@@ -2985,8 +3281,12 @@ zeMemAllocDevice(
     )
 {
     auto pfnAllocDevice = ze_lib::context->zeDdiTable.Mem.pfnAllocDevice;
-    if( nullptr == pfnAllocDevice )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAllocDevice ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAllocDevice( hContext, device_desc, size, alignment, hDevice, pptr );
 }
@@ -3035,8 +3335,12 @@ zeMemAllocHost(
     )
 {
     auto pfnAllocHost = ze_lib::context->zeDdiTable.Mem.pfnAllocHost;
-    if( nullptr == pfnAllocHost )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAllocHost ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAllocHost( hContext, host_desc, size, alignment, pptr );
 }
@@ -3069,8 +3373,12 @@ zeMemFree(
     )
 {
     auto pfnFree = ze_lib::context->zeDdiTable.Mem.pfnFree;
-    if( nullptr == pfnFree )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnFree ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnFree( hContext, ptr );
 }
@@ -3104,8 +3412,12 @@ zeMemGetAllocProperties(
     )
 {
     auto pfnGetAllocProperties = ze_lib::context->zeDdiTable.Mem.pfnGetAllocProperties;
-    if( nullptr == pfnGetAllocProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetAllocProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetAllocProperties( hContext, ptr, pMemAllocProperties, phDevice );
 }
@@ -3133,8 +3445,12 @@ zeMemGetAddressRange(
     )
 {
     auto pfnGetAddressRange = ze_lib::context->zeDdiTable.Mem.pfnGetAddressRange;
-    if( nullptr == pfnGetAddressRange )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetAddressRange ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetAddressRange( hContext, ptr, pBase, pSize );
 }
@@ -3167,8 +3483,12 @@ zeMemGetIpcHandle(
     )
 {
     auto pfnGetIpcHandle = ze_lib::context->zeDdiTable.Mem.pfnGetIpcHandle;
-    if( nullptr == pfnGetIpcHandle )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetIpcHandle ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetIpcHandle( hContext, ptr, pIpcHandle );
 }
@@ -3209,8 +3529,12 @@ zeMemOpenIpcHandle(
     )
 {
     auto pfnOpenIpcHandle = ze_lib::context->zeDdiTable.Mem.pfnOpenIpcHandle;
-    if( nullptr == pfnOpenIpcHandle )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOpenIpcHandle ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOpenIpcHandle( hContext, hDevice, handle, flags, pptr );
 }
@@ -3240,8 +3564,12 @@ zeMemCloseIpcHandle(
     )
 {
     auto pfnCloseIpcHandle = ze_lib::context->zeDdiTable.Mem.pfnCloseIpcHandle;
-    if( nullptr == pfnCloseIpcHandle )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCloseIpcHandle ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCloseIpcHandle( hContext, ptr );
 }
@@ -3291,8 +3619,12 @@ zeModuleCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Module.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, desc, phModule, phBuildLog );
 }
@@ -3324,8 +3656,12 @@ zeModuleDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Module.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hModule );
 }
@@ -3379,8 +3715,12 @@ zeModuleDynamicLink(
     )
 {
     auto pfnDynamicLink = ze_lib::context->zeDdiTable.Module.pfnDynamicLink;
-    if( nullptr == pfnDynamicLink )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDynamicLink ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDynamicLink( numModules, phModules, phLinkLog );
 }
@@ -3410,8 +3750,12 @@ zeModuleBuildLogDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.ModuleBuildLog.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hModuleBuildLog );
 }
@@ -3441,8 +3785,12 @@ zeModuleBuildLogGetString(
     )
 {
     auto pfnGetString = ze_lib::context->zeDdiTable.ModuleBuildLog.pfnGetString;
-    if( nullptr == pfnGetString )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetString ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetString( hModuleBuildLog, pSize, pBuildLog );
 }
@@ -3478,8 +3826,12 @@ zeModuleGetNativeBinary(
     )
 {
     auto pfnGetNativeBinary = ze_lib::context->zeDdiTable.Module.pfnGetNativeBinary;
-    if( nullptr == pfnGetNativeBinary )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetNativeBinary ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetNativeBinary( hModule, pSize, pModuleNativeBinary );
 }
@@ -3513,8 +3865,12 @@ zeModuleGetGlobalPointer(
     )
 {
     auto pfnGetGlobalPointer = ze_lib::context->zeDdiTable.Module.pfnGetGlobalPointer;
-    if( nullptr == pfnGetGlobalPointer )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetGlobalPointer ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetGlobalPointer( hModule, pGlobalName, pSize, pptr );
 }
@@ -3548,8 +3904,12 @@ zeModuleGetKernelNames(
     )
 {
     auto pfnGetKernelNames = ze_lib::context->zeDdiTable.Module.pfnGetKernelNames;
-    if( nullptr == pfnGetKernelNames )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetKernelNames ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetKernelNames( hModule, pCount, pNames );
 }
@@ -3576,8 +3936,12 @@ zeModuleGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zeDdiTable.Module.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hModule, pModuleProperties );
 }
@@ -3613,8 +3977,12 @@ zeKernelCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Kernel.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hModule, desc, phKernel );
 }
@@ -3644,8 +4012,12 @@ zeKernelDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Kernel.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hKernel );
 }
@@ -3678,8 +4050,12 @@ zeModuleGetFunctionPointer(
     )
 {
     auto pfnGetFunctionPointer = ze_lib::context->zeDdiTable.Module.pfnGetFunctionPointer;
-    if( nullptr == pfnGetFunctionPointer )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetFunctionPointer ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetFunctionPointer( hModule, pFunctionName, pfnFunction );
 }
@@ -3710,8 +4086,12 @@ zeKernelSetGroupSize(
     )
 {
     auto pfnSetGroupSize = ze_lib::context->zeDdiTable.Kernel.pfnSetGroupSize;
-    if( nullptr == pfnSetGroupSize )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetGroupSize ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetGroupSize( hKernel, groupSizeX, groupSizeY, groupSizeZ );
 }
@@ -3749,8 +4129,12 @@ zeKernelSuggestGroupSize(
     )
 {
     auto pfnSuggestGroupSize = ze_lib::context->zeDdiTable.Kernel.pfnSuggestGroupSize;
-    if( nullptr == pfnSuggestGroupSize )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSuggestGroupSize ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSuggestGroupSize( hKernel, globalSizeX, globalSizeY, globalSizeZ, groupSizeX, groupSizeY, groupSizeZ );
 }
@@ -3777,8 +4161,12 @@ zeKernelSuggestMaxCooperativeGroupCount(
     )
 {
     auto pfnSuggestMaxCooperativeGroupCount = ze_lib::context->zeDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount;
-    if( nullptr == pfnSuggestMaxCooperativeGroupCount )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSuggestMaxCooperativeGroupCount ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSuggestMaxCooperativeGroupCount( hKernel, totalGroupCount );
 }
@@ -3811,8 +4199,12 @@ zeKernelSetArgumentValue(
     )
 {
     auto pfnSetArgumentValue = ze_lib::context->zeDdiTable.Kernel.pfnSetArgumentValue;
-    if( nullptr == pfnSetArgumentValue )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetArgumentValue ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetArgumentValue( hKernel, argIndex, argSize, pArgValue );
 }
@@ -3843,8 +4235,12 @@ zeKernelSetIndirectAccess(
     )
 {
     auto pfnSetIndirectAccess = ze_lib::context->zeDdiTable.Kernel.pfnSetIndirectAccess;
-    if( nullptr == pfnSetIndirectAccess )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetIndirectAccess ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetIndirectAccess( hKernel, flags );
 }
@@ -3872,8 +4268,12 @@ zeKernelGetIndirectAccess(
     )
 {
     auto pfnGetIndirectAccess = ze_lib::context->zeDdiTable.Kernel.pfnGetIndirectAccess;
-    if( nullptr == pfnGetIndirectAccess )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetIndirectAccess ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetIndirectAccess( hKernel, pFlags );
 }
@@ -3906,8 +4306,12 @@ zeKernelGetSourceAttributes(
     )
 {
     auto pfnGetSourceAttributes = ze_lib::context->zeDdiTable.Kernel.pfnGetSourceAttributes;
-    if( nullptr == pfnGetSourceAttributes )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetSourceAttributes ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetSourceAttributes( hKernel, pSize, pString );
 }
@@ -3939,8 +4343,12 @@ zeKernelSetCacheConfig(
     )
 {
     auto pfnSetCacheConfig = ze_lib::context->zeDdiTable.Kernel.pfnSetCacheConfig;
-    if( nullptr == pfnSetCacheConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetCacheConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetCacheConfig( hKernel, flags );
 }
@@ -3967,8 +4375,12 @@ zeKernelGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zeDdiTable.Kernel.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hKernel, pKernelProperties );
 }
@@ -4000,8 +4412,12 @@ zeKernelGetName(
     )
 {
     auto pfnGetName = ze_lib::context->zeDdiTable.Kernel.pfnGetName;
-    if( nullptr == pfnGetName )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetName ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetName( hKernel, pSize, pName );
 }
@@ -4045,8 +4461,12 @@ zeCommandListAppendLaunchKernel(
     )
 {
     auto pfnAppendLaunchKernel = ze_lib::context->zeDdiTable.CommandList.pfnAppendLaunchKernel;
-    if( nullptr == pfnAppendLaunchKernel )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendLaunchKernel ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendLaunchKernel( hCommandList, hKernel, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -4094,8 +4514,12 @@ zeCommandListAppendLaunchCooperativeKernel(
     )
 {
     auto pfnAppendLaunchCooperativeKernel = ze_lib::context->zeDdiTable.CommandList.pfnAppendLaunchCooperativeKernel;
-    if( nullptr == pfnAppendLaunchCooperativeKernel )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendLaunchCooperativeKernel ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendLaunchCooperativeKernel( hCommandList, hKernel, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -4145,8 +4569,12 @@ zeCommandListAppendLaunchKernelIndirect(
     )
 {
     auto pfnAppendLaunchKernelIndirect = ze_lib::context->zeDdiTable.CommandList.pfnAppendLaunchKernelIndirect;
-    if( nullptr == pfnAppendLaunchKernelIndirect )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendLaunchKernelIndirect ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendLaunchKernelIndirect( hCommandList, hKernel, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -4203,8 +4631,12 @@ zeCommandListAppendLaunchMultipleKernelsIndirect(
     )
 {
     auto pfnAppendLaunchMultipleKernelsIndirect = ze_lib::context->zeDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect;
-    if( nullptr == pfnAppendLaunchMultipleKernelsIndirect )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendLaunchMultipleKernelsIndirect ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendLaunchMultipleKernelsIndirect( hCommandList, numKernels, phKernels, pCountBuffer, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -4238,8 +4670,12 @@ zeContextMakeMemoryResident(
     )
 {
     auto pfnMakeMemoryResident = ze_lib::context->zeDdiTable.Context.pfnMakeMemoryResident;
-    if( nullptr == pfnMakeMemoryResident )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnMakeMemoryResident ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnMakeMemoryResident( hContext, hDevice, ptr, size );
 }
@@ -4275,8 +4711,12 @@ zeContextEvictMemory(
     )
 {
     auto pfnEvictMemory = ze_lib::context->zeDdiTable.Context.pfnEvictMemory;
-    if( nullptr == pfnEvictMemory )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEvictMemory ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEvictMemory( hContext, hDevice, ptr, size );
 }
@@ -4308,8 +4748,12 @@ zeContextMakeImageResident(
     )
 {
     auto pfnMakeImageResident = ze_lib::context->zeDdiTable.Context.pfnMakeImageResident;
-    if( nullptr == pfnMakeImageResident )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnMakeImageResident ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnMakeImageResident( hContext, hDevice, hImage );
 }
@@ -4343,8 +4787,12 @@ zeContextEvictImage(
     )
 {
     auto pfnEvictImage = ze_lib::context->zeDdiTable.Context.pfnEvictImage;
-    if( nullptr == pfnEvictImage )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEvictImage ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEvictImage( hContext, hDevice, hImage );
 }
@@ -4381,8 +4829,12 @@ zeSamplerCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.Sampler.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, desc, phSampler );
 }
@@ -4412,8 +4864,12 @@ zeSamplerDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.Sampler.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hSampler );
 }
@@ -4457,8 +4913,12 @@ zeVirtualMemReserve(
     )
 {
     auto pfnReserve = ze_lib::context->zeDdiTable.VirtualMem.pfnReserve;
-    if( nullptr == pfnReserve )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReserve ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReserve( hContext, pStart, size, pptr );
 }
@@ -4492,8 +4952,12 @@ zeVirtualMemFree(
     )
 {
     auto pfnFree = ze_lib::context->zeDdiTable.VirtualMem.pfnFree;
-    if( nullptr == pfnFree )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnFree ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnFree( hContext, ptr, size );
 }
@@ -4527,8 +4991,12 @@ zeVirtualMemQueryPageSize(
     )
 {
     auto pfnQueryPageSize = ze_lib::context->zeDdiTable.VirtualMem.pfnQueryPageSize;
-    if( nullptr == pfnQueryPageSize )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnQueryPageSize ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnQueryPageSize( hContext, hDevice, size, pagesize );
 }
@@ -4568,8 +5036,12 @@ zePhysicalMemCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zeDdiTable.PhysicalMem.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, desc, phPhysicalMemory );
 }
@@ -4599,8 +5071,12 @@ zePhysicalMemDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zeDdiTable.PhysicalMem.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hContext, hPhysicalMemory );
 }
@@ -4651,8 +5127,12 @@ zeVirtualMemMap(
     )
 {
     auto pfnMap = ze_lib::context->zeDdiTable.VirtualMem.pfnMap;
-    if( nullptr == pfnMap )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnMap ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnMap( hContext, ptr, size, hPhysicalMemory, offset, access );
 }
@@ -4689,8 +5169,12 @@ zeVirtualMemUnmap(
     )
 {
     auto pfnUnmap = ze_lib::context->zeDdiTable.VirtualMem.pfnUnmap;
-    if( nullptr == pfnUnmap )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnUnmap ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnUnmap( hContext, ptr, size );
 }
@@ -4727,8 +5211,12 @@ zeVirtualMemSetAccessAttribute(
     )
 {
     auto pfnSetAccessAttribute = ze_lib::context->zeDdiTable.VirtualMem.pfnSetAccessAttribute;
-    if( nullptr == pfnSetAccessAttribute )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetAccessAttribute ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetAccessAttribute( hContext, ptr, size, access );
 }
@@ -4768,8 +5256,12 @@ zeVirtualMemGetAccessAttribute(
     )
 {
     auto pfnGetAccessAttribute = ze_lib::context->zeDdiTable.VirtualMem.pfnGetAccessAttribute;
-    if( nullptr == pfnGetAccessAttribute )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetAccessAttribute ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetAccessAttribute( hContext, ptr, size, access, outSize );
 }
@@ -4799,8 +5291,12 @@ zeKernelSetGlobalOffsetExp(
     )
 {
     auto pfnSetGlobalOffsetExp = ze_lib::context->zeDdiTable.KernelExp.pfnSetGlobalOffsetExp;
-    if( nullptr == pfnSetGlobalOffsetExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetGlobalOffsetExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetGlobalOffsetExp( hKernel, offsetX, offsetY, offsetZ );
 }
@@ -4833,8 +5329,12 @@ zeDeviceReserveCacheExt(
     )
 {
     auto pfnReserveCacheExt = ze_lib::context->zeDdiTable.Device.pfnReserveCacheExt;
-    if( nullptr == pfnReserveCacheExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReserveCacheExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReserveCacheExt( hDevice, cacheLevel, cacheReservationSize );
 }
@@ -4865,8 +5365,12 @@ zeDeviceSetCacheAdviceExt(
     )
 {
     auto pfnSetCacheAdviceExt = ze_lib::context->zeDdiTable.Device.pfnSetCacheAdviceExt;
-    if( nullptr == pfnSetCacheAdviceExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetCacheAdviceExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetCacheAdviceExt( hDevice, ptr, regionSize, cacheRegion );
 }
@@ -4914,8 +5418,12 @@ zeEventQueryTimestampsExp(
     )
 {
     auto pfnQueryTimestampsExp = ze_lib::context->zeDdiTable.EventExp.pfnQueryTimestampsExp;
-    if( nullptr == pfnQueryTimestampsExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnQueryTimestampsExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnQueryTimestampsExp( hEvent, hDevice, pCount, pTimestamps );
 }
@@ -4948,8 +5456,12 @@ zeImageGetMemoryPropertiesExp(
     )
 {
     auto pfnGetMemoryPropertiesExp = ze_lib::context->zeDdiTable.ImageExp.pfnGetMemoryPropertiesExp;
-    if( nullptr == pfnGetMemoryPropertiesExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetMemoryPropertiesExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetMemoryPropertiesExp( hImage, pMemoryProperties );
 }
@@ -5002,8 +5514,12 @@ zeImageViewCreateExp(
     )
 {
     auto pfnViewCreateExp = ze_lib::context->zeDdiTable.ImageExp.pfnViewCreateExp;
-    if( nullptr == pfnViewCreateExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnViewCreateExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnViewCreateExp( hContext, hDevice, desc, hImage, phImageView );
 }
@@ -5039,8 +5555,12 @@ zeKernelSchedulingHintExp(
     )
 {
     auto pfnSchedulingHintExp = ze_lib::context->zeDdiTable.KernelExp.pfnSchedulingHintExp;
-    if( nullptr == pfnSchedulingHintExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSchedulingHintExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSchedulingHintExp( hKernel, pHint );
 }
@@ -5071,8 +5591,12 @@ zeDevicePciGetPropertiesExt(
     )
 {
     auto pfnPciGetPropertiesExt = ze_lib::context->zeDdiTable.Device.pfnPciGetPropertiesExt;
-    if( nullptr == pfnPciGetPropertiesExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnPciGetPropertiesExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnPciGetPropertiesExt( hDevice, pPciProperties );
 }
@@ -5140,8 +5664,12 @@ zeCommandListAppendImageCopyToMemoryExt(
     )
 {
     auto pfnAppendImageCopyToMemoryExt = ze_lib::context->zeDdiTable.CommandList.pfnAppendImageCopyToMemoryExt;
-    if( nullptr == pfnAppendImageCopyToMemoryExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendImageCopyToMemoryExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendImageCopyToMemoryExt( hCommandList, dstptr, hSrcImage, pSrcRegion, destRowPitch, destSlicePitch, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -5209,8 +5737,12 @@ zeCommandListAppendImageCopyFromMemoryExt(
     )
 {
     auto pfnAppendImageCopyFromMemoryExt = ze_lib::context->zeDdiTable.CommandList.pfnAppendImageCopyFromMemoryExt;
-    if( nullptr == pfnAppendImageCopyFromMemoryExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendImageCopyFromMemoryExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendImageCopyFromMemoryExt( hCommandList, hDstImage, srcptr, pDstRegion, srcRowPitch, srcSlicePitch, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -5238,8 +5770,12 @@ zeImageGetAllocPropertiesExt(
     )
 {
     auto pfnGetAllocPropertiesExt = ze_lib::context->zeDdiTable.Image.pfnGetAllocPropertiesExt;
-    if( nullptr == pfnGetAllocPropertiesExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetAllocPropertiesExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetAllocPropertiesExt( hContext, hImage, pImageAllocProperties );
 }
@@ -5276,8 +5812,12 @@ zeModuleInspectLinkageExt(
     )
 {
     auto pfnInspectLinkageExt = ze_lib::context->zeDdiTable.Module.pfnInspectLinkageExt;
-    if( nullptr == pfnInspectLinkageExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnInspectLinkageExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnInspectLinkageExt( pInspectDesc, numModules, phModules, phLog );
 }
@@ -5311,8 +5851,12 @@ zeMemFreeExt(
     )
 {
     auto pfnFreeExt = ze_lib::context->zeDdiTable.Mem.pfnFreeExt;
-    if( nullptr == pfnFreeExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnFreeExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnFreeExt( hContext, pMemFreeDesc, ptr );
 }
@@ -5349,8 +5893,12 @@ zeFabricVertexGetExp(
     )
 {
     auto pfnGetExp = ze_lib::context->zeDdiTable.FabricVertexExp.pfnGetExp;
-    if( nullptr == pfnGetExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetExp( hDriver, pCount, phVertices );
 }
@@ -5389,8 +5937,12 @@ zeFabricVertexGetSubVerticesExp(
     )
 {
     auto pfnGetSubVerticesExp = ze_lib::context->zeDdiTable.FabricVertexExp.pfnGetSubVerticesExp;
-    if( nullptr == pfnGetSubVerticesExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetSubVerticesExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetSubVerticesExp( hVertex, pCount, phSubvertices );
 }
@@ -5417,8 +5969,12 @@ zeFabricVertexGetPropertiesExp(
     )
 {
     auto pfnGetPropertiesExp = ze_lib::context->zeDdiTable.FabricVertexExp.pfnGetPropertiesExp;
-    if( nullptr == pfnGetPropertiesExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetPropertiesExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetPropertiesExp( hVertex, pVertexProperties );
 }
@@ -5449,8 +6005,12 @@ zeFabricVertexGetDeviceExp(
     )
 {
     auto pfnGetDeviceExp = ze_lib::context->zeDdiTable.FabricVertexExp.pfnGetDeviceExp;
-    if( nullptr == pfnGetDeviceExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetDeviceExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetDeviceExp( hVertex, phDevice );
 }
@@ -5479,8 +6039,12 @@ zeDeviceGetFabricVertexExp(
     )
 {
     auto pfnGetFabricVertexExp = ze_lib::context->zeDdiTable.DeviceExp.pfnGetFabricVertexExp;
-    if( nullptr == pfnGetFabricVertexExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetFabricVertexExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetFabricVertexExp( hDevice, phVertex );
 }
@@ -5519,8 +6083,12 @@ zeFabricEdgeGetExp(
     )
 {
     auto pfnGetExp = ze_lib::context->zeDdiTable.FabricEdgeExp.pfnGetExp;
-    if( nullptr == pfnGetExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetExp( hVertexA, hVertexB, pCount, phEdges );
 }
@@ -5551,8 +6119,12 @@ zeFabricEdgeGetVerticesExp(
     )
 {
     auto pfnGetVerticesExp = ze_lib::context->zeDdiTable.FabricEdgeExp.pfnGetVerticesExp;
-    if( nullptr == pfnGetVerticesExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetVerticesExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetVerticesExp( hEdge, phVertexA, phVertexB );
 }
@@ -5579,8 +6151,12 @@ zeFabricEdgeGetPropertiesExp(
     )
 {
     auto pfnGetPropertiesExp = ze_lib::context->zeDdiTable.FabricEdgeExp.pfnGetPropertiesExp;
-    if( nullptr == pfnGetPropertiesExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetPropertiesExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetPropertiesExp( hEdge, pEdgeProperties );
 }
diff --git a/source/lib/zes_libapi.cpp b/source/lib/zes_libapi.cpp
index d4231395..c2c3014b 100644
--- a/source/lib/zes_libapi.cpp
+++ b/source/lib/zes_libapi.cpp
@@ -35,8 +35,12 @@ zesDeviceGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Device.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hDevice, pProperties );
 }
@@ -64,8 +68,12 @@ zesDeviceGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Device.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hDevice, pState );
 }
@@ -101,8 +109,12 @@ zesDeviceReset(
     )
 {
     auto pfnReset = ze_lib::context->zesDdiTable.Device.pfnReset;
-    if( nullptr == pfnReset )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReset ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReset( hDevice, force );
 }
@@ -147,8 +159,12 @@ zesDeviceProcessesGetState(
     )
 {
     auto pfnProcessesGetState = ze_lib::context->zesDdiTable.Device.pfnProcessesGetState;
-    if( nullptr == pfnProcessesGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnProcessesGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnProcessesGetState( hDevice, pCount, pProcesses );
 }
@@ -175,8 +191,12 @@ zesDevicePciGetProperties(
     )
 {
     auto pfnPciGetProperties = ze_lib::context->zesDdiTable.Device.pfnPciGetProperties;
-    if( nullptr == pfnPciGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnPciGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnPciGetProperties( hDevice, pProperties );
 }
@@ -203,8 +223,12 @@ zesDevicePciGetState(
     )
 {
     auto pfnPciGetState = ze_lib::context->zesDdiTable.Device.pfnPciGetState;
-    if( nullptr == pfnPciGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnPciGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnPciGetState( hDevice, pState );
 }
@@ -239,8 +263,12 @@ zesDevicePciGetBars(
     )
 {
     auto pfnPciGetBars = ze_lib::context->zesDdiTable.Device.pfnPciGetBars;
-    if( nullptr == pfnPciGetBars )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnPciGetBars ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnPciGetBars( hDevice, pCount, pProperties );
 }
@@ -269,8 +297,12 @@ zesDevicePciGetStats(
     )
 {
     auto pfnPciGetStats = ze_lib::context->zesDdiTable.Device.pfnPciGetStats;
-    if( nullptr == pfnPciGetStats )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnPciGetStats ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnPciGetStats( hDevice, pStats );
 }
@@ -307,8 +339,12 @@ zesDeviceEnumDiagnosticTestSuites(
     )
 {
     auto pfnEnumDiagnosticTestSuites = ze_lib::context->zesDdiTable.Device.pfnEnumDiagnosticTestSuites;
-    if( nullptr == pfnEnumDiagnosticTestSuites )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumDiagnosticTestSuites ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumDiagnosticTestSuites( hDevice, pCount, phDiagnostics );
 }
@@ -336,8 +372,12 @@ zesDiagnosticsGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Diagnostics.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hDiagnostics, pProperties );
 }
@@ -376,8 +416,12 @@ zesDiagnosticsGetTests(
     )
 {
     auto pfnGetTests = ze_lib::context->zesDdiTable.Diagnostics.pfnGetTests;
-    if( nullptr == pfnGetTests )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetTests ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetTests( hDiagnostics, pCount, pTests );
 }
@@ -419,8 +463,12 @@ zesDiagnosticsRunTests(
     )
 {
     auto pfnRunTests = ze_lib::context->zesDdiTable.Diagnostics.pfnRunTests;
-    if( nullptr == pfnRunTests )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnRunTests ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnRunTests( hDiagnostics, startIndex, endIndex, pResult );
 }
@@ -447,8 +495,12 @@ zesDeviceEccAvailable(
     )
 {
     auto pfnEccAvailable = ze_lib::context->zesDdiTable.Device.pfnEccAvailable;
-    if( nullptr == pfnEccAvailable )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEccAvailable ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEccAvailable( hDevice, pAvailable );
 }
@@ -475,8 +527,12 @@ zesDeviceEccConfigurable(
     )
 {
     auto pfnEccConfigurable = ze_lib::context->zesDdiTable.Device.pfnEccConfigurable;
-    if( nullptr == pfnEccConfigurable )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEccConfigurable ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEccConfigurable( hDevice, pConfigurable );
 }
@@ -503,8 +559,12 @@ zesDeviceGetEccState(
     )
 {
     auto pfnGetEccState = ze_lib::context->zesDdiTable.Device.pfnGetEccState;
-    if( nullptr == pfnGetEccState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetEccState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetEccState( hDevice, pState );
 }
@@ -539,8 +599,12 @@ zesDeviceSetEccState(
     )
 {
     auto pfnSetEccState = ze_lib::context->zesDdiTable.Device.pfnSetEccState;
-    if( nullptr == pfnSetEccState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetEccState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetEccState( hDevice, newState, pState );
 }
@@ -577,8 +641,12 @@ zesDeviceEnumEngineGroups(
     )
 {
     auto pfnEnumEngineGroups = ze_lib::context->zesDdiTable.Device.pfnEnumEngineGroups;
-    if( nullptr == pfnEnumEngineGroups )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumEngineGroups ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumEngineGroups( hDevice, pCount, phEngine );
 }
@@ -605,8 +673,12 @@ zesEngineGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Engine.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hEngine, pProperties );
 }
@@ -634,8 +706,12 @@ zesEngineGetActivity(
     )
 {
     auto pfnGetActivity = ze_lib::context->zesDdiTable.Engine.pfnGetActivity;
-    if( nullptr == pfnGetActivity )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetActivity ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetActivity( hEngine, pStats );
 }
@@ -662,8 +738,12 @@ zesDeviceEventRegister(
     )
 {
     auto pfnEventRegister = ze_lib::context->zesDdiTable.Device.pfnEventRegister;
-    if( nullptr == pfnEventRegister )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEventRegister ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEventRegister( hDevice, events );
 }
@@ -712,8 +792,12 @@ zesDriverEventListen(
     )
 {
     auto pfnEventListen = ze_lib::context->zesDdiTable.Driver.pfnEventListen;
-    if( nullptr == pfnEventListen )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEventListen ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEventListen( hDriver, timeout, count, phDevices, pNumDeviceEvents, pEvents );
 }
@@ -762,8 +846,12 @@ zesDriverEventListenEx(
     )
 {
     auto pfnEventListenEx = ze_lib::context->zesDdiTable.Driver.pfnEventListenEx;
-    if( nullptr == pfnEventListenEx )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEventListenEx ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEventListenEx( hDriver, timeout, count, phDevices, pNumDeviceEvents, pEvents );
 }
@@ -800,8 +888,12 @@ zesDeviceEnumFabricPorts(
     )
 {
     auto pfnEnumFabricPorts = ze_lib::context->zesDdiTable.Device.pfnEnumFabricPorts;
-    if( nullptr == pfnEnumFabricPorts )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumFabricPorts ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumFabricPorts( hDevice, pCount, phPort );
 }
@@ -828,8 +920,12 @@ zesFabricPortGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.FabricPort.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hPort, pProperties );
 }
@@ -857,8 +953,12 @@ zesFabricPortGetLinkType(
     )
 {
     auto pfnGetLinkType = ze_lib::context->zesDdiTable.FabricPort.pfnGetLinkType;
-    if( nullptr == pfnGetLinkType )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetLinkType ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetLinkType( hPort, pLinkType );
 }
@@ -885,8 +985,12 @@ zesFabricPortGetConfig(
     )
 {
     auto pfnGetConfig = ze_lib::context->zesDdiTable.FabricPort.pfnGetConfig;
-    if( nullptr == pfnGetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetConfig( hPort, pConfig );
 }
@@ -915,8 +1019,12 @@ zesFabricPortSetConfig(
     )
 {
     auto pfnSetConfig = ze_lib::context->zesDdiTable.FabricPort.pfnSetConfig;
-    if( nullptr == pfnSetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetConfig( hPort, pConfig );
 }
@@ -944,8 +1052,12 @@ zesFabricPortGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.FabricPort.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hPort, pState );
 }
@@ -974,8 +1086,12 @@ zesFabricPortGetThroughput(
     )
 {
     auto pfnGetThroughput = ze_lib::context->zesDdiTable.FabricPort.pfnGetThroughput;
-    if( nullptr == pfnGetThroughput )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetThroughput ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetThroughput( hPort, pThroughput );
 }
@@ -1012,8 +1128,12 @@ zesDeviceEnumFans(
     )
 {
     auto pfnEnumFans = ze_lib::context->zesDdiTable.Device.pfnEnumFans;
-    if( nullptr == pfnEnumFans )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumFans ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumFans( hDevice, pCount, phFan );
 }
@@ -1040,8 +1160,12 @@ zesFanGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Fan.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hFan, pProperties );
 }
@@ -1069,8 +1193,12 @@ zesFanGetConfig(
     )
 {
     auto pfnGetConfig = ze_lib::context->zesDdiTable.Fan.pfnGetConfig;
-    if( nullptr == pfnGetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetConfig( hFan, pConfig );
 }
@@ -1097,8 +1225,12 @@ zesFanSetDefaultMode(
     )
 {
     auto pfnSetDefaultMode = ze_lib::context->zesDdiTable.Fan.pfnSetDefaultMode;
-    if( nullptr == pfnSetDefaultMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetDefaultMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetDefaultMode( hFan );
 }
@@ -1130,8 +1262,12 @@ zesFanSetFixedSpeedMode(
     )
 {
     auto pfnSetFixedSpeedMode = ze_lib::context->zesDdiTable.Fan.pfnSetFixedSpeedMode;
-    if( nullptr == pfnSetFixedSpeedMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetFixedSpeedMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetFixedSpeedMode( hFan, speed );
 }
@@ -1165,8 +1301,12 @@ zesFanSetSpeedTableMode(
     )
 {
     auto pfnSetSpeedTableMode = ze_lib::context->zesDdiTable.Fan.pfnSetSpeedTableMode;
-    if( nullptr == pfnSetSpeedTableMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetSpeedTableMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetSpeedTableMode( hFan, speedTable );
 }
@@ -1200,8 +1340,12 @@ zesFanGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Fan.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hFan, units, pSpeed );
 }
@@ -1238,8 +1382,12 @@ zesDeviceEnumFirmwares(
     )
 {
     auto pfnEnumFirmwares = ze_lib::context->zesDdiTable.Device.pfnEnumFirmwares;
-    if( nullptr == pfnEnumFirmwares )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumFirmwares ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumFirmwares( hDevice, pCount, phFirmware );
 }
@@ -1267,8 +1415,12 @@ zesFirmwareGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Firmware.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hFirmware, pProperties );
 }
@@ -1298,8 +1450,12 @@ zesFirmwareFlash(
     )
 {
     auto pfnFlash = ze_lib::context->zesDdiTable.Firmware.pfnFlash;
-    if( nullptr == pfnFlash )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnFlash ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnFlash( hFirmware, pImage, size );
 }
@@ -1336,8 +1492,12 @@ zesDeviceEnumFrequencyDomains(
     )
 {
     auto pfnEnumFrequencyDomains = ze_lib::context->zesDdiTable.Device.pfnEnumFrequencyDomains;
-    if( nullptr == pfnEnumFrequencyDomains )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumFrequencyDomains ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumFrequencyDomains( hDevice, pCount, phFrequency );
 }
@@ -1364,8 +1524,12 @@ zesFrequencyGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Frequency.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hFrequency, pProperties );
 }
@@ -1403,8 +1567,12 @@ zesFrequencyGetAvailableClocks(
     )
 {
     auto pfnGetAvailableClocks = ze_lib::context->zesDdiTable.Frequency.pfnGetAvailableClocks;
-    if( nullptr == pfnGetAvailableClocks )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetAvailableClocks ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetAvailableClocks( hFrequency, pCount, phFrequency );
 }
@@ -1432,8 +1600,12 @@ zesFrequencyGetRange(
     )
 {
     auto pfnGetRange = ze_lib::context->zesDdiTable.Frequency.pfnGetRange;
-    if( nullptr == pfnGetRange )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetRange ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetRange( hFrequency, pLimits );
 }
@@ -1463,8 +1635,12 @@ zesFrequencySetRange(
     )
 {
     auto pfnSetRange = ze_lib::context->zesDdiTable.Frequency.pfnSetRange;
-    if( nullptr == pfnSetRange )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetRange ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetRange( hFrequency, pLimits );
 }
@@ -1492,8 +1668,12 @@ zesFrequencyGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Frequency.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hFrequency, pState );
 }
@@ -1521,8 +1701,12 @@ zesFrequencyGetThrottleTime(
     )
 {
     auto pfnGetThrottleTime = ze_lib::context->zesDdiTable.Frequency.pfnGetThrottleTime;
-    if( nullptr == pfnGetThrottleTime )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetThrottleTime ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetThrottleTime( hFrequency, pThrottleTime );
 }
@@ -1550,8 +1734,12 @@ zesFrequencyOcGetCapabilities(
     )
 {
     auto pfnOcGetCapabilities = ze_lib::context->zesDdiTable.Frequency.pfnOcGetCapabilities;
-    if( nullptr == pfnOcGetCapabilities )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcGetCapabilities ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcGetCapabilities( hFrequency, pOcCapabilities );
 }
@@ -1589,8 +1777,12 @@ zesFrequencyOcGetFrequencyTarget(
     )
 {
     auto pfnOcGetFrequencyTarget = ze_lib::context->zesDdiTable.Frequency.pfnOcGetFrequencyTarget;
-    if( nullptr == pfnOcGetFrequencyTarget )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcGetFrequencyTarget ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcGetFrequencyTarget( hFrequency, pCurrentOcFrequency );
 }
@@ -1626,8 +1818,12 @@ zesFrequencyOcSetFrequencyTarget(
     )
 {
     auto pfnOcSetFrequencyTarget = ze_lib::context->zesDdiTable.Frequency.pfnOcSetFrequencyTarget;
-    if( nullptr == pfnOcSetFrequencyTarget )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcSetFrequencyTarget ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcSetFrequencyTarget( hFrequency, CurrentOcFrequency );
 }
@@ -1668,8 +1864,12 @@ zesFrequencyOcGetVoltageTarget(
     )
 {
     auto pfnOcGetVoltageTarget = ze_lib::context->zesDdiTable.Frequency.pfnOcGetVoltageTarget;
-    if( nullptr == pfnOcGetVoltageTarget )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcGetVoltageTarget ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcGetVoltageTarget( hFrequency, pCurrentVoltageTarget, pCurrentVoltageOffset );
 }
@@ -1707,8 +1907,12 @@ zesFrequencyOcSetVoltageTarget(
     )
 {
     auto pfnOcSetVoltageTarget = ze_lib::context->zesDdiTable.Frequency.pfnOcSetVoltageTarget;
-    if( nullptr == pfnOcSetVoltageTarget )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcSetVoltageTarget ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcSetVoltageTarget( hFrequency, CurrentVoltageTarget, CurrentVoltageOffset );
 }
@@ -1743,8 +1947,12 @@ zesFrequencyOcSetMode(
     )
 {
     auto pfnOcSetMode = ze_lib::context->zesDdiTable.Frequency.pfnOcSetMode;
-    if( nullptr == pfnOcSetMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcSetMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcSetMode( hFrequency, CurrentOcMode );
 }
@@ -1779,8 +1987,12 @@ zesFrequencyOcGetMode(
     )
 {
     auto pfnOcGetMode = ze_lib::context->zesDdiTable.Frequency.pfnOcGetMode;
-    if( nullptr == pfnOcGetMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcGetMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcGetMode( hFrequency, pCurrentOcMode );
 }
@@ -1811,8 +2023,12 @@ zesFrequencyOcGetIccMax(
     )
 {
     auto pfnOcGetIccMax = ze_lib::context->zesDdiTable.Frequency.pfnOcGetIccMax;
-    if( nullptr == pfnOcGetIccMax )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcGetIccMax ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcGetIccMax( hFrequency, pOcIccMax );
 }
@@ -1847,8 +2063,12 @@ zesFrequencyOcSetIccMax(
     )
 {
     auto pfnOcSetIccMax = ze_lib::context->zesDdiTable.Frequency.pfnOcSetIccMax;
-    if( nullptr == pfnOcSetIccMax )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcSetIccMax ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcSetIccMax( hFrequency, ocIccMax );
 }
@@ -1878,8 +2098,12 @@ zesFrequencyOcGetTjMax(
     )
 {
     auto pfnOcGetTjMax = ze_lib::context->zesDdiTable.Frequency.pfnOcGetTjMax;
-    if( nullptr == pfnOcGetTjMax )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcGetTjMax ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcGetTjMax( hFrequency, pOcTjMax );
 }
@@ -1914,8 +2138,12 @@ zesFrequencyOcSetTjMax(
     )
 {
     auto pfnOcSetTjMax = ze_lib::context->zesDdiTable.Frequency.pfnOcSetTjMax;
-    if( nullptr == pfnOcSetTjMax )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOcSetTjMax ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOcSetTjMax( hFrequency, ocTjMax );
 }
@@ -1952,8 +2180,12 @@ zesDeviceEnumLeds(
     )
 {
     auto pfnEnumLeds = ze_lib::context->zesDdiTable.Device.pfnEnumLeds;
-    if( nullptr == pfnEnumLeds )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumLeds ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumLeds( hDevice, pCount, phLed );
 }
@@ -1980,8 +2212,12 @@ zesLedGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Led.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hLed, pProperties );
 }
@@ -2008,8 +2244,12 @@ zesLedGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Led.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hLed, pState );
 }
@@ -2036,8 +2276,12 @@ zesLedSetState(
     )
 {
     auto pfnSetState = ze_lib::context->zesDdiTable.Led.pfnSetState;
-    if( nullptr == pfnSetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetState( hLed, enable );
 }
@@ -2068,8 +2312,12 @@ zesLedSetColor(
     )
 {
     auto pfnSetColor = ze_lib::context->zesDdiTable.Led.pfnSetColor;
-    if( nullptr == pfnSetColor )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetColor ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetColor( hLed, pColor );
 }
@@ -2106,8 +2354,12 @@ zesDeviceEnumMemoryModules(
     )
 {
     auto pfnEnumMemoryModules = ze_lib::context->zesDdiTable.Device.pfnEnumMemoryModules;
-    if( nullptr == pfnEnumMemoryModules )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumMemoryModules ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumMemoryModules( hDevice, pCount, phMemory );
 }
@@ -2134,8 +2386,12 @@ zesMemoryGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Memory.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hMemory, pProperties );
 }
@@ -2162,8 +2418,12 @@ zesMemoryGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Memory.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hMemory, pState );
 }
@@ -2193,8 +2453,12 @@ zesMemoryGetBandwidth(
     )
 {
     auto pfnGetBandwidth = ze_lib::context->zesDdiTable.Memory.pfnGetBandwidth;
-    if( nullptr == pfnGetBandwidth )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetBandwidth ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetBandwidth( hMemory, pBandwidth );
 }
@@ -2233,8 +2497,12 @@ zesDeviceEnumPerformanceFactorDomains(
     )
 {
     auto pfnEnumPerformanceFactorDomains = ze_lib::context->zesDdiTable.Device.pfnEnumPerformanceFactorDomains;
-    if( nullptr == pfnEnumPerformanceFactorDomains )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumPerformanceFactorDomains ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumPerformanceFactorDomains( hDevice, pCount, phPerf );
 }
@@ -2262,8 +2530,12 @@ zesPerformanceFactorGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.PerformanceFactor.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hPerf, pProperties );
 }
@@ -2291,8 +2563,12 @@ zesPerformanceFactorGetConfig(
     )
 {
     auto pfnGetConfig = ze_lib::context->zesDdiTable.PerformanceFactor.pfnGetConfig;
-    if( nullptr == pfnGetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetConfig( hPerf, pFactor );
 }
@@ -2322,8 +2598,12 @@ zesPerformanceFactorSetConfig(
     )
 {
     auto pfnSetConfig = ze_lib::context->zesDdiTable.PerformanceFactor.pfnSetConfig;
-    if( nullptr == pfnSetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetConfig( hPerf, factor );
 }
@@ -2360,8 +2640,12 @@ zesDeviceEnumPowerDomains(
     )
 {
     auto pfnEnumPowerDomains = ze_lib::context->zesDdiTable.Device.pfnEnumPowerDomains;
-    if( nullptr == pfnEnumPowerDomains )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumPowerDomains ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumPowerDomains( hDevice, pCount, phPower );
 }
@@ -2390,8 +2674,12 @@ zesDeviceGetCardPowerDomain(
     )
 {
     auto pfnGetCardPowerDomain = ze_lib::context->zesDdiTable.Device.pfnGetCardPowerDomain;
-    if( nullptr == pfnGetCardPowerDomain )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetCardPowerDomain ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetCardPowerDomain( hDevice, phPower );
 }
@@ -2418,8 +2706,12 @@ zesPowerGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Power.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hPower, pProperties );
 }
@@ -2447,8 +2739,12 @@ zesPowerGetEnergyCounter(
     )
 {
     auto pfnGetEnergyCounter = ze_lib::context->zesDdiTable.Power.pfnGetEnergyCounter;
-    if( nullptr == pfnGetEnergyCounter )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetEnergyCounter ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetEnergyCounter( hPower, pEnergy );
 }
@@ -2478,8 +2774,12 @@ zesPowerGetLimits(
     )
 {
     auto pfnGetLimits = ze_lib::context->zesDdiTable.Power.pfnGetLimits;
-    if( nullptr == pfnGetLimits )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetLimits ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetLimits( hPower, pSustained, pBurst, pPeak );
 }
@@ -2513,8 +2813,12 @@ zesPowerSetLimits(
     )
 {
     auto pfnSetLimits = ze_lib::context->zesDdiTable.Power.pfnSetLimits;
-    if( nullptr == pfnSetLimits )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetLimits ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetLimits( hPower, pSustained, pBurst, pPeak );
 }
@@ -2546,8 +2850,12 @@ zesPowerGetEnergyThreshold(
     )
 {
     auto pfnGetEnergyThreshold = ze_lib::context->zesDdiTable.Power.pfnGetEnergyThreshold;
-    if( nullptr == pfnGetEnergyThreshold )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetEnergyThreshold ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetEnergyThreshold( hPower, pThreshold );
 }
@@ -2592,8 +2900,12 @@ zesPowerSetEnergyThreshold(
     )
 {
     auto pfnSetEnergyThreshold = ze_lib::context->zesDdiTable.Power.pfnSetEnergyThreshold;
-    if( nullptr == pfnSetEnergyThreshold )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetEnergyThreshold ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetEnergyThreshold( hPower, threshold );
 }
@@ -2630,8 +2942,12 @@ zesDeviceEnumPsus(
     )
 {
     auto pfnEnumPsus = ze_lib::context->zesDdiTable.Device.pfnEnumPsus;
-    if( nullptr == pfnEnumPsus )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumPsus ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumPsus( hDevice, pCount, phPsu );
 }
@@ -2658,8 +2974,12 @@ zesPsuGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Psu.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hPsu, pProperties );
 }
@@ -2686,8 +3006,12 @@ zesPsuGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Psu.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hPsu, pState );
 }
@@ -2734,8 +3058,12 @@ zesDeviceEnumRasErrorSets(
     )
 {
     auto pfnEnumRasErrorSets = ze_lib::context->zesDdiTable.Device.pfnEnumRasErrorSets;
-    if( nullptr == pfnEnumRasErrorSets )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumRasErrorSets ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumRasErrorSets( hDevice, pCount, phRas );
 }
@@ -2764,8 +3092,12 @@ zesRasGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Ras.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hRas, pProperties );
 }
@@ -2802,8 +3134,12 @@ zesRasGetConfig(
     )
 {
     auto pfnGetConfig = ze_lib::context->zesDdiTable.Ras.pfnGetConfig;
-    if( nullptr == pfnGetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetConfig( hRas, pConfig );
 }
@@ -2845,8 +3181,12 @@ zesRasSetConfig(
     )
 {
     auto pfnSetConfig = ze_lib::context->zesDdiTable.Ras.pfnSetConfig;
-    if( nullptr == pfnSetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetConfig( hRas, pConfig );
 }
@@ -2879,8 +3219,12 @@ zesRasGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Ras.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hRas, clear, pState );
 }
@@ -2923,8 +3267,12 @@ zesDeviceEnumSchedulers(
     )
 {
     auto pfnEnumSchedulers = ze_lib::context->zesDdiTable.Device.pfnEnumSchedulers;
-    if( nullptr == pfnEnumSchedulers )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumSchedulers ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumSchedulers( hDevice, pCount, phScheduler );
 }
@@ -2951,8 +3299,12 @@ zesSchedulerGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Scheduler.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hScheduler, pProperties );
 }
@@ -2981,8 +3333,12 @@ zesSchedulerGetCurrentMode(
     )
 {
     auto pfnGetCurrentMode = ze_lib::context->zesDdiTable.Scheduler.pfnGetCurrentMode;
-    if( nullptr == pfnGetCurrentMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetCurrentMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetCurrentMode( hScheduler, pMode );
 }
@@ -3013,8 +3369,12 @@ zesSchedulerGetTimeoutModeProperties(
     )
 {
     auto pfnGetTimeoutModeProperties = ze_lib::context->zesDdiTable.Scheduler.pfnGetTimeoutModeProperties;
-    if( nullptr == pfnGetTimeoutModeProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetTimeoutModeProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetTimeoutModeProperties( hScheduler, getDefaults, pConfig );
 }
@@ -3045,8 +3405,12 @@ zesSchedulerGetTimesliceModeProperties(
     )
 {
     auto pfnGetTimesliceModeProperties = ze_lib::context->zesDdiTable.Scheduler.pfnGetTimesliceModeProperties;
-    if( nullptr == pfnGetTimesliceModeProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetTimesliceModeProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetTimesliceModeProperties( hScheduler, getDefaults, pConfig );
 }
@@ -3085,8 +3449,12 @@ zesSchedulerSetTimeoutMode(
     )
 {
     auto pfnSetTimeoutMode = ze_lib::context->zesDdiTable.Scheduler.pfnSetTimeoutMode;
-    if( nullptr == pfnSetTimeoutMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetTimeoutMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetTimeoutMode( hScheduler, pProperties, pNeedReload );
 }
@@ -3124,8 +3492,12 @@ zesSchedulerSetTimesliceMode(
     )
 {
     auto pfnSetTimesliceMode = ze_lib::context->zesDdiTable.Scheduler.pfnSetTimesliceMode;
-    if( nullptr == pfnSetTimesliceMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetTimesliceMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetTimesliceMode( hScheduler, pProperties, pNeedReload );
 }
@@ -3161,8 +3533,12 @@ zesSchedulerSetExclusiveMode(
     )
 {
     auto pfnSetExclusiveMode = ze_lib::context->zesDdiTable.Scheduler.pfnSetExclusiveMode;
-    if( nullptr == pfnSetExclusiveMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetExclusiveMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetExclusiveMode( hScheduler, pNeedReload );
 }
@@ -3199,8 +3575,12 @@ zesSchedulerSetComputeUnitDebugMode(
     )
 {
     auto pfnSetComputeUnitDebugMode = ze_lib::context->zesDdiTable.Scheduler.pfnSetComputeUnitDebugMode;
-    if( nullptr == pfnSetComputeUnitDebugMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetComputeUnitDebugMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetComputeUnitDebugMode( hScheduler, pNeedReload );
 }
@@ -3237,8 +3617,12 @@ zesDeviceEnumStandbyDomains(
     )
 {
     auto pfnEnumStandbyDomains = ze_lib::context->zesDdiTable.Device.pfnEnumStandbyDomains;
-    if( nullptr == pfnEnumStandbyDomains )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumStandbyDomains ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumStandbyDomains( hDevice, pCount, phStandby );
 }
@@ -3265,8 +3649,12 @@ zesStandbyGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Standby.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hStandby, pProperties );
 }
@@ -3293,8 +3681,12 @@ zesStandbyGetMode(
     )
 {
     auto pfnGetMode = ze_lib::context->zesDdiTable.Standby.pfnGetMode;
-    if( nullptr == pfnGetMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetMode( hStandby, pMode );
 }
@@ -3323,8 +3715,12 @@ zesStandbySetMode(
     )
 {
     auto pfnSetMode = ze_lib::context->zesDdiTable.Standby.pfnSetMode;
-    if( nullptr == pfnSetMode )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetMode ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetMode( hStandby, mode );
 }
@@ -3361,8 +3757,12 @@ zesDeviceEnumTemperatureSensors(
     )
 {
     auto pfnEnumTemperatureSensors = ze_lib::context->zesDdiTable.Device.pfnEnumTemperatureSensors;
-    if( nullptr == pfnEnumTemperatureSensors )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnEnumTemperatureSensors ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnEnumTemperatureSensors( hDevice, pCount, phTemperature );
 }
@@ -3389,8 +3789,12 @@ zesTemperatureGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zesDdiTable.Temperature.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hTemperature, pProperties );
 }
@@ -3423,8 +3827,12 @@ zesTemperatureGetConfig(
     )
 {
     auto pfnGetConfig = ze_lib::context->zesDdiTable.Temperature.pfnGetConfig;
-    if( nullptr == pfnGetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetConfig( hTemperature, pConfig );
 }
@@ -3474,8 +3882,12 @@ zesTemperatureSetConfig(
     )
 {
     auto pfnSetConfig = ze_lib::context->zesDdiTable.Temperature.pfnSetConfig;
-    if( nullptr == pfnSetConfig )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetConfig ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetConfig( hTemperature, pConfig );
 }
@@ -3503,8 +3915,12 @@ zesTemperatureGetState(
     )
 {
     auto pfnGetState = ze_lib::context->zesDdiTable.Temperature.pfnGetState;
-    if( nullptr == pfnGetState )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetState ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetState( hTemperature, pTemperature );
 }
@@ -3541,8 +3957,12 @@ zesPowerGetLimitsExt(
     )
 {
     auto pfnGetLimitsExt = ze_lib::context->zesDdiTable.Power.pfnGetLimitsExt;
-    if( nullptr == pfnGetLimitsExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetLimitsExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetLimitsExt( hPower, pCount, pSustained );
 }
@@ -3582,8 +4002,12 @@ zesPowerSetLimitsExt(
     )
 {
     auto pfnSetLimitsExt = ze_lib::context->zesDdiTable.Power.pfnSetLimitsExt;
-    if( nullptr == pfnSetLimitsExt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetLimitsExt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetLimitsExt( hPower, pCount, pSustained );
 }
diff --git a/source/lib/zet_libapi.cpp b/source/lib/zet_libapi.cpp
index aca426e8..b54cb5f8 100644
--- a/source/lib/zet_libapi.cpp
+++ b/source/lib/zet_libapi.cpp
@@ -43,8 +43,12 @@ zetModuleGetDebugInfo(
     )
 {
     auto pfnGetDebugInfo = ze_lib::context->zetDdiTable.Module.pfnGetDebugInfo;
-    if( nullptr == pfnGetDebugInfo )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetDebugInfo ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetDebugInfo( hModule, format, pSize, pDebugInfo );
 }
@@ -67,8 +71,12 @@ zetDeviceGetDebugProperties(
     )
 {
     auto pfnGetDebugProperties = ze_lib::context->zetDdiTable.Device.pfnGetDebugProperties;
-    if( nullptr == pfnGetDebugProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetDebugProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetDebugProperties( hDevice, pDebugProperties );
 }
@@ -103,8 +111,12 @@ zetDebugAttach(
     )
 {
     auto pfnAttach = ze_lib::context->zetDdiTable.Debug.pfnAttach;
-    if( nullptr == pfnAttach )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAttach ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAttach( hDevice, config, phDebug );
 }
@@ -124,8 +136,12 @@ zetDebugDetach(
     )
 {
     auto pfnDetach = ze_lib::context->zetDdiTable.Debug.pfnDetach;
-    if( nullptr == pfnDetach )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDetach ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDetach( hDebug );
 }
@@ -157,8 +173,12 @@ zetDebugReadEvent(
     )
 {
     auto pfnReadEvent = ze_lib::context->zetDdiTable.Debug.pfnReadEvent;
-    if( nullptr == pfnReadEvent )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReadEvent ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReadEvent( hDebug, timeout, event );
 }
@@ -181,8 +201,12 @@ zetDebugAcknowledgeEvent(
     )
 {
     auto pfnAcknowledgeEvent = ze_lib::context->zetDdiTable.Debug.pfnAcknowledgeEvent;
-    if( nullptr == pfnAcknowledgeEvent )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAcknowledgeEvent ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAcknowledgeEvent( hDebug, event );
 }
@@ -205,8 +229,12 @@ zetDebugInterrupt(
     )
 {
     auto pfnInterrupt = ze_lib::context->zetDdiTable.Debug.pfnInterrupt;
-    if( nullptr == pfnInterrupt )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnInterrupt ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnInterrupt( hDebug, thread );
 }
@@ -229,8 +257,12 @@ zetDebugResume(
     )
 {
     auto pfnResume = ze_lib::context->zetDdiTable.Debug.pfnResume;
-    if( nullptr == pfnResume )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnResume ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnResume( hDebug, thread );
 }
@@ -266,8 +298,12 @@ zetDebugReadMemory(
     )
 {
     auto pfnReadMemory = ze_lib::context->zetDdiTable.Debug.pfnReadMemory;
-    if( nullptr == pfnReadMemory )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReadMemory ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReadMemory( hDebug, thread, desc, size, buffer );
 }
@@ -303,8 +339,12 @@ zetDebugWriteMemory(
     )
 {
     auto pfnWriteMemory = ze_lib::context->zetDdiTable.Debug.pfnWriteMemory;
-    if( nullptr == pfnWriteMemory )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnWriteMemory ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnWriteMemory( hDebug, thread, desc, size, buffer );
 }
@@ -336,8 +376,12 @@ zetDebugGetRegisterSetProperties(
     )
 {
     auto pfnGetRegisterSetProperties = ze_lib::context->zetDdiTable.Debug.pfnGetRegisterSetProperties;
-    if( nullptr == pfnGetRegisterSetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetRegisterSetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetRegisterSetProperties( hDevice, pCount, pRegisterSetProperties );
 }
@@ -366,8 +410,12 @@ zetDebugReadRegisters(
     )
 {
     auto pfnReadRegisters = ze_lib::context->zetDdiTable.Debug.pfnReadRegisters;
-    if( nullptr == pfnReadRegisters )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReadRegisters ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReadRegisters( hDebug, thread, type, start, count, pRegisterValues );
 }
@@ -396,8 +444,12 @@ zetDebugWriteRegisters(
     )
 {
     auto pfnWriteRegisters = ze_lib::context->zetDdiTable.Debug.pfnWriteRegisters;
-    if( nullptr == pfnWriteRegisters )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnWriteRegisters ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnWriteRegisters( hDebug, thread, type, start, count, pRegisterValues );
 }
@@ -431,8 +483,12 @@ zetMetricGroupGet(
     )
 {
     auto pfnGet = ze_lib::context->zetDdiTable.MetricGroup.pfnGet;
-    if( nullptr == pfnGet )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGet ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGet( hDevice, pCount, phMetricGroups );
 }
@@ -458,8 +514,12 @@ zetMetricGroupGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zetDdiTable.MetricGroup.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hMetricGroup, pProperties );
 }
@@ -499,8 +559,12 @@ zetMetricGroupCalculateMetricValues(
     )
 {
     auto pfnCalculateMetricValues = ze_lib::context->zetDdiTable.MetricGroup.pfnCalculateMetricValues;
-    if( nullptr == pfnCalculateMetricValues )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCalculateMetricValues ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCalculateMetricValues( hMetricGroup, type, rawDataSize, pRawData, pMetricValueCount, pMetricValues );
 }
@@ -533,8 +597,12 @@ zetMetricGet(
     )
 {
     auto pfnGet = ze_lib::context->zetDdiTable.Metric.pfnGet;
-    if( nullptr == pfnGet )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGet ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGet( hMetricGroup, pCount, phMetrics );
 }
@@ -560,8 +628,12 @@ zetMetricGetProperties(
     )
 {
     auto pfnGetProperties = ze_lib::context->zetDdiTable.Metric.pfnGetProperties;
-    if( nullptr == pfnGetProperties )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProperties ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProperties( hMetric, pProperties );
 }
@@ -605,8 +677,12 @@ zetContextActivateMetricGroups(
     )
 {
     auto pfnActivateMetricGroups = ze_lib::context->zetDdiTable.Context.pfnActivateMetricGroups;
-    if( nullptr == pfnActivateMetricGroups )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnActivateMetricGroups ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnActivateMetricGroups( hContext, hDevice, count, phMetricGroups );
 }
@@ -647,8 +723,12 @@ zetMetricStreamerOpen(
     )
 {
     auto pfnOpen = ze_lib::context->zetDdiTable.MetricStreamer.pfnOpen;
-    if( nullptr == pfnOpen )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnOpen ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnOpen( hContext, hDevice, hMetricGroup, desc, hNotificationEvent, phMetricStreamer );
 }
@@ -681,8 +761,12 @@ zetCommandListAppendMetricStreamerMarker(
     )
 {
     auto pfnAppendMetricStreamerMarker = ze_lib::context->zetDdiTable.CommandList.pfnAppendMetricStreamerMarker;
-    if( nullptr == pfnAppendMetricStreamerMarker )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMetricStreamerMarker ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMetricStreamerMarker( hCommandList, hMetricStreamer, value );
 }
@@ -706,8 +790,12 @@ zetMetricStreamerClose(
     )
 {
     auto pfnClose = ze_lib::context->zetDdiTable.MetricStreamer.pfnClose;
-    if( nullptr == pfnClose )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnClose ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnClose( hMetricStreamer );
 }
@@ -744,8 +832,12 @@ zetMetricStreamerReadData(
     )
 {
     auto pfnReadData = ze_lib::context->zetDdiTable.MetricStreamer.pfnReadData;
-    if( nullptr == pfnReadData )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReadData ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReadData( hMetricStreamer, maxReportCount, pRawDataSize, pRawData );
 }
@@ -780,8 +872,12 @@ zetMetricQueryPoolCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zetDdiTable.MetricQueryPool.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, hDevice, hMetricGroup, desc, phMetricQueryPool );
 }
@@ -811,8 +907,12 @@ zetMetricQueryPoolDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zetDdiTable.MetricQueryPool.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hMetricQueryPool );
 }
@@ -840,8 +940,12 @@ zetMetricQueryCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zetDdiTable.MetricQuery.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hMetricQueryPool, index, phMetricQuery );
 }
@@ -869,8 +973,12 @@ zetMetricQueryDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zetDdiTable.MetricQuery.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hMetricQuery );
 }
@@ -896,8 +1004,12 @@ zetMetricQueryReset(
     )
 {
     auto pfnReset = ze_lib::context->zetDdiTable.MetricQuery.pfnReset;
-    if( nullptr == pfnReset )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnReset ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnReset( hMetricQuery );
 }
@@ -929,8 +1041,12 @@ zetCommandListAppendMetricQueryBegin(
     )
 {
     auto pfnAppendMetricQueryBegin = ze_lib::context->zetDdiTable.CommandList.pfnAppendMetricQueryBegin;
-    if( nullptr == pfnAppendMetricQueryBegin )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMetricQueryBegin ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMetricQueryBegin( hCommandList, hMetricQuery );
 }
@@ -978,8 +1094,12 @@ zetCommandListAppendMetricQueryEnd(
     )
 {
     auto pfnAppendMetricQueryEnd = ze_lib::context->zetDdiTable.CommandList.pfnAppendMetricQueryEnd;
-    if( nullptr == pfnAppendMetricQueryEnd )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMetricQueryEnd ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMetricQueryEnd( hCommandList, hMetricQuery, hSignalEvent, numWaitEvents, phWaitEvents );
 }
@@ -1003,8 +1123,12 @@ zetCommandListAppendMetricMemoryBarrier(
     )
 {
     auto pfnAppendMetricMemoryBarrier = ze_lib::context->zetDdiTable.CommandList.pfnAppendMetricMemoryBarrier;
-    if( nullptr == pfnAppendMetricMemoryBarrier )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnAppendMetricMemoryBarrier ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnAppendMetricMemoryBarrier( hCommandList );
 }
@@ -1038,8 +1162,12 @@ zetMetricQueryGetData(
     )
 {
     auto pfnGetData = ze_lib::context->zetDdiTable.MetricQuery.pfnGetData;
-    if( nullptr == pfnGetData )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetData ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetData( hMetricQuery, pRawDataSize, pRawData );
 }
@@ -1070,8 +1198,12 @@ zetKernelGetProfileInfo(
     )
 {
     auto pfnGetProfileInfo = ze_lib::context->zetDdiTable.Kernel.pfnGetProfileInfo;
-    if( nullptr == pfnGetProfileInfo )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnGetProfileInfo ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnGetProfileInfo( hKernel, pProfileProperties );
 }
@@ -1105,8 +1237,12 @@ zetTracerExpCreate(
     )
 {
     auto pfnCreate = ze_lib::context->zetDdiTable.TracerExp.pfnCreate;
-    if( nullptr == pfnCreate )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCreate ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCreate( hContext, desc, phTracer );
 }
@@ -1135,8 +1271,12 @@ zetTracerExpDestroy(
     )
 {
     auto pfnDestroy = ze_lib::context->zetDdiTable.TracerExp.pfnDestroy;
-    if( nullptr == pfnDestroy )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnDestroy ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnDestroy( hTracer );
 }
@@ -1168,8 +1308,12 @@ zetTracerExpSetPrologues(
     )
 {
     auto pfnSetPrologues = ze_lib::context->zetDdiTable.TracerExp.pfnSetPrologues;
-    if( nullptr == pfnSetPrologues )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetPrologues ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetPrologues( hTracer, pCoreCbs );
 }
@@ -1201,8 +1345,12 @@ zetTracerExpSetEpilogues(
     )
 {
     auto pfnSetEpilogues = ze_lib::context->zetDdiTable.TracerExp.pfnSetEpilogues;
-    if( nullptr == pfnSetEpilogues )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetEpilogues ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetEpilogues( hTracer, pCoreCbs );
 }
@@ -1227,8 +1375,12 @@ zetTracerExpSetEnabled(
     )
 {
     auto pfnSetEnabled = ze_lib::context->zetDdiTable.TracerExp.pfnSetEnabled;
-    if( nullptr == pfnSetEnabled )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnSetEnabled ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnSetEnabled( hTracer, enable );
 }
@@ -1287,8 +1439,12 @@ zetMetricGroupCalculateMultipleMetricValuesExp(
     )
 {
     auto pfnCalculateMultipleMetricValuesExp = ze_lib::context->zetDdiTable.MetricGroupExp.pfnCalculateMultipleMetricValuesExp;
-    if( nullptr == pfnCalculateMultipleMetricValuesExp )
-        return ZE_RESULT_ERROR_UNINITIALIZED;
+    if( nullptr == pfnCalculateMultipleMetricValuesExp ) {
+        if(!ze_lib::context->isInitialized)
+            return ZE_RESULT_ERROR_UNINITIALIZED;
+        else
+            return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+    }
 
     return pfnCalculateMultipleMetricValuesExp( hMetricGroup, type, rawDataSize, pRawData, pSetCount, pTotalMetricValueCount, pMetricCounts, pMetricValues );
 }