diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index 24b6256..b9ecbad 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -2,6 +2,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 1 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x72",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 1 Mux",
+                "Type": "PCA9545Mux"
+            },
+            {
                 "Address": "0x48",
                 "Bus": "$bus",
                 "Name": "Riser 1 Temp",
@@ -32,29 +50,11 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x72",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 1 Mux",
-                "Type": "PCA9545Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 1 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "1Ux16 Riser 1",
-        "Type": "Board",
         "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 80})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -65,6 +65,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 2 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x73",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 2 Mux",
+                "Type": "PCA9545Mux"
+            },
+            {
                 "Address": "0x49",
                 "Bus": "$bus",
                 "Name": "Riser 2 Temp",
@@ -95,29 +113,11 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x73",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 2 Mux",
-                "Type": "PCA9545Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 2 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "1Ux16 Riser 2",
-        "Type": "Board",
         "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 81})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -125,4 +125,4 @@
             "SerialNumber": "$BOARD_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index 7dc883f..bd6e3c1 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -2,6 +2,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 1 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x72",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 1 Mux",
+                "Type": "PCA9545Mux"
+            },
+            {
                 "Address": "0x48",
                 "Bus": "$bus",
                 "Name": "Riser 1 Temp",
@@ -32,29 +50,11 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x72",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 1 Mux",
-                "Type": "PCA9545Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 1 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "2Ux8 Riser 1",
-        "Type": "Board",
         "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': 80})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -65,6 +65,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 2 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x73",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 2 Mux",
+                "Type": "PCA9545Mux"
+            },
+            {
                 "Address": "0x49",
                 "Bus": "$bus",
                 "Name": "Riser 2 Temp",
@@ -95,29 +113,11 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x73",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 2 Mux",
-                "Type": "PCA9545Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 2 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "2Ux8 Riser 2",
-        "Type": "Board",
         "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': 81})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/8X25 HSBP.json b/configurations/8X25 HSBP.json
index 5dd9122..8c1043a 100644
--- a/configurations/8X25 HSBP.json
+++ b/configurations/8X25 HSBP.json
@@ -15,6 +15,6 @@
         }
     ],
     "Name": "1U_HSBP",
-    "Type": "Board",
-    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})"
+    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})",
+    "Type": "Board"
 }
\ No newline at end of file
diff --git a/configurations/A2UL16RISER.json b/configurations/A2UL16RISER.json
index caa866f..bbf03c0 100644
--- a/configurations/A2UL16RISER.json
+++ b/configurations/A2UL16RISER.json
@@ -2,6 +2,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 1 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x72",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 1 Mux",
+                "Type": "PCA9544Mux"
+            },
+            {
                 "Address": "0x48",
                 "Bus": "$bus",
                 "Name": "Riser1 Temp",
@@ -32,29 +50,11 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x72",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 1 Mux",
-                "Type": "PCA9544Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 1 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "2U12x35 Riser1",
-        "Type": "Board",
         "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 80})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -65,6 +65,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 2 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x73",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 2 Mux",
+                "Type": "PCA9544Mux"
+            },
+            {
                 "Address": "0x49",
                 "Bus": "$bus",
                 "Name": "Riser2 Temp",
@@ -95,24 +113,6 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x73",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 2 Mux",
-                "Type": "PCA9544Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 2 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "2U12x35 Riser2",
diff --git a/configurations/A2UX8X4RISER.json b/configurations/A2UX8X4RISER.json
index e960f87..20557bf 100644
--- a/configurations/A2UX8X4RISER.json
+++ b/configurations/A2UX8X4RISER.json
@@ -2,6 +2,12 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 3 Fru",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x4E",
                 "Bus": "$bus",
                 "Name": "Riser 3 Temp",
@@ -32,17 +38,11 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 3 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "2Ux8 Riser 3",
-        "Type": "Board",
         "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UX8X4RISER'})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/AHW1UM2RISER.json b/configurations/AHW1UM2RISER.json
index f57e13d..82a3f14 100644
--- a/configurations/AHW1UM2RISER.json
+++ b/configurations/AHW1UM2RISER.json
@@ -2,6 +2,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 1 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x72",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 1 Mux",
+                "Type": "PCA9545Mux"
+            },
+            {
                 "Address": "0x4e",
                 "Bus": "$bus",
                 "Name": "Riser 1 Temp",
@@ -32,24 +50,6 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x72",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 1 Mux",
-                "Type": "PCA9545Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 1 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Riser 1",
@@ -64,6 +64,24 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Riser 2 Fru",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x73",
+                "Bus": "$bus",
+                "ChannelNames": [
+                    "Pcie_Slot_1",
+                    "Pcie_Slot_2",
+                    "Pcie_Slot_3",
+                    ""
+                ],
+                "Name": "Riser 2 Mux",
+                "Type": "PCA9545Mux"
+            },
+            {
                 "Address": "0x4f",
                 "Bus": "$bus",
                 "Name": "Riser 2 Temp",
@@ -94,24 +112,6 @@
                     }
                 ],
                 "Type": "TMP75"
-            },
-            {
-                "Address": "0x73",
-                "Bus": "$bus",
-                "ChannelNames": [
-                    "Pcie_Slot_1",
-                    "Pcie_Slot_2",
-                    "Pcie_Slot_3",
-                    ""
-                ],
-                "Name": "Riser 2 Mux",
-                "Type": "PCA9545Mux"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Riser 2 Fru",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Riser 2",
@@ -123,4 +123,4 @@
             "SerialNumber": "$BOARD_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/AXX2PRTHDHD.json b/configurations/AXX2PRTHDHD.json
index bc22319..b74465c 100644
--- a/configurations/AXX2PRTHDHD.json
+++ b/configurations/AXX2PRTHDHD.json
@@ -7,6 +7,42 @@
             "Type": "EEPROM"
         },
         {
+            "Address": "0x74",
+            "Bus": "$bus",
+            "ChannelNames": [
+                "MiniSASHD1",
+                "MiniSASHD2",
+                "MiniSASHD3",
+                "MiniSASHD4"
+            ],
+            "Name": "PCIe Retimer $index Mux",
+            "Type": "PCA9544Mux"
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -0.1,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "PCIE Retimer Temp"
+            ],
+            "Name": "PCIE Retimer Temp",
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "SetPoint": 45.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Left",
+                "Right"
+            ]
+        },
+        {
             "Address": "0x4F",
             "Bus": "$bus",
             "Name": "PCIE Retimer Temp",
@@ -37,47 +73,11 @@
                 }
             ],
             "Type": "TMP75"
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -0.1,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "PCIE Retimer Temp"
-            ],
-            "Name": "PCIE Retimer Temp",
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "SetPoint": 45.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Left",
-                "Right"
-            ]
-        },
-        {
-            "Address": "0x74",
-            "Bus": "$bus",
-            "ChannelNames": [
-                "MiniSASHD1",
-                "MiniSASHD2",
-                "MiniSASHD3",
-                "MiniSASHD4"
-            ],
-            "Name": "PCIe Retimer $index Mux",
-            "Type": "PCA9544Mux"
         }
     ],
     "Name": "PCIE Retimer",
