diff --git a/configurations/ASRock_E3C246D4I.json b/configurations/ASRock_E3C246D4I.json
index e9d79fa..b7a73c4 100644
--- a/configurations/ASRock_E3C246D4I.json
+++ b/configurations/ASRock_E3C246D4I.json
@@ -1,28 +1,6 @@
 {
     "Exposes": [
         {
-            "Address": "0x4c",
-            "Bus": 1,
-            "Name": "MB",
-            "Name1": "MB_alt",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 55
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 54
-                }
-            ],
-            "Type": "W83773G"
-        },
-
-        {
             "Index": 0,
             "Name": "3.3V Standby",
             "ScaleFactor": 0.5349,
@@ -63,7 +41,7 @@
                     "Direction": "greater than",
                     "Name": "upper critical",
                     "Severity": 1,
-                    "Value": 5.50
+                    "Value": 5.5
                 },
                 {
                     "Direction": "greater than",
@@ -81,7 +59,7 @@
                     "Direction": "less than",
                     "Name": "lower critical",
                     "Severity": 1,
-                    "Value": 4.50
+                    "Value": 4.5
                 }
             ],
             "Type": "ADC"
@@ -259,7 +237,7 @@
                     "Direction": "less than",
                     "Name": "lower non critical",
                     "Severity": 0,
-                    "Value": 2.40
+                    "Value": 2.4
                 },
                 {
                     "Direction": "less than",
@@ -271,10 +249,6 @@
             "Type": "ADC"
         },
         {
-            "Index": 9,
-            "Name": "VBAT",
-            "ScaleFactor": 0.3435,
-            "PollRate": 43200,
             "BridgeGpio": [
                 {
                     "Name": "HWM_BAT_EN",
@@ -282,30 +256,34 @@
                     "SetupTime": 0.5
                 }
             ],
+            "Index": 9,
+            "Name": "VBAT",
+            "PollRate": 43200,
+            "ScaleFactor": 0.3435,
             "Thresholds": [
                 {
                     "Direction": "greater than",
                     "Name": "upper critical",
                     "Severity": 1,
-                    "Value": 3.30
+                    "Value": 3.3
                 },
                 {
                     "Direction": "greater than",
                     "Name": "upper non critical",
                     "Severity": 0,
-                    "Value": 3.20
+                    "Value": 3.2
                 },
                 {
                     "Direction": "less than",
                     "Name": "lower non critical",
                     "Severity": 0,
-                    "Value": 2.80
+                    "Value": 2.8
                 },
                 {
                     "Direction": "less than",
                     "Name": "lower critical",
                     "Severity": 1,
-                    "Value": 2.70
+                    "Value": 2.7
                 }
             ],
             "Type": "ADC"
@@ -353,25 +331,25 @@
                     "Direction": "greater than",
                     "Name": "upper critical",
                     "Severity": 1,
-                    "Value": 5.50
+                    "Value": 5.5
                 },
                 {
                     "Direction": "greater than",
                     "Name": "upper non critical",
                     "Severity": 0,
-                    "Value": 5.30
+                    "Value": 5.3
                 },
                 {
                     "Direction": "less than",
                     "Name": "lower non critical",
                     "Severity": 0,
-                    "Value": 4.70
+                    "Value": 4.7
                 },
                 {
                     "Direction": "less than",
                     "Name": "lower critical",
                     "Severity": 1,
-                    "Value": 4.50
+                    "Value": 4.5
                 }
             ],
             "Type": "ADC"
@@ -386,30 +364,50 @@
                     "Direction": "greater than",
                     "Name": "upper critical",
                     "Severity": 1,
-                    "Value": 13.20
+                    "Value": 13.2
                 },
                 {
                     "Direction": "greater than",
                     "Name": "upper non critical",
                     "Severity": 0,
-                    "Value": 12.80
+                    "Value": 12.8
                 },
                 {
                     "Direction": "less than",
                     "Name": "lower non critical",
                     "Severity": 0,
-                    "Value": 11.20
+                    "Value": 11.2
                 },
                 {
                     "Direction": "less than",
                     "Name": "lower critical",
                     "Severity": 1,
-                    "Value": 10.80
+                    "Value": 10.8
                 }
             ],
             "Type": "ADC"
         },
