diff --git a/configurations/mt_jade.json b/configurations/mt_jade.json
index 4c65d33..f81cdd7 100644
--- a/configurations/mt_jade.json
+++ b/configurations/mt_jade.json
@@ -2,7 +2,7 @@
     {
         "Exposes": [
             {
-                "Index": 0,
+                "Index": 28,
                 "Name": "3V3_SB",
                 "PollRate": 1,
                 "ScaleFactor": 0.3333,
@@ -25,11 +25,11 @@
             {
                 "BridgeGpio": [
                     {
-                        "Name": "RTC_BAT_SEN_EN",
+                        "Name": "rtc-battery-voltage-read-enable",
                         "Polarity": "High"
                     }
                 ],
-                "Index": 0,
+                "Index": 29,
                 "Name": "VBAT_RTC",
                 "PollRate": 86400,
                 "ScaleFactor": 0.3333,
@@ -50,10 +50,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 0,
                 "Name": "S0_0V8_VDDC_SOC",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -72,10 +73,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 1,
                 "Name": "S1_0V8_VDDC_SOC",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -94,6 +96,7 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 2,
                 "Name": "S0_0V75_PCP",
                 "PollRate": 1,
@@ -116,6 +119,7 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 3,
                 "Name": "S1_0V75_PCP",
                 "PollRate": 1,
@@ -138,10 +142,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 4,
                 "Name": "S0_1V2_VDDQ0123",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -160,10 +165,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 5,
                 "Name": "S1_1V2_VDDQ0123",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -182,10 +188,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 6,
                 "Name": "S0_0V6_VTT0123",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -204,10 +211,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 7,
                 "Name": "S1_0V6_VTT0123",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -226,10 +234,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 8,
                 "Name": "S0_2V5_VPP0123",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -248,10 +257,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 9,
                 "Name": "S1_2V5_VPP0123",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -270,10 +280,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 10,
                 "Name": "S0_1V2_VDDQ4567",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -292,10 +303,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 11,
                 "Name": "S1_1V2_VDDQ4567",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -314,10 +326,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 12,
                 "Name": "S0_0V6_VTT4567",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -336,10 +349,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 13,
                 "Name": "S1_0V6_VTT4567",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -358,10 +372,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 14,
                 "Name": "S0_2V5_VPP4567",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -380,10 +395,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 15,
                 "Name": "S1_2V5_VPP4567",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -402,10 +418,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 16,
                 "Name": "S0_0V85_RCA",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -424,10 +441,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 17,
                 "Name": "S1_0V85_RCA",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -446,10 +464,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 18,
                 "Name": "S0_1V8_VDDH",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -468,10 +487,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 19,
                 "Name": "S1_1V8_VDDH",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -490,10 +510,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 20,
                 "Name": "S0_1V5_VDDH",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -512,10 +533,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 21,
                 "Name": "S1_1V5_VDDH",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 1,
                 "Thresholds": [
                     {
@@ -534,10 +556,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 22,
                 "Name": "S0_1V8_SOC",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -556,10 +579,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 23,
                 "Name": "S1_1V8_SOC",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.5,
                 "Thresholds": [
                     {
@@ -578,6 +602,7 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 24,
                 "Name": "S0_1V8_PCP",
                 "PollRate": 1,
@@ -600,6 +625,7 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 25,
                 "Name": "S1_1V8_PCP",
                 "PollRate": 1,
@@ -622,10 +648,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 1,
                 "Index": 26,
                 "Name": "S0_3V3_SOC",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.3333,
                 "Thresholds": [
                     {
@@ -644,10 +671,11 @@
                 "Type": "ADC"
             },
             {
+                "CPURequired": 2,
                 "Index": 27,
                 "Name": "S1_3V3_SOC",
                 "PollRate": 1,
-                "PowerState": "On",
+                "PowerState": "ChassisOn",
                 "ScaleFactor": 0.3333,
                 "Thresholds": [
                     {
@@ -675,7 +703,9 @@
                     ]
                 },
                 "Index": 4,
+                "MaxReading": 23100,
                 "Name": "FAN3_1",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -704,6 +734,7 @@
                 "Index": 5,
                 "MaxReading": 23100,
                 "Name": "FAN3_2",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -732,6 +763,7 @@
                 "Index": 6,
                 "MaxReading": 23100,
                 "Name": "FAN4_1",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -760,6 +792,7 @@
                 "Index": 7,
                 "MaxReading": 23100,
                 "Name": "FAN4_2",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -788,6 +821,7 @@
                 "Index": 8,
                 "MaxReading": 23100,
                 "Name": "FAN5_1",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -816,6 +850,7 @@
                 "Index": 9,
                 "MaxReading": 23100,
                 "Name": "FAN5_2",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -844,6 +879,7 @@
                 "Index": 10,
                 "MaxReading": 23100,
                 "Name": "FAN6_1",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -872,6 +908,7 @@
                 "Index": 11,
                 "MaxReading": 23100,
                 "Name": "FAN6_2",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -900,6 +937,7 @@
                 "Index": 12,
                 "MaxReading": 23100,
                 "Name": "FAN7_1",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -928,6 +966,7 @@
                 "Index": 13,
                 "MaxReading": 23100,
                 "Name": "FAN7_2",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -956,6 +995,7 @@
                 "Index": 14,
                 "MaxReading": 23100,
                 "Name": "FAN8_1",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -984,6 +1024,7 @@
                 "Index": 15,
                 "MaxReading": 23100,
                 "Name": "FAN8_2",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "less than",
@@ -2006,11 +2047,12 @@
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
             "Model": "$PRODUCT_PRODUCT_NAME $PRODUCT_VERSION",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+            "PartNumber": "$CHASSIS_PART_NUMBER",
+            "SerialNumber": "$CHASSIS_SERIAL_NUMBER"
         },
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
             "AssetTag": "$PRODUCT_ASSET_TAG"
-        }
+        },
+        "xyz.openbmc_project.Inventory.Item.System": {}
     }
 ]