diff --git a/oem/ibm/configurations/fru/Battery_LocationCode.json b/oem/ibm/configurations/fru/Battery_LocationCode.json
new file mode 100644
index 0000000..663e8bb
--- /dev/null
+++ b/oem/ibm/configurations/fru/Battery_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Battery"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/Battery_VINI.json b/oem/ibm/configurations/fru/Battery_VINI.json
new file mode 100644
index 0000000..cd08ee6
--- /dev/null
+++ b/oem/ibm/configurations/fru/Battery_VINI.json
@@ -0,0 +1,164 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Battery"
+   },
+   "fru_fields":[
+      {
+         "fru_field_type" : 2,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "RT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 3,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B3",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 4,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B4",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 5,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B7",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 6,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CC",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 7,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 8,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 9,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "DR",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 10,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FG",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 11,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 12,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 13,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HW",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 14,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HX",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 15,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "PN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 16,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "SN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 17,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "TS",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 18,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "VZ",
+               "property_type" : "bytearray"
+            }
+      }
+    ]
+}
+
diff --git a/oem/ibm/configurations/fru/Bmc_LocationCode.json b/oem/ibm/configurations/fru/Bmc_LocationCode.json
index 6af12b8..7335fc3 100644
--- a/oem/ibm/configurations/fru/Bmc_LocationCode.json
+++ b/oem/ibm/configurations/fru/Bmc_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }
diff --git a/oem/ibm/configurations/fru/Chassis_LocationCode.json b/oem/ibm/configurations/fru/Chassis_LocationCode.json
index 48ba98e..84bba68 100644
--- a/oem/ibm/configurations/fru/Chassis_LocationCode.json
+++ b/oem/ibm/configurations/fru/Chassis_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }
diff --git a/oem/ibm/configurations/fru/Chassis_VINI.json b/oem/ibm/configurations/fru/Chassis_VINI.json
new file mode 100644
index 0000000..72012a0
--- /dev/null
+++ b/oem/ibm/configurations/fru/Chassis_VINI.json
@@ -0,0 +1,164 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Chassis"
+   },
+   "fru_fields":[
+      {
+         "fru_field_type" : 2,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "RT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 3,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B3",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 4,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B4",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 5,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B7",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 6,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CC",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 7,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 8,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 9,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "DR",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 10,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FG",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 11,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 12,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 13,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HW",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 14,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HX",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 15,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "PN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 16,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "SN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 17,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "TS",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 18,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "VZ",
+               "property_type" : "bytearray"
+            }
+      }
+    ]
+}
+
diff --git a/oem/ibm/configurations/fru/Connector_LocationCode.json b/oem/ibm/configurations/fru/Connector_LocationCode.json
new file mode 100644
index 0000000..9782ae2
--- /dev/null
+++ b/oem/ibm/configurations/fru/Connector_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Connector"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/DiskBackplane_LocationCode.json b/oem/ibm/configurations/fru/DiskBackplane_LocationCode.json
new file mode 100644
index 0000000..f93afc5
--- /dev/null
+++ b/oem/ibm/configurations/fru/DiskBackplane_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.DiskBackplane"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/DiskBackplane_VINI.json b/oem/ibm/configurations/fru/DiskBackplane_VINI.json
new file mode 100644
index 0000000..b326edc
--- /dev/null
+++ b/oem/ibm/configurations/fru/DiskBackplane_VINI.json
@@ -0,0 +1,164 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.DiskBackplane"
+   },
+   "fru_fields":[
+      {
+         "fru_field_type" : 2,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "RT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 3,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B3",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 4,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B4",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 5,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B7",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 6,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CC",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 7,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 8,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 9,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "DR",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 10,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FG",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 11,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 12,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 13,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HW",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 14,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HX",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 15,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "PN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 16,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "SN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 17,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "TS",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 18,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "VZ",
+               "property_type" : "bytearray"
+            }
+      }
+    ]
+}
+
diff --git a/oem/ibm/configurations/fru/Fan_LocationCode.json b/oem/ibm/configurations/fru/Fan_LocationCode.json
new file mode 100644
index 0000000..e3ae750
--- /dev/null
+++ b/oem/ibm/configurations/fru/Fan_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Fan"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/Motherboard_LocationCode.json b/oem/ibm/configurations/fru/Motherboard_LocationCode.json
index 713c4d1..db3e37f 100644
--- a/oem/ibm/configurations/fru/Motherboard_LocationCode.json
+++ b/oem/ibm/configurations/fru/Motherboard_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }
diff --git a/oem/ibm/configurations/fru/PCIeDevice_LocationCode.json b/oem/ibm/configurations/fru/PCIeDevice_LocationCode.json
new file mode 100644
index 0000000..4b54acd
--- /dev/null
+++ b/oem/ibm/configurations/fru/PCIeDevice_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.PCIeDevice"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/PCIeDevice_VINI.json b/oem/ibm/configurations/fru/PCIeDevice_VINI.json
new file mode 100644
index 0000000..d3aa6fa
--- /dev/null
+++ b/oem/ibm/configurations/fru/PCIeDevice_VINI.json
@@ -0,0 +1,164 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.PCIeDevice"
+   },
+   "fru_fields":[
+      {
+         "fru_field_type" : 2,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "RT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 3,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B3",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 4,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B4",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 5,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B7",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 6,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CC",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 7,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 8,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 9,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "DR",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 10,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FG",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 11,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 12,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 13,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HW",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 14,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HX",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 15,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "PN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 16,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "SN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 17,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "TS",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 18,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "VZ",
+               "property_type" : "bytearray"
+            }
+      }
+    ]
+}
+
diff --git a/oem/ibm/configurations/fru/PCIeSlot_LocationCode.json b/oem/ibm/configurations/fru/PCIeSlot_LocationCode.json
new file mode 100644
index 0000000..ac53afd
--- /dev/null
+++ b/oem/ibm/configurations/fru/PCIeSlot_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.PCIeSlot"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/Panel_LocationCode.json b/oem/ibm/configurations/fru/Panel_LocationCode.json
index 8fc54f3..fc7d981 100644
--- a/oem/ibm/configurations/fru/Panel_LocationCode.json
+++ b/oem/ibm/configurations/fru/Panel_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }
diff --git a/oem/ibm/configurations/fru/PowerSupply_LocationCode.json b/oem/ibm/configurations/fru/PowerSupply_LocationCode.json
new file mode 100644
index 0000000..73fb84b
--- /dev/null
+++ b/oem/ibm/configurations/fru/PowerSupply_LocationCode.json
@@ -0,0 +1,19 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.PowerSupply"
+   },
+   "fru_fields":[
+     {
+         "fru_field_type" : 254,
+         "dbus":
+            {
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
+               "property_name" : "LocationCode",
+               "property_type" : "string"
+            }
+      }
+    ]
+}
diff --git a/oem/ibm/configurations/fru/PowerSupply_VINI.json b/oem/ibm/configurations/fru/PowerSupply_VINI.json
new file mode 100644
index 0000000..cd74b44
--- /dev/null
+++ b/oem/ibm/configurations/fru/PowerSupply_VINI.json
@@ -0,0 +1,164 @@
+{
+   "record_details":
+   {
+        "fru_record_type" : 254,
+        "fru_encoding_type": 1,
+        "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.PowerSupply"
+   },
+   "fru_fields":[
+      {
+         "fru_field_type" : 2,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "RT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 3,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B3",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 4,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B4",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 5,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "B7",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 6,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CC",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 7,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 8,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "CT",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 9,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "DR",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 10,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FG",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 11,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "FN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 12,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HE",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 13,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HW",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 14,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "HX",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 15,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "PN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 16,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "SN",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 17,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "TS",
+               "property_type" : "bytearray"
+            }
+      },
+      {
+         "fru_field_type" : 18,
+         "dbus":
+            {
+               "interface" : "com.ibm.ipzvpd.VINI",
+               "property_name" : "VZ",
+               "property_type" : "bytearray"
+            }
+      }
+    ]
+}
+
diff --git a/oem/ibm/configurations/fru/System_LocationCode.json b/oem/ibm/configurations/fru/System_LocationCode.json
index 23ed69c..787514a 100644
--- a/oem/ibm/configurations/fru/System_LocationCode.json
+++ b/oem/ibm/configurations/fru/System_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }
diff --git a/oem/ibm/configurations/fru/Tpm_LocationCode.json b/oem/ibm/configurations/fru/Tpm_LocationCode.json
index cef2ce2..7d73f91 100644
--- a/oem/ibm/configurations/fru/Tpm_LocationCode.json
+++ b/oem/ibm/configurations/fru/Tpm_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }
diff --git a/oem/ibm/configurations/fru/Vrm_LocationCode.json b/oem/ibm/configurations/fru/Vrm_LocationCode.json
index 4015ee6..d201c4c 100644
--- a/oem/ibm/configurations/fru/Vrm_LocationCode.json
+++ b/oem/ibm/configurations/fru/Vrm_LocationCode.json
@@ -10,7 +10,7 @@
          "fru_field_type" : 254,
          "dbus":
             {
-               "interface" : "com.ibm.ipzvpd.Location",
+               "interface" : "xyz.openbmc_project.Inventory.Decorator.LocationCode",
                "property_name" : "LocationCode",
                "property_type" : "string"
             }