-
+        {
+            "Address": "0x4c",
+            "Bus": 1,
+            "Name": "MB",
+            "Name1": "MB_alt",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 55
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 54
+                }
+            ],
+            "Type": "W83773G"
+        },
         {
             "Address": "0x30",
             "Bus": 0,
diff --git a/configurations/Bletchley.json b/configurations/Bletchley.json
index ebc2c32..96e6c30 100644
--- a/configurations/Bletchley.json
+++ b/configurations/Bletchley.json
@@ -343,32 +343,6 @@
             "Type": "ADC"
         },
         {
-            "Address": "0x4C",
-            "Bus": 12,
-            "Name": "MB_U73_THERM_LOCAL",
-            "Name1": "MB_U73_THERM_REMOTE",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4D",
-            "Bus": 12,
-            "Name": "MB_U72_THERM_LOCAL",
-            "Name1": "MB_U72_THERM_REMOTE",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 9,
-            "Name": "MB_U402_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 10,
-            "Name": "MB_U19_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
             "Address": "0x11",
             "Bus": 12,
             "Labels": [
@@ -381,42 +355,6 @@
             "Type": "ADM1278"
         },
         {
-            "Address": "0x4F",
-            "Bus": 0,
-            "Name": "SLED1_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 1,
-            "Name": "SLED2_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 2,
-            "Name": "SLED3_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 3,
-            "Name": "SLED4_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 4,
-            "Name": "SLED5_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
-            "Address": "0x4F",
-            "Bus": 5,
-            "Name": "SLED6_THERM_LOCAL",
-            "Type": "TMP421"
-        },
-        {
             "Address": "0x40",
             "Bus": 0,
             "Labels": [
@@ -487,6 +425,68 @@
             ],
             "Name": "SLED6_HSC",
             "Type": "MP5023"
+        },
+        {
+            "Address": "0x4C",
+            "Bus": 12,
+            "Name": "MB_U73_THERM_LOCAL",
+            "Name1": "MB_U73_THERM_REMOTE",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4D",
+            "Bus": 12,
+            "Name": "MB_U72_THERM_LOCAL",
+            "Name1": "MB_U72_THERM_REMOTE",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 9,
+            "Name": "MB_U402_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 10,
+            "Name": "MB_U19_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 0,
+            "Name": "SLED1_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 1,
+            "Name": "SLED2_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 2,
+            "Name": "SLED3_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 3,
+            "Name": "SLED4_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 4,
+            "Name": "SLED5_THERM_LOCAL",
+            "Type": "TMP421"
+        },
+        {
+            "Address": "0x4F",
+            "Bus": 5,
+            "Name": "SLED6_THERM_LOCAL",
+            "Type": "TMP421"
         }
     ],
     "Name": "Bletchley Baseboard",
diff --git a/configurations/Blyth.json b/configurations/Blyth.json
index 5c744d0..8f4e956 100644
--- a/configurations/Blyth.json
+++ b/configurations/Blyth.json
@@ -1,18 +1,6 @@
 {
     "Exposes": [
         {
-            "Address": "0x40",
-            "Bus": 7,
-            "Name": "Ambient 2 Temp",
-            "Type": "SI7020"
-        },
-        {
-            "Address": "0x48",
-            "Bus": 7,
-            "Name": "Ambient 0 Temp",
-            "Type": "TMP75"
-        },
-        {
             "Address": "0x76",
             "Bus": 7,
             "Name": "Ambient 1 Temp",
@@ -52,6 +40,18 @@
             ],
             "Type": "ModifiedMedian",
             "Units": "DegreesC"
+        },
+        {
+            "Address": "0x40",
+            "Bus": 7,
+            "Name": "Ambient 2 Temp",
+            "Type": "SI7020"
+        },
+        {
+            "Address": "0x48",
+            "Bus": 7,
+            "Name": "Ambient 0 Temp",
+            "Type": "TMP75"
         }
     ],
     "Name": "Blyth Panel",
