diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 23331a6..fdb5d27 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -2,6 +2,7 @@
     "exposes": [
         {
             "bind_connector": "1U System Fan connector 1",
+            "index": 0,
             "name": "Fan 1a",
             "thresholds": [
                 {
@@ -21,6 +22,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 1",
+            "index": 1,
             "name": "Fan 1b",
             "thresholds": [
                 {
@@ -40,6 +42,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 2",
+            "index": 2,
             "name": "Fan 2a",
             "thresholds": [
                 {
@@ -59,6 +62,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 2",
+            "index": 3,
             "name": "Fan 2b",
             "thresholds": [
                 {
@@ -78,6 +82,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 3",
+            "index": 4,
             "name": "Fan 3a",
             "thresholds": [
                 {
@@ -97,6 +102,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 3",
+            "index": 5,
             "name": "Fan 3b",
             "thresholds": [
                 {
@@ -116,6 +122,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 4",
+            "index": 6,
             "name": "Fan 4a",
             "thresholds": [
                 {
@@ -135,6 +142,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 4",
+            "index": 7,
             "name": "Fan 4b",
             "thresholds": [
                 {
@@ -154,6 +162,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 5",
+            "index": 8,
             "name": "Fan 5a",
             "thresholds": [
                 {
@@ -173,6 +182,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 5",
+            "index": 9,
             "name": "Fan 5b",
             "thresholds": [
                 {
@@ -192,6 +202,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 6",
+            "index": 10,
             "name": "Fan 6a",
             "thresholds": [
                 {
@@ -211,6 +222,7 @@
         },
         {
             "bind_connector": "1U System Fan connector 6",
+            "index": 11,
             "name": "Fan 6b",
             "thresholds": [
                 {
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index f0dc3a2..7743b77 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -2,6 +2,7 @@
     "exposes": [
         {
             "bind_connector": "2U System Fan connector 1",
+            "index": 0,
             "name": "Fan 1",
             "thresholds": [
                 {
@@ -21,6 +22,7 @@
         },
         {
             "bind_connector": "2U System Fan connector 2",
+            "index": 1,
             "name": "Fan 2",
             "thresholds": [
                 {
@@ -40,6 +42,7 @@
         },
         {
             "bind_connector": "2U System Fan connector 3",
+            "index": 2,
             "name": "Fan 3",
             "thresholds": [
                 {
@@ -59,6 +62,7 @@
         },
         {
             "bind_connector": "2U System Fan connector 4",
+            "index": 3,
             "name": "Fan 4",
             "thresholds": [
                 {
@@ -78,6 +82,7 @@
         },
         {
             "bind_connector": "2U System Fan connector 5",
+            "index": 4,
             "name": "Fan 5",
             "thresholds": [
                 {
@@ -97,6 +102,7 @@
         },
         {
             "bind_connector": "2U System Fan connector 6",
+            "index": 5,
             "name": "Fan 6",
             "thresholds": [
                 {
diff --git a/configurations/STP P4000 Chassis.json b/configurations/STP P4000 Chassis.json
index cd35350..445c89a 100644
--- a/configurations/STP P4000 Chassis.json
+++ b/configurations/STP P4000 Chassis.json
@@ -2,6 +2,7 @@
     "exposes": [
         {
             "bind_connector": "4U System Fan connector 1",
+            "index": 0,
             "name": "Fan 1",
             "thresholds": [
                 {
@@ -21,6 +22,7 @@
         },
         {
             "bind_connector": "4U System Fan connector 2",
+            "index": 1,
             "name": "Fan 2",
             "thresholds": [
                 {
@@ -40,6 +42,7 @@
         },
         {
             "bind_connector": "4U System Fan connector 3",
+            "index": 2,
             "name": "Fan 3",
             "thresholds": [
                 {
@@ -59,6 +62,7 @@
         },
         {
             "bind_connector": "4U System Fan connector 4",
+            "index": 3,
             "name": "Fan 4",
             "thresholds": [
                 {
@@ -78,6 +82,7 @@
         },
         {
             "bind_connector": "4U System Fan connector 5",
+            "index": 4,
             "name": "Fan 5",
             "thresholds": [
                 {
@@ -97,6 +102,7 @@
         },
         {
             "bind_connector": "4U System Fan connector 6",
+            "index": 5,
             "name": "Fan 6",
             "thresholds": [
                 {
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index a2fba07..d156f79 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,8 +1,4 @@
 {
-    "manufacturer": "$BOARD_MANUFACTURER",
-    "model": "$BOARD_PRODUCT_NAME",
-    "part_number": "$CHASSIS_PART_NUMBER",
-    "serial_number": "$CHASSIS_SERIAL_NUMBER",
     "exposes": [
         {
             "name": "1U System Fan connector 1",
@@ -814,6 +810,10 @@
             "type": "SkylakeCPU"
         }
     ],
+    "manufacturer": "$BOARD_MANUFACTURER",
+    "model": "$BOARD_PRODUCT_NAME",
     "name": "WFP Baseboard",
-    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*WFT'})"
+    "part_number": "$CHASSIS_PART_NUMBER",
+    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*WFT'})",
+    "serial_number": "$CHASSIS_SERIAL_NUMBER"
 }
\ No newline at end of file