-    "Type": "Board",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'AXX2PRTHDHD'})",
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
         "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 76b8194..f915ceb 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -2,10 +2,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Delta DPS-750XB PSU FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x5a",
                 "Bus": "$bus",
                 "Name": "PSU3",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -50,12 +56,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Delta DPS-750XB PSU 3",
@@ -71,10 +71,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Delta DPS-750XB PSU FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x59",
                 "Bus": "$bus",
                 "Name": "PSU2",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -119,12 +125,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Delta DPS-750XB PSU 2",
@@ -140,10 +140,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Delta DPS-750XB PSU FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x58",
                 "Bus": "$bus",
                 "Name": "PSU1",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -188,12 +194,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Delta DPS-750XB PSU 1",
@@ -206,4 +206,4 @@
             "SerialNumber": "$BOARD_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/FBTP.json b/configurations/FBTP.json
index 00e8ce3..5801ea1 100644
--- a/configurations/FBTP.json
+++ b/configurations/FBTP.json
@@ -1,171 +1,6 @@
 {
     "Exposes": [
         {
-            "Name": "Pwm 1",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 2",
-            "Type": "Pwm"
-        },
-        {
-            "Connector": {
-                "Name": "System Fan Connector 1",
-                "Pwm": 0,
-                "Tachs": [
-                    0
-                ]
-            },
-            "Index": 0,
-            "Name": "MB_FAN0_TACH",
-            "Thresholds": [
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 500
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 8500
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11500
-                }
-            ],
-            "Type": "AspeedFan"
-        },
-        {
-            "Connector": {
-                "Name": "System Fan Connector 3",
-                "Pwm": 1,
-                "Tachs": [
-                    2
-                ]
-            },
-            "Index": 2,
-            "Name": "MB_FAN1_TACH",
-            "Thresholds": [
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 500
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 8500
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11500
-                }
-            ],
-            "Type": "AspeedFan"
-        },
-        {
-            "Class": "fan",
-            "FFGainCoefficient": 1.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": 0.0,
-            "ILimitMax": 0.0,
-            "ILimitMin": 0.0,
-            "Inputs": [
-                "MB_FAN0_TACH"
-            ],
-            "Name": "MB_FAN0_TACH",
-            "OutLimitMax": 100.0,
-            "OutLimitMin": 30.0,
-            "Outputs": [
-                "Pwm 1"
-            ],
-            "PCoefficient": 0.0,
-            "SlewNeg": 0.0,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Pid 1"
-            ]
-        },
-        {
-            "Class": "fan",
-            "FFGainCoefficient": 1.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": 0.0,
-            "ILimitMax": 0.0,
-            "ILimitMin": 0.0,
-            "Inputs": [
-                "MB_FAN1_TACH"
-            ],
-            "Name": "MB_FAN1_TACH",
-            "OutLimitMax": 100.0,
-            "OutLimitMin": 30.0,
-            "Outputs": [
-                "Pwm 2"
-            ],
-            "PCoefficient": 0.0,
-            "SlewNeg": 0.0,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Pid 1"
-            ]
-        },
-        {
-            "Address": "0x4e",
-            "Bus": 6,
-            "Name": "MB_INLET_TEMP",
-            "Name1": "MB_INLET_REMOTE_TEMP",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 40
-                }
-            ],
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4f",
-            "Bus": 6,
-            "Name": "MB_OUTLET_TEMP",
-            "Name1": "MB_OUTLET_REMOTE_TEMP",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 90
-                }
-            ],
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x1f",
-            "Bus": 8,
-            "Name": "MEZZ_SENSOR_REMOTE_TEMP",
-            "Name1": "MEZZ_SENSOR_TEMP",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 95
-                }
-            ],
-            "Type": "TMP421"
-        },
-        {
             "Index": 0,
             "Name": " MB_P3V3",
             "ScaleFactor": 0.1124,
@@ -325,50 +160,144 @@
             "Type": "ADC"
         },
         {
-            "Address": "0x30",
-            "Bus": 0,
-            "CpuID": 1,
-            "Name": "Skylake CPU 1",
+            "Connector": {
+                "Name": "System Fan Connector 1",
+                "Pwm": 0,
+                "Tachs": [
+                    0
+                ]
+            },
+            "Index": 0,
+            "Name": "MB_FAN0_TACH",
             "Thresholds": [
                 {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper critical",
+                    "Direction": "less than",
+                    "Name": "lower critical",
                     "Severity": 1,
-                    "Value": 99
+                    "Value": 500
                 },
                 {
                     "Direction": "greater than",
-                    "Label": "DIMM",
                     "Name": "upper non critical",
                     "Severity": 0,
-                    "Value": 89
+                    "Value": 8500
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 11500
                 }
             ],
-            "Type": "SkylakeCPU"
+            "Type": "AspeedFan"
         },
         {
-            "Address": "0x31",
-            "Bus": 0,
-            "CpuID": 2,
-            "Name": "Skylake CPU 2",
+            "Connector": {
+                "Name": "System Fan Connector 3",
+                "Pwm": 1,
+                "Tachs": [
+                    2
+                ]
+            },
+            "Index": 2,
+            "Name": "MB_FAN1_TACH",
             "Thresholds": [
                 {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper critical",
+                    "Direction": "less than",
+                    "Name": "lower critical",
                     "Severity": 1,
-                    "Value": 99
+                    "Value": 500
                 },
                 {
                     "Direction": "greater than",
-                    "Label": "DIMM",
                     "Name": "upper non critical",
                     "Severity": 0,
-                    "Value": 89
+                    "Value": 8500
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 11500
                 }
             ],
-            "Type": "SkylakeCPU"
+            "Type": "AspeedFan"
+        },
+        {
+            "Direction": "Out",
+            "Index": 33,
+            "Name": "Reset Out",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Both",
+            "Index": 35,
+            "Name": "Power Up",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Out",
+            "Index": 14,
+            "Name": "Power Good",
+            "Polarity": "High",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Out",
+            "Index": 145,
+            "Name": "BMC Ready",
+            "Polarity": "High",
+            "Type": "Gpio"
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "MB_FAN0_TACH"
+            ],
+            "Name": "MB_FAN0_TACH",
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 30.0,
+            "Outputs": [
+                "Pwm 1"
+            ],
+            "PCoefficient": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Pid 1"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "MB_FAN1_TACH"
+            ],
+            "Name": "MB_FAN1_TACH",
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 30.0,
+            "Outputs": [
+                "Pwm 2"
+            ],
+            "PCoefficient": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Pid 1"
+            ]
         },
         {
             "Class": "temp",
@@ -440,32 +369,103 @@
             ]
         },
         {
-            "Direction": "Out",
-            "Index": 33,
-            "Name": "Reset Out",
-            "Polarity": "Low",
-            "Type": "Gpio"
+            "Name": "Pwm 1",
+            "Type": "Pwm"
         },
         {
-            "Direction": "Both",
-            "Index": 35,
-            "Name": "Power Up",
-            "Polarity": "Low",
-            "Type": "Gpio"
+            "Name": "Pwm 2",
+            "Type": "Pwm"
         },
         {
-            "Direction": "Out",
-            "Index": 14,
-            "Name": "Power Good",
-            "Polarity": "High",
-            "Type": "Gpio"
+            "Address": "0x30",
+            "Bus": 0,
+            "CpuID": 1,
+            "Name": "Skylake CPU 1",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 99
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 89
+                }
+            ],
+            "Type": "SkylakeCPU"
         },
         {
-            "Direction": "Out",
-            "Index": 145,
-            "Name": "BMC Ready",
-            "Polarity": "High",
-            "Type": "Gpio"
+            "Address": "0x31",
+            "Bus": 0,
+            "CpuID": 2,
+            "Name": "Skylake CPU 2",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 99
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 89
+                }
+            ],
+            "Type": "SkylakeCPU"
+        },
+        {
+            "Address": "0x4e",
+            "Bus": 6,
+            "Name": "MB_INLET_TEMP",
+            "Name1": "MB_INLET_REMOTE_TEMP",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 40
+                }
+            ],
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4f",
+            "Bus": 6,
+            "Name": "MB_OUTLET_TEMP",
+            "Name1": "MB_OUTLET_REMOTE_TEMP",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 90
+                }
+            ],
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x1f",
+            "Bus": 8,
+            "Name": "MEZZ_SENSOR_REMOTE_TEMP",
+            "Name1": "MEZZ_SENSOR_TEMP",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 95
+                }
+            ],
+            "Type": "TMP421"
         }
     ],
     "Name": "TiogaPass Baseboard",
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 9a14520..88c1dc4 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -2,10 +2,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x5a",
                 "Bus": "$bus",
                 "Name": "PSU3",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -50,12 +56,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 3",
