diff --git a/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp b/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp
index 4b54db04f6..3b922a615d 100644
--- a/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp
+++ b/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp
@@ -5,23 +5,17 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/gen11/hw_cmds.h"
 
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 
 namespace NEO {
 
-typedef ICLFamily Family;
+using Family = ICLFamily;
 
 struct EnableL0Gen11 {
     EnableL0Gen11() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         L0::populateFactoryTable<L0::L0HwHelperHw<Family>>();
     }
 };
diff --git a/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp b/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp
index 839d6ff3f5..26720e9231 100644
--- a/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp
+++ b/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp
@@ -5,22 +5,17 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/gen12lp/hw_cmds.h"
 
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
+
 namespace NEO {
 
-typedef TGLLPFamily Family;
+using Family = TGLLPFamily;
 
 struct EnableL0Gen12LP {
     EnableL0Gen12LP() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         L0::populateFactoryTable<L0::L0HwHelperHw<Family>>();
     }
 };
diff --git a/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp b/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp
index 4f5bef0094..7084495b78 100644
--- a/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp
+++ b/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp
@@ -5,20 +5,14 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/gen8/hw_cmds.h"
 
 namespace NEO {
 
-typedef BDWFamily Family;
+using Family = BDWFamily;
 
 struct EnableL0Gen8 {
     EnableL0Gen8() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp b/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp
index 8a6ac121d1..0083c3a79a 100644
--- a/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp
+++ b/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp
@@ -5,23 +5,17 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/gen9/hw_cmds.h"
 
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 
 namespace NEO {
 
-typedef SKLFamily Family;
+using Family = SKLFamily;
 
 struct EnableL0Gen9 {
     EnableL0Gen9() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         L0::populateFactoryTable<L0::L0HwHelperHw<Family>>();
     }
 };
diff --git a/level_zero/core/source/xe_hp_core/enable_family_full_l0_xe_hp_core.cpp b/level_zero/core/source/xe_hp_core/enable_family_full_l0_xe_hp_core.cpp
index 7a94be2e42..cfcf088d3b 100644
--- a/level_zero/core/source/xe_hp_core/enable_family_full_l0_xe_hp_core.cpp
+++ b/level_zero/core/source/xe_hp_core/enable_family_full_l0_xe_hp_core.cpp
@@ -5,23 +5,17 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 
 namespace NEO {
 
-typedef XeHpFamily Family;
+using Family = XeHpFamily;
 
 struct EnableL0XeHpCore {
     EnableL0XeHpCore() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         L0::populateFactoryTable<L0::L0HwHelperHw<Family>>();
     }
 };
diff --git a/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp
index 26328c51b2..e5e3d25d4f 100644
--- a/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp
+++ b/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp
@@ -5,10 +5,7 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
@@ -19,9 +16,6 @@ using Family = XE_HPC_COREFamily;
 
 struct EnableL0XeHpcCore {
     EnableL0XeHpcCore() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         L0::populateFactoryTable<L0::L0HwHelperHw<Family>>();
     }
 };
diff --git a/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp b/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp
index 6aa21bc770..16e0ec1e18 100644
--- a/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp
+++ b/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp
@@ -5,23 +5,17 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 
 namespace NEO {
 
-typedef XE_HPG_COREFamily Family;
+using Family = XE_HPG_COREFamily;
 
 struct EnableL0XeHpgCore {
     EnableL0XeHpgCore() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         L0::populateFactoryTable<L0::L0HwHelperHw<Family>>();
     }
 };
diff --git a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp
index 8dc2cf814e..dee71460e5 100644
--- a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp
+++ b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp
@@ -5,9 +5,6 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
@@ -19,19 +16,16 @@
 
 namespace NEO {
 
-typedef ICLFamily Family;
+using Family = ICLFamily;
 
 struct EnableOCLGen11 {
     EnableOCLGen11() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<DeviceQueueHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
index 6c749c074b..c2ba98d863 100644
--- a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
+++ b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
@@ -5,9 +5,6 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
@@ -19,18 +16,15 @@
 
 namespace NEO {
 
-typedef TGLLPFamily Family;
+using Family = TGLLPFamily;
 
 struct EnableOCLGen12LP {
     EnableOCLGen12LP() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
index c6c2c8fda2..5ec7e103e9 100644
--- a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
+++ b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
@@ -5,11 +5,7 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
-#include "shared/source/utilities/perf_counter.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
@@ -17,22 +13,17 @@
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
 
-#include <type_traits>
-
 namespace NEO {
 
-typedef BDWFamily Family;
+using Family = BDWFamily;
 
 struct EnableOCLGen8 {
     EnableOCLGen8() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
index 4d31962e2b..40bf509dc2 100644
--- a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
+++ b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
@@ -5,11 +5,7 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
-#include "shared/source/utilities/perf_counter.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/device_queue/device_queue_hw.h"
@@ -18,23 +14,18 @@
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
 
-#include <type_traits>
-
 namespace NEO {
 
-typedef SKLFamily Family;
+using Family = SKLFamily;
 
 struct EnableOCLGen9 {
     EnableOCLGen9() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<DeviceQueueHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp b/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp
index 3a12633d8a..146ec8e95a 100644
--- a/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp
+++ b/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp
@@ -5,9 +5,6 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
@@ -19,18 +16,15 @@
 
 namespace NEO {
 
-typedef XeHpFamily Family;
+using Family = XeHpFamily;
 
 struct EnableOCLXeHpCore {
     EnableOCLXeHpCore() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
index ba7e8dd109..72bcb6c87f 100644
--- a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
@@ -22,14 +20,11 @@ using Family = XE_HPC_COREFamily;
 
 struct EnableOCLXeHpcCore {
     EnableOCLXeHpcCore() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
index 94f5ebccc6..595bc45d71 100644
--- a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
+++ b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
@@ -5,9 +5,6 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
@@ -19,18 +16,15 @@
 
 namespace NEO {
 
-typedef XE_HPG_COREFamily Family;
+using Family = XE_HPG_COREFamily;
 
 struct EnableOCLXeHpgCore {
     EnableOCLXeHpgCore() {
-        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ClHwHelperHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
-        populateFactoryTable<CommandStreamReceiverHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/gen11/enable_family_full_core_gen11.cpp b/shared/source/gen11/enable_family_full_core_gen11.cpp
index a2d782f64a..9ec7661fab 100644
--- a/shared/source/gen11/enable_family_full_core_gen11.cpp
+++ b/shared/source/gen11/enable_family_full_core_gen11.cpp
@@ -5,19 +5,26 @@
  *
  */
 
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 
 namespace NEO {
 
 extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
 
-typedef ICLFamily Family;
+using Family = ICLFamily;
 static auto gfxFamily = IGFX_GEN11_CORE;
 
 struct EnableCoreGen11 {
     EnableCoreGen11() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp b/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp
index dccd684098..830b3241cd 100644
--- a/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp
+++ b/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp
@@ -5,19 +5,26 @@
  *
  */
 
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 
 namespace NEO {
 
 extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
 
-typedef TGLLPFamily Family;
+using Family = TGLLPFamily;
 static auto gfxFamily = IGFX_GEN12LP_CORE;
 
 struct EnableCoreGen12LP {
     EnableCoreGen12LP() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/gen8/enable_family_full_core_gen8.cpp b/shared/source/gen8/enable_family_full_core_gen8.cpp
index cc83e777b0..8f06898525 100644
--- a/shared/source/gen8/enable_family_full_core_gen8.cpp
+++ b/shared/source/gen8/enable_family_full_core_gen8.cpp
@@ -5,8 +5,12 @@
  *
  */
 
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 
 #include <type_traits>
 
@@ -14,12 +18,15 @@ namespace NEO {
 
 extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
 
-typedef BDWFamily Family;
+using Family = BDWFamily;
 static const auto gfxFamily = IGFX_GEN8_CORE;
 
 struct EnableCoreGen8 {
     EnableCoreGen8() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/gen9/enable_family_full_core_gen9.cpp b/shared/source/gen9/enable_family_full_core_gen9.cpp
index 09d33dc0d5..750e38f5f3 100644
--- a/shared/source/gen9/enable_family_full_core_gen9.cpp
+++ b/shared/source/gen9/enable_family_full_core_gen9.cpp
@@ -5,8 +5,12 @@
  *
  */
 
-#include "shared/source/gen8/hw_cmds.h"
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
+#include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 
 #include <type_traits>
 
@@ -14,12 +18,15 @@ namespace NEO {
 
 extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
 
-typedef SKLFamily Family;
+using Family = SKLFamily;
 static const auto gfxFamily = IGFX_GEN9_CORE;
 
 struct EnableCoreGen9 {
     EnableCoreGen9() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/xe_hp_core/enable_family_full_core_xe_hp_core.cpp b/shared/source/xe_hp_core/enable_family_full_core_xe_hp_core.cpp
index 07fa1ccef2..eec3fcf727 100644
--- a/shared/source/xe_hp_core/enable_family_full_core_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/enable_family_full_core_xe_hp_core.cpp
@@ -5,19 +5,26 @@
  *
  */
 
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 namespace NEO {
 
 extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
 
-typedef XeHpFamily Family;
+using Family = XeHpFamily;
 static auto gfxFamily = IGFX_XE_HP_CORE;
 
 struct EnableCoreXeHpCore {
     EnableCoreXeHpCore() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp
index 3cfcb9ae2f..0120df2d3d 100644
--- a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp
@@ -5,7 +5,11 @@
  *
  */
 
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe_hpc_core/hw_cmds.h"
 
 namespace NEO {
@@ -18,6 +22,9 @@ static auto gfxFamily = IGFX_XE_HPC_CORE;
 struct EnableCoreXeHpcCore {
     EnableCoreXeHpcCore() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };
 
diff --git a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp
index d4e023ce19..648a7f5502 100644
--- a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp
@@ -5,19 +5,26 @@
  *
  */
 
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe_hpg_core/hw_cmds.h"
 
 namespace NEO {
 
 extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
 
-typedef XE_HPG_COREFamily Family;
+using Family = XE_HPG_COREFamily;
 static auto gfxFamily = IGFX_XE_HPG_CORE;
 
 struct EnableCoreXeHpgCore {
     EnableCoreXeHpgCore() {
         hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+        populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
+        populateFactoryTable<CommandStreamReceiverHw<Family>>();
+        populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
     }
 };