diff --git a/configurations/FBTP.json b/configurations/FBTP.json
index ebc0544..f271b67 100644
--- a/configurations/FBTP.json
+++ b/configurations/FBTP.json
@@ -257,6 +257,178 @@
             "Type": "Gpio"
         },
         {
+            "Address": "0x40",
+            "Bus": 19,
+            "CurrScaleFactor": 200,
+            "Labels": [
+                "in1",
+                "curr1",
+                "power1"
+            ],
+            "Name": "MB_C2_P12V_INA230",
+            "PowerScaleFactor": 200000,
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "in1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 12.96
+                },
+                {
+                    "Direction": "less than",
+                    "Label": "in1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 11.04
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "curr1",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 5.5
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 75.0
+                }
+            ],
+            "Type": "INA230"
+        },
+        {
+            "Address": "0x41",
+            "Bus": 19,
+            "CurrScaleFactor": 200,
+            "Labels": [
+                "in1",
+                "curr1",
+                "power1"
+            ],
+            "Name": "MB_C3_P12V_INA230",
+            "PowerScaleFactor": 200000,
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "in1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 12.96
+                },
+                {
+                    "Direction": "less than",
+                    "Label": "in1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 11.04
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "curr1",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 5.5
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 75.0
+                }
+            ],
+            "Type": "INA230"
+        },
+        {
+            "Address": "0x44",
+            "Bus": 19,
+            "CurrScaleFactor": 200,
+            "Labels": [
+                "in1",
+                "curr1",
+                "power1"
+            ],
+            "Name": "MB_C4_P12V_INA230",
+            "PowerScaleFactor": 200000,
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "in1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 12.96
+                },
+                {
+                    "Direction": "less than",
+                    "Label": "in1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 11.04
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "curr1",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 5.5
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 75.0
+                }
+            ],
+            "Type": "INA230"
+        },
+        {
+            "Address": "0x45",
+            "Bus": 19,
+            "CurrScaleFactor": 200,
+            "Labels": [
+                "in1",
+                "curr1",
+                "power1"
+            ],
+            "Name": "MB_CONN_P12V_INA230",
+            "PowerScaleFactor": 200000,
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Label": "in1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 12.96
+                },
+                {
+                    "Direction": "less than",
+                    "Label": "in1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 11.04
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "curr1",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 20.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 250.0
+                }
+            ],
+            "Type": "INA230"
+        },
+        {
             "Address": "0x08",
             "Class": "METemp",
             "Name": "MB_PCH_TEMP",
@@ -1394,178 +1566,6 @@
                 }
             ],
             "Type": "pmbus"
-        },
-        {
-            "Address": "0x40",
-            "Bus": 19,
-            "CurrScaleFactor": 200,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1"
-            ],
-            "Name": "MB_C2_P12V_INA230",
-            "PowerScaleFactor": 200000,
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 12.96
-                },
-                {
-                    "Direction": "less than",
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 11.04
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 5.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 75.0
-                }
-            ],
-            "Type": "INA230"
-        },
-        {
-            "Address": "0x41",
-            "Bus": 19,
-            "CurrScaleFactor": 200,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1"
-            ],
-            "Name": "MB_C3_P12V_INA230",
-            "PowerScaleFactor": 200000,
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 12.96
-                },
-                {
-                    "Direction": "less than",
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 11.04
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 5.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 75.0
-                }
-            ],
-            "Type": "INA230"
-        },
-        {
-            "Address": "0x44",
-            "Bus": 19,
-            "CurrScaleFactor": 200,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1"
-            ],
-            "Name": "MB_C4_P12V_INA230",
-            "PowerScaleFactor": 200000,
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 12.96
-                },
-                {
-                    "Direction": "less than",
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 11.04
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 5.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 75.0
-                }
-            ],
-            "Type": "INA230"
-        },
-        {
-            "Address": "0x45",
-            "Bus": 19,
-            "CurrScaleFactor": 200,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1"
-            ],
-            "Name": "MB_CONN_P12V_INA230",
-            "PowerScaleFactor": 200000,
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 12.96
-                },
-                {
-                    "Direction": "less than",
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 11.04
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 20.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 250.0
-                }
-            ],
-            "Type": "INA230"
         }
     ],
     "Name": "TiogaPass Baseboard",
