diff --git a/ntoskrnl/include/internal/ps_i.h b/ntoskrnl/include/internal/ps_i.h
index 7f15a8afb63..c50e2bd4fb7 100644
--- a/ntoskrnl/include/internal/ps_i.h
+++ b/ntoskrnl/include/internal/ps_i.h
@@ -410,17 +410,16 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] =
     ),
 
     /* ThreadDescriptorTableEntry is only implemented in x86 as well as the descriptor entry */
-    #if defined(_X86_)
-        /* ThreadDescriptorTableEntry */
-        IQS_SAME
-        (
-            DESCRIPTOR_TABLE_ENTRY,
-            ULONG,
-            ICIF_QUERY
-        ),
-    #else
-        IQS_NONE,
-    #endif
+#if defined(_X86_)
+    IQS_SAME
+    (
+        DESCRIPTOR_TABLE_ENTRY,
+        ULONG,
+        ICIF_QUERY
+    ),
+#else
+    IQS_NONE,
+#endif
 
     /* ThreadEnableAlignmentFaultFixup */
     IQS
@@ -555,4 +554,70 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] =
 
     /* ThreadCSwitchMon */
     IQS_NONE,
+
+    // Windows 7
+    /* ThreadCSwitchPmu */
+    IQS_NONE,
+    /* ThreadWow64Context */
+    IQS_NONE,
+    /* ThreadGroupInformation */
+    IQS_NONE,
+    /* ThreadUmsInformation */
+    IQS_NONE,
+    /* ThreadCounterProfiling */
+    IQS_NONE,
+    /* ThreadIdealProcessorEx */
+    IQS_NONE,
+
+    // Windows 8
+    /* ThreadCpuAccountingInformation */
+    IQS_NONE,
+
+    // Windows 8.1
+    /* ThreadSuspendCount */
+    IQS_NONE,
+
+    // Windows 10
+    /* ThreadHeterogeneousCpuPolicy */
+    IQS_NONE,
+    /* ThreadContainerId */
+    IQS_NONE,
+    /* ThreadNameInformation */
+    IQS_NONE,
+    /* ThreadSelectedCpuSets */
+    IQS_NONE,
+    /* ThreadSystemThreadInformation */
+    IQS_NONE,
+    /* ThreadActualGroupAffinity */
+    IQS_NONE,
+
+    /* ThreadDynamicCodePolicyInfo */
+    IQS_NONE,
+    /* ThreadExplicitCaseSensitivity */
+    IQS_NONE,
+    /* ThreadWorkOnBehalfTicket */
+    IQS_NONE,
+    /* ThreadSubsystemInformation */
+    IQS_NONE,
+    /* ThreadDbgkWerReportActive */
+    IQS_NONE,
+    /* ThreadAttachContainer */
+    IQS_NONE,
+    /* ThreadManageWritesToExecutableMemory */
+    IQS_NONE,
+    /* ThreadPowerThrottlingState */
+    IQS_NONE,
+    /* ThreadWorkloadClass */
+    IQS_NONE,
+    /* ThreadCreateStateChange */
+    IQS_NONE,
+    /* ThreadApplyStateChange */
+    IQS_NONE,
+    /* ThreadStrongerBadHandleChecks */
+    IQS_NONE,
+    /* ThreadEffectiveIoPriority */
+    IQS_NONE,
+    /* ThreadEffectivePagePriority */
+    IQS_NONE,
+
 };
diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h
index d52ccad32dd..4dff85d9219 100644
--- a/sdk/include/ndk/pstypes.h
+++ b/sdk/include/ndk/pstypes.h
@@ -428,13 +428,28 @@ typedef enum _THREADINFOCLASS
     ThreadSuspendCount, // 0x23
 
     // Windows 10
-    ThreadHeterogeneousCpuPolic, // 0x24
+    ThreadHeterogeneousCpuPolicy, // 0x24
     ThreadContainerId,
     ThreadNameInformation,
     ThreadSelectedCpuSets,
     ThreadSystemThreadInformation,
     ThreadActualGroupAffinity,
 
+    ThreadDynamicCodePolicyInfo,
+    ThreadExplicitCaseSensitivity,
+    ThreadWorkOnBehalfTicket,
+    ThreadSubsystemInformation,
+    ThreadDbgkWerReportActive,
+    ThreadAttachContainer,
+    ThreadManageWritesToExecutableMemory,
+    ThreadPowerThrottlingState,
+    ThreadWorkloadClass,
+    ThreadCreateStateChange,
+    ThreadApplyStateChange,
+    ThreadStrongerBadHandleChecks,
+    ThreadEffectiveIoPriority,
+    ThreadEffectivePagePriority,
+
     MaxThreadInfoClass
 } THREADINFOCLASS;