@@ -71,10 +71,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x59",
                 "Bus": "$bus",
                 "Name": "PSU2",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -119,12 +125,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 2",
@@ -140,10 +140,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x58",
                 "Bus": "$bus",
                 "Name": "PSU1",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -188,12 +194,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 1",
@@ -206,4 +206,4 @@
             "SerialNumber": "$BOARD_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index 0f5c5ce..5cde642 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -40,12 +40,12 @@
         }
     ],
     "Name": "Intel Front Panel",
-    "Type": "Board",
     "Probe": [
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})",
         "OR",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2USTOPANEL'})"
     ],
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
         "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index 4471887..0f19b1a 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -2,10 +2,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Solum 1300W PSU 3 FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x5a",
                 "Bus": "$bus",
                 "Name": "PSU3",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -50,12 +56,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1300W PSU 3 FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Solum 1300W PSU 3",
@@ -68,14 +68,19 @@
             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
         }
     },
-
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Solum 1300W PSU 2 FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x59",
                 "Bus": "$bus",
                 "Name": "PSU2",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -120,12 +125,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1300W PSU 2 FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Solum 1300W PSU 2",
@@ -141,10 +140,16 @@
     {
         "Exposes": [
             {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Solum 1300W PSU 1 FRU",
+                "Type": "EEPROM"
+            },
+            {
                 "Address": "0x58",
                 "Bus": "$bus",
                 "Name": "PSU1",
-                "Thresholds" : [
+                "Thresholds": [
                     {
                         "Direction": "greater than",
                         "Label": "pin",
@@ -189,12 +194,6 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1300W PSU 1 FRU",
-                "Type": "EEPROM"
             }
         ],
         "Name": "Solum 1300W PSU 1",
@@ -207,4 +206,4 @@
             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/PSSF162205A.json b/configurations/PSSF162205A.json
index 775bfb6..7808b41 100644
--- a/configurations/PSSF162205A.json
+++ b/configurations/PSSF162205A.json
@@ -2,16 +2,16 @@
     {
         "Exposes": [
             {
-                "Address": "0x60",
-                "Bus": "$bus",
-                "Name": "Solum 1600W PSU 3 Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 1600W PSU 3 FRU",
                 "Type": "EEPROM"
+            },
+            {
+                "Address": "0x60",
+                "Bus": "$bus",
+                "Name": "Solum 1600W PSU 3 Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "Solum 1600W PSU 3",
@@ -27,16 +27,16 @@
     {
         "Exposes": [
             {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "Solum 1600W PSU 2 Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 1600W PSU 2 FRU",
                 "Type": "EEPROM"
+            },
+            {
+                "Address": "0x59",
+                "Bus": "$bus",
+                "Name": "Solum 1600W PSU 2 Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "Solum 1600W PSU 2",
@@ -52,16 +52,16 @@
     {
         "Exposes": [
             {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "Solum 1600W PSU 1 Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 1600W PSU 1 FRU",
                 "Type": "EEPROM"
+            },
+            {
+                "Address": "0x58",
+                "Bus": "$bus",
+                "Name": "Solum 1600W PSU 1 Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "Solum 1600W PSU 1",
@@ -74,4 +74,4 @@
             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/PSSF212201A.json b/configurations/PSSF212201A.json
index dbcdf44..d108ddd 100644
--- a/configurations/PSSF212201A.json
+++ b/configurations/PSSF212201A.json
@@ -2,16 +2,16 @@
     {
         "Exposes": [
             {
-                "Address": "0x60",
-                "Bus": "$bus",
-                "Name": "Solum 2100W PSU 3 Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 2100W PSU 3 FRU",
                 "Type": "EEPROM"
+            },
+            {
+                "Address": "0x60",
+                "Bus": "$bus",
+                "Name": "Solum 2100W PSU 3 Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "Solum 2100W PSU 3",
@@ -27,16 +27,16 @@
     {
         "Exposes": [
             {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "Solum 2100W PSU 2 Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 2100W PSU 2 FRU",
                 "Type": "EEPROM"
+            },
+            {
+                "Address": "0x59",
+                "Bus": "$bus",
+                "Name": "Solum 2100W PSU 2 Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "Solum 2100W PSU 2",
@@ -52,16 +52,16 @@
     {
         "Exposes": [
             {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "Solum 2100W PSU 1 Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 2100W PSU 1 FRU",
                 "Type": "EEPROM"
+            },
+            {
+                "Address": "0x58",
+                "Bus": "$bus",
+                "Name": "Solum 2100W PSU 1 Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "Solum 2100W PSU 1",
@@ -74,4 +74,4 @@
             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 777ad47..74f8189 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -1,30 +1,6 @@
 {
     "Exposes": [
         {
-            "Name": "Pwm 1",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 2",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 3",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 4",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 5",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 6",
-            "Type": "Pwm"
-        },
-        {
             "BindConnector": "1U System Fan connector 1",
             "Index": 0,
             "Name": "Fan 1a",
@@ -265,6 +241,59 @@
             "Type": "AspeedFan"
         },
         {
+            "C1": 92.16,
+            "C2": 107.52,
+            "MaxCFM": 17.5,
+            "Name": "System Airflow",
+            "TachMaxPercent": 100,
+            "TachMinPercent": 20,
+            "Tachs": [
+                "Fan 1a",
+                "Fan 1b",
+                "Fan 2a",
+                "Fan 2b",
+                "Fan 3a",
+                "Fan 3b",
+                "Fan 4a",
+                "Fan 4b",
+                "Fan 5a",
+                "Fan 5b",
+                "Fan 6a",
+                "Fan 6b"
+            ],
+            "Type": "CFMSensor"
+        },
+        {
+            "AlphaF": 4.352,
+            "AlphaS": 0.512,
+            "Name": "Exit Air Temp",
+            "PowerFactorMax": 10,
+            "PowerFactorMin": 4,
+            "QMax": 88,
+            "QMin": 15,
+            "Type": "ExitAirTempSensor"
+        },
+        {
+            "Controllers": [
+                ".*"
+            ],
+            "Name": "Acoustic",
+            "Type": "FanProfile"
+        },
+        {
+            "Controllers": [
+                "Front Panel LCC",
+                "CPU\\d"
+            ],
+            "Name": "Performance",
+            "Type": "FanProfile"
+        },
+        {
+            "AllowedFailures": 1,
+            "Name": "FanRedundancy",
+            "Type": "FanRedundancy"
+        },
+        {
             "Class": "fan",
             "FFGainCoefficient": 1.0,
             "FFOffCoefficient": 0.0,
@@ -427,6 +456,68 @@
             ]
         },
         {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Exit Air Temp"
+            ],
+            "Name": "Exit Air Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 70.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Left",
+                "Right"
+            ]
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Left",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Right",
+            "Type": "Pid.Zone"
+        },
+        {
+            "Name": "Pwm 1",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 2",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 3",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 4",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 5",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 6",
+            "Type": "Pwm"
+        },
+        {
             "Class": "Ceiling",
             "Inputs": [
                 "Front Panel Temp"
@@ -469,107 +560,16 @@
                 "Left",
                 "Right"
             ]
-        },
-        {
-            "FailSafePercent": 100,
-            "MinThermalOutput": 30,
-            "Name": "Left",
-            "Type": "Pid.Zone"
-        },
-        {
-            "FailSafePercent": 100,
-            "MinThermalOutput": 30,
-            "Name": "Right",
-            "Type": "Pid.Zone"
-        },
-        {
-            "AllowedFailures": 1,
-            "Name": "FanRedundancy",
-            "Type": "FanRedundancy"
-        },
-        {
-            "AlphaF": 4.352,
-            "AlphaS": 0.512,
-            "Name": "Exit Air Temp",
-            "PowerFactorMax": 10,
-            "PowerFactorMin": 4,
-            "QMax": 88,
-            "QMin": 15,
-            "Type": "ExitAirTempSensor"
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -1.0,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "Exit Air Temp"
-            ],
-            "Name": "Exit Air Temp",
-            "NegativeHysteresis": 5.0,
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "PositiveHysteresis": 0.0,
-            "SetPoint": 70.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Left",
-                "Right"
-            ]
-        },
-        {
-            "C1": 92.16,
-            "C2": 107.52,
-            "MaxCFM": 17.5,
-            "Name": "System Airflow",
-            "TachMaxPercent": 100,
-            "TachMinPercent": 20,
-            "Tachs": [
-                "Fan 1a",
-                "Fan 1b",
-                "Fan 2a",
-                "Fan 2b",
-                "Fan 3a",
-                "Fan 3b",
-                "Fan 4a",
-                "Fan 4b",
-                "Fan 5a",
-                "Fan 5b",
-                "Fan 6a",
-                "Fan 6b"
-            ],
-            "Type": "CFMSensor"
-        },
-        {
-            "Controllers": [
-                ".*"
-            ],
-            "Name": "Acoustic",
-            "Type": "FanProfile"
-        },
-        {
-            "Controllers": [
-                "Front Panel LCC",
-                "CPU\\d"
-            ],
-            "Name": "Performance",
-            "Type": "FanProfile"
         }
     ],
     "Name": "R1000 Chassis",
-    "Type": "Chassis",
     "Probe": [
         "FOUND('WFP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d'})",
         "MATCH_ONE"
     ],
+    "Type": "Chassis",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "Intel Corporation",
         "Model": "R1000",
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index e5fbc8b..42dac8d 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -1,30 +1,6 @@
 {
     "Exposes": [
         {
-            "Name": "Pwm 1",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 2",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 3",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 4",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 5",
-            "Type": "Pwm"
-        },
-        {
-            "Name": "Pwm 6",
-            "Type": "Pwm"
-        },
-        {
             "BindConnector": "2U System Fan connector 1",
             "BindPresence": "Fan 0 Present",
             "Index": 0,
@@ -157,6 +133,53 @@
             "Type": "AspeedFan"
         },
         {
+            "C1": 53.76,
+            "C2": 53.76,
+            "MaxCFM": 71,
+            "Name": "System Airflow",
+            "TachMaxPercent": 100,
+            "TachMinPercent": 20,
+            "Tachs": [
+                "Fan 1",
+                "Fan 2",
+                "Fan 3",
+                "Fan 4",
+                "Fan 5",
+                "Fan 6"
+            ],
+            "Type": "CFMSensor"
+        },
+        {
+            "AlphaF": 4.352,
+            "AlphaS": 0.512,
+            "Name": "Exit Air Temp",
+            "PowerFactorMax": 12,
+            "PowerFactorMin": 9,
+            "QMax": 165,
+            "QMin": 31,
+            "Type": "ExitAirTempSensor"
+        },
+        {
+            "Controllers": [
+                ".*"
+            ],
+            "Name": "Acoustic",
+            "Type": "FanProfile"
+        },
+        {
+            "Controllers": [
+                "Front Panel LCC",
+                "CPU\\d"
+            ],
+            "Name": "Performance",
+            "Type": "FanProfile"
+        },
+        {
+            "AllowedFailures": 1,
+            "Name": "FanRedundancy",
+            "Type": "FanRedundancy"
+        },
+        {
             "Class": "fan",
             "FFGainCoefficient": 1.0,
             "FFOffCoefficient": 0.0,
@@ -313,6 +336,68 @@
             ]
         },
         {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Exit Air Temp"
+            ],
+            "Name": "Exit Air Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 70.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Left",
+                "Right"
+            ]
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Left",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Right",
+            "Type": "Pid.Zone"
+        },
+        {
+            "Name": "Pwm 1",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 2",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 3",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 4",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 5",
+            "Type": "Pwm"
+        },
+        {
+            "Name": "Pwm 6",
+            "Type": "Pwm"
+        },
+        {
             "Class": "Floor",
             "Inputs": [
                 "Front Panel Temp"
@@ -355,101 +440,16 @@
                 "Left",
                 "Right"
             ]
-        },
-        {
-            "FailSafePercent": 100,
-            "MinThermalOutput": 30,
-            "Name": "Left",
-            "Type": "Pid.Zone"
-        },
-        {
-            "FailSafePercent": 100,
-            "MinThermalOutput": 30,
-            "Name": "Right",
-            "Type": "Pid.Zone"
-        },
-        {
-            "AllowedFailures": 1,
-            "Name": "FanRedundancy",
-            "Type": "FanRedundancy"
-        },
-        {
-            "AlphaF": 4.352,
-            "AlphaS": 0.512,
-            "Name": "Exit Air Temp",
-            "PowerFactorMax": 12,
-            "PowerFactorMin": 9,
-            "QMax": 165,
-            "QMin": 31,
-            "Type": "ExitAirTempSensor"
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -1.0,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "Exit Air Temp"
-            ],
-            "Name": "Exit Air Temp",
-            "NegativeHysteresis": 5.0,
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "PositiveHysteresis": 0.0,
-            "SetPoint": 70.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Left",
-                "Right"
-            ]
-        },
-        {
-            "C1": 53.76,
-            "C2": 53.76,
-            "MaxCFM": 71,
-            "Name": "System Airflow",
-            "TachMaxPercent": 100,
-            "TachMinPercent": 20,
-            "Tachs": [
-                "Fan 1",
-                "Fan 2",
-                "Fan 3",
-                "Fan 4",
-                "Fan 5",
-                "Fan 6"
-            ],
-            "Type": "CFMSensor"
-        },
-        {
-            "Controllers": [
-                ".*"
-            ],
-            "Name": "Acoustic",
-            "Type": "FanProfile"
-        },
-        {
-            "Controllers": [
-                "Front Panel LCC",
-                "CPU\\d"
-            ],
-            "Name": "Performance",
-            "Type": "FanProfile"
         }
     ],
     "Name": "R2000 Chassis",
-    "Type": "Chassis",
     "Probe": [
         "FOUND('WFP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL\\d+RISER\\d'})",
         "MATCH_ONE"
     ],
+    "Type": "Chassis",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "Intel Corporation",
         "Model": "R2000",
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 0f24b7c..11ebfab 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -2,12 +2,6 @@
     {
         "Exposes": [
             {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "SOLUM CO IS162F22 PSU Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU FRU",
@@ -26,6 +20,12 @@
                 "Index": 1,
                 "Name": "PS 1 Fan 2",
                 "Type": "I2CFan"
+            },
+            {
+                "Address": "0x59",
+                "Bus": "$bus",
+                "Name": "SOLUM CO IS162F22 PSU Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "SOLUM CO IS162F22 PSU 2",
@@ -41,12 +41,6 @@
     {
         "Exposes": [
             {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "SOLUM CO IS162F22 PSU Device",
-                "Type": "pmbus"
-            },
-            {
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU FRU",
@@ -65,6 +59,12 @@
                 "Index": 1,
                 "Name": "PS 2 Fan 2",
                 "Type": "I2CFan"
+            },
+            {
+                "Address": "0x58",
+                "Bus": "$bus",
+                "Name": "SOLUM CO IS162F22 PSU Device",
+                "Type": "pmbus"
             }
         ],
         "Name": "SOLUM CO IS162F22 PSU 1",
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 769bee9..79d1da2 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -1,280 +1,6 @@
 {
     "Exposes": [
         {
-            "Name": "4U System Fan connector 1",
-            "Pwm": 1,
-            "Status": "disabled",
-            "Tachs": [
-                1
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U System Fan connector 2",
-            "Pwm": 2,
-            "Status": "disabled",
-            "Tachs": [
-                2
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U System Fan connector 3",
-            "Pwm": 3,
-            "Status": "disabled",
-            "Tachs": [
-                3
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U System Fan connector 4",
-            "Pwm": 4,
-            "Status": "disabled",
-            "Tachs": [
-                4
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U System Fan connector 5",
-            "Pwm": 5,
-            "Status": "disabled",
-            "Tachs": [
-                5
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U System Fan connector 6",
-            "Pwm": 6,
-            "Status": "disabled",
-            "Tachs": [
-                6
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U CPU 1 fan connector",
-            "Pwm": 7,
-            "Status": "disabled",
-            "Tachs": [
-                7
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U CPU 2 fan connector",
-            "Pwm": 8,
-            "Status": "disabled",
-            "Tachs": [
-                8
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "4U System Fan connector 7",
-            "Pwm": 9,
-            "Status": "disabled",
-            "Tachs": [
-                9
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Address": "0x48",
-            "Bus": 6,
-            "Name": "M_2 Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 6,
-            "Name": "Memory VRM Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
-            "Address": "0x4E",
-            "Bus": 6,
-            "Name": "LR Memory Board Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
-            "Address": "0x4C",
-            "Bus": 6,
-            "Name": "BMC Temp",
-            "Name1": "TMP421 Internal Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x49",
-            "Bus": 6,
-            "Name": "CPU VR Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
-            "Address": "0x4D",
-            "Bus": 6,
-            "Name": "Ambient Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
             "Index": 0,
             "Name": "PSU 12 Volt",
             "ScaleFactor": 0.1124,
@@ -787,6 +513,100 @@
             "Type": "ADC"
         },
         {
+            "BindGpioIntrusion": "Chassis Intrusion GPIO",
+            "Class": "Gpio",
+            "Name": "Chassis Intrusion Sensor",
+            "Type": "ChassisIntrusionSensor"
+        },
+        {
+            "Direction": "Input",
+            "Index": 143,
+            "Name": "Chassis Intrusion GPIO",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Name": "4U System Fan connector 1",
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
+                1
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U System Fan connector 2",
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
+                2
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U System Fan connector 3",
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
+                3
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U System Fan connector 4",
+            "Pwm": 4,
+            "Status": "disabled",
+            "Tachs": [
+                4
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U System Fan connector 5",
+            "Pwm": 5,
+            "Status": "disabled",
+            "Tachs": [
+                5
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U System Fan connector 6",
+            "Pwm": 6,
+            "Status": "disabled",
+            "Tachs": [
+                6
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U CPU 1 fan connector",
+            "Pwm": 7,
+            "Status": "disabled",
+            "Tachs": [
+                7
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U CPU 2 fan connector",
+            "Pwm": 8,
+            "Status": "disabled",
+            "Tachs": [
+                8
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "4U System Fan connector 7",
+            "Pwm": 9,
+            "Status": "disabled",
+            "Tachs": [
+                9
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
             "Address": "0x30",
             "CpuID": 1,
             "Name": "Skylake CPU 1",
@@ -831,17 +651,197 @@
             "Type": "SkylakeCPU"
         },
         {
-            "Direction": "Input",
-            "Index": 143,
-            "Polarity": "Low",
-            "Name": "Chassis Intrusion GPIO",
-            "Type": "Gpio"
+            "Address": "0x4C",
+            "Bus": 6,
+            "Name": "BMC Temp",
+            "Name1": "TMP421 Internal Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP421"
         },
         {
-            "Class": "Gpio",
-            "BindGpioIntrusion": "Chassis Intrusion GPIO",
-            "Name": "Chassis Intrusion Sensor",
-            "Type": "ChassisIntrusionSensor"
+            "Address": "0x48",
+            "Bus": 6,
+            "Name": "M_2 Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 6,
+            "Name": "Memory VRM Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x4E",
+            "Bus": 6,
+            "Name": "LR Memory Board Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x49",
+            "Bus": 6,
+            "Name": "CPU VR Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x4D",
+            "Bus": 6,
+            "Name": "Ambient Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
         }
     ],
     "Name": "STP Baseboard",
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index d8f16f1..1bb365f 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,152 +1,6 @@
 {
     "Exposes": [
         {
-            "Name": "1U System Fan connector 1",
-            "Pwm": 0,
-            "Status": "disabled",
-            "Tachs": [
-                0,
-                1
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "1U System Fan connector 2",
-            "Pwm": 1,
-            "Status": "disabled",
-            "Tachs": [
-                2,
-                3
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "1U System Fan connector 3",
-            "Pwm": 2,
-            "Status": "disabled",
-            "Tachs": [
-                4,
-                5
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "1U System Fan connector 4",
-            "Pwm": 3,
-            "Status": "disabled",
-            "Tachs": [
-                6,
-                7
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "1U System Fan connector 5",
-            "Pwm": 4,
-            "Status": "disabled",
-            "Tachs": [
-                8,
-                9
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "1U System Fan connector 6",
-            "Pwm": 5,
-            "Status": "disabled",
-            "Tachs": [
-                10,
-                11
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "2U System Fan connector 1",
-            "Pwm": 0,
-            "Status": "disabled",
-            "Tachs": [
-                0
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "2U System Fan connector 2",
-            "Pwm": 1,
-            "Status": "disabled",
-            "Tachs": [
-                2
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "2U System Fan connector 3",
-            "Pwm": 2,
-            "Status": "disabled",
-            "Tachs": [
-                4
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "2U System Fan connector 4",
-            "Pwm": 3,
-            "Status": "disabled",
-            "Tachs": [
-                6
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "2U System Fan connector 5",
-            "Pwm": 4,
-            "Status": "disabled",
-            "Tachs": [
-                8
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "2U System Fan connector 6",
-            "Pwm": 5,
-            "Status": "disabled",
-            "Tachs": [
-                10
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Address": "0x4A",
-            "Bus": 6,
-            "Name": "BMC Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
             "Index": 0,
             "Name": "Baseboard 12 Volt",
             "PowerState": "On",
@@ -180,56 +34,6 @@
             "Type": "ADC"
         },
         {
-            "Name": "CPU 1 Fan Connector",
-            "Pwm": 7,
-            "Status": "disabled",
-            "Tachs": [
-                13
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "CPU 2 Fan Connector",
-            "Pwm": 8,
-            "Status": "disabled",
-            "Tachs": [
-                14
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Address": "0x49",
-            "Bus": 6,
-            "Name": "Left Rear Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
             "Index": 4,
             "Name": "P0V83_LAN_AUX",
             "Thresholds": [
@@ -389,9 +193,9 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": 208,
             "Index": 7,
             "Name": "P3VBAT",
-            "BridgeGpio":208,
             "ScaleFactor": 0.3333,
             "Thresholds": [
                 {
@@ -711,199 +515,6 @@
             "Type": "ADC"
         },
         {
-            "Address": "0x4D",
-            "Bus": 6,
-            "Name": "Right Rear Board Temp",
-            "Name1": "Right Rear TMP421 Internal Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x48",
-            "Bus": 6,
-            "Name": "Voltage Regulator 1 Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
-            "Address": "0x4B",
-            "Bus": 6,
-            "Name": "Voltage Regulator 2 Temp",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 115
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 110
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "TMP75"
-        },
-        {
-            "Address": "0x30",
-            "Bus": 0,
-            "CpuID": 1,
-            "Name": "Skylake CPU 1",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89
-                }
-            ],
-            "Type": "SkylakeCPU"
-        },
-        {
-            "Address": "0x31",
-            "Bus": 0,
-            "CpuID": 2,
-            "Name": "Skylake CPU 2",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 99
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "DIMM",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 89
-                }
-            ],
-            "Type": "SkylakeCPU"
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -0.1,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "Core \\d+ CPU1"
-            ],
-            "Name": "CPU1",
-            "NegativeHysteresis": 5.0,
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "PositiveHysteresis": 0.0,
-            "SetPoint": 45.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Left"
-            ]
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -0.1,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "Core \\d+ CPU2"
-            ],
-            "Name": "CPU2",
-            "NegativeHysteresis": 5.0,
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "PositiveHysteresis": 0.0,
-            "SetPoint": 45.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Right"
-            ]
-        },
-        {
             "Direction": "Input",
             "Index": 32,
             "Name": "Reset Button",
@@ -1472,104 +1083,136 @@
             "Type": "Gpio"
         },
         {
-            "FaultIndex": 0,
-            "FaultType": "faultMemory",
-            "LedGpioPins": [
-                240,
-                241,
-                242,
-                243,
-                244,
-                245,
-                246,
-                247,
-                248,
-                249,
-                250,
-                251
+            "Name": "1U System Fan connector 1",
+            "Pwm": 0,
+            "Status": "disabled",
+            "Tachs": [
+                0,
+                1
             ],
-            "Name": "CPU1 DIMM FAULT LEDs",
-            "Type": "LedFault"
+            "Type": "IntelFanConnector"
         },
         {
-            "FaultIndex": 1,
-            "FaultType": "faultMemory",
-            "LedGpioPins": [
-                260,
-                261,
-                262,
-                263,
-                264,
-                265,
-                266,
-                267,
-                268,
-                269,
-                270,
-                271
+            "Name": "1U System Fan connector 2",
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
+                2,
+                3
             ],
-            "Name": "CPU2 DIMM FAULT LEDs",
-            "Type": "LedFault"
+            "Type": "IntelFanConnector"
         },
         {
-            "FaultIndex": 2,
-            "FaultType": "faultMemory",
-            "LedGpioPins": [
-                273,
-                273,
-                274,
-                275,
-                276,
-                277,
-                278,
-                279,
-                280,
-                281,
-                282,
-                283
+            "Name": "1U System Fan connector 3",
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
+                4,
+                5
             ],
-            "Name": "CPU3 DIMM FAULT LEDs",
-            "Type": "LedFault"
+            "Type": "IntelFanConnector"
         },
         {
-            "FaultIndex": 3,
-            "FaultType": "faultMemory",
-            "LedGpioPins": [
-                284,
-                285,
-                286,
-                287,
-                288,
-                289,
-                290,
-                291,
-                292,
-                293,
-                294,
-                295
+            "Name": "1U System Fan connector 4",
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
+                6,
+                7
             ],
-            "Name": "CPU4 DIMM FAULT LEDs",
-            "Type": "LedFault"
+            "Type": "IntelFanConnector"
         },
         {
-            "FaultIndex": 0,
-            "FaultType": "faultFan",
-            "LedGpioPins": [
-                252,
-                253,
-                254,
-                255,
-                256,
-                257,
-                258,
-                259
+            "Name": "1U System Fan connector 5",
+            "Pwm": 4,
+            "Status": "disabled",
+            "Tachs": [
+                8,
+                9
             ],
-            "Name": "Fan FAULT LEDs",
-            "Type": "LedFault"
+            "Type": "IntelFanConnector"
         },
         {
-            "Name": "Node Manager Sensor",
-            "Type": "NMSensor"
+            "Name": "1U System Fan connector 6",
+            "Pwm": 5,
+            "Status": "disabled",
+            "Tachs": [
+                10,
+                11
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "2U System Fan connector 1",
+            "Pwm": 0,
+            "Status": "disabled",
+            "Tachs": [
+                0
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "2U System Fan connector 2",
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
+                2
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "2U System Fan connector 3",
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
+                4
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "2U System Fan connector 4",
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
+                6
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "2U System Fan connector 5",
+            "Pwm": 4,
+            "Status": "disabled",
+            "Tachs": [
+                8
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "2U System Fan connector 6",
+            "Pwm": 5,
+            "Status": "disabled",
+            "Tachs": [
+                10
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "CPU 1 Fan Connector",
+            "Pwm": 7,
+            "Status": "disabled",
+            "Tachs": [
+                13
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "Name": "CPU 2 Fan Connector",
+            "Pwm": 8,
+            "Status": "disabled",
+            "Tachs": [
+                14
+            ],
+            "Type": "IntelFanConnector"
         },
         {
             "Address": "0x8",
@@ -1893,6 +1536,118 @@
             "Type": "IpmbSensor"
         },
         {
+            "FaultIndex": 0,
+            "FaultType": "faultMemory",
+            "LedGpioPins": [
+                240,
+                241,
+                242,
+                243,
+                244,
+                245,
+                246,
+                247,
+                248,
+                249,
+                250,
+                251
+            ],
+            "Name": "CPU1 DIMM FAULT LEDs",
+            "Type": "LedFault"
+        },
+        {
+            "FaultIndex": 1,
+            "FaultType": "faultMemory",
+            "LedGpioPins": [
+                260,
+                261,
+                262,
+                263,
+                264,
+                265,
+                266,
+                267,
+                268,
+                269,
+                270,
+                271
+            ],
+            "Name": "CPU2 DIMM FAULT LEDs",
+            "Type": "LedFault"
+        },
+        {
+            "FaultIndex": 2,
+            "FaultType": "faultMemory",
+            "LedGpioPins": [
+                273,
+                273,
+                274,
+                275,
+                276,
+                277,
+                278,
+                279,
+                280,
+                281,
+                282,
+                283
+            ],
+            "Name": "CPU3 DIMM FAULT LEDs",
+            "Type": "LedFault"
+        },
+        {
+            "FaultIndex": 3,
+            "FaultType": "faultMemory",
+            "LedGpioPins": [
+                284,
+                285,
+                286,
+                287,
+                288,
+                289,
+                290,
+                291,
+                292,
+                293,
+                294,
+                295
+            ],
+            "Name": "CPU4 DIMM FAULT LEDs",
+            "Type": "LedFault"
+        },
+        {
+            "FaultIndex": 0,
+            "FaultType": "faultFan",
+            "LedGpioPins": [
+                252,
+                253,
+                254,
+                255,
+                256,
+                257,
+                258,
+                259
+            ],
+            "Name": "Fan FAULT LEDs",
+            "Type": "LedFault"
+        },
+        {
+            "Name": "Node Manager Sensor",
+            "Type": "NMSensor"
+        },
+        {
+            "Address": "0x71",
+            "Bus": 2,
+            "ChannelNames": [
+                "M2_Slot1",
+                "M2_Slot2",
+                "",
+                ""
+            ],
+            "Name": "M.2 Mux",
+            "Type": "PCA9543Mux"
+        },
+        {
             "Address": "0x70",
             "Bus": 4,
             "ChannelNames": [
@@ -1965,16 +1720,261 @@
             "Type": "PCA9546Mux"
         },
         {
-            "Address": "0x71",
-            "Bus": 2,
-            "ChannelNames": [
-                "M2_Slot1",
-                "M2_Slot2",
-                "",
-                ""
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -0.1,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Core \\d+ CPU1"
             ],
-            "Name": "M.2 Mux",
-            "Type": "PCA9543Mux"
+            "Name": "CPU1",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 45.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Left"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -0.1,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Core \\d+ CPU2"
+            ],
+            "Name": "CPU2",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 45.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Right"
+            ]
+        },
+        {
+            "Address": "0x30",
+            "Bus": 0,
+            "CpuID": 1,
+            "Name": "Skylake CPU 1",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 99
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 89
+                }
+            ],
+            "Type": "SkylakeCPU"
+        },
+        {
+            "Address": "0x31",
+            "Bus": 0,
+            "CpuID": 2,
+            "Name": "Skylake CPU 2",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 99
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "DIMM",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 89
+                }
+            ],
+            "Type": "SkylakeCPU"
+        },
+        {
+            "Address": "0x4D",
+            "Bus": 6,
+            "Name": "Right Rear Board Temp",
+            "Name1": "Right Rear TMP421 Internal Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4A",
+            "Bus": 6,
+            "Name": "BMC Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x49",
+            "Bus": 6,
+            "Name": "Left Rear Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x48",
+            "Bus": 6,
+            "Name": "Voltage Regulator 1 Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
+        },
+        {
+            "Address": "0x4B",
+            "Bus": 6,
+            "Name": "Voltage Regulator 2 Temp",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "TMP75"
         }
     ],
     "Name": "WFP Baseboard",
diff --git a/scripts/autojson.py b/scripts/autojson.py
index e4f2818..582631d 100755
--- a/scripts/autojson.py
+++ b/scripts/autojson.py
@@ -6,9 +6,15 @@
 from sys import argv
 
 for file in argv[1:]:
-   print("formatting file {}".format(file))
-   with open(file) as f:
-      j = json.load(f)
+    print("formatting file {}".format(file))
+    with open(file) as f:
+        j = json.load(f)
 
-   with open(file, 'w') as f:
-      f.write(json.dumps(j, indent=4, sort_keys=True, separators=(',', ': ')))
+    if isinstance(j, list):
+        for item in j:
+            item["Exposes"] = sorted(item["Exposes"], key=lambda k: k["Type"])
+    else:
+        j["Exposes"] = sorted(j["Exposes"], key=lambda k: k["Type"])
+
+    with open(file, 'w') as f:
+        f.write(json.dumps(j, indent=4, sort_keys=True, separators=(',', ': ')))