diff --git a/writefru.mako.hpp b/writefru.mako.hpp
index 7bbd079..e27005f 100755
--- a/writefru.mako.hpp
+++ b/writefru.mako.hpp
@@ -55,10 +55,13 @@
         % for name, value in properties.iteritems():
             % if fru and interface and name and value:
 <%
-                record, keyword = value.split(",")
+                record, keyword = name.split(",")
 %>\
-    ${intfName}Props["${name}"] =
-        vpdStore.get<Record::${record}, record::Keyword::${keyword}>();
+    if (vpdStore.exists<Record::${record}, record::Keyword::${keyword}>())
+    {
+        ${intfName}Props["${value}"] =
+            vpdStore.get<Record::${record}, record::Keyword::${keyword}>();
+    }
             % endif
         % endfor
     // Check and update extra properties
diff --git a/writefru.yaml b/writefru.yaml
index 0b4802d..eb7f827 100644
--- a/writefru.yaml
+++ b/writefru.yaml
@@ -1,17 +1,15 @@
 BMC:
     xyz.openbmc_project.Inventory.Decorator.Asset:
-        PartNumber: VINI,PN
-        SerialNumber: VINI,SN
-        Manufacturer: OPFR,VN
-    org.openpower_project.Inventory.Decorator.Asset:
-        CCIN: VINI,CC
+        VINI,PN: PartNumber
+        VINI,SN: SerialNumber
+        OPFR,VN: Manufacturer
     xyz.openbmc_project.Inventory.Item:
-        PrettyName: VINI,DR
-    xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version: VINI,HW
+        VINI,DR: PrettyName
     xyz.openbmc_project.Common.UUID:
-        UUID: OPFR,UD
+        OPFR,UD: UUID
+
 
 ETHERNET:
     xyz.openbmc_project.Inventory.Item.NetworkInterface:
-        MACAddress: VINI,B1
+        VINI,B1: MACAddress
+        OPFR,B1: MACAddress