diff --git a/analyzer/callout.hpp b/analyzer/callout.hpp
index adb2fd4..00d968e 100644
--- a/analyzer/callout.hpp
+++ b/analyzer/callout.hpp
@@ -79,12 +79,14 @@
     // `openbmc/phosphor-logging` for the full list of these values.
 
     PROCESSOR      = 0x10,
+    PROCESSOR_FRU  = 0x11,
     PROCESSOR_UNIT = 0x13,
     PROCESSOR_BUS  = 0x14,
 
-    MEMORY      = 0x20,
+    MEMORY_CTLR = 0x21,
     MEMORY_BUS  = 0x22,
     MEMORY_DIMM = 0x23,
+    MEMORY_FRU  = 0x24,
 
     PHB = 0x38,
 
diff --git a/analyzer/service_data.cpp b/analyzer/service_data.cpp
index 28ef329..c571ca5 100644
--- a/analyzer/service_data.cpp
+++ b/analyzer/service_data.cpp
@@ -294,22 +294,23 @@
     static const std::map<uint8_t, callout::SrcSubsystem> subSysMap =
     {
         {TargetType_t::TYPE_DIMM,     callout::SrcSubsystem::MEMORY_DIMM   },
-        {TargetType_t::TYPE_PROC,     callout::SrcSubsystem::PROCESSOR     },
+        {TargetType_t::TYPE_PROC,     callout::SrcSubsystem::PROCESSOR_FRU },
         {TargetType_t::TYPE_CORE,     callout::SrcSubsystem::PROCESSOR_UNIT},
-        {TargetType_t::TYPE_EQ,       callout::SrcSubsystem::PROCESSOR     },
-        {TargetType_t::TYPE_PEC,      callout::SrcSubsystem::PHB           },
+        {TargetType_t::TYPE_NX,       callout::SrcSubsystem::PROCESSOR     },
+        {TargetType_t::TYPE_EQ,       callout::SrcSubsystem::PROCESSOR_UNIT},
+        {TargetType_t::TYPE_PEC,      callout::SrcSubsystem::PROCESSOR_UNIT},
         {TargetType_t::TYPE_PHB,      callout::SrcSubsystem::PHB           },
-        {TargetType_t::TYPE_MC,       callout::SrcSubsystem::MEMORY        },
-        {TargetType_t::TYPE_IOLINK,   callout::SrcSubsystem::CEC_HARDWARE  },
-        {TargetType_t::TYPE_OMI,      callout::SrcSubsystem::MEMORY        },
-        {TargetType_t::TYPE_MCC,      callout::SrcSubsystem::MEMORY        },
-        {TargetType_t::TYPE_OMIC,     callout::SrcSubsystem::MEMORY        },
-        {TargetType_t::TYPE_OCMB,     callout::SrcSubsystem::MEMORY        },
-        {TargetType_t::TYPE_MEM_PORT, callout::SrcSubsystem::MEMORY        },
-        {TargetType_t::TYPE_NMMU,     callout::SrcSubsystem::PROCESSOR     },
-        {TargetType_t::TYPE_PAU,      callout::SrcSubsystem::PROCESSOR_BUS },
-        {TargetType_t::TYPE_IOHS,     callout::SrcSubsystem::PROCESSOR_BUS },
-        {TargetType_t::TYPE_PAUC,     callout::SrcSubsystem::PROCESSOR     },
+        {TargetType_t::TYPE_MC,       callout::SrcSubsystem::MEMORY_CTLR   },
+        {TargetType_t::TYPE_IOLINK,   callout::SrcSubsystem::PROCESSOR_BUS },
+        {TargetType_t::TYPE_OMI,      callout::SrcSubsystem::MEMORY_CTLR   },
+        {TargetType_t::TYPE_MCC,      callout::SrcSubsystem::MEMORY_CTLR   },
+        {TargetType_t::TYPE_OMIC,     callout::SrcSubsystem::MEMORY_CTLR   },
+        {TargetType_t::TYPE_OCMB,     callout::SrcSubsystem::MEMORY_FRU    },
+        {TargetType_t::TYPE_MEM_PORT, callout::SrcSubsystem::MEMORY_CTLR   },
+        {TargetType_t::TYPE_NMMU,     callout::SrcSubsystem::PROCESSOR_UNIT},
+        {TargetType_t::TYPE_PAU,      callout::SrcSubsystem::PROCESSOR_UNIT},
+        {TargetType_t::TYPE_IOHS,     callout::SrcSubsystem::PROCESSOR_UNIT},
+        {TargetType_t::TYPE_PAUC,     callout::SrcSubsystem::PROCESSOR_UNIT},
     };
     // clang-format on
 
diff --git a/test/test-resolution.cpp b/test/test-resolution.cpp
index 35f6307..2de693d 100644
--- a/test/test-resolution.cpp
+++ b/test/test-resolution.cpp
@@ -67,10 +67,10 @@
 
     // Verify the subsystems
     std::pair<callout::SrcSubsystem, callout::Priority> subsys = {
-        callout::SrcSubsystem::PROCESSOR, callout::Priority::HIGH};
+        callout::SrcSubsystem::PROCESSOR_FRU, callout::Priority::HIGH};
     EXPECT_EQ(sd1.getSubsys(), subsys);
 
-    subsys = {callout::SrcSubsystem::PROCESSOR, callout::Priority::HIGH};
+    subsys = {callout::SrcSubsystem::PROCESSOR_FRU, callout::Priority::HIGH};
     EXPECT_EQ(sd2.getSubsys(), subsys);
 
     // Start verifying
@@ -156,7 +156,7 @@
 
     // Verify the subsystem
     std::pair<callout::SrcSubsystem, callout::Priority> subsys = {
-        callout::SrcSubsystem::MEMORY, callout::Priority::MED_A};
+        callout::SrcSubsystem::MEMORY_CTLR, callout::Priority::MED_A};
     EXPECT_EQ(sd.getSubsys(), subsys);
 
     nlohmann::json j{};
@@ -216,7 +216,7 @@
 
     // Verify the subsystem
     std::pair<callout::SrcSubsystem, callout::Priority> subsys = {
-        callout::SrcSubsystem::CEC_HARDWARE, callout::Priority::MED_A};
+        callout::SrcSubsystem::PROCESSOR_BUS, callout::Priority::MED_A};
     EXPECT_EQ(sd.getSubsys(), subsys);
 
     // Callout list
@@ -307,7 +307,7 @@
 
     // Verify the subsystem
     std::pair<callout::SrcSubsystem, callout::Priority> subsys = {
-        callout::SrcSubsystem::MEMORY, callout::Priority::MED_A};
+        callout::SrcSubsystem::MEMORY_CTLR, callout::Priority::MED_A};
     EXPECT_EQ(sd.getSubsys(), subsys);
 
     // Callout list
diff --git a/util/pdbg.hpp b/util/pdbg.hpp
index cd8c737..10a4694 100644
--- a/util/pdbg.hpp
+++ b/util/pdbg.hpp
@@ -26,6 +26,7 @@
     TYPE_DIMM     = 0x03,
     TYPE_PROC     = 0x05,
     TYPE_CORE     = 0x07,
+    TYPE_NX       = 0x1e,
     TYPE_EQ       = 0x23,
     TYPE_PEC      = 0x2d,
     TYPE_PHB      = 0x2e,