diff --git a/configurations/pdr/4.json b/configurations/pdr/4.json
index a91457d..c42e8fb 100644
--- a/configurations/pdr/4.json
+++ b/configurations/pdr/4.json
@@ -116,7 +116,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card0/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -133,7 +133,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card0/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -150,7 +150,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card3/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -167,7 +167,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card3/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -184,7 +184,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card4/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -201,7 +201,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card4/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -218,7 +218,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card10/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -235,7 +235,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card10/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -405,7 +405,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
+        "type" : 142,
+        "instance" : 1,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -422,7 +424,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
+        "type" : 142,
+        "instance" : 2,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -439,7 +443,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
+        "type" : 142,
+        "instance" : 3,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -456,7 +462,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
+        "type" : 142,
+        "instance" : 4,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -473,7 +481,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
+        "type" : 142,
+        "instance" : 5,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -490,7 +500,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
+        "type" : 142,
+        "instance" : 6,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -507,7 +519,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
+        "type" : 142,
+        "instance" : 7,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -524,7 +538,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
+        "type" : 142,
+        "instance" : 8,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -541,7 +557,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
+        "type" : 142,
+        "instance" : 9,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -558,7 +576,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
+        "type" : 142,
+        "instance" : 10,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -575,7 +595,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
+        "type" : 142,
+        "instance" : 11,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -592,7 +614,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
+        "type" : 142,
+        "instance" : 12,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -609,7 +633,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
+        "type" : 142,
+        "instance" : 13,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -626,7 +652,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
+        "type" : 142,
+        "instance" : 14,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -643,7 +671,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
+        "type" : 142,
+        "instance" : 15,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -660,7 +690,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
+        "type" : 142,
+        "instance" : 16,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -677,7 +709,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm16",
+        "type" : 142,
+        "instance" : 17,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -694,7 +728,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm17",
+        "type" : 142,
+        "instance" : 18,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -711,7 +747,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm18",
+        "type" : 142,
+        "instance" : 19,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -728,7 +766,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm19",
+        "type" : 142,
+        "instance" : 20,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -745,7 +785,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm20",
+        "type" : 142,
+        "instance" : 21,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -762,7 +804,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm21",
+        "type" : 142,
+        "instance" : 22,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -779,7 +823,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm22",
+        "type" : 142,
+        "instance" : 23,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -796,7 +842,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm23",
+        "type" : 142,
+        "instance" : 24,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -813,7 +861,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm24",
+        "type" : 142,
+        "instance" : 25,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -830,7 +880,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm25",
+        "type" : 142,
+        "instance" : 26,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -847,7 +899,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm26",
+        "type" : 142,
+        "instance" : 27,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -864,7 +918,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm27",
+        "type" : 142,
+        "instance" : 28,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -881,7 +937,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm28",
+        "type" : 142,
+        "instance" : 29,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -898,7 +956,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm29",
+        "type" : 142,
+        "instance" : 30,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -915,7 +975,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm30",
+        "type" : 142,
+        "instance" : 31,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -932,7 +994,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm31",
+        "type" : 142,
+        "instance" : 32,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 17,
@@ -1838,7 +1902,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card0/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1855,7 +1919,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card0/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1872,7 +1936,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card3/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1889,7 +1953,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card3/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1906,7 +1970,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card4/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1923,7 +1987,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card4/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1940,7 +2004,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card10/cxp_bot",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_bot",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -1957,7 +2021,7 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcie_cable_card10/cxp_top",
+        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_top",
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2127,7 +2191,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
+        "type" : 142,
+        "instance" : 1,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2144,7 +2210,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
+        "type" : 142,
+        "instance" : 2,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2161,7 +2229,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
+        "type" : 142,
+        "instance" : 3,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2178,7 +2248,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
+        "type" : 142,
+        "instance" : 4,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2195,7 +2267,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
+        "type" : 142,
+        "instance" : 5,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2212,7 +2286,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
+        "type" : 142,
+        "instance" : 6,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2229,7 +2305,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
+        "type" : 142,
+        "instance" : 7,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2246,7 +2324,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
+        "type" : 142,
+        "instance" : 8,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2263,7 +2343,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
+        "type" : 142,
+        "instance" : 9,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2280,7 +2362,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
+        "type" : 142,
+        "instance" : 10,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2297,7 +2381,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
+        "type" : 142,
+        "instance" : 11,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2314,7 +2400,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
+        "type" : 142,
+        "instance" : 12,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2331,7 +2419,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
+        "type" : 142,
+        "instance" : 13,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2348,7 +2438,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
+        "type" : 142,
+        "instance" : 14,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2365,7 +2457,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
+        "type" : 142,
+        "instance" : 15,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2382,7 +2476,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
+        "type" : 142,
+        "instance" : 16,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2399,7 +2495,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm16",
+        "type" : 142,
+        "instance" : 17,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2416,7 +2514,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm17",
+        "type" : 142,
+        "instance" : 18,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2433,7 +2533,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm18",
+        "type" : 142,
+        "instance" : 19,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2450,7 +2552,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm19",
+        "type" : 142,
+        "instance" : 20,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2467,7 +2571,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm20",
+        "type" : 142,
+        "instance" : 21,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2484,7 +2590,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm21",
+        "type" : 142,
+        "instance" : 22,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2501,7 +2609,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm22",
+        "type" : 142,
+        "instance" : 23,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2518,7 +2628,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm23",
+        "type" : 142,
+        "instance" : 24,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2535,7 +2647,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm24",
+        "type" : 142,
+        "instance" : 25,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2552,7 +2666,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm25",
+        "type" : 142,
+        "instance" : 26,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2569,7 +2685,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm26",
+        "type" : 142,
+        "instance" : 27,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2586,7 +2704,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm27",
+        "type" : 142,
+        "instance" : 28,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2603,7 +2723,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm28",
+        "type" : 142,
+        "instance" : 29,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2620,7 +2742,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm29",
+        "type" : 142,
+        "instance" : 30,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2637,7 +2761,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm30",
+        "type" : 142,
+        "instance" : 31,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,
@@ -2654,7 +2780,9 @@
         }]
     },
     {
-        "entity_path" : "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm31",
+        "type" : 142,
+        "instance" : 32,
+        "container" : 3,
         "sensors" : [{
             "set" : {
                 "id" : 10,