diff --git a/configurations/F2U12X35S3P_riser.json b/configurations/F2U12X35S3P_riser.json
index 83fda94..365208f 100644
--- a/configurations/F2U12X35S3P_riser.json
+++ b/configurations/F2U12X35S3P_riser.json
@@ -40,7 +40,11 @@
                 "type": "IntelFruDevice"
             }
         ],
+        "manufacturer": "$BOARD_MANUFACTURER",
+        "model": "$BOARD_PRODUCT_NAME",
         "name": "2U12x35 Riser1",
+        "part_number": "$BOARD_PART_NUMBER",
+        "serial_number": "$BOARD_SERIAL_NUMBER",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : '0x50'})"
     },
     {
@@ -84,7 +88,11 @@
                 "type": "IntelFruDevice"
             }
         ],
+        "manufacturer": "$BOARD_MANUFACTURER",
+        "model": "$BOARD_PRODUCT_NAME",
         "name": "2U12x35 Riser2",
+        "serial_number": "$BOARD_SERIAL_NUMBER",
+        "part_number": "$BOARD_PART_NUMBER",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : '0x51'})"
     }
 ]
\ No newline at end of file
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 7b4274e..537e28d 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -1,18 +1,44 @@
-{
-    "exposes": [
-        {
-            "address": "0x58",
-            "bus": "$bus",
-            "name": "Flextronics S-1100ADU00-201 PSU Device",
-            "type": "pmbus"
-        },
-        {
-            "address": "$address",
-            "bus": "$bus",
-            "name": "Flextronics S-1100ADU00-201 PSU FRU",
-            "type": "IntelFruDevice"
-        }
-    ],
-    "name": "Flextronics S-1100ADU00-201 PSU",
-    "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': '0x50'})"
-}
\ No newline at end of file
+[
+    {
+        "exposes": [
+            {
+                "address": "0x59",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU Device",
+                "type": "pmbus"
+            },
+            {
+                "address": "$address",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "type": "IntelFruDevice"
+            }
+        ],
+        "manufacturer": "$BOARD_MANUFACTURER",
+        "model": "$BOARD_PRODUCT_NAME",
+        "name": "Flextronics S-1100ADU00-201 PSU",
+        "part_number": "$BOARD_PART_NUMBER",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': '0x51'})"
+    },
+    {
+        "exposes": [
+            {
+                "address": "0x58",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU Device",
+                "type": "pmbus"
+            },
+            {
+                "address": "$address",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "type": "IntelFruDevice"
+            }
+        ],
+        "manufacturer": "$BOARD_MANUFACTURER",
+        "model": "$BOARD_PRODUCT_NAME",
+        "name": "Flextronics S-1100ADU00-201 PSU",
+        "part_number": "$BOARD_PART_NUMBER",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': '0x50'})"
+    }
+]
\ No newline at end of file
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index 79e6775..a5a86fa 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -39,7 +39,11 @@
             "type": "TMP75"
         }
     ],
+    "manufacturer": "$BOARD_MANUFACTURER",
+    "model": "$BOARD_PRODUCT_NAME",
     "name": "Intel Front Panel",
+    "part_number": "$BOARD_PART_NUMBER",
+    "serial_number": "$BOARD_SERIAL_NUMBER",
     "probe": [
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})",
         "OR",
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index e6fca44..bd88d88 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -13,6 +13,10 @@
             "type": "TMP75"
         }
     ],
+    "manufacturer": "$BOARD_MANUFACTURER",
+    "model": "$BOARD_PRODUCT_NAME",
     "name": "PCIE SSD Retimer",
+    "part_number": "$BOARD_PART_NUMBER",
+    "serial_number": "$BOARD_SERIAL_NUMBER",
     "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})"
 }
\ No newline at end of file
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
new file mode 100755
index 0000000..6161111
--- /dev/null
+++ b/configurations/PSSF132202A.json
@@ -0,0 +1,46 @@
+[
+    {
+        "exposes": [
+            {
+                "address": "0x59",
+                "bus": "$bus",
+                "name": "Solum 1300W PSU 2 Device",
+                "type": "pmbus"
+            },
+            {
+                "address": "$address",
+                "bus": "$bus",
+                "name": "Solum 1300W PSU 2 FRU",
+                "type": "IntelFruDevice"
+            }
+        ],
+        "manufacturer": "$PRODUCT_MANUFACTURER",
+        "model": "$PRODUCT_PRODUCT_NAME",
+        "name": "Solum 1300W PSU 2",
+        "part_number": "$PRODUCT_PART_NUMBER",
+        "serial_number": "$PRODUCT_PRODUCT_SERIAL_NUMBER",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': '0x51'})"
+    },
+    {
+        "exposes": [
+            {
+                "address": "0x58",
+                "bus": "$bus",
+                "name": "Solum 1300W PSU 1 Device",
+                "type": "pmbus"
+            },
+            {
+                "address": "$address",
+                "bus": "$bus",
+                "name": "Solum 1300W PSU 1 FRU",
+                "type": "IntelFruDevice"
+            }
+        ],
+        "manufacturer": "$PRODUCT_MANUFACTURER",
+        "model": "$PRODUCT_PRODUCT_NAME",
+        "name": "Solum 1300W PSU 1",
+        "part_number": "$PRODUCT_PART_NUMBER",
+        "serial_number": "$PRODUCT_PRODUCT_SERIAL_NUMBER",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': '0x50'})"
+    }
+]
\ No newline at end of file
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 692d403..65a9ef6 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -242,6 +242,8 @@
         }
     ],
     "name": "R1000 Chassis",
+    "part_number": "R1208",
+    "serial_number": "23165",
     "probe": [
         "FOUND('WFP Baseboard')",
         "AND",
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 298b16f..6150b60 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -121,7 +121,12 @@
             "type": "AspeedFan"
         }
     ],
+
+    "manufacturer": "Intel Corporation",
+    "model": "R2000",
     "name": "R2000 Chassis",
+    "part_number": "R2104",
+    "serial_number": "23165",
     "probe": [
         "FOUND('WFP Baseboard')",
         "AND",
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 6d8aae0..a3cc987 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -811,7 +811,7 @@
     "manufacturer": "$BOARD_MANUFACTURER",
     "model": "$BOARD_PRODUCT_NAME",
     "name": "WFP Baseboard",
-    "part_number": "$CHASSIS_PART_NUMBER",
-    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*WFT'})",
-    "serial_number": "$CHASSIS_SERIAL_NUMBER"
-}
+    "part_number": "$BOARD_PART_NUMBER",
+    "serial_number": "$BOARD_SERIAL_NUMBER",
+    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*WFT'})"
+}
\ No newline at end of file