diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
index a03e275..2c7f8ee 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
@@ -1,89 +1,108 @@
 PROC:
-  xyz.openbmc_project.Inventory.Decorator.Asset:
-    BuildDate:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Mfg Date"
-    Manufacturer:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Manufacturer"
-    PartNumber:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Part Number"
-    SerialNumber:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Serial Number"
-  xyz.openbmc_project.Inventory.Item:
-    PrettyName:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Name"
-  xyz.openbmc_project.Inventory.Decorator.Revision:
-    Version:
-      IPMIFruSection: Board
-      # Custom Field 2  is EC.
-      IPMIFruProperty: "Custom Field 2"
-      # Delimiter value in ascii as YAML parser
-      # was not allowing certain characters like ":" as value
-      IPMIFruValueDelimiter: "58"
-
+  Interfaces:
+    xyz.openbmc_project.Inventory.Decorator.Asset:
+      BuildDate:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Mfg Date"
+      Manufacturer:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Manufacturer"
+      PartNumber:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Part Number"
+      SerialNumber:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Serial Number"
+    xyz.openbmc_project.Inventory.Item:
+      PrettyName:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Name"
+    xyz.openbmc_project.Inventory.Decorator.Revision:
+      Version:
+        IPMIFruSection: Board
+        # Custom Field 2  is EC.
+        IPMIFruProperty: "Custom Field 2"
+        # Delimiter value in ascii as YAML parser
+        # was not allowing certain characters like ":" as value
+        IPMIFruValueDelimiter: "58"
 SYS:
-  xyz.openbmc_project.Inventory.Decorator.Asset:
-    BuildDate:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Mfg Date"
-    Manufacturer:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Manufacturer"
-    PartNumber:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Part Number"
-    SerialNumber:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Serial Number"
-  xyz.openbmc_project.Inventory.Item:
-    PrettyName:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Name"
+  Interfaces:
+    xyz.openbmc_project.Inventory.Decorator.Asset:
+      PartNumber:
+        IPMIFruSection: Chassis
+        IPMIFruProperty: "Part Number"
+      SerialNumber:
+        IPMIFruSection: Chassis
+        IPMIFruProperty: "Serial Number"
+      Model:
+        IPMIFruSection: Chassis
+        IPMIFruProperty: "Type"
+
+NODE:
+  Interfaces:
+    xyz.openbmc_project.Inventory.Decorator.Asset:
+      BuildDate:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Mfg Date"
+      Manufacturer:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Manufacturer"
+      PartNumber:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Part Number"
+      SerialNumber:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Serial Number"
+    xyz.openbmc_project.Inventory.Item:
+      PrettyName:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Name"
+  AssociatedTypes:
+    - SYS
+
 DIMM:
-  xyz.openbmc_project.Inventory.Decorator.Asset:
-    BuildDate:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Mfg Date"
-    Manufacturer:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Manufacturer"
-    PartNumber:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Part Number"
-    SerialNumber:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Serial Number"
-    Model:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Model Number"
-  xyz.openbmc_project.Inventory.Item:
-    PrettyName:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Name"
-  xyz.openbmc_project.Inventory.Decorator.Revision:
-    Version:
-      IPMIFruSection: Product
-      IPMIFruProperty: "Version"
+  Interfaces:
+    xyz.openbmc_project.Inventory.Decorator.Asset:
+      BuildDate:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Mfg Date"
+      Manufacturer:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Manufacturer"
+      PartNumber:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Part Number"
+      SerialNumber:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Serial Number"
+      Model:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Model Number"
+    xyz.openbmc_project.Inventory.Item:
+      PrettyName:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Name"
+    xyz.openbmc_project.Inventory.Decorator.Revision:
+      Version:
+        IPMIFruSection: Product
+        IPMIFruProperty: "Version"
 
 MEMBUFF:
-  xyz.openbmc_project.Inventory.Decorator.Asset:
-    BuildDate:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Mfg Date"
-    Manufacturer:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Manufacturer"
-    PartNumber:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Part Number"
-    SerialNumber:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Serial Number"
-  xyz.openbmc_project.Inventory.Item:
-    PrettyName:
-      IPMIFruSection: Board
-      IPMIFruProperty: "Name"
+  Interfaces:
+    xyz.openbmc_project.Inventory.Decorator.Asset:
+      BuildDate:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Mfg Date"
+      Manufacturer:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Manufacturer"
+      PartNumber:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Part Number"
+      SerialNumber:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Serial Number"
+    xyz.openbmc_project.Inventory.Item:
+      PrettyName:
+        IPMIFruSection: Board
+        IPMIFruProperty: "Name"
diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass
index 8032f42..649fb45 100644
--- a/meta-phosphor/classes/mrw-rev.bbclass
+++ b/meta-phosphor/classes/mrw-rev.bbclass
@@ -2,4 +2,4 @@
 MRW_API_SRCREV ?= "31155941629988f0adcf765e7e7dd3af34fb1214"
 
 MRW_TOOLS_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools"
-MRW_TOOLS_SRCREV ?= "5cb5f4e91dc05c59be05a369c8ed777b618d79ac"
+MRW_TOOLS_SRCREV ?= "c8dca9e8b87adfec6401d6f26b28a7b991a08b2b"