diff --git a/configurations/Kudo_BMC.json b/configurations/Kudo_BMC.json
index db3dec8..4178621 100644
--- a/configurations/Kudo_BMC.json
+++ b/configurations/Kudo_BMC.json
@@ -1,219 +1,218 @@
 [
     {
-        "Exposes":
-        [
-           {
-              "Address":"$address",
-              "Bus":"$bus",
-              "Name":"BMC FRU",
-              "Type":"EEPROM"
-           },
-           {
-              "Address":"0x59",
-              "Bus":14,
-              "PowerState":"Always",
-              "Name":"BMC_MAX34451",
-              "Labels":[
-                 "vout1",
-                 "vout2",
-                 "vout3",
-                 "vout5",
-                 "vout6",
-                 "vout10"
-              ],
-              "Name1":"DC_P1V8",
-              "Name2":"DC_P2V5",
-              "Name3":"DC_P1V2",
-              "Name4":"DC_3V3_STBY",
-              "Name5":"DC_P1V175",
-              "Name6":"DC_PVTT",
-              "vout1_Max":4,
-              "vout2_Max":3.5,
-              "vout3_Max":2.5,
-              "vout5_Max":5.8,
-              "vout6_Max":3,
-              "vout10_Max":4,
-              "Thresholds":[
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"vout2",
-                    "Severity":1,
-                    "Value":2.754
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"vout2",
-                    "Severity":0,
-                    "Value":2.617
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower non critical",
-                    "Label":"vout2",
-                    "Severity":0,
-                    "Value":2.4
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower critical",
-                    "Label":"vout2",
-                    "Severity":1,
-                    "Value":2.37
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"vout3",
-                    "Severity":1,
-                    "Value":1.313
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"vout3",
-                    "Severity":0,
-                    "Value":1.215
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower non critical",
-                    "Label":"vout3",
-                    "Severity":0,
-                    "Value":1.176
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower critical",
-                    "Label":"vout3",
-                    "Severity":1,
-                    "Value":1.147
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"vout5",
-                    "Severity":1,
-                    "Value":3.609
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"vout5",
-                    "Severity":0,
-                    "Value":3.382
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower non critical",
-                    "Label":"vout5",
-                    "Severity":0,
-                    "Value":3.2
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower critical",
-                    "Label":"vout5",
-                    "Severity":1,
-                    "Value":3.155
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"vout6",
-                    "Severity":1,
-                    "Value":1.286
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"vout6",
-                    "Severity":0,
-                    "Value":1.227
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower non critical",
-                    "Label":"vout6",
-                    "Severity":0,
-                    "Value":1.121
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower critical",
-                    "Label":"vout6",
-                    "Severity":1,
-                    "Value":1.121
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"vout1",
-                    "Severity":1,
-                    "Value":1.978
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"vout1",
-                    "Severity":0,
-                    "Value":1.884
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower non critical",
-                    "Label":"vout1",
-                    "Severity":0,
-                    "Value":1.711
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower critical",
-                    "Label":"vout1",
-                    "Severity":1,
-                    "Value":1.633
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"vout10",
-                    "Severity":1,
-                    "Value":0.659
-                 },
-                 {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"vout10",
-                    "Severity":0,
-                    "Value":0.628
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower non critical",
-                    "Label":"vout10",
-                    "Severity":0,
-                    "Value":0.581
-                 },
-                 {
-                    "Direction":"less than",
-                    "Name":"lower critical",
-                    "Label":"vout10",
-                    "Severity":1,
-                    "Value":0.55
-                 }
-              ],
-              "Type":"MAX34451"
-           }
+        "Exposes": [
+            {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "BMC FRU",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x59",
+                "Bus": 14,
+                "Labels": [
+                    "vout1",
+                    "vout2",
+                    "vout3",
+                    "vout5",
+                    "vout6",
+                    "vout10"
+                ],
+                "Name": "BMC_MAX34451",
+                "Name1": "DC_P1V8",
+                "Name2": "DC_P2V5",
+                "Name3": "DC_P1V2",
+                "Name4": "DC_3V3_STBY",
+                "Name5": "DC_P1V175",
+                "Name6": "DC_PVTT",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout2",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 2.754
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout2",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 2.617
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout2",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 2.4
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout2",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 2.37
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout3",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 1.313
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout3",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 1.215
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout3",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 1.176
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout3",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 1.147
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout5",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 3.609
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout5",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 3.382
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout5",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 3.2
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout5",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 3.155
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout6",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 1.286
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout6",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 1.227
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout6",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 1.121
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout6",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 1.121
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 1.978
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout1",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 1.884
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout1",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 1.711
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 1.633
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout10",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 0.659
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "vout10",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 0.628
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout10",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 0.581
+                    },
+                    {
+                        "Direction": "less than",
+                        "Label": "vout10",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0.55
+                    }
+                ],
+                "Type": "MAX34451",
+                "vout10_Max": 4,
+                "vout1_Max": 4,
+                "vout2_Max": 3.5,
+                "vout3_Max": 2.5,
+                "vout5_Max": 5.8,
+                "vout6_Max": 3
+            }
         ],
