diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_proc_gettracearray.H b/src/import/chips/p9/procedures/hwp/perv/p9_proc_gettracearray.H
index 2648ca3c1f1..5b39fc2a9df 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_proc_gettracearray.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_proc_gettracearray.H
@@ -63,6 +63,7 @@ static const fapi2::TargetType PROC_GETTRACEARRAY_TARGET_TYPES =
     fapi2::TARGET_TYPE_PROC_CHIP |
     fapi2::TARGET_TYPE_OBUS |
     fapi2::TARGET_TYPE_MCBIST |
+    fapi2::TARGET_TYPE_MC |
     fapi2::TARGET_TYPE_EX |
     fapi2::TARGET_TYPE_CORE;
 
@@ -106,6 +107,10 @@ extern "C"
         {
             return fapi2::TARGET_TYPE_PROC_CHIP;
         }
+        else if (i_trace_bus <= _PROC_TB_LAST_AXONE_MC_TARGET)
+        {
+            return fapi2::TARGET_TYPE_MC;
+        }
         else
         {
             return fapi2::TARGET_TYPE_EX;
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tracearray.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tracearray.H
index 5df714a8a79..ecaf785f774 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tracearray.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tracearray.H
@@ -128,6 +128,10 @@ extern "C" {
         {
             return fapi2::TARGET_TYPE_PROC_CHIP;
         }
+        else if (i_trace_bus <= _PROC_TB_LAST_AXONE_MC_TARGET)
+        {
+            return fapi2::TARGET_TYPE_PERV;
+        }
         else
         {
             return fapi2::TARGET_TYPE_EX;
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_tracearray_defs.H b/src/import/chips/p9/procedures/hwp/perv/p9_tracearray_defs.H
index 62b2fd40f57..c0f8d8e32b6 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_tracearray_defs.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_tracearray_defs.H
@@ -176,11 +176,14 @@ enum p9_tracearray_bus_id
     PROC_TB_NPU11,
     PROC_TB_NPU20,
     PROC_TB_NPU21,
+
+    _PROC_TB_LAST_AXONE_CHIP_TARGET = PROC_TB_NPU21,
+
     PROC_TB_OMI0,
     PROC_TB_OMI1,
     PROC_TB_OMI2,
 
-    _PROC_TB_LAST_AXONE_CHIP_TARGET = PROC_TB_OMI2,
+    _PROC_TB_LAST_AXONE_MC_TARGET = PROC_TB_OMI2,
 
     PROC_TB_SKIT00,
     PROC_TB_SKIT01,