diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 15c23ae..44a313b 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -362,9 +362,6 @@
             "Type": "Pid",
             "Zones": [
                 "Pid 1"
-            ],
-            "Zones": [
-                "Pid 1"
             ]
         },
         {
@@ -447,6 +444,39 @@
             "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"
+        },
+        {
+            "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"
         }
     ],
     "Name": "R1000 Chassis",
diff --git a/schemas/global.json b/schemas/global.json
index fdf4f15..6d4ac33 100644
--- a/schemas/global.json
+++ b/schemas/global.json
@@ -235,12 +235,54 @@
                             "MinThermalRpm": {
                                 "type": "integer"
                             },
-                            "Count": {
+                            "AllowedFailures": {
                                 "type": "integer"
                             },
                             "PowerState": {
                                 "type": "string"
                             },
+                            "AlphaF": {
+                                "type": "number"
+                            },
+                            "AlphaS": {
+                                "type": "number"
+                            },
+                            "PowerFactorMax": {
+                                "type": "number"
+                            },
+                            "PowerFactorMin": {
+                                "type": "number"
+                            },
+                            "QMax": {
+                                "type": "number"
+                            },
+                            "QMin": {
+                                "type": "number"
+                            },
+                            "C1": {
+                                "type": "number"
+                            },
+                            "C2": {
+                                "type": "number"
+                            },
+                            "MaxCFM": {
+                                "type": "number"
+                            },
+                            "TachMaxPercent": {
+                                "type": "number"
+                            },
+                            "TachMinPercent": {
+                                "type": "number"
+                            },
+                            "Tachs": {
+                                "type": "array",
+                                "items": {
+                                    "type": [
+                                        "integer",
+                                        "string"
+                                    ]
+                                }
+                            },
                             "BindPresence": {
                                 "type": "string"
                             },
@@ -250,12 +292,6 @@
                             "Status": {
                                 "type": "string"
                             },
-                            "Tachs": {
-                                "type": "array",
-                                "items": {
-                                    "type": "integer"
-                                }
-                            },
                             "Name1": {
                                 "type": "string"
                             },