-        "Name":"Kudo_BMC",
-        "Probe":"xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': '1093695-*'})",
-        "Type":"Board",
+        "Name": "Kudo_BMC",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': '1093695-*'})",
+        "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
-           "Manufacturer":"$BOARD_MANUFACTURER",
-           "Model":"$BOARD_PRODUCT_NAME",
-           "PartNumber":"$BOARD_PART_NUMBER",
-           "SerialNumber":"$BOARD_SERIAL_NUMBER"
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER"
         }
     }
-]
\ No newline at end of file
+]
diff --git a/configurations/Kudo_Motherboard.json b/configurations/Kudo_Motherboard.json
index 138480b..1c51bb6 100644
--- a/configurations/Kudo_Motherboard.json
+++ b/configurations/Kudo_Motherboard.json
@@ -1,169 +1,168 @@
 [
     {
-       "Exposes":
-       [
-          {
-             "Address":"$address",
-             "Bus":"$bus",
-             "Name":"MB FRU",
-             "Type":"EEPROM"
-          },
-          {
-             "Address":"0x48",
-             "Bus":42,
-             "Name":"Mobo_M2_ZONE_T",
-             "Thresholds":[
-                {
-                   "Direction":"greater than",
-                   "Name":"upper critical",
-                   "Severity":1,
-                   "Value":70
-                },
-                {
-                   "Direction":"greater than",
-                   "Name":"upper non critical",
-                   "Severity":0,
-                   "Value":60
-                }
-             ],
-             "Type":"TMP75"
-          },
-          {
-             "Address":"0x49",
-             "Bus":43,
-             "Name":"Mobo_BATT_ZONE_T",
-             "Thresholds":[
-                {
-                   "Direction":"greater than",
-                   "Name":"upper critical",
-                   "Severity":1,
-                   "Value":70
-                },
-                {
-                   "Direction":"greater than",
-                   "Name":"upper non critical",
-                   "Severity":0,
-                   "Value":60
-                }
-             ],
-             "Type":"TMP75"
-          },
-          {
-             "Address":"0x5c",
-             "Bus":20,
-             "Name":"Mobo_INLET1_T",
-             "Thresholds":[
-                {
-                   "Direction":"greater than",
-                   "Name":"upper critical",
-                   "Severity":1,
-                   "Value":46
-                },
-                {
-                   "Direction":"greater than",
-                   "Name":"upper non critical",
-                   "Severity":0,
-                   "Value":42
-                }
-             ],
-             "Type":"TMP75"
-          },
-          {
-             "Address":"0x5c",
-             "Bus":21,
-             "Name":"Mobo_OUTLET1_T",
-             "Thresholds":[
-                {
-                   "Direction":"greater than",
-                   "Name":"upper critical",
-                   "Severity":1,
-                   "Value":85
-                },
-                {
-                   "Direction":"greater than",
-                   "Name":"upper non critical",
-                   "Severity":0,
-                   "Value":80
-                }
-             ],
-             "Type":"TMP75"
-          },
-          {
-             "Address":"0x5c",
-             "Bus":22,
-             "Name":"Mobo_OUTLET2_T",
-             "Thresholds":[
-                {
-                   "Direction":"greater than",
-                   "Name":"upper critical",
-                   "Severity":1,
-                   "Value":85
-                },
-                {
-                   "Direction":"greater than",
-                   "Name":"upper non critical",
-                   "Severity":0,
-                   "Value":80
-                }
-             ],
-             "Type":"TMP75"
-          },
-          {
-             "Address":"0x5c",
-             "Bus":23,
-             "Name":"Mobo_OUTLET3_T",
-             "Thresholds":[
-                {
-                   "Direction":"greater than",
-                   "Name":"upper critical",
-                   "Severity":1,
-                   "Value":85
-                },
-                {
-                   "Direction":"greater than",
-                   "Name":"upper non critical",
-                   "Severity":0,
-                   "Value":80
-                }
-             ],
-             "Type":"TMP75"
-          },
-          {
-            "Address":"0x74",
-            "Bus":26,
-            "Name":"Mobo_STB_T",
-            "Labels":[
-                "temp1"
-            ],
-            "Name1":"Mobo_STB_T",
-            "MaxValue" : 255,
-            "Thresholds":[
-                {
-                    "Direction":"greater than",
-                    "Name":"upper critical",
-                    "Label":"temp1",
-                    "Severity":1,
-                    "Value":105
-                },
-                {
-                    "Direction":"greater than",
-                    "Name":"upper non critical",
-                    "Label":"temp1",
-                    "Severity":0,
-                    "Value":100
-                }
-            ],
-            "Type":"pmbus"
-          }
-       ],
-       "Name":"Kudo_Motherboard",
-       "Probe":"xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': '1103638-*'})",
-       "Type":"Board",
-       "xyz.openbmc_project.Inventory.Decorator.Asset": {
-          "Manufacturer":"$BOARD_MANUFACTURER",
-          "Model":"$BOARD_PRODUCT_NAME",
-          "PartNumber":"$BOARD_PART_NUMBER",
-          "SerialNumber":"$BOARD_SERIAL_NUMBER"
-       }
+        "Exposes": [
+            {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "MB FRU",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x48",
+                "Bus": 42,
+                "Name": "Mobo_M2_ZONE_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 70
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 60
+                    }
+                ],
+                "Type": "TMP75"
+            },
+            {
+                "Address": "0x49",
+                "Bus": 43,
+                "Name": "Mobo_BATT_ZONE_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 70
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 60
+                    }
+                ],
+                "Type": "TMP75"
+            },
+            {
+                "Address": "0x5c",
+                "Bus": 20,
+                "Name": "Mobo_INLET1_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 46
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 42
+                    }
+                ],
+                "Type": "TMP75"
+            },
+            {
+                "Address": "0x5c",
+                "Bus": 21,
+                "Name": "Mobo_OUTLET1_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 85
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 80
+                    }
+                ],
+                "Type": "TMP75"
+            },
+            {
+                "Address": "0x5c",
+                "Bus": 22,
+                "Name": "Mobo_OUTLET2_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 85
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 80
+                    }
+                ],
+                "Type": "TMP75"
+            },
+            {
+                "Address": "0x5c",
+                "Bus": 23,
+                "Name": "Mobo_OUTLET3_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 85
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 80
+                    }
+                ],
+                "Type": "TMP75"
+            },
+            {
+                "Address": "0x74",
+                "Bus": 26,
+                "Labels": [
+                    "temp1"
+                ],
+                "MaxValue": 255,
+                "Name": "Mobo_STB_T",
+                "Name1": "Mobo_STB_T",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 105
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 100
+                    }
+                ],
+                "Type": "pmbus"
+            }
+        ],
+        "Name": "Kudo_Motherboard",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': '1103638-*'})",
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER"
+        }
     }
-]
\ No newline at end of file
+]
diff --git a/configurations/Storm King.json b/configurations/Storm King.json
index 453413c..49206b5 100644
--- a/configurations/Storm King.json
+++ b/configurations/Storm King.json
@@ -1,6 +1,13 @@
 {
     "Exposes": [
         {
+            "Address": "0x76",
+            "Bus": 29,
+            "Name": "Ambient 1 Temp",
+            "Name1": "Station Pressure",
+            "Type": "DPS310"
+        },
+        {
             "Address": "0x40",
             "Bus": 29,
             "Name": "Ambient 2 Temp",
@@ -11,13 +18,6 @@
             "Bus": 29,
             "Name": "Ambient 0 Temp",
             "Type": "TMP75"
-        },
-        {
-            "Address": "0x76",
-            "Bus": 29,
-            "Name": "Ambient 1 Temp",
-            "Name1": "Station Pressure",
-            "Type": "DPS310"
         }
     ],
     "Name": "Storm King Panel",
diff --git a/configurations/Tyan_S7106_Baseboard.json b/configurations/Tyan_S7106_Baseboard.json
index 9018d3a..c5dfe9b 100644
--- a/configurations/Tyan_S7106_Baseboard.json
+++ b/configurations/Tyan_S7106_Baseboard.json
@@ -1,118 +1,118 @@
 {
     "Exposes": [
         {
+            "EntityId": 3,
+            "EntityInstance": 0,
             "Index": 0,
             "Name": "pvccp_p0",
             "ScaleFactor": 0.75,
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 0,
             "Index": 1,
             "Name": "pvccio_p0",
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 0,
             "Index": 2,
             "Name": "pvddq_p0",
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 0,
             "Index": 3,
             "Name": "pvpp_p0",
             "ScaleFactor": 0.541666667,
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 1,
             "Index": 4,
             "Name": "pvccp_p1",
             "ScaleFactor": 0.75,
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 1
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 1,
             "Index": 5,
             "Name": "pvccio_p1",
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 1
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 1,
             "Index": 6,
             "Name": "pvddq_p1",
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 1
+            "Type": "ADC"
         },
         {
+            "EntityId": 3,
+            "EntityInstance": 1,
             "Index": 7,
             "Name": "pvpp_p1",
             "ScaleFactor": 0.541666667,
-            "Type": "ADC",
-            "EntityId": 3,
-            "EntityInstance": 1
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 8,
             "Name": "vcc12",
             "ScaleFactor": 0.112166667,
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 9,
             "Name": "vcc5",
             "ScaleFactor": 0.2666,
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 10,
             "Name": "vcc3",
             "ScaleFactor": 0.405151515,
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 11,
             "Name": "vcc3_aux",
             "ScaleFactor": 0.405151515,
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 12,
             "Name": "p1v8_pch",
             "ScaleFactor": 0.75,
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 13,
             "Name": "pvnn_pch",
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 14,
             "Name": "p1v05_pch",
-            "Type": "ADC",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "ADC"
         },
         {
             "Connector": {
@@ -122,11 +122,11 @@
                     0
                 ]
             },
+            "EntityId": 3,
+            "EntityInstance": 0,
             "Index": 0,
             "Name": "cpufan0",
-            "Type": "AspeedFan",
-            "EntityId": 3,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -136,11 +136,11 @@
                     1
                 ]
             },
+            "EntityId": 3,
+            "EntityInstance": 1,
             "Index": 1,
             "Name": "cpufan1",
-            "Type": "AspeedFan",
-            "EntityId": 3,
-            "EntityInstance": 1
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -150,11 +150,11 @@
                     2
                 ]
             },
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 2,
             "Name": "fan1",
-            "Type": "AspeedFan",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -164,11 +164,11 @@
                     3
                 ]
             },
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 3,
             "Name": "fan2",
-            "Type": "AspeedFan",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -178,11 +178,11 @@
                     4
                 ]
             },
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 4,
             "Name": "fan3",
-            "Type": "AspeedFan",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -192,11 +192,11 @@
                     5
                 ]
             },
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 5,
             "Name": "fan4",
-            "Type": "AspeedFan",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -206,11 +206,11 @@
                     6
                 ]
             },
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 6,
             "Name": "fan5",
-            "Type": "AspeedFan",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Connector": {
@@ -220,22 +220,22 @@
                     7
                 ]
             },
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Index": 7,
             "Name": "fan6",
-            "Type": "AspeedFan",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "AspeedFan"
         },
         {
             "Address": "0x28",
             "Bus": 0,
+            "EntityId": 7,
+            "EntityInstance": 0,
             "Name": "sys_air_inlet",
             "Name1": "mb_air_inlet",
             "Name2": "sys_air_outlet",
             "Name3": "pch_temp",
-            "Type": "TMP421",
-            "EntityId": 7,
-            "EntityInstance": 0
+            "Type": "TMP421"
         }
     ],
     "Name": "Tyan S7106 Baseboard",