diff --git a/README.md b/README.md
index 396297a..ed55e47 100755
--- a/README.md
+++ b/README.md
@@ -1,185 +1,204 @@
 # Repository Details
 
 ## Table of Contents
-* [Overview](#overview)
-* [Building](#building)
-* [Contents](#contents)
+
+- [Overview](#overview)
+- [Building](#building)
+- [Contents](#contents)
 
 ## Overview
+
 The phosphor-fan-presence repository provides a set of thermal related
 applications that control and monitor the cooling of a system using fans. Each
 application independently controls or monitors an area related to the thermal
 status of a system that uses fans as its primary cooling mechanism. Since each
 application independent in its functionality, they can individually be included
-in a BMC image at *configure* time to provide only the functionality needed by
-a user's machine.
-
+in a BMC image at _configure_ time to provide only the functionality needed by a
+user's machine.
 
 ## Building
+
 By default, runtime JSON configuration file(s) are used for each application.
 The use of YAML configuration file(s) has been deprecated in favor of the JSON
-method.  Support for the use of YAML based configuration files may be removed
+method. Support for the use of YAML based configuration files may be removed
 once all applications completely support getting their configuration from JSON
 file(s) at runtime.
 
 The following applications are built by default:
-* [Fan Control](#fan-control)
-  * To disable from building, use the `-Dcontrol-service=disabled` meson option:
+
+- [Fan Control](#fan-control)
+  - To disable from building, use the `-Dcontrol-service=disabled` meson option:
   ```
   meson build -Dcontrol-service=disabled
   ```
-* [Fan Presence Detection](#fan-presence-detection)
-  * To disable from building, use the `-Dpresence-service=disabled` meson
+- [Fan Presence Detection](#fan-presence-detection)
+  - To disable from building, use the `-Dpresence-service=disabled` meson
     option:
   ```
   meson build -Dpresence-service=disabled
   ```
-* [Fan Monitoring](#fan-monitoring)
-  * To disable from building, use the `-Dmonitor-service=disabled` meson
-    option:
+- [Fan Monitoring](#fan-monitoring)
+  - To disable from building, use the `-Dmonitor-service=disabled` meson option:
   ```
   meson build -Dmonitor-service=disabled
   ```
-* [Sensor Monitoring](#sensor-monitoring)
-  * To disable from building, use the `-Dsensor-monitor-service=disabled` meson
+- [Sensor Monitoring](#sensor-monitoring)
+  - To disable from building, use the `-Dsensor-monitor-service=disabled` meson
     option:
   ```
   meson build -Dsensor-monitor-service=disabled
   ```
 
-The following applications must be enabled at *configure* time to be built:
-* [Cooling Type](#cooling-type)
-  * To enable building this, set the `-Dcooling-type-service=enable` meson
+The following applications must be enabled at _configure_ time to be built:
+
+- [Cooling Type](#cooling-type)
+  - To enable building this, set the `-Dcooling-type-service=enable` meson
     option:
   ```
   meson build -Dcooling-type-service=enabled
   ```
 
 ### YAML (Deprecated)
-The location of the YAML configuration file(s) are provided at
-*configure* time to each application thru environment variables. The default
-YAML configuration file(s) used are the examples found within each
-application's example directory. See each application below
-([Contents](#contents)) for more information on how to set their specific
-*configure* time options, including the location of the YAML configuration
-file(s).
+
+The location of the YAML configuration file(s) are provided at _configure_ time
+to each application thru environment variables. The default YAML configuration
+file(s) used are the examples found within each application's example directory.
+See each application below ([Contents](#contents)) for more information on how
+to set their specific _configure_ time options, including the location of the
+YAML configuration file(s).
 
 Meson defaults to JSON based runtime configuration, so to select the YAML
 configuration use the '-Djson-config=disabled' option when building:
+
 ```
     1. meson build -Djson-config=disabled
     2. ninja -C build
 ```
 
 ### JSON
+
 See each application below ([Contents](#contents)) for more information on how
-to set their specific *configure* time options and details on how to configure
+to set their specific _configure_ time options and details on how to configure
 each using JSON.
 
-As JSON based runtime configuration is the default option, no extra options
-are required to build:
+As JSON based runtime configuration is the default option, no extra options are
+required to build:
+
 ```
     1. meson build
     2. ninja -C build
 ```
+
 **Note: Features/Restrictions of applications in this package that are only
 supported using the JSON based configuration are listed below:**
-#### Features
-* [Fan Presence Detection](#fan-presence-detection)
-  * Error logging for missing fans
-* [Fan Monitoring](#fan-monitoring)
-  * Error logging for nonfunctional fans
-  * System power off due to missing or nonfunctional fans
-* [Sensor Monitoring](#sensor-monitoring) - Only supports JSON
 
+#### Features
+
+- [Fan Presence Detection](#fan-presence-detection)
+  - Error logging for missing fans
+- [Fan Monitoring](#fan-monitoring)
+  - Error logging for nonfunctional fans
+  - System power off due to missing or nonfunctional fans
+- [Sensor Monitoring](#sensor-monitoring) - Only supports JSON
 
 ## Contents
 
 ### Fan Control
+
 Controls the fans based on a set of events that are configured using a group of
 D-Bus objects and one-or-more triggers that run a configured set of actions.
-These events are meant to be configured to handle all aspects of controlling
-the fans within a system. Fans are added to zones that then have events
-configured against the zone to control the fans based on the state of any sized
-group of D-Bus objects.
+These events are meant to be configured to handle all aspects of controlling the
+fans within a system. Fans are added to zones that then have events configured
+against the zone to control the fans based on the state of any sized group of
+D-Bus objects.
 
-* Available meson options:
-  * `control-persist-root-path` - Base location to persist zone property states
-  on the BMC
-    * Default = '/var/lib/phosphor-fan-presence/control'
+- Available meson options:
+  - `control-persist-root-path` - Base location to persist zone property states
+    on the BMC
+    - Default = '/var/lib/phosphor-fan-presence/control'
 
 #### YAML (Deprecated)
-* Available meson options:
-  * `fan-def-yaml-file` - Build time fan configuration file
-    * Default = ['control/example/fans.yaml'](control/example/fans.yaml)
-  * `fan-zone-yaml-file` - Build time zone configuration file
-    * Default = ['control/example/zones.yaml'](control/example/zones.yaml)
-  * `fan-events-yaml-file` - Build time events configuration file
-    * Default = ['control/example/events.yaml'](control/example/events.yaml)
-  * `zone-conditions-yaml-file` Build time zone conditions configuration file
-    * Default = ['control/example/zone_conditions.yaml'](control/example/zone_conditions.yaml)
+
+- Available meson options:
+  - `fan-def-yaml-file` - Build time fan configuration file
+    - Default = ['control/example/fans.yaml'](control/example/fans.yaml)
+  - `fan-zone-yaml-file` - Build time zone configuration file
+    - Default = ['control/example/zones.yaml'](control/example/zones.yaml)
+  - `fan-events-yaml-file` - Build time events configuration file
+    - Default = ['control/example/events.yaml'](control/example/events.yaml)
+  - `zone-conditions-yaml-file` Build time zone conditions configuration file
+    - Default =
+      ['control/example/zone_conditions.yaml'](control/example/zone_conditions.yaml)
 
 [Example](control/example/)
 
 #### JSON
+
 [README](docs/control/README.md)
 
 ---
 
 ### Fan Presence Detection
+
 Monitors the presence state of fans using GPIOs, nonzero tach feedbacks, or a
 combination of both. This updates a configured location of a fan D-Bus object's
 `Present` property according to the state of the methods used to detect the
 fan's presence.
 
-* Available meson options:
-  * `num-presence-log-entries` - Maximum number of entries in the message log
-    * Default = 50
+- Available meson options:
+  - `num-presence-log-entries` - Maximum number of entries in the message log
+    - Default = 50
 
 #### YAML (Deprecated)
-* Available meson options:
-  * `presence-config` - Location of the config file
-    * Default = ['presence/example/example.yaml'](presence/example/example.yaml)
+
+- Available meson options:
+  - `presence-config` - Location of the config file
+    - Default = ['presence/example/example.yaml'](presence/example/example.yaml)
 
 Example: [example.yaml](presence/example/example.yaml)
 
 #### JSON
+
 [README](docs/presence/README.md)
 
 ---
 
 ### Fan Monitoring
+
 Monitors the functional state of fans by comparing the fan feedback speed
 against the current target, applying any configured adjustments to the target
 due to fan hardware properties. In addition to updating the configured location
 of a fan D-Bus object's `Functional` property in inventory, actions can be
-configured* to be taken based on the state of fans, i.e.) creating event logs or
-powering off the system.
+configured\* to be taken based on the state of fans, i.e.) creating event logs
+or powering off the system.
 
 Another feature that can be configured is the ability to cancel the monitoring
-of a set of fans that may be necessary to workaround designs of the fan
-hardware and/or controller used.
+of a set of fans that may be necessary to workaround designs of the fan hardware
+and/or controller used.
 
-**Actions to be taken based on the state of fans is only available using a JSON
- based configuration*
+\*_Actions to be taken based on the state of fans is only available using a JSON
+based configuration_
 
-* Available meson options:
-  * `num-monitor-log-entries` - Maximum number of entries in the message log
-    * Default = 75
+- Available meson options:
+  - `num-monitor-log-entries` - Maximum number of entries in the message log
+    - Default = 75
 
 #### YAML (Deprecated)
-* Available meson options:
-  * `fan-monitor-yaml-file` - Location of the config file
-    * Default = ['monitor/example/monitor.yaml'](monitor/example/monitor.yaml)
+
+- Available meson options:
+  - `fan-monitor-yaml-file` - Location of the config file
+    - Default = ['monitor/example/monitor.yaml'](monitor/example/monitor.yaml)
 
 Example: [monitor.yaml](monitor/example/monitor.yaml)
 
 #### JSON
+
 [README](docs/monitor/README.md)
 
 ---
 
 ### Cooling Type
+
 Sets the `AirCooled` and `WaterCooled` property on the
 `xyz.openbmc_project.Inventory.Decorator.CoolingType` interface in inventory
 based on a given GPIO. No configuration files are used with this application as
@@ -188,21 +207,22 @@
 ---
 
 ### Sensor Monitoring
+
 Takes actions, such as powering off the system, based on sensor thresholds and
 values.
 
-* Available meson options:
-  * `sensor-monitor-persist-root-path` - Base location to persist sensor
-  monitoring data
-    * Default = '/var/lib/phosphor-fan-presence/sensor-monitor'
-  * `sensor-monitor-hard-shutdown-delay` - Milliseconds to delay the alarm
-  hard shutdown
-    * Default = 23000
-  * `sensor-monitor-soft-shutdown-delay` - Milliseconds to delay the alarm
-  soft shutdown
-    * Default = 900000
-  * `use-host-power-state` - Use the host state for the power state as
-  opposed to the PGOOD state.
+- Available meson options:
+  - `sensor-monitor-persist-root-path` - Base location to persist sensor
+    monitoring data
+    - Default = '/var/lib/phosphor-fan-presence/sensor-monitor'
+  - `sensor-monitor-hard-shutdown-delay` - Milliseconds to delay the alarm hard
+    shutdown
+    - Default = 23000
+  - `sensor-monitor-soft-shutdown-delay` - Milliseconds to delay the alarm soft
+    shutdown
+    - Default = 900000
+  - `use-host-power-state` - Use the host state for the power state as opposed
+    to the PGOOD state.
 
 [README](docs/sensor-monitor/README.md)
 
diff --git a/control/config_files/p10bmc/ibm,bonnell/events.json b/control/config_files/p10bmc/ibm,bonnell/events.json
index 0d4f101..fe51488 100644
--- a/control/config_files/p10bmc/ibm,bonnell/events.json
+++ b/control/config_files/p10bmc/ibm,bonnell/events.json
@@ -1,2 +1 @@
-[
-]
+[]
diff --git a/control/config_files/p10bmc/ibm,bonnell/groups.json b/control/config_files/p10bmc/ibm,bonnell/groups.json
index 0d4f101..fe51488 100644
--- a/control/config_files/p10bmc/ibm,bonnell/groups.json
+++ b/control/config_files/p10bmc/ibm,bonnell/groups.json
@@ -1,2 +1 @@
-[
-]
+[]
diff --git a/control/config_files/p10bmc/ibm,everest/events.json b/control/config_files/p10bmc/ibm,everest/events.json
index 147e3eb..45e4c44 100644
--- a/control/config_files/p10bmc/ibm,everest/events.json
+++ b/control/config_files/p10bmc/ibm,everest/events.json
@@ -1,2238 +1,2238 @@
 [
-   {
-     // Hold fans at the given target when a number of fans are missing.
-     "name": "fan(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 11300
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when a number of rotors are nonfunctional.
-     "name": "fan rotor(s) faulted",
-     "groups": [
-       {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan3 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 2,
-         "state": false,
-         "target": 11300
-       }
-     ]
-   },
-   {
-     // (for the following 4 rules)
-     // if a dual-rotor fan becomes non-functional, lock its speed to
-     // poweron_target to lock the other rotor to full_speed
-     "name": "nonfunc rotor override-0",
-     "groups": [
-      {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan0" ],
-         "target": 11300
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-1",
-     "groups": [
-      {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan1" ],
-         "target": 11300
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-2",
-     "groups": [
-      {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan2" ],
-         "target": 11300
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-3",
-     "groups": [
-      {
-         "name": "fan3 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan3" ],
-         "target": 11300
-       }
-    ]
-  },
-   {
-     // Hold fans at the given target when any critical service
-     // is not running for 5 seconds.
-     "name": "service(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       },
-       {
-         "name": "occ objects",
-         "interface": "org.open_power.OCC.Status",
-         "property": { "name": "OccActive" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "ambient temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "name_has_owner"
-       },
-       {
-         "class": "signal",
-         "signal": "name_owner_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "call_actions_based_on_timer",
-         "timer": {
-           "interval": 5000000,
-           "type": "oneshot"
-         },
-         "actions": [
-           {
-             "name": "set_target_on_missing_owner",
-             "groups": [
-               {
-                 "name": "fan inventory",
-                 "interface": "xyz.openbmc_project.Inventory.Item",
-                 "property": { "name": "Present" }
-               },
-               {
-                 "name": "occ objects",
-                 "interface": "org.open_power.OCC.Status",
-                 "property": { "name": "OccActive" }
-               },
-               {
-                 "name": "nvme temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "planar temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "pcie cable card temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "ambient temp",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               }
-             ],
-             "target": 9700
-           }
-         ]
-       }
-     ]
-   },
-   {
-    // Set a fan floor if an OCC isn't active
-    "name": "Non-active OCC(s)",
-    "groups": [
-      {
-        "name": "occ objects",
-        "interface": "org.open_power.OCC.Status",
-        "property": {
-          "name": "OccActive"
-        }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 11300
-      }
-    ]
-  },
-  {
-    // Set a raised fan floor when any temperature or altitude sensor is
-    // nonfunctional
-    "name": "Nonfunctional temperature sensors",
-    "groups": [
-      {
-        "name": "proc0 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc2 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc3 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc4 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc5 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc6 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc7 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc0 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc2 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc3 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc4 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc5 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc6 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc7 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pmic temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "internal memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram and external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "vdd vrm temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "planar temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pcie cable card temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "altitude",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_removed"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 11300
-      }
-    ]
-  },
-  {
-     "name": "Set Proc 0 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 2 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 2 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 3 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 3 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 4 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 4 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_4_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_4_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 5 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 5 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_5_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_5_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 6 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 6 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_6_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_6_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 7 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 7 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_7_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 7
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_7_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 9
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 0 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 2 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 2 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 3 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 3 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 4 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 4 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_4_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_4_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 5 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 5 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_5_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_5_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 6 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 6 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_6_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_6_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 7 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 7 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_7_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_7_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     // Collect group temperatures each iteration the repeating timer expires
-     "name": "Fan control timer loop",
-     "groups": [
-       {
-         "name": "proc0 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc2 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc3 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc4 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc5 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc6 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc7 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc0 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc2 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc3 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc4 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc5 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc6 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc7 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pmic temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "internal memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram and external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "vdd vrm temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "timer",
-         "type": "repeating",
-         "interval": 2000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc2 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc3 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc4 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_4_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc5 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_5_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc6 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_6_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc7 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_7_core_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc2 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc3 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc4 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_4_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc5 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_5_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc6 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_6_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc7 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_7_ioring_dvfs_increase_temp",
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 69.0,
-         "delta": 175
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 58.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 75.0,
-         "delta": 150
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 85.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 58.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 50.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 70.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc2 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc3 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc4 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_4_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc5 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_5_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc6 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_6_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc7 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_7_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc2 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc3 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc4 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_4_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc5 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_5_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc6 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_6_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc7 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_7_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 66.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 72.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 52.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 52.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 80.0,
-         "delta": 30
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 48.0,
-         "delta": 80
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 80
-       }
-     ]
-   },
-   {
-     // Remove NVMe temperature objects from cache when they are removed from
-     // dbus. There's no need to react to their removal.
-     "name": "remove nvme objects",
-     "groups": [
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "signal",
-         "signal": "interfaces_removed"
-       }
-     ]
-   },
-   {
-     "name": "set pcie floor index",
-     "groups": [
-       {
-         "name": "pcie slots",
-         "interface": "xyz.openbmc_project.State.Decorator.PowerState",
-         "property": {
-           "name": "PowerState"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0DeviceId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0VendorId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemVendorId"
-         }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "pcie_card_floors",
-         "use_config_specific_files": true,
-         "settle_time": 2
-       }
-     ]
-   },
-   {
-     "name": "Set altitude offset parameter",
-     "groups": [
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         // Refresh altitude every 24hrs
-         "class": "timer",
-         "type": "repeating",
-         "interval": 86400000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_20_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 1500,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 375 },
-             { "arg_value": 1500, "parameter_value": 550 },
-             { "arg_value": 2000, "parameter_value": 775 },
-             { "arg_value": 2500, "parameter_value": 1000 },
-             { "arg_value": 3050, "parameter_value": 1275 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_25_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 2000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 450 },
-             { "arg_value": 1500, "parameter_value": 700 },
-             { "arg_value": 2000, "parameter_value": 975 },
-             { "arg_value": 2500, "parameter_value": 1275 },
-             { "arg_value": 3050, "parameter_value": 1625 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_30_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 2500,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 600 },
-             { "arg_value": 1500, "parameter_value": 900 },
-             { "arg_value": 2000, "parameter_value": 1275 },
-             { "arg_value": 2500, "parameter_value": 1650 },
-             { "arg_value": 3050, "parameter_value": 2100 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_35_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 3000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 750 },
-             { "arg_value": 1500, "parameter_value": 1175 },
-             { "arg_value": 2000, "parameter_value": 1625 },
-             { "arg_value": 2500, "parameter_value": 2125 },
-             { "arg_value": 3050, "parameter_value": 2725 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_40_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 3500,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 975 },
-             { "arg_value": 1500, "parameter_value": 1500 },
-             { "arg_value": 2000, "parameter_value": 2100 },
-             { "arg_value": 2500, "parameter_value": 2750 },
-             { "arg_value": 3050, "parameter_value": 3500 }
-           ]
-         }
-       }
-     ]
-   },
-   {
-     "name": "Fan floors",
-     "groups": [
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.Sensor.Value",
-        "property": { "name": "Value" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "parameter",
-         "parameter": "pcie_floor_index"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_20_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_25_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_30_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_35_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_40_altitude_offset"
-       }
-     ],
-     "actions": [
-       {
-         "name": "mapped_floor",
-         "key_group": "ambient temp",
-         "fan_floors": [
-          {
-            // Entry valid for temps < 20
-            "key": 20,
-            "default_floor": 3800,
-            "floor_offset_parameter": "ambient_20_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 3800 },
-                  { "value": 2, "floor": 4200 },
-                  { "value": 3, "floor": 4600 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 25
-            "key": 25,
-            "default_floor": 4400,
-            "floor_offset_parameter": "ambient_25_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 4400 },
-                  { "value": 2, "floor": 4800 },
-                  { "value": 3, "floor": 5400 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 30
-            "key": 30,
-            "default_floor": 5000,
-            "floor_offset_parameter": "ambient_30_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 5000 },
-                  { "value": 2, "floor": 5600 },
-                  { "value": 3, "floor": 6500 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 35
-            "key": 35,
-            "default_floor": 5800,
-            "floor_offset_parameter": "ambient_35_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 5800 },
-                  { "value": 2, "floor": 6700 },
-                  { "value": 3, "floor": 7700 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 40
-            "key": 40,
-            "default_floor": 6900,
-            "floor_offset_parameter": "ambient_40_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 6900 },
-                  { "value": 2, "floor": 7900 },
-                  { "value": 3, "floor": 9200 }
-                ]
-              }
-            ]
-          }
+    {
+        // Hold fans at the given target when a number of fans are missing.
+        "name": "fan(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 11300
+            }
         ]
-       }
-     ]
-   }
+    },
+    {
+        // Hold fans at the given target when a number of rotors are nonfunctional.
+        "name": "fan rotor(s) faulted",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan3 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 2,
+                "state": false,
+                "target": 11300
+            }
+        ]
+    },
+    {
+        // (for the following 4 rules)
+        // if a dual-rotor fan becomes non-functional, lock its speed to
+        // poweron_target to lock the other rotor to full_speed
+        "name": "nonfunc rotor override-0",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan0"],
+                "target": 11300
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-1",
+        "groups": [
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan1"],
+                "target": 11300
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-2",
+        "groups": [
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan2"],
+                "target": 11300
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-3",
+        "groups": [
+            {
+                "name": "fan3 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan3"],
+                "target": 11300
+            }
+        ]
+    },
+    {
+        // Hold fans at the given target when any critical service
+        // is not running for 5 seconds.
+        "name": "service(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            },
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": { "name": "OccActive" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "name_has_owner"
+            },
+            {
+                "class": "signal",
+                "signal": "name_owner_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "call_actions_based_on_timer",
+                "timer": {
+                    "interval": 5000000,
+                    "type": "oneshot"
+                },
+                "actions": [
+                    {
+                        "name": "set_target_on_missing_owner",
+                        "groups": [
+                            {
+                                "name": "fan inventory",
+                                "interface": "xyz.openbmc_project.Inventory.Item",
+                                "property": { "name": "Present" }
+                            },
+                            {
+                                "name": "occ objects",
+                                "interface": "org.open_power.OCC.Status",
+                                "property": { "name": "OccActive" }
+                            },
+                            {
+                                "name": "nvme temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "planar temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "pcie cable card temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "ambient temp",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            }
+                        ],
+                        "target": 9700
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        // Set a fan floor if an OCC isn't active
+        "name": "Non-active OCC(s)",
+        "groups": [
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": {
+                    "name": "OccActive"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 11300
+            }
+        ]
+    },
+    {
+        // Set a raised fan floor when any temperature or altitude sensor is
+        // nonfunctional
+        "name": "Nonfunctional temperature sensors",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc2 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc3 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc4 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc5 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc6 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc7 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc2 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc3 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc4 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc5 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc6 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc7 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 11300
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 2 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 2 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 3 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 3 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 4 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 4 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_4_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_4_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 5 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 5 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_5_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_5_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 6 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 6 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_6_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_6_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 7 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 7 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_7_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 7
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_7_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 9
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 2 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 2 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 3 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 3 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 4 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 4 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_4_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_4_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 5 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 5 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_5_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_5_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 6 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 6 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_6_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_6_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 7 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 7 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_7_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_7_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        // Collect group temperatures each iteration the repeating timer expires
+        "name": "Fan control timer loop",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc2 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc3 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc4 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc5 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc6 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc7 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc2 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc3 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc4 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc5 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc6 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc7 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "timer",
+                "type": "repeating",
+                "interval": 2000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc2 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc3 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc4 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_4_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc5 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_5_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc6 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_6_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc7 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_7_core_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc2 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc3 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc4 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_4_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc5 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_5_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc6 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_6_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc7 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_7_ioring_dvfs_increase_temp",
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 69.0,
+                "delta": 175
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 58.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 75.0,
+                "delta": 150
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 85.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 58.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 50.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 70.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc2 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc3 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc4 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_4_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc5 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_5_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc6 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_6_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc7 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_7_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc2 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc3 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc4 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_4_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc5 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_5_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc6 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_6_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc7 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_7_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 66.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 72.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 52.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 52.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 80.0,
+                "delta": 30
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 48.0,
+                "delta": 80
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 80
+            }
+        ]
+    },
+    {
+        // Remove NVMe temperature objects from cache when they are removed from
+        // dbus. There's no need to react to their removal.
+        "name": "remove nvme objects",
+        "groups": [
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            }
+        ]
+    },
+    {
+        "name": "set pcie floor index",
+        "groups": [
+            {
+                "name": "pcie slots",
+                "interface": "xyz.openbmc_project.State.Decorator.PowerState",
+                "property": {
+                    "name": "PowerState"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0DeviceId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0VendorId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemVendorId"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "pcie_card_floors",
+                "use_config_specific_files": true,
+                "settle_time": 2
+            }
+        ]
+    },
+    {
+        "name": "Set altitude offset parameter",
+        "groups": [
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                // Refresh altitude every 24hrs
+                "class": "timer",
+                "type": "repeating",
+                "interval": 86400000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_20_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 1500,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 375 },
+                        { "arg_value": 1500, "parameter_value": 550 },
+                        { "arg_value": 2000, "parameter_value": 775 },
+                        { "arg_value": 2500, "parameter_value": 1000 },
+                        { "arg_value": 3050, "parameter_value": 1275 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_25_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 2000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 450 },
+                        { "arg_value": 1500, "parameter_value": 700 },
+                        { "arg_value": 2000, "parameter_value": 975 },
+                        { "arg_value": 2500, "parameter_value": 1275 },
+                        { "arg_value": 3050, "parameter_value": 1625 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_30_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 2500,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 600 },
+                        { "arg_value": 1500, "parameter_value": 900 },
+                        { "arg_value": 2000, "parameter_value": 1275 },
+                        { "arg_value": 2500, "parameter_value": 1650 },
+                        { "arg_value": 3050, "parameter_value": 2100 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_35_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 3000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 750 },
+                        { "arg_value": 1500, "parameter_value": 1175 },
+                        { "arg_value": 2000, "parameter_value": 1625 },
+                        { "arg_value": 2500, "parameter_value": 2125 },
+                        { "arg_value": 3050, "parameter_value": 2725 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_40_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 3500,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 975 },
+                        { "arg_value": 1500, "parameter_value": 1500 },
+                        { "arg_value": 2000, "parameter_value": 2100 },
+                        { "arg_value": 2500, "parameter_value": 2750 },
+                        { "arg_value": 3050, "parameter_value": 3500 }
+                    ]
+                }
+            }
+        ]
+    },
+    {
+        "name": "Fan floors",
+        "groups": [
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "parameter",
+                "parameter": "pcie_floor_index"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_20_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_25_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_30_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_35_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_40_altitude_offset"
+            }
+        ],
+        "actions": [
+            {
+                "name": "mapped_floor",
+                "key_group": "ambient temp",
+                "fan_floors": [
+                    {
+                        // Entry valid for temps < 20
+                        "key": 20,
+                        "default_floor": 3800,
+                        "floor_offset_parameter": "ambient_20_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 3800 },
+                                    { "value": 2, "floor": 4200 },
+                                    { "value": 3, "floor": 4600 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 25
+                        "key": 25,
+                        "default_floor": 4400,
+                        "floor_offset_parameter": "ambient_25_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 4400 },
+                                    { "value": 2, "floor": 4800 },
+                                    { "value": 3, "floor": 5400 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 30
+                        "key": 30,
+                        "default_floor": 5000,
+                        "floor_offset_parameter": "ambient_30_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 5000 },
+                                    { "value": 2, "floor": 5600 },
+                                    { "value": 3, "floor": 6500 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 35
+                        "key": 35,
+                        "default_floor": 5800,
+                        "floor_offset_parameter": "ambient_35_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 5800 },
+                                    { "value": 2, "floor": 6700 },
+                                    { "value": 3, "floor": 7700 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 40
+                        "key": 40,
+                        "default_floor": 6900,
+                        "floor_offset_parameter": "ambient_40_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 6900 },
+                                    { "value": 2, "floor": 7900 },
+                                    { "value": 3, "floor": 9200 }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index de14afe..526b7dc 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -1,977 +1,975 @@
 [
- {
-   "name": "fan inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3"
-   ]
- },
- {
-   "name": "fan0 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_1"
-   ]
- },
- {
-   "name": "fan1 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_1"
-   ]
- },
- {
-   "name": "fan2 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_1"
-   ]
- },
- {
-   "name": "fan3 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_1"
-   ]
- },
- {
-   "name": "occ objects",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/org/open_power/control/occ0",
-     "/org/open_power/control/occ1",
-     "/org/open_power/control/occ2",
-     "/org/open_power/control/occ3",
-     "/org/open_power/control/occ4",
-     "/org/open_power/control/occ5",
-     "/org/open_power/control/occ6",
-     "/org/open_power/control/occ7"
-   ]
- },
- {
-   "name": "proc0 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
-   ]
- },
- {
-   "name": "proc1 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
-   ]
- },
- {
-   "name": "proc2 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core15_1_temp"
-   ]
- },
- {
-   "name": "proc3 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core15_1_temp"
-   ]
- },
- {
-   "name": "proc4 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc4_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc4_core15_1_temp"
-   ]
- },
- {
-   "name": "proc5 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc5_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc5_core15_1_temp"
-   ]
- },
- {
-   "name": "proc6 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc6_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc6_core15_1_temp"
-   ]
- },
- {
-   "name": "proc7 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc7_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc7_core15_1_temp"
-   ]
- },
- {
-   "name": "proc0 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
-   ]
- },
- {
-   "name": "proc1 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
-   ]
- },
- {
-   "name": "proc2 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
-   ]
- },
- {
-   "name": "proc3 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
-   ]
- },
- {
-   "name": "proc4 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc4_ioring_temp"
-   ]
- },
- {
-   "name": "proc5 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc5_ioring_temp"
-   ]
- },
- {
-   "name": "proc6 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc6_ioring_temp"
-   ]
- },
- {
-   "name": "proc7 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc7_ioring_temp"
-   ]
- },
- {
-   "name": "dram temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm32_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm33_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm34_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm35_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm36_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm37_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm38_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm39_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm40_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm41_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm42_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm43_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm44_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm45_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm46_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm47_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm48_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm49_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm50_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm51_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm52_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm53_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm54_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm55_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm56_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm57_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm58_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm59_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm60_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm61_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm62_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm63_dram_temp"
-   ]
- },
- {
-   "name": "pmic temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm32_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm33_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm34_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm35_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm36_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm37_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm38_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm39_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm40_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm41_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm42_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm43_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm44_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm45_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm46_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm47_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm48_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm49_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm50_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm51_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm52_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm53_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm54_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm55_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm56_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm57_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm58_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm59_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm60_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm61_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm62_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm63_pmic_temp"
-   ]
- },
- {
-   "name": "internal memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm32_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm33_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm34_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm35_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm36_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm37_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm38_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm39_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm40_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm41_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm42_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm43_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm44_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm45_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm46_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm47_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm48_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm49_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm50_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm51_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm52_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm53_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm54_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm55_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm56_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm57_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm58_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm59_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm60_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm61_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm62_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm63_intmb_temp"
-   ]
- },
- {
-   "name": "dram and external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm32_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm33_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm34_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm35_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm36_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm37_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm38_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm39_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm40_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm41_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm42_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm43_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm44_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm45_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm46_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm47_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm48_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm49_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm50_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm51_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm52_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm53_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm54_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm55_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm56_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm57_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm58_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm59_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm60_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm61_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm62_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm63_dram_extmb_temp"
-   ]
- },
- {
-   "name": "external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm32_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm33_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm34_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm35_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm36_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm37_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm38_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm39_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm40_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm41_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm42_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm43_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm44_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm45_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm46_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm47_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm48_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm49_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm50_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm51_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm52_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm53_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm54_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm55_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm56_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm57_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm58_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm59_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm60_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm61_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm62_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm63_extmb_temp"
-   ]
- },
- {
-   "name": "vdd vrm temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd2_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd3_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd4_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd5_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd6_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd7_temp"
-   ]
- },
- {
-   "name": "proc 0 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 2 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 3 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 4 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc4_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 5 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc5_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 6 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc6_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 7 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc7_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 0 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 2 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 3 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 4 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc4_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 5 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc5_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 6 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc6_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 7 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc7_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "nvme temps",
-   "service": "xyz.openbmc_project.NVMeSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp"
-   ]
- },
- {
-   "name": "planar temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
-     "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
-   ]
- },
- {
-   // Bear Lake card
-   "name": "pcie cable card temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C1_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C5_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C6_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
-   ]
- },
- {
-   "name": "ambient temp",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
-   ]
- },
- {
-   "name": "altitude",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/altitude/Altitude"
-   ]
- },
- {
-   "name": "pcie cards",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot5/pcie_card5",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
-   ]
- },
- {
-   "name": "pcie slots",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot5",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
-   ]
- }
+    {
+        "name": "fan inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3"
+        ]
+    },
+    {
+        "name": "fan0 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_1"
+        ]
+    },
+    {
+        "name": "fan1 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_1"
+        ]
+    },
+    {
+        "name": "fan2 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_1"
+        ]
+    },
+    {
+        "name": "fan3 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_1"
+        ]
+    },
+    {
+        "name": "occ objects",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/org/open_power/control/occ0",
+            "/org/open_power/control/occ1",
+            "/org/open_power/control/occ2",
+            "/org/open_power/control/occ3",
+            "/org/open_power/control/occ4",
+            "/org/open_power/control/occ5",
+            "/org/open_power/control/occ6",
+            "/org/open_power/control/occ7"
+        ]
+    },
+    {
+        "name": "proc0 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc1 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc2 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc3 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc4 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc4_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc4_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc5 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc5_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc5_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc6 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc6_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc6_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc7 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc7_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc7_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc0 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc1 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc2 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc3 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc4 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc4_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc5 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc5_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc6 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc6_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc7 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc7_ioring_temp"
+        ]
+    },
+    {
+        "name": "dram temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm32_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm33_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm34_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm35_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm36_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm37_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm38_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm39_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm40_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm41_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm42_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm43_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm44_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm45_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm46_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm47_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm48_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm49_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm50_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm51_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm52_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm53_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm54_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm55_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm56_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm57_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm58_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm59_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm60_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm61_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm62_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm63_dram_temp"
+        ]
+    },
+    {
+        "name": "pmic temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm32_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm33_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm34_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm35_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm36_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm37_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm38_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm39_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm40_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm41_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm42_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm43_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm44_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm45_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm46_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm47_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm48_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm49_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm50_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm51_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm52_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm53_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm54_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm55_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm56_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm57_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm58_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm59_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm60_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm61_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm62_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm63_pmic_temp"
+        ]
+    },
+    {
+        "name": "internal memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm32_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm33_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm34_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm35_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm36_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm37_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm38_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm39_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm40_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm41_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm42_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm43_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm44_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm45_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm46_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm47_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm48_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm49_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm50_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm51_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm52_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm53_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm54_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm55_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm56_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm57_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm58_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm59_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm60_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm61_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm62_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm63_intmb_temp"
+        ]
+    },
+    {
+        "name": "dram and external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm32_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm33_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm34_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm35_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm36_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm37_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm38_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm39_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm40_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm41_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm42_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm43_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm44_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm45_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm46_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm47_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm48_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm49_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm50_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm51_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm52_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm53_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm54_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm55_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm56_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm57_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm58_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm59_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm60_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm61_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm62_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm63_dram_extmb_temp"
+        ]
+    },
+    {
+        "name": "external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm32_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm33_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm34_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm35_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm36_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm37_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm38_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm39_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm40_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm41_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm42_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm43_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm44_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm45_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm46_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm47_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm48_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm49_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm50_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm51_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm52_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm53_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm54_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm55_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm56_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm57_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm58_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm59_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm60_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm61_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm62_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm63_extmb_temp"
+        ]
+    },
+    {
+        "name": "vdd vrm temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd2_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd3_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd4_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd5_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd6_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd7_temp"
+        ]
+    },
+    {
+        "name": "proc 0 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 2 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 3 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 4 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc4_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 5 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc5_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 6 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc6_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 7 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc7_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 0 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 2 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 3 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 4 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc4_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 5 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc5_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 6 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc6_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 7 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc7_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "nvme temps",
+        "service": "xyz.openbmc_project.NVMeSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp"
+        ]
+    },
+    {
+        "name": "planar temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
+        ]
+    },
+    {
+        // Bear Lake card
+        "name": "pcie cable card temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C1_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C5_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C6_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
+        ]
+    },
+    {
+        "name": "ambient temp",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
+        ]
+    },
+    {
+        "name": "altitude",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": ["/xyz/openbmc_project/sensors/altitude/Altitude"]
+    },
+    {
+        "name": "pcie cards",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot5/pcie_card5",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+        ]
+    },
+    {
+        "name": "pcie slots",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot5",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,everest/pcie_cards.json b/control/config_files/p10bmc/ibm,everest/pcie_cards.json
index aca5675..c419964 100755
--- a/control/config_files/p10bmc/ibm,everest/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,everest/pcie_cards.json
@@ -1,148 +1,148 @@
 {
-  "cards": [
-    {
-      "name": "PHYP had errors getting IDs",
-      "vendor_id": "0xFFFF",
-      "device_id": "0xFFFF",
-      "subsystem_vendor_id": "0xFFFF",
-      "subsystem_id": "0xFFFF",
-      "floor_index": 3
-    },
-    {
-      "name": "Bear Lake and Bear River",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0004",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "GTO",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x033B",
-      "floor_index": 2
-    },
-    {
-      "name": "ZR1",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x035E",
-      "floor_index": 1
-    },
-    {
-      "name": "Z06",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0355",
-      "floor_index": 2
-    },
-    {
-      "name": "Glacier Park EDR 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1013",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x04F1",
-      "floor_index": 1
-    },
-    {
-      "name": "Glacier Park EDR 1Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1013",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x04F4",
-      "floor_index": 1
-    },
-    {
-      "name": "Glacier Park EN 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1013",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x04F7",
-      "floor_index": 1
-    },
-    {
-      "name": "Lassen Dual Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1019",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0617",
-      "floor_index": 1
-    },
-    {
-      "name": "Lassen Single Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1017",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0616",
-      "floor_index": 1
-    },
-    {
-      "name": "Everglades 10Gb 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1015",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x061F",
-      "floor_index": 1
-    },
-    {
-      "name": "Everglades 25Gb 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1015",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x061E",
-      "floor_index": 1
-    },
-    {
-      "name": "Haleakala EN 2Port 100Gb",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1019",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0635",
-      "floor_index": 2
-    },
-    {
-      "name": "Bono HMS",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0005",
-      "floor_index": 1
-    },
-    {
-      "name": "Cedar Lake 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A6",
-      "floor_index": 3
-    },
-    {
-      "name": "Cedar Lake Crypto 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A5",
-      "floor_index": 3
-    },
-    {
-      "name": "Castello",
-      "vendor_id": "0x1014",
-      "device_id": "0x0611",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0611",
-      "floor_index": 3
-    },
-    {
-      "name": "Baby Blue Tip (CX-3 Pro)",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1007",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x04E7",
-      "floor_index": 1
-    }
-  ]
+    "cards": [
+        {
+            "name": "PHYP had errors getting IDs",
+            "vendor_id": "0xFFFF",
+            "device_id": "0xFFFF",
+            "subsystem_vendor_id": "0xFFFF",
+            "subsystem_id": "0xFFFF",
+            "floor_index": 3
+        },
+        {
+            "name": "Bear Lake and Bear River",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0004",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "GTO",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x033B",
+            "floor_index": 2
+        },
+        {
+            "name": "ZR1",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x035E",
+            "floor_index": 1
+        },
+        {
+            "name": "Z06",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0355",
+            "floor_index": 2
+        },
+        {
+            "name": "Glacier Park EDR 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1013",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x04F1",
+            "floor_index": 1
+        },
+        {
+            "name": "Glacier Park EDR 1Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1013",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x04F4",
+            "floor_index": 1
+        },
+        {
+            "name": "Glacier Park EN 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1013",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x04F7",
+            "floor_index": 1
+        },
+        {
+            "name": "Lassen Dual Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1019",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0617",
+            "floor_index": 1
+        },
+        {
+            "name": "Lassen Single Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1017",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0616",
+            "floor_index": 1
+        },
+        {
+            "name": "Everglades 10Gb 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1015",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x061F",
+            "floor_index": 1
+        },
+        {
+            "name": "Everglades 25Gb 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1015",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x061E",
+            "floor_index": 1
+        },
+        {
+            "name": "Haleakala EN 2Port 100Gb",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1019",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0635",
+            "floor_index": 2
+        },
+        {
+            "name": "Bono HMS",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0005",
+            "floor_index": 1
+        },
+        {
+            "name": "Cedar Lake 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A6",
+            "floor_index": 3
+        },
+        {
+            "name": "Cedar Lake Crypto 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A5",
+            "floor_index": 3
+        },
+        {
+            "name": "Castello",
+            "vendor_id": "0x1014",
+            "device_id": "0x0611",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0611",
+            "floor_index": 3
+        },
+        {
+            "name": "Baby Blue Tip (CX-3 Pro)",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1007",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x04E7",
+            "floor_index": 1
+        }
+    ]
 }
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index 8dc7408..520e0cb 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -1,1146 +1,1146 @@
 [
-   {
-     // Hold fans at the given target when a number of fans are missing.
-     "name": "fan(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 10400
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when a number of rotors are nonfunctional.
-     "name": "fan rotor(s) faulted",
-     "groups": [
-       {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan4 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 10400
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when any critical service
-     // is not running for 5 seconds.
-     "name": "service(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       },
-       {
-         "name": "occ objects",
-         "interface": "org.open_power.OCC.Status",
-         "property": { "name": "OccActive" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "ambient temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "name_has_owner"
-       },
-       {
-         "class": "signal",
-         "signal": "name_owner_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "call_actions_based_on_timer",
-         "timer": {
-           "interval": 5000000,
-           "type": "oneshot"
-         },
-         "actions": [
-           {
-             "name": "set_target_on_missing_owner",
-             "groups": [
-               {
-                 "name": "fan inventory",
-                 "interface": "xyz.openbmc_project.Inventory.Item",
-                 "property": { "name": "Present" }
-               },
-               {
-                 "name": "occ objects",
-                 "interface": "org.open_power.OCC.Status",
-                 "property": { "name": "OccActive" }
-               },
-               {
-                 "name": "nvme temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "planar temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "flett temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "pcie cable card temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "ambient temp",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               }
-             ],
-             "target": 10400
-           }
-         ]
-       }
-     ]
-   },
-   {
-    // Set a fan floor if an OCC isn't active
-    "name": "Non-active OCC(s)",
-    "groups": [
-      {
-        "name": "occ objects",
-        "interface": "org.open_power.OCC.Status",
-        "property": {
-          "name": "OccActive"
-        }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 10400
-      }
-    ]
-  },
-  {
-    // Set a raised fan floor when any temperature sensor is nonfunctional
-    "name": "Nonfunctional temperature sensors",
-    "groups": [
-      {
-        "name": "proc0 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc0 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pmic temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "internal memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram and external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "vdd vrm temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "planar temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "flett temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pcie cable card temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_removed"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 10400
-      }
-    ]
-  },
-  {
-     "name": "Set Proc 0 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 0 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     // Collect group temperatures each iteration the repeating timer expires
-     "name": "Fan control timer loop",
-     "groups": [
-       {
-         "name": "proc0 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc0 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pmic temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "internal memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram and external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "vdd vrm temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "timer",
-         "type": "repeating",
-         "interval": 2000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 63.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 74.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 66.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 82.0,
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 58.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 80.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 70.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 62.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 71.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 63.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 57.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 79.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 75.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 50
-       }
-     ]
-   },
-   {
-     // Remove NVMe temperature objects from cache when they are removed from
-     // dbus. There's no need to react to their removal.
-     "name": "remove nvme objects",
-     "groups": [
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "signal",
-         "signal": "interfaces_removed"
-       }
-     ]
-   },
-   {
-     "name": "set pcie floor index",
-     "groups": [
-       {
-         "name": "pcie slots",
-         "interface": "xyz.openbmc_project.State.Decorator.PowerState",
-         "property": {
-           "name": "PowerState"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0DeviceId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0VendorId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemVendorId"
-         }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "pcie_card_floors",
-         "use_config_specific_files": true,
-         "settle_time": 2
-       }
-     ]
-   },
-   {
-     "name": "Set altitude offset parameter",
-     "groups": [
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         // Refresh altitude every 24hrs
-         "class": "timer",
-         "type": "repeating",
-         "interval": 86400000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 3000,
-           "value": [
-             { "arg_value": 1000, "parameter_value": 0 },
-             { "arg_value": 1900, "parameter_value": 1000 },
-             { "arg_value": 2800, "parameter_value": 2000 }
-           ]
-         }
-       }
-     ]
-   },
-   {
-     "name": "Fan floors",
-     "groups": [
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.Sensor.Value",
-        "property": { "name": "Value" }
-      },
-      {
-        "name": "power mode",
-        "interface": "xyz.openbmc_project.Control.Power.Mode",
-        "property": { "name": "PowerMode" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "parameter",
-         "parameter": "pcie_floor_index"
-       },
-       {
-         "class": "parameter",
-         "parameter": "altitude_offset"
-       }
-     ],
-     "actions": [
-       {
-         "name": "mapped_floor",
-         "key_group": "ambient temp",
-         "fan_floors": [
-          {
-            // Entry valid for ambient temp < 27
-            "key": 27,
-            "default_floor": 3700,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 6000 },
-                  { "value": 2, "floor": 7000 },
-                  { "value": 3, "floor": 8000 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 32
-            "key": 32,
-            "default_floor": 5000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 9000 },
-                  { "value": 3, "floor": 9500 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 37
-            "key": 37,
-            "default_floor": 6000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 9000 },
-                  { "value": 2, "floor": 9500 },
-                  { "value": 3, "floor": 10400 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 42
-            "key": 42,
-            "default_floor": 8000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 9500 },
-                  { "value": 2, "floor": 10400 },
-                  { "value": 3, "floor": 10400 }
-                ]
-              }
-            ]
-          }
+    {
+        // Hold fans at the given target when a number of fans are missing.
+        "name": "fan(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 10400
+            }
         ]
-       }
-     ]
-   }
+    },
+    {
+        // Hold fans at the given target when a number of rotors are nonfunctional.
+        "name": "fan rotor(s) faulted",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan4 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 10400
+            }
+        ]
+    },
+    {
+        // Hold fans at the given target when any critical service
+        // is not running for 5 seconds.
+        "name": "service(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            },
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": { "name": "OccActive" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "name_has_owner"
+            },
+            {
+                "class": "signal",
+                "signal": "name_owner_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "call_actions_based_on_timer",
+                "timer": {
+                    "interval": 5000000,
+                    "type": "oneshot"
+                },
+                "actions": [
+                    {
+                        "name": "set_target_on_missing_owner",
+                        "groups": [
+                            {
+                                "name": "fan inventory",
+                                "interface": "xyz.openbmc_project.Inventory.Item",
+                                "property": { "name": "Present" }
+                            },
+                            {
+                                "name": "occ objects",
+                                "interface": "org.open_power.OCC.Status",
+                                "property": { "name": "OccActive" }
+                            },
+                            {
+                                "name": "nvme temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "planar temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "flett temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "pcie cable card temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "ambient temp",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            }
+                        ],
+                        "target": 10400
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        // Set a fan floor if an OCC isn't active
+        "name": "Non-active OCC(s)",
+        "groups": [
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": {
+                    "name": "OccActive"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 10400
+            }
+        ]
+    },
+    {
+        // Set a raised fan floor when any temperature sensor is nonfunctional
+        "name": "Nonfunctional temperature sensors",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 10400
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        // Collect group temperatures each iteration the repeating timer expires
+        "name": "Fan control timer loop",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "timer",
+                "type": "repeating",
+                "interval": 2000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 63.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 74.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 66.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 82.0,
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 58.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 80.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 70.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 62.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 71.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 63.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 57.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 79.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 75.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 50
+            }
+        ]
+    },
+    {
+        // Remove NVMe temperature objects from cache when they are removed from
+        // dbus. There's no need to react to their removal.
+        "name": "remove nvme objects",
+        "groups": [
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            }
+        ]
+    },
+    {
+        "name": "set pcie floor index",
+        "groups": [
+            {
+                "name": "pcie slots",
+                "interface": "xyz.openbmc_project.State.Decorator.PowerState",
+                "property": {
+                    "name": "PowerState"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0DeviceId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0VendorId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemVendorId"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "pcie_card_floors",
+                "use_config_specific_files": true,
+                "settle_time": 2
+            }
+        ]
+    },
+    {
+        "name": "Set altitude offset parameter",
+        "groups": [
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                // Refresh altitude every 24hrs
+                "class": "timer",
+                "type": "repeating",
+                "interval": 86400000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 3000,
+                    "value": [
+                        { "arg_value": 1000, "parameter_value": 0 },
+                        { "arg_value": 1900, "parameter_value": 1000 },
+                        { "arg_value": 2800, "parameter_value": 2000 }
+                    ]
+                }
+            }
+        ]
+    },
+    {
+        "name": "Fan floors",
+        "groups": [
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "power mode",
+                "interface": "xyz.openbmc_project.Control.Power.Mode",
+                "property": { "name": "PowerMode" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "parameter",
+                "parameter": "pcie_floor_index"
+            },
+            {
+                "class": "parameter",
+                "parameter": "altitude_offset"
+            }
+        ],
+        "actions": [
+            {
+                "name": "mapped_floor",
+                "key_group": "ambient temp",
+                "fan_floors": [
+                    {
+                        // Entry valid for ambient temp < 27
+                        "key": 27,
+                        "default_floor": 3700,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 6000 },
+                                    { "value": 2, "floor": 7000 },
+                                    { "value": 3, "floor": 8000 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 32
+                        "key": 32,
+                        "default_floor": 5000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 7000 },
+                                    { "value": 2, "floor": 9000 },
+                                    { "value": 3, "floor": 9500 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 37
+                        "key": 37,
+                        "default_floor": 6000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 9000 },
+                                    { "value": 2, "floor": 9500 },
+                                    { "value": 3, "floor": 10400 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 42
+                        "key": 42,
+                        "default_floor": 8000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 9500 },
+                                    { "value": 2, "floor": 10400 },
+                                    { "value": 3, "floor": 10400 }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index eb4d172..fa19473 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -1,375 +1,373 @@
 [
- {
-   "name": "fan inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4"
-   ]
- },
- {
-   "name": "fan0 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0"
-   ]
- },
- {
-   "name": "fan1 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0"
-   ]
- },
- {
-   "name": "fan2 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0"
-   ]
- },
- {
-   "name": "fan4 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0"
-   ]
- },
- {
-   "name": "occ objects",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/org/open_power/control/occ0",
-     "/org/open_power/control/occ1"
-   ]
- },
- {
-   "name": "proc0 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
-   ]
- },
- {
-   "name": "proc1 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
-   ]
- },
- {
-   "name": "proc0 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
-   ]
- },
- {
-   "name": "proc1 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
-   ]
- },
- {
-   "name": "dram temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp"
-   ]
- },
- {
-   "name": "pmic temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp"
-   ]
- },
- {
-   "name": "internal memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp"
-   ]
- },
- {
-   // Repurposed as DRAM temperature sensors for 4U DDIMMs
-   "name": "dram and external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp"
-   ]
- },
- {
-   // Repurposed as PMIC temperature sensors for 4U DDIMMs
-   "name": "external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp"
-   ]
- },
- {
-   "name": "vdd vrm temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp"
-   ]
- },
- {
-   "name": "proc 0 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 0 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "nvme temps",
-   "service": "xyz.openbmc_project.NVMeSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
-   ]
- },
- {
-   "name": "planar temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
-     "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
-   ]
- },
- {
-   "name": "flett temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
-   ]
- },
- {
-   // Bear Lake card
-   "name": "pcie cable card temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
-   ]
- },
- {
-   "name": "ambient temp",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
-   ]
- },
- {
-   "name": "pcie cards",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
-   ]
- },
- {
-   "name": "pcie slots",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
-   ]
- },
- {
-   "name": "power mode",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/control/host0/power_mode"
-   ]
- }
+    {
+        "name": "fan inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4"
+        ]
+    },
+    {
+        "name": "fan0 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0"
+        ]
+    },
+    {
+        "name": "fan1 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0"
+        ]
+    },
+    {
+        "name": "fan2 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0"
+        ]
+    },
+    {
+        "name": "fan4 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0"
+        ]
+    },
+    {
+        "name": "occ objects",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/org/open_power/control/occ0",
+            "/org/open_power/control/occ1"
+        ]
+    },
+    {
+        "name": "proc0 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc1 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc0 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc1 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
+        ]
+    },
+    {
+        "name": "dram temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp"
+        ]
+    },
+    {
+        "name": "pmic temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp"
+        ]
+    },
+    {
+        "name": "internal memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp"
+        ]
+    },
+    {
+        // Repurposed as DRAM temperature sensors for 4U DDIMMs
+        "name": "dram and external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp"
+        ]
+    },
+    {
+        // Repurposed as PMIC temperature sensors for 4U DDIMMs
+        "name": "external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp"
+        ]
+    },
+    {
+        "name": "vdd vrm temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp"
+        ]
+    },
+    {
+        "name": "proc 0 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 0 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "nvme temps",
+        "service": "xyz.openbmc_project.NVMeSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
+        ]
+    },
+    {
+        "name": "planar temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
+        ]
+    },
+    {
+        "name": "flett temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
+        ]
+    },
+    {
+        // Bear Lake card
+        "name": "pcie cable card temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
+        ]
+    },
+    {
+        "name": "ambient temp",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
+        ]
+    },
+    {
+        "name": "pcie cards",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+        ]
+    },
+    {
+        "name": "pcie slots",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
+        ]
+    },
+    {
+        "name": "power mode",
+        "service": "org.open_power.OCC.Control",
+        "members": ["/xyz/openbmc_project/control/host0/power_mode"]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
index 9c8dd19..650dd9e 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
@@ -1,196 +1,196 @@
 {
-  "cards": [
-    {
-      "name": "PHYP had errors getting IDs",
-      "vendor_id": "0xFFFF",
-      "device_id": "0xFFFF",
-      "subsystem_vendor_id": "0xFFFF",
-      "subsystem_id": "0xFFFF",
-      "floor_index": 3
-    },
-    {
-      "name": "Flett",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0007",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "Bear Lake and Bear River",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0004",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "GTO",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x033B",
-      "floor_index": 2
-    },
-    {
-      "name": "ZR1",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x035E",
-      "floor_index": 2
-    },
-    {
-      "name": "Z06",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0355",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0621",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0622",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0629",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064A",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064B",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064C",
-      "floor_index": 2
-    },
-    {
-      "name": "Sentry",
-      "vendor_id": "0x1014",
-      "device_id": "0x0466",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0466",
-      "floor_index": 2
-    },
-    {
-      "name": "Haleakala EN 2Port 100Gb",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1019",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0635",
-      "floor_index": 1
-    },
-    {
-      "name": "Cedar Lake 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A6",
-      "floor_index": 3
-    },
-    {
-      "name": "Cedar Lake Crypto 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A5",
-      "floor_index": 3
-    },
-    {
-      "name": "Crater Lake 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A4",
-      "floor_index": 3
-    },
-    {
-      "name": "Crater Lake Crypto 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A3",
-      "floor_index": 3
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0682",
-      "floor_index": 2
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0683",
-      "floor_index": 2
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0684",
-      "floor_index": 2
-    },
-    {
-      "name": "Castello",
-      "vendor_id": "0x1014",
-      "device_id": "0x0611",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0611",
-      "floor_index": 3
-    },
-    {
-      "name": "Puntfish",
-      "vendor_id": "0x1077",
-      "device_id": "0x2271",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x069E",
-      "floor_index": 1
-    },
-    {
-      "name": "Bluefish",
-      "vendor_id": "0x10DF",
-      "device_id": "0xE300",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0614",
-      "floor_index": 1
-    }
-  ]
+    "cards": [
+        {
+            "name": "PHYP had errors getting IDs",
+            "vendor_id": "0xFFFF",
+            "device_id": "0xFFFF",
+            "subsystem_vendor_id": "0xFFFF",
+            "subsystem_id": "0xFFFF",
+            "floor_index": 3
+        },
+        {
+            "name": "Flett",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0007",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "Bear Lake and Bear River",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0004",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "GTO",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x033B",
+            "floor_index": 2
+        },
+        {
+            "name": "ZR1",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x035E",
+            "floor_index": 2
+        },
+        {
+            "name": "Z06",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0355",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0621",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0622",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0629",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064A",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064B",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064C",
+            "floor_index": 2
+        },
+        {
+            "name": "Sentry",
+            "vendor_id": "0x1014",
+            "device_id": "0x0466",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0466",
+            "floor_index": 2
+        },
+        {
+            "name": "Haleakala EN 2Port 100Gb",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1019",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0635",
+            "floor_index": 1
+        },
+        {
+            "name": "Cedar Lake 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A6",
+            "floor_index": 3
+        },
+        {
+            "name": "Cedar Lake Crypto 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A5",
+            "floor_index": 3
+        },
+        {
+            "name": "Crater Lake 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A4",
+            "floor_index": 3
+        },
+        {
+            "name": "Crater Lake Crypto 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A3",
+            "floor_index": 3
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0682",
+            "floor_index": 2
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0683",
+            "floor_index": 2
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0684",
+            "floor_index": 2
+        },
+        {
+            "name": "Castello",
+            "vendor_id": "0x1014",
+            "device_id": "0x0611",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0611",
+            "floor_index": 3
+        },
+        {
+            "name": "Puntfish",
+            "vendor_id": "0x1077",
+            "device_id": "0x2271",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x069E",
+            "floor_index": 1
+        },
+        {
+            "name": "Bluefish",
+            "vendor_id": "0x10DF",
+            "device_id": "0xE300",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0614",
+            "floor_index": 1
+        }
+    ]
 }
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/events.json b/control/config_files/p10bmc/ibm,rainier-2u/events.json
index 579fffe..21a66f8 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/events.json
@@ -1,1752 +1,1752 @@
 [
-   {
-     // Hold fans at the given target when a number of fans are missing.
-     "name": "fan(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 18000
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when a number of rotors are nonfunctional.
-     "name": "fan rotor(s) faulted",
-     "groups": [
-       {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan3 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan4 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan5 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 18000
-       }
-     ]
-   },
-   {
-     // (for the following 6 rules)
-     // if a dual-rotor fan becomes non-functional, lock its speed to
-     // poweron_target to lock the other rotor to full_speed
-     "name": "nonfunc rotor override-0",
-     "groups": [
-      {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan0" ],
-         "target": 18000
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-1",
-     "groups": [
-      {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan1" ],
-         "target": 18000
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-2",
-     "groups": [
-      {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan2" ],
-         "target": 18000
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-3",
-     "groups": [
-      {
-         "name": "fan3 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan3" ],
-         "target": 18000
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-4",
-     "groups": [
-      {
-         "name": "fan4 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan4" ],
-         "target": 18000
-       }
-    ]
-  },
-  {
-     "name": "nonfunc rotor override-5",
-     "groups": [
-      {
-         "name": "fan5 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "override_fan_target",
-         "count": 1,
-         "state": false,
-         "fans": [ "fan5" ],
-         "target": 18000
-       }
-    ]
-  },
-  {
-     // Hold fans at the given target when any critical service
-     // is not running for 5 seconds.
-     "name": "service(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       },
-       {
-         "name": "occ objects",
-         "interface": "org.open_power.OCC.Status",
-         "property": { "name": "OccActive" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "ambient temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "name_has_owner"
-       },
-       {
-         "class": "signal",
-         "signal": "name_owner_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "call_actions_based_on_timer",
-         "timer": {
-           "interval": 5000000,
-           "type": "oneshot"
-         },
-         "actions": [
-           {
-             "name": "set_target_on_missing_owner",
-             "groups": [
-               {
-                 "name": "fan inventory",
-                 "interface": "xyz.openbmc_project.Inventory.Item",
-                 "property": { "name": "Present" }
-               },
-               {
-                 "name": "occ objects",
-                 "interface": "org.open_power.OCC.Status",
-                 "property": { "name": "OccActive" }
-               },
-               {
-                 "name": "nvme temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "planar temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "flett temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "pcie cable card temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "ambient temp",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               }
-             ],
-             "target": 18000
-           }
-         ]
-       }
-     ]
-   },
-   {
-    // Set a fan floor if an OCC isn't active
-    "name": "Non-active OCCs",
-    "groups": [
-      {
-        "name": "occ objects",
-        "interface": "org.open_power.OCC.Status",
-        "property": {
-          "name": "OccActive"
-        }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 18000
-      }
-    ]
-  },
-  {
-    // Set a raised fan floor when any temperature or altitude sensor is
-    // nonfunctional
-    "name": "Nonfunctional temperature sensors",
-    "groups": [
-      {
-        "name": "proc0 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc2 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc3 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc0 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc2 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc3 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pmic temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "internal memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram and external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "vdd vrm temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "planar temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "flett temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pcie cable card temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "altitude",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_removed"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 18000
-      }
-    ]
-  },
-  {
-     "name": "Set Proc 0 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 2 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 2 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 3 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 3 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 0 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 2 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 2 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 3 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 3 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     // Collect group temperatures each iteration the repeating timer expires
-     "name": "Fan control timer loop",
-     "groups": [
-       {
-         "name": "proc0 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc2 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc3 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc0 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc2 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc3 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pmic temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "internal memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram and external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "vdd vrm temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "timer",
-         "type": "repeating",
-         "interval": 2000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc2 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc3 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc2 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc3 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 68.0,
-         "delta": 100
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 68.0,
-         "delta": 100
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 74.0,
-         "delta": 100
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 82.0,
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 58.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 80.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 70.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc2 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc3 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc2 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc3 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 71.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 52.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 52.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 79.0,
-         "delta": 30
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 80
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 75.0,
-         "delta": 80
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 80
-       }
-     ]
-   },
-   {
-     // Remove NVMe temperature objects from cache when they are removed from
-     // dbus. There's no need to react to their removal.
-     "name": "remove nvme objects",
-     "groups": [
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "signal",
-         "signal": "interfaces_removed"
-       }
-     ]
-   },
-   {
-     "name": "set pcie floor index",
-     "groups": [
-       {
-         "name": "pcie slots",
-         "interface": "xyz.openbmc_project.State.Decorator.PowerState",
-         "property": {
-           "name": "PowerState"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0DeviceId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0VendorId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemVendorId"
-         }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "pcie_card_floors",
-         "use_config_specific_files": true,
-         "settle_time": 2
-       }
-     ]
-   },
-   {
-     "name": "Set altitude offset parameter",
-     "groups": [
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         // Refresh altitude every 24hrs
-         "class": "timer",
-         "type": "repeating",
-         "interval": 86400000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_20_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 10000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 700 },
-             { "arg_value": 1500, "parameter_value": 1600 },
-             { "arg_value": 2000, "parameter_value": 2300 },
-             { "arg_value": 2500, "parameter_value": 3200 },
-             { "arg_value": 3300, "parameter_value": 4000 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_25_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 10000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 1000 },
-             { "arg_value": 1500, "parameter_value": 2100 },
-             { "arg_value": 2000, "parameter_value": 3100 },
-             { "arg_value": 2500, "parameter_value": 4100 },
-             { "arg_value": 3300, "parameter_value": 4900 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_30_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 10000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 1000 },
-             { "arg_value": 1500, "parameter_value": 2100 },
-             { "arg_value": 2000, "parameter_value": 3200 },
-             { "arg_value": 2500, "parameter_value": 4000 },
-             { "arg_value": 3300, "parameter_value": 4800 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_35_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 10000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 900 },
-             { "arg_value": 1500, "parameter_value": 1700 },
-             { "arg_value": 2000, "parameter_value": 2500 },
-             { "arg_value": 2500, "parameter_value": 3400 },
-             { "arg_value": 3300, "parameter_value": 4200 }
-           ]
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "ambient_40_altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 10000,
-           "value": [
-             { "arg_value": 500, "parameter_value": 0 },
-             { "arg_value": 1000, "parameter_value": 1000 },
-             { "arg_value": 1500, "parameter_value": 1900 },
-             { "arg_value": 2000, "parameter_value": 2800 },
-             { "arg_value": 2500, "parameter_value": 3700 },
-             { "arg_value": 3300, "parameter_value": 4500 }
-           ]
-         }
-       }
-     ]
-   },
-   {
-     "name": "Fan floors",
-     "groups": [
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.Sensor.Value",
-        "property": { "name": "Value" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "parameter",
-         "parameter": "pcie_floor_index"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_20_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_25_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_30_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_35_altitude_offset"
-       },
-       {
-         "class": "parameter",
-         "parameter": "ambient_40_altitude_offset"
-       }
-     ],
-     "actions": [
-       {
-         "name": "mapped_floor",
-         "key_group": "ambient temp",
-         "fan_floors": [
-          {
-            // Entry valid for temps < 20
-            "key": 20,
-            "default_floor": 5400,
-            "floor_offset_parameter": "ambient_20_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 5600 },
-                  { "value": 2, "floor": 9000 },
-                  { "value": 3, "floor": 9000 },
-                  { "value": 4, "floor": 9200 },
-                  { "value": 5, "floor": 10600 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 25
-            "key": 25,
-            "default_floor": 7300,
-            "floor_offset_parameter": "ambient_25_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 7800 },
-                  { "value": 2, "floor": 10700 },
-                  { "value": 3, "floor": 11300 },
-                  { "value": 4, "floor": 12700 },
-                  { "value": 5, "floor": 13900 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 30
-            "key": 30,
-            "default_floor": 9100,
-            "floor_offset_parameter": "ambient_30_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 10300 },
-                  { "value": 2, "floor": 12100 },
-                  { "value": 3, "floor": 14400 },
-                  { "value": 4, "floor": 16300 },
-                  { "value": 5, "floor": 17200 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 35
-            "key": 35,
-            "default_floor": 10800,
-            "floor_offset_parameter": "ambient_35_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 12700 },
-                  { "value": 2, "floor": 13500 },
-                  { "value": 3, "floor": 17400 },
-                  { "value": 4, "floor": 18000 },
-                  { "value": 5, "floor": 18000 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for temps < 40
-            "key": 40,
-            "default_floor": 12600,
-            "floor_offset_parameter": "ambient_40_altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 15000 },
-                  { "value": 2, "floor": 15500 },
-                  { "value": 3, "floor": 18000 },
-                  { "value": 4, "floor": 18000 },
-                  { "value": 5, "floor": 18000 }
-                ]
-              }
-            ]
-          }
+    {
+        // Hold fans at the given target when a number of fans are missing.
+        "name": "fan(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 18000
+            }
         ]
-       }
-     ]
-   }
+    },
+    {
+        // Hold fans at the given target when a number of rotors are nonfunctional.
+        "name": "fan rotor(s) faulted",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan3 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan4 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan5 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 18000
+            }
+        ]
+    },
+    {
+        // (for the following 6 rules)
+        // if a dual-rotor fan becomes non-functional, lock its speed to
+        // poweron_target to lock the other rotor to full_speed
+        "name": "nonfunc rotor override-0",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan0"],
+                "target": 18000
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-1",
+        "groups": [
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan1"],
+                "target": 18000
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-2",
+        "groups": [
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan2"],
+                "target": 18000
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-3",
+        "groups": [
+            {
+                "name": "fan3 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan3"],
+                "target": 18000
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-4",
+        "groups": [
+            {
+                "name": "fan4 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan4"],
+                "target": 18000
+            }
+        ]
+    },
+    {
+        "name": "nonfunc rotor override-5",
+        "groups": [
+            {
+                "name": "fan5 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "override_fan_target",
+                "count": 1,
+                "state": false,
+                "fans": ["fan5"],
+                "target": 18000
+            }
+        ]
+    },
+    {
+        // Hold fans at the given target when any critical service
+        // is not running for 5 seconds.
+        "name": "service(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            },
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": { "name": "OccActive" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "name_has_owner"
+            },
+            {
+                "class": "signal",
+                "signal": "name_owner_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "call_actions_based_on_timer",
+                "timer": {
+                    "interval": 5000000,
+                    "type": "oneshot"
+                },
+                "actions": [
+                    {
+                        "name": "set_target_on_missing_owner",
+                        "groups": [
+                            {
+                                "name": "fan inventory",
+                                "interface": "xyz.openbmc_project.Inventory.Item",
+                                "property": { "name": "Present" }
+                            },
+                            {
+                                "name": "occ objects",
+                                "interface": "org.open_power.OCC.Status",
+                                "property": { "name": "OccActive" }
+                            },
+                            {
+                                "name": "nvme temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "planar temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "flett temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "pcie cable card temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "ambient temp",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            }
+                        ],
+                        "target": 18000
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        // Set a fan floor if an OCC isn't active
+        "name": "Non-active OCCs",
+        "groups": [
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": {
+                    "name": "OccActive"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 18000
+            }
+        ]
+    },
+    {
+        // Set a raised fan floor when any temperature or altitude sensor is
+        // nonfunctional
+        "name": "Nonfunctional temperature sensors",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc2 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc3 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc2 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc3 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 18000
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 2 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 2 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 3 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 3 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 2 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 2 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 3 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 3 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        // Collect group temperatures each iteration the repeating timer expires
+        "name": "Fan control timer loop",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc2 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc3 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc2 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc3 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "timer",
+                "type": "repeating",
+                "interval": 2000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc2 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc3 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc2 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc3 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 68.0,
+                "delta": 100
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 68.0,
+                "delta": 100
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 74.0,
+                "delta": 100
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 82.0,
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 58.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 80.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 70.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc2 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc3 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc2 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc3 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 71.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 52.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 52.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 79.0,
+                "delta": 30
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 80
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 75.0,
+                "delta": 80
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 80
+            }
+        ]
+    },
+    {
+        // Remove NVMe temperature objects from cache when they are removed from
+        // dbus. There's no need to react to their removal.
+        "name": "remove nvme objects",
+        "groups": [
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            }
+        ]
+    },
+    {
+        "name": "set pcie floor index",
+        "groups": [
+            {
+                "name": "pcie slots",
+                "interface": "xyz.openbmc_project.State.Decorator.PowerState",
+                "property": {
+                    "name": "PowerState"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0DeviceId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0VendorId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemVendorId"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "pcie_card_floors",
+                "use_config_specific_files": true,
+                "settle_time": 2
+            }
+        ]
+    },
+    {
+        "name": "Set altitude offset parameter",
+        "groups": [
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                // Refresh altitude every 24hrs
+                "class": "timer",
+                "type": "repeating",
+                "interval": 86400000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_20_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 10000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 700 },
+                        { "arg_value": 1500, "parameter_value": 1600 },
+                        { "arg_value": 2000, "parameter_value": 2300 },
+                        { "arg_value": 2500, "parameter_value": 3200 },
+                        { "arg_value": 3300, "parameter_value": 4000 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_25_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 10000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 1000 },
+                        { "arg_value": 1500, "parameter_value": 2100 },
+                        { "arg_value": 2000, "parameter_value": 3100 },
+                        { "arg_value": 2500, "parameter_value": 4100 },
+                        { "arg_value": 3300, "parameter_value": 4900 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_30_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 10000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 1000 },
+                        { "arg_value": 1500, "parameter_value": 2100 },
+                        { "arg_value": 2000, "parameter_value": 3200 },
+                        { "arg_value": 2500, "parameter_value": 4000 },
+                        { "arg_value": 3300, "parameter_value": 4800 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_35_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 10000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 900 },
+                        { "arg_value": 1500, "parameter_value": 1700 },
+                        { "arg_value": 2000, "parameter_value": 2500 },
+                        { "arg_value": 2500, "parameter_value": 3400 },
+                        { "arg_value": 3300, "parameter_value": 4200 }
+                    ]
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "ambient_40_altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 10000,
+                    "value": [
+                        { "arg_value": 500, "parameter_value": 0 },
+                        { "arg_value": 1000, "parameter_value": 1000 },
+                        { "arg_value": 1500, "parameter_value": 1900 },
+                        { "arg_value": 2000, "parameter_value": 2800 },
+                        { "arg_value": 2500, "parameter_value": 3700 },
+                        { "arg_value": 3300, "parameter_value": 4500 }
+                    ]
+                }
+            }
+        ]
+    },
+    {
+        "name": "Fan floors",
+        "groups": [
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "parameter",
+                "parameter": "pcie_floor_index"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_20_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_25_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_30_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_35_altitude_offset"
+            },
+            {
+                "class": "parameter",
+                "parameter": "ambient_40_altitude_offset"
+            }
+        ],
+        "actions": [
+            {
+                "name": "mapped_floor",
+                "key_group": "ambient temp",
+                "fan_floors": [
+                    {
+                        // Entry valid for temps < 20
+                        "key": 20,
+                        "default_floor": 5400,
+                        "floor_offset_parameter": "ambient_20_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 5600 },
+                                    { "value": 2, "floor": 9000 },
+                                    { "value": 3, "floor": 9000 },
+                                    { "value": 4, "floor": 9200 },
+                                    { "value": 5, "floor": 10600 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 25
+                        "key": 25,
+                        "default_floor": 7300,
+                        "floor_offset_parameter": "ambient_25_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 7800 },
+                                    { "value": 2, "floor": 10700 },
+                                    { "value": 3, "floor": 11300 },
+                                    { "value": 4, "floor": 12700 },
+                                    { "value": 5, "floor": 13900 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 30
+                        "key": 30,
+                        "default_floor": 9100,
+                        "floor_offset_parameter": "ambient_30_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 10300 },
+                                    { "value": 2, "floor": 12100 },
+                                    { "value": 3, "floor": 14400 },
+                                    { "value": 4, "floor": 16300 },
+                                    { "value": 5, "floor": 17200 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 35
+                        "key": 35,
+                        "default_floor": 10800,
+                        "floor_offset_parameter": "ambient_35_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 12700 },
+                                    { "value": 2, "floor": 13500 },
+                                    { "value": 3, "floor": 17400 },
+                                    { "value": 4, "floor": 18000 },
+                                    { "value": 5, "floor": 18000 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for temps < 40
+                        "key": 40,
+                        "default_floor": 12600,
+                        "floor_offset_parameter": "ambient_40_altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 15000 },
+                                    { "value": 2, "floor": 15500 },
+                                    { "value": 3, "floor": 18000 },
+                                    { "value": 4, "floor": 18000 },
+                                    { "value": 5, "floor": 18000 }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index 5c98bfc..41cc30d 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -1,593 +1,591 @@
 [
- {
-   "name": "fan inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5"
-   ]
- },
- {
-   "name": "fan0 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_1"
-   ]
- },
- {
-   "name": "fan1 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_1"
-   ]
- },
- {
-   "name": "fan2 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_1"
-   ]
- },
- {
-   "name": "fan3 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_1"
-   ]
- },
- {
-   "name": "fan4 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_1"
-   ]
- },
- {
-   "name": "fan5 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5/fan5_0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5/fan5_1"
-   ]
- },
- {
-   "name": "occ objects",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/org/open_power/control/occ0",
-     "/org/open_power/control/occ1",
-     "/org/open_power/control/occ2",
-     "/org/open_power/control/occ3"
-   ]
- },
- {
-   "name": "proc0 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
-   ]
- },
- {
-   "name": "proc1 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
-   ]
- },
- {
-   "name": "proc2 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core15_1_temp"
-   ]
- },
- {
-   "name": "proc3 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core15_1_temp"
-   ]
- },
- {
-   "name": "proc0 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
-   ]
- },
- {
-   "name": "proc1 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
-   ]
- },
- {
-   "name": "proc2 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
-   ]
- },
- {
-   "name": "proc3 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
-   ]
- },
- {
-   "name": "dram temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_dram_temp"
-   ]
- },
- {
-   "name": "pmic temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_pmic_temp"
-   ]
- },
- {
-   "name": "internal memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_intmb_temp"
-   ]
- },
- {
-   "name": "dram and external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_dram_extmb_temp"
-   ]
- },
- {
-   "name": "external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_extmb_temp"
-   ]
- },
- {
-   "name": "vdd vrm temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd2_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd3_temp"
-   ]
- },
- {
-   "name": "proc 0 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 2 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 3 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 0 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 2 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 3 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "nvme temps",
-   "service": "xyz.openbmc_project.NVMeSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp"
-   ]
- },
- {
-   "name": "planar temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
-     "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
-   ]
- },
- {
-   "name": "flett temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
-   ]
- },
- {
-   // Bear River card
-   "name": "pcie cable card temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C0_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
-   ]
- },
- {
-   "name": "ambient temp",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
-   ]
- },
- {
-   "name": "altitude",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/altitude/Altitude"
-   ]
- },
- {
-   "name": "pcie cards",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
-   ]
- },
- {
-   "name": "pcie slots",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
-   ]
- }
+    {
+        "name": "fan inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5"
+        ]
+    },
+    {
+        "name": "fan0 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_1"
+        ]
+    },
+    {
+        "name": "fan1 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_1"
+        ]
+    },
+    {
+        "name": "fan2 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_1"
+        ]
+    },
+    {
+        "name": "fan3 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_1"
+        ]
+    },
+    {
+        "name": "fan4 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_1"
+        ]
+    },
+    {
+        "name": "fan5 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5/fan5_0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5/fan5_1"
+        ]
+    },
+    {
+        "name": "occ objects",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/org/open_power/control/occ0",
+            "/org/open_power/control/occ1",
+            "/org/open_power/control/occ2",
+            "/org/open_power/control/occ3"
+        ]
+    },
+    {
+        "name": "proc0 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc1 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc2 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc3 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc0 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc1 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc2 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc3 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
+        ]
+    },
+    {
+        "name": "dram temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_dram_temp"
+        ]
+    },
+    {
+        "name": "pmic temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_pmic_temp"
+        ]
+    },
+    {
+        "name": "internal memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_intmb_temp"
+        ]
+    },
+    {
+        "name": "dram and external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_dram_extmb_temp"
+        ]
+    },
+    {
+        "name": "external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_extmb_temp"
+        ]
+    },
+    {
+        "name": "vdd vrm temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd2_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd3_temp"
+        ]
+    },
+    {
+        "name": "proc 0 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 2 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 3 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 0 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 2 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 3 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "nvme temps",
+        "service": "xyz.openbmc_project.NVMeSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp"
+        ]
+    },
+    {
+        "name": "planar temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
+        ]
+    },
+    {
+        "name": "flett temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
+        ]
+    },
+    {
+        // Bear River card
+        "name": "pcie cable card temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
+        ]
+    },
+    {
+        "name": "ambient temp",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
+        ]
+    },
+    {
+        "name": "altitude",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": ["/xyz/openbmc_project/sensors/altitude/Altitude"]
+    },
+    {
+        "name": "pcie cards",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+        ]
+    },
+    {
+        "name": "pcie slots",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json
index ee0111d..83bdf86 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json
@@ -1,180 +1,180 @@
 {
-  "cards": [
-    {
-      "name": "PHYP had errors getting IDs",
-      "vendor_id": "0xFFFF",
-      "device_id": "0xFFFF",
-      "subsystem_vendor_id": "0xFFFF",
-      "subsystem_id": "0xFFFF",
-      "floor_index": 5
-    },
-    {
-      "name": "Flett",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0007",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "Bear Lake and Bear River",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0004",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "Everglades 10Gb 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1015",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x061F",
-      "floor_index": 1
-    },
-    {
-      "name": "Everglades 25Gb 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1015",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x061E",
-      "floor_index": 1
-    },
-    {
-      "name": "Cedar Lake 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A6",
-      "floor_index": 5
-    },
-    {
-      "name": "Cedar Lake Crypto 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A5",
-      "floor_index": 5
-    },
-    {
-      "name": "GTO",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x033B",
-      "floor_index": 3
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0621",
-      "floor_index": 3
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0622",
-      "floor_index": 4
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0629",
-      "floor_index": 4
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064A",
-      "floor_index": 3
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064B",
-      "floor_index": 4
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064C",
-      "floor_index": 4
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0682",
-      "floor_index": 4
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0683",
-      "floor_index": 4
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0684",
-      "floor_index": 4
-    },
-    {
-      "name": "Puntfish",
-      "vendor_id": "0x1077",
-      "device_id": "0x2271",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x069E",
-      "floor_index": 1
-    },
-    {
-      "name": "Flavafish",
-      "vendor_id": "0x1077",
-      "device_id": "0x2281",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0651",
-      "floor_index": 1
-    },
-    {
-      "name": "Haleakala EN 2Port 100Gb",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1019",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0635",
-      "floor_index": 5
-    },
-    {
-      "name": "Crater Lake Crypto 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A3",
-      "floor_index": 5
-    },
-    {
-      "name": "Crater Lake 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A4",
-      "floor_index": 5
-    }
-  ]
+    "cards": [
+        {
+            "name": "PHYP had errors getting IDs",
+            "vendor_id": "0xFFFF",
+            "device_id": "0xFFFF",
+            "subsystem_vendor_id": "0xFFFF",
+            "subsystem_id": "0xFFFF",
+            "floor_index": 5
+        },
+        {
+            "name": "Flett",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0007",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "Bear Lake and Bear River",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0004",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "Everglades 10Gb 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1015",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x061F",
+            "floor_index": 1
+        },
+        {
+            "name": "Everglades 25Gb 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1015",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x061E",
+            "floor_index": 1
+        },
+        {
+            "name": "Cedar Lake 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A6",
+            "floor_index": 5
+        },
+        {
+            "name": "Cedar Lake Crypto 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A5",
+            "floor_index": 5
+        },
+        {
+            "name": "GTO",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x033B",
+            "floor_index": 3
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0621",
+            "floor_index": 3
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0622",
+            "floor_index": 4
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0629",
+            "floor_index": 4
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064A",
+            "floor_index": 3
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064B",
+            "floor_index": 4
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064C",
+            "floor_index": 4
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0682",
+            "floor_index": 4
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0683",
+            "floor_index": 4
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0684",
+            "floor_index": 4
+        },
+        {
+            "name": "Puntfish",
+            "vendor_id": "0x1077",
+            "device_id": "0x2271",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x069E",
+            "floor_index": 1
+        },
+        {
+            "name": "Flavafish",
+            "vendor_id": "0x1077",
+            "device_id": "0x2281",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0651",
+            "floor_index": 1
+        },
+        {
+            "name": "Haleakala EN 2Port 100Gb",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1019",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0635",
+            "floor_index": 5
+        },
+        {
+            "name": "Crater Lake Crypto 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A3",
+            "floor_index": 5
+        },
+        {
+            "name": "Crater Lake 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A4",
+            "floor_index": 5
+        }
+    ]
 }
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index 5968efb..ec2923f 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -1,1461 +1,1461 @@
 [
-   {
-     // Hold fans at the given target when a number of fans are missing.
-     "name": "fan(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 10400
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when a number of rotors are nonfunctional.
-     "name": "fan rotor(s) faulted",
-     "groups": [
-       {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan3 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan4 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan5 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 10400
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when any critical service
-     // is not running for 5 seconds.
-     "name": "service(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       },
-       {
-         "name": "occ objects",
-         "interface": "org.open_power.OCC.Status",
-         "property": { "name": "OccActive" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "ambient temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "name_has_owner"
-       },
-       {
-         "class": "signal",
-         "signal": "name_owner_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "call_actions_based_on_timer",
-         "timer": {
-           "interval": 5000000,
-           "type": "oneshot"
-         },
-         "actions": [
-           {
-             "name": "set_target_on_missing_owner",
-             "groups": [
-               {
-                 "name": "fan inventory",
-                 "interface": "xyz.openbmc_project.Inventory.Item",
-                 "property": { "name": "Present" }
-               },
-               {
-                 "name": "occ objects",
-                 "interface": "org.open_power.OCC.Status",
-                 "property": { "name": "OccActive" }
-               },
-               {
-                 "name": "nvme temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "planar temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "flett temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "pcie cable card temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "ambient temp",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               }
-             ],
-             "target": 10400
-           }
-         ]
-       }
-     ]
-   },
-   {
-    // Set a fan floor if an OCC isn't active
-    "name": "Non-active OCCs",
-    "groups": [
-      {
-        "name": "occ objects",
-        "interface": "org.open_power.OCC.Status",
-        "property": {
-          "name": "OccActive"
-        }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 10400
-      }
-    ]
-  },
-  {
-    // Set a raised fan floor when any temperature sensor is nonfunctional
-    "name": "Nonfunctional temperature sensors",
-    "groups": [
-      {
-        "name": "proc0 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc2 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc3 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc0 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc2 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc3 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pmic temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "internal memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram and external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "vdd vrm temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "planar temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "flett temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pcie cable card temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_removed"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 10400
-      }
-    ]
-  },
-  {
-     "name": "Set Proc 0 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 2 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 2 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 3 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 3 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 0 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-
-   {
-     "name": "Set Proc 1 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 2 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 2 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 3 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 3 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     // Collect group temperatures each iteration the repeating timer expires
-     "name": "Fan control timer loop",
-     "groups": [
-       {
-         "name": "proc0 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc2 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc3 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc0 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc2 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc3 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pmic temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "internal memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram and external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "vdd vrm temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "timer",
-         "type": "repeating",
-         "interval": 2000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc2 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc3 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc2 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc3 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 63.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 74.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 66.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 82.0,
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 58.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 80.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 70.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc2 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc3 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc2 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc3 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 62.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 71.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 63.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 57.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 79.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 75.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 50
-       }
-     ]
-   },
-   {
-     // Remove NVMe temperature objects from cache when they are removed from
-     // dbus. There's no need to react to their removal.
-     "name": "remove nvme objects",
-     "groups": [
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "signal",
-         "signal": "interfaces_removed"
-       }
-     ]
-   },
-   {
-     "name": "set pcie floor index",
-     "groups": [
-       {
-         "name": "pcie slots",
-         "interface": "xyz.openbmc_project.State.Decorator.PowerState",
-         "property": {
-           "name": "PowerState"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0DeviceId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0VendorId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemVendorId"
-         }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "pcie_card_floors",
-         "use_config_specific_files": true,
-         "settle_time": 2
-       }
-     ]
-   },
-   {
-     "name": "Set altitude offset parameter",
-     "groups": [
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         // Refresh altitude every 24hrs
-         "class": "timer",
-         "type": "repeating",
-         "interval": 86400000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 3000,
-           "value": [
-             { "arg_value": 1000, "parameter_value": 0 },
-             { "arg_value": 1900, "parameter_value": 1000 },
-             { "arg_value": 2800, "parameter_value": 2000 }
-           ]
-         }
-       }
-     ]
-   },
-   {
-     "name": "Fan floors",
-     "groups": [
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.Sensor.Value",
-        "property": { "name": "Value" }
-      },
-      {
-        "name": "power mode",
-        "interface": "xyz.openbmc_project.Control.Power.Mode",
-        "property": { "name": "PowerMode" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "parameter",
-         "parameter": "pcie_floor_index"
-       },
-       {
-         "class": "parameter",
-         "parameter": "altitude_offset"
-       }
-     ],
-     "actions": [
-       {
-         "name": "mapped_floor",
-         "key_group": "ambient temp",
-         "fan_floors": [
-          {
-            // Entry valid for ambient temp < 27
-            "key": 27,
-            "default_floor": 5000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 8000 },
-                  { "value": 3, "floor": 9000 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 32
-            "key": 32,
-            "default_floor": 6000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 8000 },
-                  { "value": 2, "floor": 9000 },
-                  { "value": 3, "floor": 9500 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 37
-            "key": 37,
-            "default_floor": 7000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 9000 },
-                  { "value": 2, "floor": 9500 },
-                  { "value": 3, "floor": 10400 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 42
-            "key": 42,
-            "default_floor": 8000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 9500 },
-                  { "value": 2, "floor": 10400 },
-                  { "value": 3, "floor": 10400 }
-                ]
-              }
-            ]
-          }
+    {
+        // Hold fans at the given target when a number of fans are missing.
+        "name": "fan(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 10400
+            }
         ]
-       }
-     ]
-   }
+    },
+    {
+        // Hold fans at the given target when a number of rotors are nonfunctional.
+        "name": "fan rotor(s) faulted",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan3 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan4 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan5 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 10400
+            }
+        ]
+    },
+    {
+        // Hold fans at the given target when any critical service
+        // is not running for 5 seconds.
+        "name": "service(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            },
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": { "name": "OccActive" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "name_has_owner"
+            },
+            {
+                "class": "signal",
+                "signal": "name_owner_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "call_actions_based_on_timer",
+                "timer": {
+                    "interval": 5000000,
+                    "type": "oneshot"
+                },
+                "actions": [
+                    {
+                        "name": "set_target_on_missing_owner",
+                        "groups": [
+                            {
+                                "name": "fan inventory",
+                                "interface": "xyz.openbmc_project.Inventory.Item",
+                                "property": { "name": "Present" }
+                            },
+                            {
+                                "name": "occ objects",
+                                "interface": "org.open_power.OCC.Status",
+                                "property": { "name": "OccActive" }
+                            },
+                            {
+                                "name": "nvme temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "planar temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "flett temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "pcie cable card temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "ambient temp",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            }
+                        ],
+                        "target": 10400
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        // Set a fan floor if an OCC isn't active
+        "name": "Non-active OCCs",
+        "groups": [
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": {
+                    "name": "OccActive"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 10400
+            }
+        ]
+    },
+    {
+        // Set a raised fan floor when any temperature sensor is nonfunctional
+        "name": "Nonfunctional temperature sensors",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc2 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc3 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc2 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc3 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 10400
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 2 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 2 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 3 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 3 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+
+    {
+        "name": "Set Proc 1 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 2 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 2 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_2_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 3 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 3 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_3_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        // Collect group temperatures each iteration the repeating timer expires
+        "name": "Fan control timer loop",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc2 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc3 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc2 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc3 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "timer",
+                "type": "repeating",
+                "interval": 2000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc2 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc3 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc2 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc3 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 63.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 74.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 66.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 82.0,
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 58.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 80.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 70.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc2 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc3 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc2 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc3 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 62.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 71.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 63.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 57.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 79.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 75.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 50
+            }
+        ]
+    },
+    {
+        // Remove NVMe temperature objects from cache when they are removed from
+        // dbus. There's no need to react to their removal.
+        "name": "remove nvme objects",
+        "groups": [
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            }
+        ]
+    },
+    {
+        "name": "set pcie floor index",
+        "groups": [
+            {
+                "name": "pcie slots",
+                "interface": "xyz.openbmc_project.State.Decorator.PowerState",
+                "property": {
+                    "name": "PowerState"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0DeviceId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0VendorId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemVendorId"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "pcie_card_floors",
+                "use_config_specific_files": true,
+                "settle_time": 2
+            }
+        ]
+    },
+    {
+        "name": "Set altitude offset parameter",
+        "groups": [
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                // Refresh altitude every 24hrs
+                "class": "timer",
+                "type": "repeating",
+                "interval": 86400000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 3000,
+                    "value": [
+                        { "arg_value": 1000, "parameter_value": 0 },
+                        { "arg_value": 1900, "parameter_value": 1000 },
+                        { "arg_value": 2800, "parameter_value": 2000 }
+                    ]
+                }
+            }
+        ]
+    },
+    {
+        "name": "Fan floors",
+        "groups": [
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "power mode",
+                "interface": "xyz.openbmc_project.Control.Power.Mode",
+                "property": { "name": "PowerMode" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "parameter",
+                "parameter": "pcie_floor_index"
+            },
+            {
+                "class": "parameter",
+                "parameter": "altitude_offset"
+            }
+        ],
+        "actions": [
+            {
+                "name": "mapped_floor",
+                "key_group": "ambient temp",
+                "fan_floors": [
+                    {
+                        // Entry valid for ambient temp < 27
+                        "key": 27,
+                        "default_floor": 5000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 7000 },
+                                    { "value": 2, "floor": 8000 },
+                                    { "value": 3, "floor": 9000 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 32
+                        "key": 32,
+                        "default_floor": 6000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 8000 },
+                                    { "value": 2, "floor": 9000 },
+                                    { "value": 3, "floor": 9500 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 37
+                        "key": 37,
+                        "default_floor": 7000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 9000 },
+                                    { "value": 2, "floor": 9500 },
+                                    { "value": 3, "floor": 10400 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 42
+                        "key": 42,
+                        "default_floor": 8000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 9500 },
+                                    { "value": 2, "floor": 10400 },
+                                    { "value": 3, "floor": 10400 }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
index ebe4ad9..ab63ac8 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
@@ -1,605 +1,603 @@
 [
- {
-   "name": "fan inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5"
-   ]
- },
- {
-   "name": "fan0 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0"
-   ]
- },
- {
-   "name": "fan1 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0"
-   ]
- },
- {
-   "name": "fan2 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0"
-   ]
- },
- {
-   "name": "fan3 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0"
-   ]
- },
- {
-   "name": "fan4 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0"
-   ]
- },
- {
-   "name": "fan5 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5/fan5_0"
-   ]
- },
- {
-   "name": "occ objects",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/org/open_power/control/occ0",
-     "/org/open_power/control/occ1",
-     "/org/open_power/control/occ2",
-     "/org/open_power/control/occ3"
-   ]
- },
- {
-   "name": "proc0 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
-   ]
- },
- {
-   "name": "proc1 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
-   ]
- },
- {
-   "name": "proc2 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc2_core15_1_temp"
-   ]
- },
- {
-   "name": "proc3 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc3_core15_1_temp"
-   ]
- },
- {
-   "name": "proc0 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
-   ]
- },
- {
-   "name": "proc1 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
-   ]
- },
- {
-   "name": "proc2 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
-   ]
- },
- {
-   "name": "proc3 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
-   ]
- },
- {
-   "name": "dram temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_dram_temp"
-   ]
- },
- {
-   "name": "pmic temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_pmic_temp"
-   ]
- },
- {
-   "name": "internal memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_intmb_temp"
-   ]
- },
- {
-   // Repurposed as DRAM temperature sensors for 4U DDIMMs
-   "name": "dram and external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_dram_extmb_temp"
-   ]
- },
- {
-   // Repurposed as PMIC temperature sensors for 4U DDIMMs
-   "name": "external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm16_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm17_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm18_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm19_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm20_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm21_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm22_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm23_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm24_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm25_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm26_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm27_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm28_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm29_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm30_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm31_extmb_temp"
-   ]
- },
- {
-   "name": "vdd vrm temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd2_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd3_temp"
-   ]
- },
- {
-   "name": "proc 0 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 2 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 3 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 0 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 2 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 3 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "nvme temps",
-   "service": "xyz.openbmc_project.NVMeSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
-   ]
- },
- {
-   "name": "planar temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
-     "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
-   ]
- },
- {
-   "name": "flett temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
-   ]
- },
- {
-   // Bear Lake card
-   "name": "pcie cable card temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C0_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
-   ]
- },
- {
-   "name": "ambient temp",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
-   ]
- },
- {
-   "name": "pcie cards",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
-   ]
- },
- {
-   "name": "pcie slots",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
-   ]
- },
- {
-   "name": "power mode",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/control/host0/power_mode"
-   ]
- }
+    {
+        "name": "fan inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5"
+        ]
+    },
+    {
+        "name": "fan0 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0"
+        ]
+    },
+    {
+        "name": "fan1 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0"
+        ]
+    },
+    {
+        "name": "fan2 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0"
+        ]
+    },
+    {
+        "name": "fan3 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0"
+        ]
+    },
+    {
+        "name": "fan4 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0"
+        ]
+    },
+    {
+        "name": "fan5 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5/fan5_0"
+        ]
+    },
+    {
+        "name": "occ objects",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/org/open_power/control/occ0",
+            "/org/open_power/control/occ1",
+            "/org/open_power/control/occ2",
+            "/org/open_power/control/occ3"
+        ]
+    },
+    {
+        "name": "proc0 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc1 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc2 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc2_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc3 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc3_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc0 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc1 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc2 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc3 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
+        ]
+    },
+    {
+        "name": "dram temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_dram_temp"
+        ]
+    },
+    {
+        "name": "pmic temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_pmic_temp"
+        ]
+    },
+    {
+        "name": "internal memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_intmb_temp"
+        ]
+    },
+    {
+        // Repurposed as DRAM temperature sensors for 4U DDIMMs
+        "name": "dram and external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_dram_extmb_temp"
+        ]
+    },
+    {
+        // Repurposed as PMIC temperature sensors for 4U DDIMMs
+        "name": "external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm16_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm17_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm18_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm19_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm20_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm21_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm22_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm23_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm24_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm25_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm26_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm27_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm28_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm29_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm30_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm31_extmb_temp"
+        ]
+    },
+    {
+        "name": "vdd vrm temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd2_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd3_temp"
+        ]
+    },
+    {
+        "name": "proc 0 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 2 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 3 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 0 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 2 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 3 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "nvme temps",
+        "service": "xyz.openbmc_project.NVMeSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
+        ]
+    },
+    {
+        "name": "planar temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
+        ]
+    },
+    {
+        "name": "flett temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
+        ]
+    },
+    {
+        // Bear Lake card
+        "name": "pcie cable card temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
+        ]
+    },
+    {
+        "name": "ambient temp",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
+        ]
+    },
+    {
+        "name": "pcie cards",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+        ]
+    },
+    {
+        "name": "pcie slots",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
+        ]
+    },
+    {
+        "name": "power mode",
+        "service": "org.open_power.OCC.Control",
+        "members": ["/xyz/openbmc_project/control/host0/power_mode"]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
index 2347cbe..5402919 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
@@ -1,212 +1,212 @@
 {
-  "cards": [
-    {
-      "name": "PHYP had errors getting IDs",
-      "vendor_id": "0xFFFF",
-      "device_id": "0xFFFF",
-      "subsystem_vendor_id": "0xFFFF",
-      "subsystem_id": "0xFFFF",
-      "floor_index": 3
-    },
-    {
-      "name": "Flett",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0007",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "Bear Lake and Bear River",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0004",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "GTO",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x033B",
-      "floor_index": 2
-    },
-    {
-      "name": "ZR1",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x035E",
-      "floor_index": 2
-    },
-    {
-      "name": "Z06",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0355",
-      "floor_index": 2
-    },
-    {
-      "name": "Everglades 10Gb 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1015",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x061F",
-      "floor_index": 1
-    },
-    {
-      "name": "Everglades 25Gb 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1015",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x061E",
-      "floor_index": 1
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0621",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0622",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0629",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064A",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064B",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064C",
-      "floor_index": 2
-    },
-    {
-      "name": "Sentry",
-      "vendor_id": "0x1014",
-      "device_id": "0x0466",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0466",
-      "floor_index": 2
-    },
-    {
-      "name": "Haleakala EN 2Port 100Gb",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1019",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0635",
-      "floor_index": 3
-    },
-    {
-      "name": "Cedar Lake 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A6",
-      "floor_index": 3
-    },
-    {
-      "name": "Cedar Lake Crypto 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A5",
-      "floor_index": 3
-    },
-    {
-      "name": "Crater Lake 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A4",
-      "floor_index": 3
-    },
-    {
-      "name": "Crater Lake Crypto 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A3",
-      "floor_index": 3
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0682",
-      "floor_index": 2
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0683",
-      "floor_index": 2
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0684",
-      "floor_index": 2
-    },
-    {
-      "name": "Castello",
-      "vendor_id": "0x1014",
-      "device_id": "0x0611",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0611",
-      "floor_index": 3
-    },
-    {
-      "name": "Puntfish",
-      "vendor_id": "0x1077",
-      "device_id": "0x2271",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x069E",
-      "floor_index": 1
-    },
-    {
-      "name": "Bluefish",
-      "vendor_id": "0x10DF",
-      "device_id": "0xE300",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0614",
-      "floor_index": 1
-    }
-  ]
+    "cards": [
+        {
+            "name": "PHYP had errors getting IDs",
+            "vendor_id": "0xFFFF",
+            "device_id": "0xFFFF",
+            "subsystem_vendor_id": "0xFFFF",
+            "subsystem_id": "0xFFFF",
+            "floor_index": 3
+        },
+        {
+            "name": "Flett",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0007",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "Bear Lake and Bear River",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0004",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "GTO",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x033B",
+            "floor_index": 2
+        },
+        {
+            "name": "ZR1",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x035E",
+            "floor_index": 2
+        },
+        {
+            "name": "Z06",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0355",
+            "floor_index": 2
+        },
+        {
+            "name": "Everglades 10Gb 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1015",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x061F",
+            "floor_index": 1
+        },
+        {
+            "name": "Everglades 25Gb 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1015",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x061E",
+            "floor_index": 1
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0621",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0622",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0629",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064A",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064B",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064C",
+            "floor_index": 2
+        },
+        {
+            "name": "Sentry",
+            "vendor_id": "0x1014",
+            "device_id": "0x0466",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0466",
+            "floor_index": 2
+        },
+        {
+            "name": "Haleakala EN 2Port 100Gb",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1019",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0635",
+            "floor_index": 3
+        },
+        {
+            "name": "Cedar Lake 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A6",
+            "floor_index": 3
+        },
+        {
+            "name": "Cedar Lake Crypto 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A5",
+            "floor_index": 3
+        },
+        {
+            "name": "Crater Lake 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A4",
+            "floor_index": 3
+        },
+        {
+            "name": "Crater Lake Crypto 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A3",
+            "floor_index": 3
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0682",
+            "floor_index": 2
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0683",
+            "floor_index": 2
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0684",
+            "floor_index": 2
+        },
+        {
+            "name": "Castello",
+            "vendor_id": "0x1014",
+            "device_id": "0x0611",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0611",
+            "floor_index": 3
+        },
+        {
+            "name": "Puntfish",
+            "vendor_id": "0x1077",
+            "device_id": "0x2271",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x069E",
+            "floor_index": 1
+        },
+        {
+            "name": "Bluefish",
+            "vendor_id": "0x10DF",
+            "device_id": "0xE300",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0614",
+            "floor_index": 1
+        }
+    ]
 }
diff --git a/docs/control/README.md b/docs/control/README.md
index 9e75bb9..9a6490e 100644
--- a/docs/control/README.md
+++ b/docs/control/README.md
@@ -1,16 +1,16 @@
 # Fan Control Configuration File
 
 ## Table of Contents
-* [Overview](#overview)
-* [Data Format](#data-format)
-* [Example](#example)
-* [System Config Location](#system-config-location)
-* [Contents](#contents)
-* [Validation](#validation)
-* [Firmware Updates](#firmware-updates)
-* [Loading and Reloading](#loading-and-reloading)
-* [Debug](#debug)
 
+- [Overview](#overview)
+- [Data Format](#data-format)
+- [Example](#example)
+- [System Config Location](#system-config-location)
+- [Contents](#contents)
+- [Validation](#validation)
+- [Firmware Updates](#firmware-updates)
+- [Loading and Reloading](#loading-and-reloading)
+- [Debug](#debug)
 
 ## Overview
 
@@ -18,23 +18,22 @@
 files (config files) that constructs the algorithm in which fans are controlled
 within a machine.
 
-
 ## Data Format
 
-The config file is written using the [JSON (JavaScript Object
-Notation)](https://www.json.org/) data format and can be created using a text
-editor.
-
+The config file is written using the
+[JSON (JavaScript Object Notation)](https://www.json.org/) data format and can
+be created using a text editor.
 
 ## System Config Location
 
 The config file names are:
-* `manager.json`
-* `profiles.json`
-* `fans.json`
-* `zones.json`
-* `groups.json`
-* `events.json`
+
+- `manager.json`
+- `profiles.json`
+- `fans.json`
+- `zones.json`
+- `groups.json`
+- `events.json`
 
 ### Supported Directory
 
@@ -47,8 +46,8 @@
 
 #### Default Location
 
-Where a single set of config files for 1-or-more system types can be used,
-the config files can be located at the base of the supported directory.
+Where a single set of config files for 1-or-more system types can be used, the
+config files can be located at the base of the supported directory.
 
 i.e.)  
 `/usr/share/phosphor-fan-presence/control/manager.json`  
@@ -56,7 +55,7 @@
 `/usr/share/phosphor-fan-presence/control/fans.json`  
 `/usr/share/phosphor-fan-presence/control/zones.json`  
 `/usr/share/phosphor-fan-presence/control/groups.json`  
-`/usr/share/phosphor-fan-presence/control/events.json`  
+`/usr/share/phosphor-fan-presence/control/events.json`
 
 #### Compatible System Type Location
 
@@ -64,60 +63,63 @@
 where more than one type of machine is supported in a single BMC firmware image
 and those system types can not share any one common config file.
 
-A system type sub-directory can be obtained from the `IBMCompatibleSystem`
-D-Bus interface's `Names` property. The `Names` property contains a list of one
-or more compatible system types, ordered from most specific to the most general.
+A system type sub-directory can be obtained from the `IBMCompatibleSystem` D-Bus
+interface's `Names` property. The `Names` property contains a list of one or
+more compatible system types, ordered from most specific to the most general.
 
 Example:
-* `ibm,rainier-2u`
-* `ibm,rainier`
 
-The `phosphor-fan-control` application then traverses the supported
-directory, appending each compatible system type entry as a sub-directory from
-most specific to most general on each config file until it is found.
+- `ibm,rainier-2u`
+- `ibm,rainier`
+
+The `phosphor-fan-control` application then traverses the supported directory,
+appending each compatible system type entry as a sub-directory from most
+specific to most general on each config file until it is found.
 
 Example:
+
 1. `/usr/share/phosphor-fan-presence/control/ibm,rainier-2u/`
-   * (directory/config file does not exist)
+   - (directory/config file does not exist)
 2. `/usr/share/phosphor-fan-presence/control/ibm,rainier/events.json`
-   * (config file found)
+   - (config file found)
 
-If any required config file is not found and the machine is powered on,
-an error is logged and `phosphor-fan-control` application terminates preventing
-the machine from successfully powering on.
+If any required config file is not found and the machine is powered on, an error
+is logged and `phosphor-fan-control` application terminates preventing the
+machine from successfully powering on.
 
 ### Override Directory
 
 `/etc/phosphor-fan-presence/control/`
 
-A different version of each of the config files can be loaded by placing it
-into this writable directory location. This avoids the need to build and
-install a new firmware image on the BMC when changing any part of the
-configuration, such as for testing purposes.
+A different version of each of the config files can be loaded by placing it into
+this writable directory location. This avoids the need to build and install a
+new firmware image on the BMC when changing any part of the configuration, such
+as for testing purposes.
 
-The override directory may not exist on the BMC, therefore to be able to use
-any number of overriding config files it must be created using the following
+The override directory may not exist on the BMC, therefore to be able to use any
+number of overriding config files it must be created using the following
 command:
 
 `mkdir -p /etc/phosphor-fan-presence/control`
 
 ### Search Order
 
-The `phosphor-fan-control` application will search for each config file at
-the directory locations in the following order:
+The `phosphor-fan-control` application will search for each config file at the
+directory locations in the following order:
+
 1. Override directory
 2. Supported directory
-   * Default location
-   * Compatible System Type location
-
+   - Default location
+   - Compatible System Type location
 
 ## Contents
 
 ### Structure
 
 #### fans.json
-This file consists of an array of fan objects representing the fan FRUs
-in the system.
+
+This file consists of an array of fan objects representing the fan FRUs in the
+system.
 
 ```
 [
@@ -134,6 +136,7 @@
 [Syntax](fans.md)
 
 #### zones.json
+
 This file contains parameters specific to the zone.
 
 ```
@@ -152,7 +155,8 @@
 [Syntax](zones.md)
 
 #### groups.json
-This file defines the groups that events.json will use in its actions.  Groups
+
+This file defines the groups that events.json will use in its actions. Groups
 consist of one or more D-Bus object paths and a name.
 
 ```
@@ -175,6 +179,7 @@
 [Syntax](groups.md)
 
 #### events.json
+
 This file contains the fan control events, where each event can contain groups,
 trigger, and actions.
 
@@ -215,7 +220,7 @@
 ### Comments
 
 The JSON data format does not support comments. However, the library used by
-code to parse the JSON does support '//'  as a comment:
+code to parse the JSON does support '//' as a comment:
 
 ```
 // This is a comment.
@@ -234,28 +239,26 @@
 ```
 
 Fans can be queried and controlled manually using the fanctl utility. Full
-documentation can be found at https://github.com/openbmc/phosphor-fan-presence/blob/master/docs/control/fanctl/README.md
+documentation can be found at
+https://github.com/openbmc/phosphor-fan-presence/blob/master/docs/control/fanctl/README.md
 
 ## Validation
 
 TBD
 
-
 ## Firmware Updates
 
 When a new firmware image is installed on the BMC, it will update the config
 file in the standard directory.
 
 The override directory will **not** be modified by a firmware update. If a
-config file exists in the override directory, it will continue to be used as
-the fan presence configuration instead of the config file located under the
+config file exists in the override directory, it will continue to be used as the
+fan presence configuration instead of the config file located under the
 appropriate location within the supported directory.
 
-
 ## Loading and Reloading
 
-The config files are loaded when the `phosphor-fan-control` application
-starts.
+The config files are loaded when the `phosphor-fan-control` application starts.
 
 To force the application to reload the config files, use the following command
 on the BMC:
@@ -267,5 +270,6 @@
 `journalctl -u phosphor-fan-control@0.service | grep Loading`
 
 ## Debug
-Fan control maintains internal data structures that can be be dumped at
-runtime.  Details [here](debug.md).
+
+Fan control maintains internal data structures that can be be dumped at runtime.
+Details [here](debug.md).
diff --git a/docs/control/debug.md b/docs/control/debug.md
index 827afab..d3f9bf7 100644
--- a/docs/control/debug.md
+++ b/docs/control/debug.md
@@ -2,7 +2,7 @@
 
 Fan control's internal data structures can be dumped at runtime using the
 `fanctl dump` command, which triggers fan control to write the structures to a
-`/tmp/fan_control_dump.json` file.  That file is a normal JSON file that can be
+`/tmp/fan_control_dump.json` file. That file is a normal JSON file that can be
 viewed, or the `fanctl query_dump` command can be used as a shortcut to just
 print portions of the file.
 
@@ -10,20 +10,24 @@
 command.
 
 ## Flight Recorder
+
 The flight recorder contains interesting events such as each time the zone
 target changes.
 
 It can be printed with:
+
 ```
 fanctl query_dump -s flight_recorder
 ```
 
 ## Object Cache
+
 The object cache contains the most recent D-Bus properties of all of the groups
-from the groups.json files.  If any of the D-Bus properties had a value of
-`NaN` (not a number), it is deleted from the cache so won't be present.
+from the groups.json files. If any of the D-Bus properties had a value of `NaN`
+(not a number), it is deleted from the cache so won't be present.
 
 It can be printed with:
+
 ```
 fanctl query_dump -s objects
 ```
@@ -34,11 +38,13 @@
 The `-n` option will match on substrings.
 
 Print the full entries of all temp sensors in the cache:
+
 ```
 fanctl query_dump -s objects -n sensors/temperature
 ```
 
 Print just the Value properties of all temperature sensors in the cache:
+
 ```
 fanctl query_dump -s objects -n sensors/temperature -p Value
 ```
@@ -51,36 +57,44 @@
 ```
 
 ## Zone Config
-The zone configuration contains values like the current target, current
-floor, and any outstanding floor or target holds.
+
+The zone configuration contains values like the current target, current floor,
+and any outstanding floor or target holds.
 
 It can be printed with:
+
 ```
 fanctl query_dump -s zones
 ```
 
 ## Parameter Values
+
 Parameters are key/value pairs set and used by actions.
 
 They can be printed with:
+
 ```
 fanctl query_dump -s parameters
 ```
 
 ## Service Cache
+
 Fan control maintains a map of objects paths of the group members to the
 services that own them.
 
 It can be printed with:
+
 ```
 fanctl query_dump -s services
 ```
 
 ## Configured Events
+
 Fan control can dump a list of all of its configured event names along with
 their group names.
 
 It can be printed with:
+
 ```
 fanctl query_dump -s events
 ```
diff --git a/docs/control/events.md b/docs/control/events.md
index 0e0af32..b90a02d 100644
--- a/docs/control/events.md
+++ b/docs/control/events.md
@@ -1,6 +1,6 @@
 # events.json
 
-This file defines the events that dictate how fan control operates.  Each event
+This file defines the events that dictate how fan control operates. Each event
 can contain groups, triggers, and actions.
 
 Actions are where fan targets are calculated and set, among other things.
@@ -52,10 +52,10 @@
 The above event is an example of a method to set the fan target to 15000 when
 one or more fans is missing. The basic behavior with this config is:
 
-The trigger `init.get_properties` will, on fan control startup, read the
-Present property on the `xyz.openbmc_project.Inventory.Item` interface from
-every D-Bus object in the 'fan inventory' group, update those values in the
-object cache, and then call the `count_state_before_target` action.
+The trigger `init.get_properties` will, on fan control startup, read the Present
+property on the `xyz.openbmc_project.Inventory.Item` interface from every D-Bus
+object in the 'fan inventory' group, update those values in the object cache,
+and then call the `count_state_before_target` action.
 
 The trigger `signal.properties_changed` will watch for changes on the Present
 property on each D-Bus object in the group, update the new value in the object
@@ -63,8 +63,8 @@
 
 The `count_state_before_target` action will look at the object cache value of
 the Present property on each member of the group and set the fan target hold to
-15000 when one or more of them is false.  Otherwise, it will clear its fan
-target hold.
+15000 when one or more of them is false. Otherwise, it will clear its fan target
+hold.
 
 ## Groups
 
@@ -80,14 +80,16 @@
 ```
 
 ### name
-The name of a group that must be also be defined in
-[groups.json](groups.md).
+
+The name of a group that must be also be defined in [groups.json](groups.md).
 
 ### interface
+
 The actions and triggers defined with this group will look at this D-Bus
 interface on the members of this group.
 
 ### property: name
+
 The actions and triggers defined with this group will look at this D-Bus
 property on the members of this group.
 
@@ -97,6 +99,7 @@
 for each.
 
 ### init
+
 Init triggers run when fan control events are enabled on fan control startup.
 After invoking the configured method, any actions configured for this trigger
 will run.
@@ -117,8 +120,9 @@
    group member in fan control's D-Bus service cache map.
 
 ### signal
+
 Signal triggers subscribe to certain D-Bus signals for each member of its
-configured group.  After handling the signal, any configured actions are run.
+configured group. After handling the signal, any configured actions are run.
 
 ```
 {
@@ -128,30 +132,32 @@
 ```
 
 #### signal types
+
 1. `properties_changed` - Subscribes to the PropertiesChanged signal for the
-   D-Bus interface and property specified in the group definition for each
-   group member.  When the signal occurs, the new property value will be added
-   to or updated in the object cache.
+   D-Bus interface and property specified in the group definition for each group
+   member. When the signal occurs, the new property value will be added to or
+   updated in the object cache.
 
 2. `interfaces_added` - Subscribes to the InterfacesAdded signal for the D-Bus
-   interface specified in the group definition for each group member.  When the
+   interface specified in the group definition for each group member. When the
    signal occurs, the interface and its properties will be added to the object
    cache.
 
 3. `interfaces_removed` - Subscribes to the InterfacesRemoved signal for the
-   D-Bus interface specified in the group definition for each group member.
-   When the signal occurs, the interface and properties will be removed from
-   the object cache.
+   D-Bus interface specified in the group definition for each group member. When
+   the signal occurs, the interface and properties will be removed from the
+   object cache.
 
 4. `name_owner_changed` - Subscribes to the NameOwnerChanged signal for the
    services that host the D-bus interface specified in the group definition for
-   each group member.  When the signal occurs, the service owned state will be
+   each group member. When the signal occurs, the service owned state will be
    updated in the service cache map.
 
-5. `member` - Subscribes to the signal listed on each group member.  No caches
+5. `member` - Subscribes to the signal listed on each group member. No caches
    are updated when the signal occurs.
 
 ### timer
+
 Timer triggers run actions after the configured type of timer expires.
 
 ```
@@ -164,18 +170,22 @@
 ```
 
 #### type
+
 1. `oneshot` - Starts a timer that runs once.
 
 2. `repeating` - Starts a repeating timer.
 
 #### interval
+
 The timer length in microseconds
 
 #### preload_groups
+
 Optional, if set to true, will update the D-Bus properties from the configured
 groups in the object cache after the timer expires but before any actions run.
 
 ### parameter
+
 Parameter triggers run actions after a parameter changes.
 
 ```
@@ -184,12 +194,15 @@
     "parameter": "<parameter>"
 }
 ```
+
 #### parameter
+
 The parameter value to watch.
 
 ### poweron
-PowerOn triggers run when the power turns on.  Functionally, they behave like
-an init trigger.
+
+PowerOn triggers run when the power turns on. Functionally, they behave like an
+init trigger.
 
 ```
 {
@@ -199,11 +212,12 @@
 ```
 
 #### method
+
 The methods are the same as with the init trigger.
 
 ### poweroff
 
-PowerOff triggers run when the power turns off.  Functionally, they behave like
+PowerOff triggers run when the power turns off. Functionally, they behave like
 an init trigger.
 
 ```
@@ -214,19 +228,21 @@
 ```
 
 #### method
+
 The methods are the same as with the init trigger.
 
 ## Actions
-Actions can either operate on the groups listed with the event, or on the
-groups listed within the action's JSON config.
 
-Most actions set fan targets or floors.  This can be done by requesting a
-target value explicitly, or by requesting an increase or decrease delta.
-Targets and floors can also be set with a hold, meaning another action can't
-set a floor/target below the one that is held.
+Actions can either operate on the groups listed with the event, or on the groups
+listed within the action's JSON config.
 
-Some actions set or read a key/value pair called a parameter.  These can be
-created, updated, and deleted as necessary.  For example, one action may
+Most actions set fan targets or floors. This can be done by requesting a target
+value explicitly, or by requesting an increase or decrease delta. Targets and
+floors can also be set with a hold, meaning another action can't set a
+floor/target below the one that is held.
+
+Some actions set or read a key/value pair called a parameter. These can be
+created, updated, and deleted as necessary. For example, one action may
 calculate and set a `floor_index` parameter, and another action may then read
 that parameter to help choose a fan floor.
 
@@ -251,9 +267,9 @@
 
 Calculates the net target increase to be requested based on the value of each
 property given within a group. The net target increase is based on the maximum
-difference between the `delta` JSON value and all of the properties of the group.
-The final result is the increase change that's requested to the current target
-of a zone.
+difference between the `delta` JSON value and all of the properties of the
+group. The final result is the increase change that's requested to the current
+target of a zone.
 
 The group values can be compared to either a value hardcoded in the JSON, or a
 parameter value.
@@ -272,13 +288,15 @@
 ```
 
 The above config uses a hardcoded state value:
+
 1. For each member of the 'pcie temps' group:
-  - Read its 'Value' D-Bus property.
-  - If that property value is greater than the 'state' value of 70.0:
-   - Subtracts 70.0 from the property value.
-   - Multiplies that difference by the 'delta' value of 255.
-2. Requests an increase of the largest calculated delta value, if there is
-   one.
+
+- Read its 'Value' D-Bus property.
+- If that property value is greater than the 'state' value of 70.0:
+- Subtracts 70.0 from the property value.
+- Multiplies that difference by the 'delta' value of 255.
+
+2. Requests an increase of the largest calculated delta value, if there is one.
 
 ```
 {
@@ -294,16 +312,20 @@
 ```
 
 The above config uses a parameter as the state value:
+
 1. For each member of the 'proc 0 core temps' group:
-  - Read its 'Value' D-Bus property.
-  - If that property value is greater than the value of the parameter listed in
-    the 'state_parameter_name' field, in this case
-    'proc_0_core_dvfs_increase_temp':
-   - Subtracts that parameter value from the property value.
-   - Multiplies that difference by the 'delta' value of 300.
+
+- Read its 'Value' D-Bus property.
+- If that property value is greater than the value of the parameter listed in
+  the 'state_parameter_name' field, in this case
+  'proc_0_core_dvfs_increase_temp':
+- Subtracts that parameter value from the property value.
+- Multiplies that difference by the 'delta' value of 300.
+
 2. Requests an increase of the largest calculated delta value, if there is one.
 
 ### set_net_decrease_target
+
 Calculates the net target decrease to be requested based on the value of each
 property given within a group. The net target decrease is based on the minimum
 difference between the `delta` JSON value and all properties in the group. The
@@ -328,13 +350,15 @@
 ```
 
 The above config uses a hardcoded state value:
+
 1. For each member of the 'pcie temps' group:
-  - Read its 'Value' D-Bus property.
-  - If that property value is less than the 'state' value of 65.0:
-   - Subtracts the property value from 65.0.
-   - Multiplies that difference by the 'delta' value of 80.
-2. Requests a decrease of the smallest calculated delta value, if there is
-   one.
+
+- Read its 'Value' D-Bus property.
+- If that property value is less than the 'state' value of 65.0:
+- Subtracts the property value from 65.0.
+- Multiplies that difference by the 'delta' value of 80.
+
+2. Requests a decrease of the smallest calculated delta value, if there is one.
 
 ```
 {
@@ -350,20 +374,22 @@
 ```
 
 The above config uses a parameter as the state value:
+
 1. For each member of the 'proc 0 core temps' group:
-  - Read its 'Value' D-Bus property.
-  - If that property value is less than the value of the parameter listed
-    the 'state_parameter_name' field, in this case
-    'proc_0_core_dvfs_decrease_temp':
-   - Subtracts the property value from the parameter value.
-   - Multiplies that difference by the 'delta' value of 50.
-2. Requests a decrease of the smallest calculated delta value, if there is
-   one.
+
+- Read its 'Value' D-Bus property.
+- If that property value is less than the value of the parameter listed the
+  'state_parameter_name' field, in this case 'proc_0_core_dvfs_decrease_temp':
+- Subtracts the property value from the parameter value.
+- Multiplies that difference by the 'delta' value of 50.
+
+2. Requests a decrease of the smallest calculated delta value, if there is one.
 
 ### count_state_floor
- Sets the fans to a configured floor when a number of members within the
- group are at a configured state. Once the number of members at the given
- state falls below the configured count, the floor hold is released.
+
+Sets the fans to a configured floor when a number of members within the group
+are at a configured state. Once the number of members at the given state falls
+below the configured count, the floor hold is released.
 
 ```
 {
@@ -375,11 +401,12 @@
 ```
 
 The above config reads the configured D-Bus property on each group member
-configured for the action.  If two or more members have a property value of
-false, a floor hold will be requested with a value of 18000.  Otherwise, the
+configured for the action. If two or more members have a property value of
+false, a floor hold will be requested with a value of 18000. Otherwise, the
 floor hold will be released (if it was previously requested).
 
 ### count_state_before_target
+
 Sets the fans to a configured target when a number of members within the group
 are at a configured state. Once the number of members at the given state falls
 below the configured count, active fan target changes are allowed.
@@ -394,21 +421,23 @@
 ```
 
 The above config reads the configured D-Bus property on each group member
-configured for the action.  If one or more members have a property value of
-false, a target hold will be requested with a value of 18000.  Otherwise, the
+configured for the action. If one or more members have a property value of
+false, a target hold will be requested with a value of 18000. Otherwise, the
 hold will be released (if it was previously requested).
 
 ### default_floor_on_missing_owner
+
 Sets the fan floor to the defined zone's default fan floor when a service
-associated to a given group has terminated. Once all services are functional
-and providing the sensors, the fan floor is allowed to be set normally again.
+associated to a given group has terminated. Once all services are functional and
+providing the sensors, the fan floor is allowed to be set normally again.
 
 There is no additional JSON config for this action.
 
 ### mapped_floor
-This action can be used to set a floor value based on 2 or more groups
-having values within certain ranges, where the key group chooses the set
-of tables in which to check the remaining group values.
+
+This action can be used to set a floor value based on 2 or more groups having
+values within certain ranges, where the key group chooses the set of tables in
+which to check the remaining group values.
 
 ```
 {
@@ -443,24 +472,24 @@
 ```
 
 The above config will use the maximum value of the 'ambient temp' group as the
-key into the 'fan_floors' tables.  There is one of those tables listed, and it
+key into the 'fan_floors' tables. There is one of those tables listed, and it
 will be used when the key group has a max value of less than 25.
 
 It will then traverse the contained floors arrays, keeping track of the highest
-valid floor value it finds.  If it doesn't find any valid floor values, it will
+valid floor value it finds. If it doesn't find any valid floor values, it will
 use the `default_floor` value of 4444, though that value is optional.
 
 If no valid tables were found given the key value, the `default_floor` value of
 5555 would be used, though that is optional and if not supplied the code would
 default to the default floor of the zone.
 
-At the end of the analysis, a floor hold will be set with the final floor
-value.
+At the end of the analysis, a floor hold will be set with the final floor value.
 
 ### set_target_on_missing_owner
+
 Sets the fans to a configured target when any service owner associated to the
-group is missing. Once all services are functional and providing all the
-group data again, active fan target changes are allowed.
+group is missing. Once all services are functional and providing all the group
+data again, active fan target changes are allowed.
 
 ```
 {
@@ -478,11 +507,12 @@
 with the 'fan inventory' group is lost.
 
 ### override_fan_target
+
 This action locks fans at configured targets when the configured `count` amount
 of fans meet criterion for the particular condition. A locked fan maintains its
 override target until unlocked (or locked at a higher target). Upon unlocking,
-it will either revert to temperature control or activate the next-highest
-target remaining in its list of locks.
+it will either revert to temperature control or activate the next-highest target
+remaining in its list of locks.
 
 ```
 {
@@ -498,17 +528,18 @@
 one or more members in its configured group have a group property value of
 false.
 
-This could be used for example, to lock the rotors of a multirotor fan to a
-high target when one of its rotors has a functional property equal to false.
+This could be used for example, to lock the rotors of a multirotor fan to a high
+target when one of its rotors has a functional property equal to false.
 
 ### pcie_card_floors
+
 Sets the `pcie_floor_index` parameter based on the current configuration of
 plugged and powered on PCIe cards, using data from the `pcie_cards.json` file.
 
-It chooses the highest index from the active PCIe cards to set in the
-parameter.
+It chooses the highest index from the active PCIe cards to set in the parameter.
 
 It must be configured with the following groups and properties:
+
 - The PCIe slots with the PowerState property
 - The PCIe cards with the following properties: Function0DeviceId,
   Function0VendorId, Function0SubsystemId, Function0SubsystemVendorId
@@ -523,24 +554,25 @@
 
 The `use_config_specific_files` field tells the code to look for the
 'pcie_cards.json' files in the same system specific directories as
-'events.json'.  If missing or false, looks in the base fan control directory.
+'events.json'. If missing or false, looks in the base fan control directory.
 
 The `settle_time` field is the amount of time in seconds that needs to pass
-without a call to run() from a group property value changing.  As the
-PCIeDevice attributes are written close together by the host, this allows the
-action to wait until the writes are done before selecting the index.
+without a call to run() from a group property value changing. As the PCIeDevice
+attributes are written close together by the host, this allows the action to
+wait until the writes are done before selecting the index.
 
-Additional details are in the [header
-file](../../control/json/actions/pcie_card_floors.hpp)
+Additional details are in the
+[header file](../../control/json/actions/pcie_card_floors.hpp)
 
 ### set_request_target_base_with_max
+
 Determines the maximum value from the properties of the group of D-Bus objects
 and sets the requested target base to this value. Only positive integer or
 floating point types are supported as these are the only valid types for a fan
 target to be based off of.
 
-The `requested target base` value is the base value to apply a target delta
-to.  By default, it's the current zone target unless modified by this action.
+The `requested target base` value is the base value to apply a target delta to.
+By default, it's the current zone target unless modified by this action.
 
 ```
 {
@@ -557,79 +589,67 @@
 property value of all members of the 'fan targets' group.
 
 ### set_parameter_from_group_max
-Sets a parameter value based on the maximum group property value.  The property
+
+Sets a parameter value based on the maximum group property value. The property
 value can be modified before storing it if the JSON specifies a valid modifier
 expression.
 
- ```
+```
 {
-    "name": "set_parameter_from_group_max",
-    "parameter_name": "proc_0_throttle_temp",
-    "modifier": {
-      "expression": "minus",
-      "value": 4
-    }
+   "name": "set_parameter_from_group_max",
+   "parameter_name": "proc_0_throttle_temp",
+   "modifier": {
+     "expression": "minus",
+     "value": 4
+   }
 }
- ```
+```
 
-The above config will first find the max of its groups property values,
-subtract 4, and then store the resulting value in the `proc_0_throttle_temp`
-parameter.
+The above config will first find the max of its groups property values, subtract
+4, and then store the resulting value in the `proc_0_throttle_temp` parameter.
 
 ### target_from_group_max
 
-The action sets target of Zone to a value corresponding to the maximum
-value from maximum group property value. The mapping is based on a provided
-table. If there are more than one event using this action, the maximum speed
-derived from the mapping of all groups will be set to the zone's target.
+The action sets target of Zone to a value corresponding to the maximum value
+from maximum group property value. The mapping is based on a provided table. If
+there are more than one event using this action, the maximum speed derived from
+the mapping of all groups will be set to the zone's target.
 
-...
-{
-    "name": "target_from_group_max",
-    "groups": [
-        {
-          "name": "zone0_ambient",
-          "interface": "xyz.openbmc_project.Sensor.Value",
-          "property": { "name": "Value" }
-        }
-    ],
-    "neg_hysteresis": 1,
-    "pos_hysteresis": 0,
-    "map": [
-        { "value": 10.0, "target": 38.0 },
-        ...
-    ]
-}
+... { "name": "target_from_group_max", "groups": [ { "name": "zone0_ambient",
+"interface": "xyz.openbmc_project.Sensor.Value", "property": { "name": "Value" }
+} ], "neg_hysteresis": 1, "pos_hysteresis": 0, "map": [ { "value": 10.0,
+"target": 38.0 }, ... ] }
 
-The above JSON will cause the action to read the property specified in the
-group "zone0_ambient" from all members of the group. The change in the group's
-members value will be checked against "neg_hysteresis" and "pos_hysteresis"
-to decide if it is worth taking action. "neg_hysteresis" is for the increasing
-case and "pos_hysteresis" is for the decreasing case. The maximum property value
-in the group will be mapped to the "map" to get the output "target".
-Each configured event using this action will be provided with a key in a static map
-to store its mapping result. The static map will be shared across the events of this
-action. Therefore, the updated "target" value derived from "zone0_ambient" will be
-stored in that static map with its own key. Each time it calls this action running
-for each event, after the new value is updated to the static map, the maximum value
-from it will be used to set to the Zone's target.
+The above JSON will cause the action to read the property specified in the group
+"zone0_ambient" from all members of the group. The change in the group's members
+value will be checked against "neg_hysteresis" and "pos_hysteresis" to decide if
+it is worth taking action. "neg_hysteresis" is for the increasing case and
+"pos_hysteresis" is for the decreasing case. The maximum property value in the
+group will be mapped to the "map" to get the output "target". Each configured
+event using this action will be provided with a key in a static map to store its
+mapping result. The static map will be shared across the events of this action.
+Therefore, the updated "target" value derived from "zone0_ambient" will be
+stored in that static map with its own key. Each time it calls this action
+running for each event, after the new value is updated to the static map, the
+maximum value from it will be used to set to the Zone's target.
 
 ### call_actions_based_on_timer
+
 This action starts and stops a timer that runs a list of actions whenever the
-timer expires.  A timer can be either `oneshot` or `repeating`.
+timer expires. A timer can be either `oneshot` or `repeating`.
 
-When all groups have a configured value to compare against, that will
-be compared against all members within each group to start/stop the
-timer. When all group members have a given value and it matches what's
-in the cache, the timer is started and if any do not match, the timer is
-stopped.
+When all groups have a configured value to compare against, that will be
+compared against all members within each group to start/stop the timer. When all
+group members have a given value and it matches what's in the cache, the timer
+is started and if any do not match, the timer is stopped.
 
-When any group does not have a configured value to be compared against,
-the groups' service owned state is used to start/stop the timer. When
-any service providing a group member is not owned, the timer is started
-and if all members' services are owned, the timer is stopped.
+When any group does not have a configured value to be compared against, the
+groups' service owned state is used to start/stop the timer. When any service
+providing a group member is not owned, the timer is started and if all members'
+services are owned, the timer is stopped.
 
 Consider the following action config:
+
 ```
 {
     "name": "call_actions_based_on_timer",
@@ -643,6 +663,7 @@
 }
 
 ```
+
 If its group configuration has a property value listed, like:
 
 ```
@@ -652,8 +673,9 @@
     "property": { "name": "Present", "value": true }
 }
 ```
+
 Then a oneshot timer of 5000000us will be started when every member of the fan
-inventory group has a value of true.  Otherwise, the timer will be stopped if
+inventory group has a value of true. Otherwise, the timer will be stopped if
 it's running.
 
 If the group configuration has no property value listed, like:
@@ -665,12 +687,14 @@
     "property": { "name": "Present" }
 }
 ```
+
 Then the timer will be started when any service providing a group member isn't
-owned (on D-Bus).  Otherwise, it will stop the timer if it's running.
+owned (on D-Bus). Otherwise, it will stop the timer if it's running.
 
 ### get_managed_objects
+
 This action adds the members of its groups to the object cache by using the
-GetManagedObjects D-Bus method to find and add the results.  When that is done,
+GetManagedObjects D-Bus method to find and add the results. When that is done,
 it then runs any actions listed in the JSON.
 
 This allows an action to run with the latest values in the cache without having
@@ -698,13 +722,15 @@
 
 The above config will make the GetManagedObjects call on all services that own
 the configured groups and then add all resulting property values to the object
-cache.  After that, it will call the `set_net_increase_target` action using the
+cache. After that, it will call the `set_net_increase_target` action using the
 same groups.
 
 ## Modifiers
+
 Modifiers are used by some actions to help calculate values.
 
 ### minus
+
 Subtract the `value` field from the passed in value.
 
 ```
@@ -717,8 +743,9 @@
 The above config subtracts 4 from what is passed to it.
 
 ### less_than
+
 Returns a value from a data table that is selected when the argument passed in
-is less than the `arg_value` entry in the table row.  If there is a
+is less than the `arg_value` entry in the table row. If there is a
 `default_value` field supplied, then that will be returned if the argument is
 greater than the `arg_value` of the last row.
 
@@ -735,4 +762,4 @@
 ```
 
 The above config returns 1 if the arg passed is less than 500, 2 if less than
-1000, and 3 if less than 1500.  Otherwise returns 10000, the default value.
+1000, and 3 if less than 1500. Otherwise returns 10000, the default value.
diff --git a/docs/control/fanctl/README.md b/docs/control/fanctl/README.md
index 0abc7b3..e0bcf9b 100644
--- a/docs/control/fanctl/README.md
+++ b/docs/control/fanctl/README.md
@@ -1,11 +1,11 @@
 # Fan Control tool
 
 A tool that enables a user to view the status of a system in regard to fan
-control including the ability to manually set the fans to a desired RPM (or
-PWM if supported by the system). This tool has been tested against systems
-utilizing the phosphor-fan-presence repository set of fan applications (i.e.
-romulus, witherspoon, etc...) and is not warranted to work on systems using
-some other set of BMC fan applications.
+control including the ability to manually set the fans to a desired RPM (or PWM
+if supported by the system). This tool has been tested against systems utilizing
+the phosphor-fan-presence repository set of fan applications (i.e. romulus,
+witherspoon, etc...) and is not warranted to work on systems using some other
+set of BMC fan applications.
 
 ## Intention
 
@@ -60,70 +60,78 @@
 ## Examples:
 
 - Set all fans to a target value (The tool determines whether the machine is
-    using RPM or PWM fan speeds, and sets them to the value provided):
-    > fanctl set 10500
+  using RPM or PWM fan speeds, and sets them to the value provided):
+
+  > fanctl set 10500
 
 - Set only fan_0, fan1_0, fan2_0 to target 8500:
-    > fanctl set 8500 fan0_0 fan1_0 fan2_0
+
+  > fanctl set 8500 fan0_0 fan1_0 fan2_0
 
 - Resume automatic fan control:
-    > fanctl resume
+
+  > fanctl resume
 
 - Get the current fan target and feedback speeds for all rotors:
-    > fanctl get
 
-    ```
-    > fanctl get
-    TARGET SENSOR    TARGET(RPM)   FEEDBACK SENSOR    FEEDBACK(RPM)
-    ===============================================================
-    fan0_0             10000            fan0_0            7020
-                                        fan0_1           10000
-    fan1_0              2300            fan1_0            2192
-                                        fan1_1            2300
-    fan2_0              2300            fan2_0            2192
-                                        fan2_1            2300
-    fan3_0              3333            fan3_0            2839
-                                        fan3_1            3333
-    fan4_0              3333            fan4_0            2839
-                                        fan4_1            3333
-    fan5_0             10000            fan5_0            7020
-                                        fan5_1           10000
-    ```
+  > fanctl get
+
+  ```
+  > fanctl get
+  TARGET SENSOR    TARGET(RPM)   FEEDBACK SENSOR    FEEDBACK(RPM)
+  ===============================================================
+  fan0_0             10000            fan0_0            7020
+                                      fan0_1           10000
+  fan1_0              2300            fan1_0            2192
+                                      fan1_1            2300
+  fan2_0              2300            fan2_0            2192
+                                      fan2_1            2300
+  fan3_0              3333            fan3_0            2839
+                                      fan3_1            3333
+  fan4_0              3333            fan4_0            2839
+                                      fan4_1            3333
+  fan5_0             10000            fan5_0            7020
+                                      fan5_1           10000
+  ```
 
 - Get the full system status in regard to fans:
-    > fanctl status
 
-    ```
-    Fan Control Service State   : loaded, inactive(dead)
+  > fanctl status
 
-    CurrentBMCState     : xyz.openbmc_project.State.BMC.BMCState.Ready
-    CurrentPowerState   : xyz.openbmc_project.State.Chassis.PowerState.Off
-    CurrentHostState    : xyz.openbmc_project.State.Host.HostState.Off
+  ```
+  Fan Control Service State   : loaded, inactive(dead)
 
-     FAN        TARGET(RPM)   FEEDBACK(RPM)  PRESENT     FUNCTIONAL
-    ===============================================================
-     fan0         10000        7020/10000      true         true
-     fan1         10000        7020/10000      true         true
-     fan2         10000        7020/10000      true         true
-     fan3         10000        7020/10000      true         true
-     fan4         10000        7020/10000      true         true
-     fan5         10000        7020/10000      true         true
+  CurrentBMCState     : xyz.openbmc_project.State.BMC.BMCState.Ready
+  CurrentPowerState   : xyz.openbmc_project.State.Chassis.PowerState.Off
+  CurrentHostState    : xyz.openbmc_project.State.Host.HostState.Off
 
-    ```
+   FAN        TARGET(RPM)   FEEDBACK(RPM)  PRESENT     FUNCTIONAL
+  ===============================================================
+   fan0         10000        7020/10000      true         true
+   fan1         10000        7020/10000      true         true
+   fan2         10000        7020/10000      true         true
+   fan3         10000        7020/10000      true         true
+   fan4         10000        7020/10000      true         true
+   fan5         10000        7020/10000      true         true
+
+  ```
 
 - Reload all json config files in the order each is found: override location,
-    given `Compatible` interface location, default location.
+  given `Compatible` interface location, default location.
 
-    > fanctl reload
+  > fanctl reload
 
-- Tell the fan control daemon to dump debug data to /tmp/fan\_control\_dump.json
-    > fanctl dump
+- Tell the fan control daemon to dump debug data to /tmp/fan_control_dump.json
+
+  > fanctl dump
 
 - Print all temperatures in the fan control cache after running 'fanctl dump':
-    > fanctl query_dump -s objects -n sensors/temperature -p Value
+
+  > fanctl query_dump -s objects -n sensors/temperature -p Value
 
 - Print every interface and property in the Ambient temp sensor's cache entry:
-    > fanctl query_dump -s objects -n Ambient
+
+  > fanctl query_dump -s objects -n Ambient
 
 - Print the flight recorder after running 'fanctl dump':
-    > fanctl query_dump -s flight_recorder
+  > fanctl query_dump -s flight_recorder
diff --git a/docs/control/fans.md b/docs/control/fans.md
index c6a3f5d..28763ed 100644
--- a/docs/control/fans.md
+++ b/docs/control/fans.md
@@ -18,20 +18,25 @@
 ## Attributes
 
 ### name
+
 The D-Bus name of the fan FRU. Required.
 
 ### zone
+
 The zone the fan is in. Required.
 
 ### sensors
+
 The D-bus sensor names associated with that fan. Required.
 
 ### target_interface
+
 The D-Bus interface to use for setting the fan target speed/PWM. Either
 `xyz.openbmc_project.Control.FanSpeed` for RPM controlled fans or
 `xyz.openbmc_project.Control.FanPWM` for PWM controlled fans. Required.
 
 ### target_path
+
 The D-Bus object path used for setting the fan target speed/PWM via
 "target_interface". If not configured, it defaults to
-`/xyz/openbmc_project/sensors/fan_tach/`. Optional.
\ No newline at end of file
+`/xyz/openbmc_project/sensors/fan_tach/`. Optional.
diff --git a/docs/control/groups.md b/docs/control/groups.md
index 662fef7..4391ddc 100644
--- a/docs/control/groups.md
+++ b/docs/control/groups.md
@@ -1,10 +1,10 @@
 # groups.json
 
-This file contains an array of group definitions.  In this usage, a group
-refers to a group of D-Bus objects that all of the same D-Bus path and
-interface, and are acted upon by actions and triggers in events.json.
-Only the D-Bus objects paths are specified in this file, the interface and
-properties are specified at the time of usage in events.json.
+This file contains an array of group definitions. In this usage, a group refers
+to a group of D-Bus objects that all of the same D-Bus path and interface, and
+are acted upon by actions and triggers in events.json. Only the D-Bus objects
+paths are specified in this file, the interface and properties are specified at
+the time of usage in events.json.
 
 ## JSON example
 
@@ -24,13 +24,15 @@
 ## Attributes
 
 ### members
-An array of the D-Bus object paths that are in the group.  Required.
+
+An array of the D-Bus object paths that are in the group. Required.
 
 ### name
-The group name.  This is how the group is referenced in events.json.
-Required.
+
+The group name. This is how the group is referenced in events.json. Required.
 
 ### service
-If known, the D-Bus service name that provides these D-bus objects.  All
-members of the group must be hosted by the same service for this to be used.
-This provides performance improvements in certain cases.  Optional.
+
+If known, the D-Bus service name that provides these D-bus objects. All members
+of the group must be hosted by the same service for this to be used. This
+provides performance improvements in certain cases. Optional.
diff --git a/docs/control/zones.md b/docs/control/zones.md
index 1c9e2d6..71a8aab 100644
--- a/docs/control/zones.md
+++ b/docs/control/zones.md
@@ -1,7 +1,7 @@
 # zones.json
 
 Zones are groups of fans that are set to the same values and have the same
-properties like `default_floor` and `poweron_target`.  The events in
+properties like `default_floor` and `poweron_target`. The events in
 [events.json](events.md) are then configured to operate on specific or all
 zones.
 
@@ -20,24 +20,28 @@
 ## Attributes
 
 ### name
-The zone name.  Required.
+
+The zone name. Required.
 
 ### poweron_target
-The fan target value set immediately after the power state changes to on.
-This is also the ceiling unless `default_ceiling` is specified.  Required.
+
+The fan target value set immediately after the power state changes to on. This
+is also the ceiling unless `default_ceiling` is specified. Required.
 
 ### default_floor
-The default fan floor value to use for the zone, if necessary.  Possibly an
-action will be configured to be in charge of the floor so this isn't
-necessary.  Optional.
+
+The default fan floor value to use for the zone, if necessary. Possibly an
+action will be configured to be in charge of the floor so this isn't necessary.
+Optional.
 
 ### increase_delay
+
 This throttles fan increases to the specified delay.
 
 The delay, in seconds, between fan target increases, when an action such as
-NetTargetIncrease requests an increase.  All increases requested
-inside of this interval are analyzed and if the highest requested target is
-greater than the current target, this new target is set when the delay expires.
+NetTargetIncrease requests an increase. All increases requested inside of this
+interval are analyzed and if the highest requested target is greater than the
+current target, this new target is set when the delay expires.
 
 Some actions may set the fan target directly, such as one that increases the
 target when a fan is removed, and this does not apply then.
@@ -45,17 +49,18 @@
 Optional with a default of zero, meaning increases are immediately requested.
 
 ### decrease_interval
+
 This throttles fan decreases to the specified delay.
 
 The delay, in seconds, between fan target decreases, when an action such as
-NetTargetDecrease requests a decrease.  All increases and decreases requested
+NetTargetDecrease requests a decrease. All increases and decreases requested
 inside of this interval are analyzed and if the highest requested target is
 lower than the current target, this new target is set when the delay expires.
 
 Optional with a default of zero, meaning decreases are immediately requested.
 
 ### default_ceiling
+
 The ceiling of the zone, i.e. the highest target that can be set.
 
-This is optional and if not specified it defaults to the `poweron_target`
-value.
+This is optional and if not specified it defaults to the `poweron_target` value.
diff --git a/docs/monitor/README.md b/docs/monitor/README.md
index a36d0e4..db0c31f 100644
--- a/docs/monitor/README.md
+++ b/docs/monitor/README.md
@@ -1,39 +1,36 @@
 # Fan Monitor Configuration File
 
 ## Table of Contents
-* [Overview](#overview)
-* [Data Format](#data-format)
-* [Example](#example)
-* [System Config Location](#system-config-location)
-* [Contents](#contents)
-* [Validation](#validation)
-* [Firmware Updates](#firmware-updates)
-* [Loading and Reloading](#loading-and-reloading)
 
+- [Overview](#overview)
+- [Data Format](#data-format)
+- [Example](#example)
+- [System Config Location](#system-config-location)
+- [Contents](#contents)
+- [Validation](#validation)
+- [Firmware Updates](#firmware-updates)
+- [Loading and Reloading](#loading-and-reloading)
 
 ## Overview
 
-The `phosphor-fan-monitor` application is controlled by a configuration
-file (config file) to manage the `Functional` property's state on the
+The `phosphor-fan-monitor` application is controlled by a configuration file
+(config file) to manage the `Functional` property's state on the
 `xyz.openbmc_project.State.Decorator.OperationalStatus` interface for fan
 inventory objects. The config file defines the method to use in determining the
 functional state and the logging of errors for each fan within a machine. It
 also provides the ability to adjust the determination of a fan being
 non-functional due to fan hardware limitations.
 
-
 ## Data Format
 
-The config file is written using the [JSON (JavaScript Object
-Notation)](https://www.json.org/) data format and can be created using a text
-editor.
-
+The config file is written using the
+[JSON (JavaScript Object Notation)](https://www.json.org/) data format and can
+be created using a text editor.
 
 ## Example
 
 See [config.json](../../monitor/example/config.json).
 
-
 ## System Config Location
 
 The config file name is `config.json`.
@@ -48,8 +45,8 @@
 
 #### Default Location
 
-Where a single config file for 1-or-more system types can be used,
-the config file can be located at the base of the supported directory.
+Where a single config file for 1-or-more system types can be used, the config
+file can be located at the base of the supported directory.
 
 i.e.) `/usr/share/phosphor-fan-presence/monitor/config.json`
 
@@ -59,27 +56,29 @@
 where more than one type of machine is supported in a single BMC firmware image
 and those system types can not share a common config file.
 
-A system type sub-directory can be obtained from the `IBMCompatibleSystem`
-D-Bus interface's `Names` property. The `Names` property contains a list of one
-or more compatible system types, ordered from most specific to the most general.
+A system type sub-directory can be obtained from the `IBMCompatibleSystem` D-Bus
+interface's `Names` property. The `Names` property contains a list of one or
+more compatible system types, ordered from most specific to the most general.
 
 Example:
-* `ibm,rainier-2u`
-* `ibm,rainier`
 
-The `phosphor-fan-monitor` application then traverses the supported
-directory, appending each compatible system type entry as a sub-directory from
-most specific to most general until the config file is found.
+- `ibm,rainier-2u`
+- `ibm,rainier`
+
+The `phosphor-fan-monitor` application then traverses the supported directory,
+appending each compatible system type entry as a sub-directory from most
+specific to most general until the config file is found.
 
 Example:
+
 1. `/usr/share/phosphor-fan-presence/monitor/ibm,rainier-2u/`
-   * (directory/config file does not exist)
+   - (directory/config file does not exist)
 2. `/usr/share/phosphor-fan-presence/monitor/ibm,rainier/config.json`
-   * (config file found)
+   - (config file found)
 
 If a config file is not found and the machine is powered on, an error is logged
-and `phosphor-fan-monitor` application terminates preventing the machine
-from successfully powering on.
+and `phosphor-fan-monitor` application terminates preventing the machine from
+successfully powering on.
 
 ### Override Directory
 
@@ -90,20 +89,20 @@
 firmware image on the BMC when changing the configuration, such as for testing
 purposes.
 
-The override directory may not exist on the BMC, therefore to be able to use
-an overriding config file it must be created using the following command:
+The override directory may not exist on the BMC, therefore to be able to use an
+overriding config file it must be created using the following command:
 
 `mkdir -p /etc/phosphor-fan-presence/monitor`
 
 ### Search Order
 
-The `phosphor-fan-monitor` application will search for the config file at
-the directory locations in the following order:
+The `phosphor-fan-monitor` application will search for the config file at the
+directory locations in the following order:
+
 1. Override directory
 2. Supported directory
-   * Default location
-   * Compatible System Type location
-
+   - Default location
+   - Compatible System Type location
 
 ## Contents
 
@@ -113,6 +112,7 @@
 their functional state and what fault handling should occur. Fault handling
 includes creating error logs and/or powering off the system for a configured
 number of fans that are missing or nonfunctional.
+
 ```
 {
   "fans": [
@@ -140,39 +140,44 @@
 ### Syntax
 
 Fan object attributes: **(Required unless otherwise noted)**
-* [inventory](inventory.md)
-* [method](method.md) - *Optional, default = "timebased"
-* [deviation](deviation.md)
-* [num_sensors_nonfunc_for_fan_nonfunc](num_sensors_nonfunc_for_fan_nonfunc.md) - Optional, default = 0
-* [monitor_start_delay](monitor_start_delay.md) - Optional, default = 0
-* [fan_missing_error_delay](fan_missing_error_delay.md) - Optional
-* [nonfunc_rotor_error_delay](nonfunc_rotor_error_delay.md) - Optional
-* [set_func_on_present](set_func_on_present.md) - Optional, default = false
-* [sensors](sensors.md)
+
+- [inventory](inventory.md)
+- [method](method.md) - \*Optional, default = "timebased"
+- [deviation](deviation.md)
+- [num_sensors_nonfunc_for_fan_nonfunc](num_sensors_nonfunc_for_fan_nonfunc.md) -
+  Optional, default = 0
+- [monitor_start_delay](monitor_start_delay.md) - Optional, default = 0
+- [fan_missing_error_delay](fan_missing_error_delay.md) - Optional
+- [nonfunc_rotor_error_delay](nonfunc_rotor_error_delay.md) - Optional
+- [set_func_on_present](set_func_on_present.md) - Optional, default = false
+- [sensors](sensors.md)
 
 Trust group attributes: **(Optional)**
-* [class](class.md)
-* [group](group.md)
+
+- [class](class.md)
+- [group](group.md)
 
 Fault handling attributes: **(Optional)**
-* [num_nonfunc_rotors_before_error](num_nonfunc_rotors_before_error.md) -
-Optional, default = 1
-* [power_off_config](power_off_config.md) - Optional
 
-*-See attribute page for more details
+- [num_nonfunc_rotors_before_error](num_nonfunc_rotors_before_error.md) -
+  Optional, default = 1
+- [power_off_config](power_off_config.md) - Optional
+
+\*-See attribute page for more details
 
 ### Comments
 
 The JSON data format does not support comments. However, an optional `comments`
 attribute name can be used to annotate any specific entry of the JSON
-configuration. It is suggested that the value of this `comments` attribute be
-an array of strings for comments containing line breaks. All `comments` objects
-are ignored when the JSON configuration is processed.
+configuration. It is suggested that the value of this `comments` attribute be an
+array of strings for comments containing line breaks. All `comments` objects are
+ignored when the JSON configuration is processed.
 
-***Note: Only 1 `comments` object can exist at any given 'layer' of the
-configuration hierarchy***
+**_Note: Only 1 `comments` object can exist at any given 'layer' of the
+configuration hierarchy_**
 
 Example:
+
 ```
 {
   "comments": [
@@ -209,25 +214,22 @@
 
 TBD
 
-
 ## Firmware Updates
 
 When a new firmware image is installed on the BMC, it will update the config
 file in the standard directory.
 
 The override directory will **not** be modified by a firmware update. If a
-config file exists in the override directory, it will continue to be used as
-the fan presence configuration instead of the config file located under the
+config file exists in the override directory, it will continue to be used as the
+fan presence configuration instead of the config file located under the
 appropriate location within the supported directory.
 
-
 ## Loading and Reloading
 
-The config file is loaded when the `phosphor-fan-monitor` application
-starts.
+The config file is loaded when the `phosphor-fan-monitor` application starts.
 
-To force the application to reload the config file, use the following command
-on the BMC:
+To force the application to reload the config file, use the following command on
+the BMC:
 
 `systemctl kill -s HUP phosphor-fan-monitor@0.service`
 
diff --git a/docs/monitor/class.md b/docs/monitor/class.md
index 5972c03..18a903d 100644
--- a/docs/monitor/class.md
+++ b/docs/monitor/class.md
@@ -1,20 +1,23 @@
 # class
 
 ## Description
+
 A trust group determination class that implements a way to check a group of fan
 sensors trust state. Each of these 'classes' override a required function that
 determines if the group is trusted by checking each fan sensors listed within
-the trust group against an algorithm that returns whether they can be trusted
-or not.
+the trust group against an algorithm that returns whether they can be trusted or
+not.
 
 ## Attribute Value(s)
-* `NonzeroSpeed`
-  * Determines if the group is trusted by checking if any sensors in the group
-  has a nonzero speed. If all sensors report zero, then no sensors in the group
-  are trusted and therefore monitoring of all the sensors in the group is
-  canceled.
+
+- `NonzeroSpeed`
+  - Determines if the group is trusted by checking if any sensors in the group
+    has a nonzero speed. If all sensors report zero, then no sensors in the
+    group are trusted and therefore monitoring of all the sensors in the group
+    is canceled.
 
 ## Example
+
 <pre><code>
 {
   "sensor_trust_groups": [
diff --git a/docs/monitor/deviation.md b/docs/monitor/deviation.md
index ec3f814..cd7a784 100644
--- a/docs/monitor/deviation.md
+++ b/docs/monitor/deviation.md
@@ -1,16 +1,19 @@
 # deviation
 
 ## Description
+
 The +/- percentage allowed for the sensors of a fan to deviate from any
-requested target before being deemed out-of-spec and not functioning as
-expected according to the target requested.
+requested target before being deemed out-of-spec and not functioning as expected
+according to the target requested.
 
 ## Attribute Value(s)
+
 integer (0 - 100)
 
 Deviation is represented as a percentage, so only 0 to 100 are valid values.
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/fan_missing_error_delay.md b/docs/monitor/fan_missing_error_delay.md
index be4188b..4fc0cf7 100644
--- a/docs/monitor/fan_missing_error_delay.md
+++ b/docs/monitor/fan_missing_error_delay.md
@@ -1,14 +1,17 @@
 # fan_missing_error_delay
 
 ## Description
+
 The amount of time(in seconds) to delay logging an error against the fan when
 its not present. This attribute is optional and defaults to **no error** being
 logged when the fan is not present when the attribute is not given.
 
 ## Attribute Value(s)
+
 integer (default = do not create an error log)
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/group.md b/docs/monitor/group.md
index 696f1f0..9a6d3a1 100644
--- a/docs/monitor/group.md
+++ b/docs/monitor/group.md
@@ -1,17 +1,24 @@
 # group
 
 ## Description
-A list of sensor object names to include in determining trust of their values based on the configured [`class`](class.md). These sensors are what's included in the group that then has all of their current values trusted or not for monitoring based on algorithm of the [`class`](class.md).
+
+A list of sensor object names to include in determining trust of their values
+based on the configured [`class`](class.md). These sensors are what's included
+in the group that then has all of their current values trusted or not for
+monitoring based on algorithm of the [`class`](class.md).
 
 ## Attribute Value(s)
-* `name` - string
-  * The name of the fan tach sensor located under the `/xyz/openbmc_project/sensros/fan_tach` D-Bus path.
-* `in_trust` - boolean (Optional)
-  * By default, the sensor is included in determining trust of the group.
-  However this can be used to cancel/restart monitoring of a fan tach sensor
-  but not have it included in the determination of trust.
+
+- `name` - string
+  - The name of the fan tach sensor located under the
+    `/xyz/openbmc_project/sensros/fan_tach` D-Bus path.
+- `in_trust` - boolean (Optional)
+  - By default, the sensor is included in determining trust of the group.
+    However this can be used to cancel/restart monitoring of a fan tach sensor
+    but not have it included in the determination of trust.
 
 ## Example
+
 <pre><code>
 {
   "sensor_trust_groups": [
diff --git a/docs/monitor/inventory.md b/docs/monitor/inventory.md
index 3698516..551adba 100644
--- a/docs/monitor/inventory.md
+++ b/docs/monitor/inventory.md
@@ -1,15 +1,18 @@
 # inventory
 
 ## Description
+
 The relative path under inventory where the fan's inventory object exists on
 D-Bus. Inventory's base path is `/xyz/openbmc_project/inventory` resulting in
 the fan's inventory object path being the base path plus what's given here.  
 i.e.) `/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0`
 
 ## Attribute Value(s)
+
 string
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/method.md b/docs/monitor/method.md
index 0b38ec5..b53c65e 100644
--- a/docs/monitor/method.md
+++ b/docs/monitor/method.md
@@ -1,62 +1,69 @@
 # method
 
 ## Description
+
 The method to use in monitoring a fan's functional state. One method can be
 configured per fan and each supported method requires its own set of attributes
 to be provided.
 
 ## Attribute Value(s)
+
 Methods:
-* ["timebased"](#timebased) - Default
-* ["count"](#count)
+
+- ["timebased"](#timebased) - Default
+- ["count"](#count)
 
 ### "timebased"
+
 Uses timers for determining when a fan's sensor should be marked nonfunctional
 or functional after its been in that state for that continuous amount of time.
 Separate timers are used to transition a fan from functional to
 nonfunctional(`allowed_out_of_range_time`) and nonfunctional to
 functional(`functional_delay`).
 
-* `allowed_out_of_range_time` - Time(in seconds) that each fan sensor is
-allowed to be calculated out of range of a current target before being marked
-nonfunctional.
-* `functional_delay` - Optional, default = 0  
-  * Time(in seconds) that each fan sensor must be calculated within range of a
-  current target before being marked functional.
+- `allowed_out_of_range_time` - Time(in seconds) that each fan sensor is allowed
+  to be calculated out of range of a current target before being marked
+  nonfunctional.
+- `functional_delay` - Optional, default = 0
+  - Time(in seconds) that each fan sensor must be calculated within range of a
+    current target before being marked functional.
 
 ```
 "method": "timebased",
 "allowed_out_of_range_time": 30,
 "functional_delay": 5
 ```
+
 **Note: Since this method is the default, simply providing
 `allowed_out_of_range_time` and `functional_delay` attributes will result in
 this method being used.**
-* This is equivalent to above:
+
+- This is equivalent to above:
   ```
   "allowed_out_of_range_time": 30,
   "functional_delay": 5
   ```
 
 ### "count"
+
 An up/down counter for determining when a fan's sensor should be marked
 nonfunctional based on a `threshold` or functional when the counter = 0. Each
 fan sensor update where its feedback speed is calculated out of range of the
 current target increments the counter by 1. Once the counter reaches the
-`threshold`, the fan is marked nonfunctional. However, at any point the
-sensor's feedback speed is within range, the counter is decremented by 1.
-Therefore the fan's sensor(s) do not have to continuously be in a faulted state
-to be marked nonfunctional and instead is deemed nonfunctional once it
-accumulates the `threshold` number of times deemed out of range. The same is
-true for a nonfunctional fan sensor to become functional, where the counter
-must accumulate enough times deemed within range to decrement the counter to 0.
-This checking occurs at an interval dictated by the `count_interval` field.
+`threshold`, the fan is marked nonfunctional. However, at any point the sensor's
+feedback speed is within range, the counter is decremented by 1. Therefore the
+fan's sensor(s) do not have to continuously be in a faulted state to be marked
+nonfunctional and instead is deemed nonfunctional once it accumulates the
+`threshold` number of times deemed out of range. The same is true for a
+nonfunctional fan sensor to become functional, where the counter must accumulate
+enough times deemed within range to decrement the counter to 0. This checking
+occurs at an interval dictated by the `count_interval` field.
 
-* `threshold` - Number of total times a fan sensor must be calculated out of
-range before being marked nonfunctional.
+- `threshold` - Number of total times a fan sensor must be calculated out of
+  range before being marked nonfunctional.
 
-* `count_interval` - The interval, in seconds, to check the feedback speed and
-  increment/decrement the counter.  Defaults to 1s if not present.
+- `count_interval` - The interval, in seconds, to check the feedback speed and
+  increment/decrement the counter. Defaults to 1s if not present.
 
 ```
 "method": "count",
@@ -69,6 +76,7 @@
 ```
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/monitor_start_delay.md b/docs/monitor/monitor_start_delay.md
index b40cefa..1d99df2 100644
--- a/docs/monitor/monitor_start_delay.md
+++ b/docs/monitor/monitor_start_delay.md
@@ -1,15 +1,18 @@
 # monitor_start_delay
 
 ## Description
+
 The amount of time(in seconds) to delay from monitoring the fan at the start of
 powering on the system. This attribute is optional and defaults to 0, meaning
 the fan will immediately be monitored according to its configuration at the
 start of power on.
 
 ## Attribute Value(s)
+
 integer (default = 0)
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/nonfunc_rotor_error_delay.md b/docs/monitor/nonfunc_rotor_error_delay.md
index 420cd27..05ad6a2 100644
--- a/docs/monitor/nonfunc_rotor_error_delay.md
+++ b/docs/monitor/nonfunc_rotor_error_delay.md
@@ -1,6 +1,7 @@
 # nonfunc_rotor_error_delay
 
 ## Description
+
 The amount of time(in seconds) to delay logging an error against the fan when
 any of its sensors are deemed nonfunctional. This attribute is optional and
 defaults to **no error** being logged when the attribute is not given and a
@@ -10,9 +11,11 @@
 `fault_handling` section of the configuration is given.**
 
 ## Attribute Value(s)
+
 integer (default = do not create an error log)
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/num_nonfunc_rotors_before_error.md b/docs/monitor/num_nonfunc_rotors_before_error.md
index e6c4ff3..c7b29ba 100644
--- a/docs/monitor/num_nonfunc_rotors_before_error.md
+++ b/docs/monitor/num_nonfunc_rotors_before_error.md
@@ -1,6 +1,7 @@
 # num_nonfunc_rotors_before_error
 
 ## Description
+
 The number of fan rotors (also known as [`sensors`](sensors.md)) that must be
 deemed nonfunctional for an error event log to be created. When the number of
 nonfunctional fan rotors are below this value, informational event logs are
@@ -9,9 +10,11 @@
 fan rotors([`sensors`](sensors.md)) being monitored is nonfunctional.
 
 ## Attribute Value(s)
+
 integer (default = 1)
 
 ## Example
+
 <pre><code>
 {
   "fault_handling": [
diff --git a/docs/monitor/num_sensors_nonfunc_for_fan_nonfunc.md b/docs/monitor/num_sensors_nonfunc_for_fan_nonfunc.md
index 748827d..8988bc3 100644
--- a/docs/monitor/num_sensors_nonfunc_for_fan_nonfunc.md
+++ b/docs/monitor/num_sensors_nonfunc_for_fan_nonfunc.md
@@ -1,15 +1,18 @@
 # num_sensors_nonfunc_for_fan_nonfunc
 
 ## Description
+
 The number of `sensors` that must be deemed nonfunctional for the fan enclosure
 object to also be nonfunctional. This attribute is optional and defaults to 0,
 meaning the fan enclosure will not be set to nonfunctional based on the
 functional state of its list of `sensors`.
 
 ## Attribute Value(s)
+
 integer (default = 0)
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/power_off_config.md b/docs/monitor/power_off_config.md
index dc0e3d7..d7ed36a 100644
--- a/docs/monitor/power_off_config.md
+++ b/docs/monitor/power_off_config.md
@@ -1,45 +1,53 @@
 # power_off_config
 
 ## Description
-A list of power off rules based on the monitoring state of the fans configured. These power off rules can perform different system power off types to protect a system that is not able to provide enough cooling due to a number of missing or nonfunctional fans.
+
+A list of power off rules based on the monitoring state of the fans configured.
+These power off rules can perform different system power off types to protect a
+system that is not able to provide enough cooling due to a number of missing or
+nonfunctional fans.
 
 ## Attribute Value(s)
-* `type` - ["hard", "soft", "epow"]
-  * "hard" - Perform a hard shutdown that immediately powers off the system.
-  * "soft" - Perform an orderly shutdown requesting that the host OS power off
-  the system.
-  * "epow" - Sets the thermal alert D-Bus property that a power off is imminent
-  after a `service_mode_delay` amount of time passes.
-* `cause` - ["missing_fan_frus", "nonfunc_fan_rotors"]
-  * "missing_fan_frus" - Power off due to missing fan enclosures
-  * "nonfunc_fan_rotors" - Power off due to nonfunctional fan
-  rotors([`sensors`](sensors.md))
-* `count` - integer
-  * Number of the configured `cause` instances to begin the power off `type`
+
+- `type` - ["hard", "soft", "epow"]
+  - "hard" - Perform a hard shutdown that immediately powers off the system.
+  - "soft" - Perform an orderly shutdown requesting that the host OS power off
+    the system.
+  - "epow" - Sets the thermal alert D-Bus property that a power off is imminent
+    after a `service_mode_delay` amount of time passes.
+- `cause` - ["missing_fan_frus", "nonfunc_fan_rotors"]
+  - "missing_fan_frus" - Power off due to missing fan enclosures
+  - "nonfunc_fan_rotors" - Power off due to nonfunctional fan
+    rotors([`sensors`](sensors.md))
+- `count` - integer
+  - Number of the configured `cause` instances to begin the power off `type`
 
 ### "hard" & "soft" `type` power offs
-* `delay` - integer
-  * Time(in seconds) to delay performing the power off after `count` instances
-  of the `cause` criteria is met.
-* `state` - ["at_pgood", "runtime"] (Optional)
-  * "at_pgood" - At system pgood, the power off rule becomes valid. A power off
-  rule of *"at_pgood"* can halt a system power on if the conditions are met.
-  * "runtime" - At system runtime, the power off rule becomes valid. A power
-  off rule of *"runtime"* only goes into affect after the system reaches
-  runtime. (Default)
+
+- `delay` - integer
+  - Time(in seconds) to delay performing the power off after `count` instances
+    of the `cause` criteria is met.
+- `state` - ["at_pgood", "runtime"] (Optional)
+  - "at_pgood" - At system pgood, the power off rule becomes valid. A power off
+    rule of _"at_pgood"_ can halt a system power on if the conditions are met.
+  - "runtime" - At system runtime, the power off rule becomes valid. A power off
+    rule of _"runtime"_ only goes into affect after the system reaches runtime.
+    (Default)
 
 ### "epow" `type` power offs
-* `service_mode_delay` - integer
-  * Time(in seconds) given before the thermal alert D-Bus property is set to
-  indicate that a power off is imminent if the `count` instances of the `cause`
-  criteria still exists. This timer is canceled when the `count` instances of
-  the `cause` is not longer met.
-* `meltdown_delay` - integer
-  * Time(in seconds) before a hard power off occurs after the
-  `service_mode_delay` timer expires. This timer can not be canceled once
-  started.
+
+- `service_mode_delay` - integer
+  - Time(in seconds) given before the thermal alert D-Bus property is set to
+    indicate that a power off is imminent if the `count` instances of the
+    `cause` criteria still exists. This timer is canceled when the `count`
+    instances of the `cause` is not longer met.
+- `meltdown_delay` - integer
+  - Time(in seconds) before a hard power off occurs after the
+    `service_mode_delay` timer expires. This timer can not be canceled once
+    started.
 
 ## Example
+
 <pre><code>
 {
   "fault_handling": [
diff --git a/docs/monitor/sensors.md b/docs/monitor/sensors.md
index b6555ee..3106d25 100644
--- a/docs/monitor/sensors.md
+++ b/docs/monitor/sensors.md
@@ -1,30 +1,46 @@
 # sensors
 
 ## Description
-An array of sensor objects that make up the fan enclosure object. The sensors are what's monitored to determine the functional state of the fan.
 
-A sensor's functional range is determined by the following equation(where *[target]* is current requested target of the fan):
-* Minimum = ([target] * (100 - [`deviation`](deviation.md)) / 100) * `factor` + `offset`
-* Maximum = ([target] * (100 + [`deviation`](deviation.md)) / 100) * `factor` + `offset`
+An array of sensor objects that make up the fan enclosure object. The sensors
+are what's monitored to determine the functional state of the fan.
 
-Therefore, a fan sensor must be above the minimum and less than the maximum to be deemed functional.
+A sensor's functional range is determined by the following equation(where
+_[target]_ is current requested target of the fan):
+
+- Minimum = ([target] _ (100 - [`deviation`](deviation.md)) / 100) _ `factor` +
+  `offset`
+- Maximum = ([target] _ (100 + [`deviation`](deviation.md)) / 100) _ `factor` +
+  `offset`
+
+Therefore, a fan sensor must be above the minimum and less than the maximum to
+be deemed functional.
 
 ## Attribute Value(s)
-* `name` - string
-  * The name of the fan tach sensors located under the
-`/xyz/openbmc_project/sensors/fan_tach` D-Bus path.
-* `has_target` - boolean
-  * Whether this sensor D-Bus object contains the `Target` property or not.
-* `target_interface` - string (Optional)
-  * The D-Bus interface containing the `Target` property. This defaults to `xyz.openbmc_project.Control.FanSpeed` for RPM controlled fans or can be set to `xyz.openbmc_project.Control.FanPwm` for PWM controlled fans.
-* `target_path` - string (Optional)
-  * The D-Bus full object path containing the `Target` property. This defaults to `/xyz/openbmc_project/sensors/fan_tach`+`name`.
-* `factor` - double (Optional)
-  * A value to multiply the current target by to adjust the monitoring of this sensor due to how the hardware works. This sensor attribute is optional and defaults to 1.0.
-* `offset` - integer (Optional)
-  * A value to shift the current target by to adjust the monitoring of this sensor due to how the hardware works. This sensors attribute is optional and defaults to 0.
+
+- `name` - string
+  - The name of the fan tach sensors located under the
+    `/xyz/openbmc_project/sensors/fan_tach` D-Bus path.
+- `has_target` - boolean
+  - Whether this sensor D-Bus object contains the `Target` property or not.
+- `target_interface` - string (Optional)
+  - The D-Bus interface containing the `Target` property. This defaults to
+    `xyz.openbmc_project.Control.FanSpeed` for RPM controlled fans or can be set
+    to `xyz.openbmc_project.Control.FanPwm` for PWM controlled fans.
+- `target_path` - string (Optional)
+  - The D-Bus full object path containing the `Target` property. This defaults
+    to `/xyz/openbmc_project/sensors/fan_tach`+`name`.
+- `factor` - double (Optional)
+  - A value to multiply the current target by to adjust the monitoring of this
+    sensor due to how the hardware works. This sensor attribute is optional and
+    defaults to 1.0.
+- `offset` - integer (Optional)
+  - A value to shift the current target by to adjust the monitoring of this
+    sensor due to how the hardware works. This sensors attribute is optional and
+    defaults to 0.
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/monitor/set_func_on_present.md b/docs/monitor/set_func_on_present.md
index c9df66e..0aa5dff 100644
--- a/docs/monitor/set_func_on_present.md
+++ b/docs/monitor/set_func_on_present.md
@@ -1,6 +1,7 @@
 # set_func_on_present
 
 ## Description
+
 Immediately set the fan FRU's contained rotors to functional when the fan's
 presence has been detected and **only** allow the fan FRU to be set to
 functional when presence is detected. Using this configuration option
@@ -15,9 +16,11 @@
 up, there won't be additional errors.
 
 ## Attribute Value(s)
+
 bool (default = false)
 
 ## Example
+
 <pre><code>
 {
   "fans": [
diff --git a/docs/presence/README.md b/docs/presence/README.md
index 82d0481..6f94a6e 100644
--- a/docs/presence/README.md
+++ b/docs/presence/README.md
@@ -1,37 +1,34 @@
 # Fan Presence Configuration File
 
 ## Table of Contents
-* [Overview](#overview)
-* [Data Format](#data-format)
-* [Example](#example)
-* [System Config Location](#system-config-location)
-* [Contents](#contents)
-* [Validation](#validation)
-* [Firmware Updates](#firmware-updates)
-* [Loading and Reloading](#loading-and-reloading)
 
+- [Overview](#overview)
+- [Data Format](#data-format)
+- [Example](#example)
+- [System Config Location](#system-config-location)
+- [Contents](#contents)
+- [Validation](#validation)
+- [Firmware Updates](#firmware-updates)
+- [Loading and Reloading](#loading-and-reloading)
 
 ## Overview
 
 The `phosphor-fan-presence-tach` application is controlled by a configuration
 file (config file) to manage the `Present` property's state on the
-`xyz.openbmc_project.Inventory.Item` interface for fan inventory objects.
-The config file defines the method(s) and policy(s) to use in determining the
+`xyz.openbmc_project.Inventory.Item` interface for fan inventory objects. The
+config file defines the method(s) and policy(s) to use in determining the
 presence of each fan within a machine.
 
-
 ## Data Format
 
-The config file is written using the [JSON (JavaScript Object
-Notation)](https://www.json.org/) data format and can be created using a text
-editor.
-
+The config file is written using the
+[JSON (JavaScript Object Notation)](https://www.json.org/) data format and can
+be created using a text editor.
 
 ## Example
 
 See [config.json](../../presence/example/config.json).
 
-
 ## System Config Location
 
 The config file name is `config.json`.
@@ -46,8 +43,8 @@
 
 #### Default Location
 
-Where a single config file for 1-or-more system types can be used,
-the config file can be located at the base of the supported directory.
+Where a single config file for 1-or-more system types can be used, the config
+file can be located at the base of the supported directory.
 
 i.e.) `/usr/share/phosphor-fan-presence/presence/config.json`
 
@@ -57,23 +54,25 @@
 where more than one type of machine is supported in a single BMC firmware image
 and those system types can not share a common config file.
 
-A system type sub-directory can be obtained from the `IBMCompatibleSystem`
-D-Bus interface's `Names` property. The `Names` property contains a list of one
-or more compatible system types, ordered from most specific to the most general.
+A system type sub-directory can be obtained from the `IBMCompatibleSystem` D-Bus
+interface's `Names` property. The `Names` property contains a list of one or
+more compatible system types, ordered from most specific to the most general.
 
 Example:
-* `ibm,rainier-2u`
-* `ibm,rainier`
+
+- `ibm,rainier-2u`
+- `ibm,rainier`
 
 The `phosphor-fan-presence-tach` application then traverses the supported
 directory, appending each compatible system type entry as a sub-directory from
 most specific to most general until the config file is found.
 
 Example:
+
 1. `/usr/share/phosphor-fan-presence/presence/ibm,rainier-2u/`
-   * (directory/config file does not exist)
+   - (directory/config file does not exist)
 2. `/usr/share/phosphor-fan-presence/presence/ibm,rainier/config.json`
-   * (config file found)
+   - (config file found)
 
 If a config file is not found and the machine is powered on, an error is logged
 and `phosphor-fan-presence-tach` application terminates preventing the machine
@@ -88,8 +87,8 @@
 firmware image on the BMC when changing the configuration, such as for testing
 purposes.
 
-The override directory may not exist on the BMC, therefore to be able to use
-an overriding config file it must be created using the following command:
+The override directory may not exist on the BMC, therefore to be able to use an
+overriding config file it must be created using the following command:
 
 `mkdir -p /etc/phosphor-fan-presence/presence`
 
@@ -97,11 +96,11 @@
 
 The `phosphor-fan-presence-tach` application will search for the config file at
 the directory locations in the following order:
+
 1. Override directory
 2. Supported directory
-   * Default location
-   * Compatible System Type location
-
+   - Default location
+   - Compatible System Type location
 
 ## Contents
 
@@ -110,6 +109,7 @@
 The config file consists of an array of fan objects that define how their
 presence is detected and the policy used to update its present state within
 inventory.
+
 ```
 [
   {
@@ -136,24 +136,26 @@
 ### Syntax
 
 Fan object attributes: **(Required unless otherwise noted)**
-* [name](name.md)
-* [path](path.md)
-* [methods](methods.md)
-* [rpolicy](rpolicy.md)
-* [eeprom](eeprom.md) *optional*
+
+- [name](name.md)
+- [path](path.md)
+- [methods](methods.md)
+- [rpolicy](rpolicy.md)
+- [eeprom](eeprom.md) _optional_
 
 ### Comments
 
 The JSON data format does not support comments. However, an optional `comments`
 attribute name can be used to annotate any specific entry of the JSON
-configuration. It is suggested that the value of this `comments` attribute be
-an array of strings for comments containing line breaks. All `comments` objects
-are ignored when the JSON configuration is processed.
+configuration. It is suggested that the value of this `comments` attribute be an
+array of strings for comments containing line breaks. All `comments` objects are
+ignored when the JSON configuration is processed.
 
-***Note: Only 1 `comments` object can exist at any given 'layer' of the
-configuration hierarchy***
+**_Note: Only 1 `comments` object can exist at any given 'layer' of the
+configuration hierarchy_**
 
 Example:
+
 ```
 [
   {
@@ -193,25 +195,23 @@
 
 TBD
 
-
 ## Firmware Updates
 
 When a new firmware image is installed on the BMC, it will update the config
 file in the standard directory.
 
 The override directory will **not** be modified by a firmware update. If a
-config file exists in the override directory, it will continue to be used as
-the fan presence configuration instead of the config file located under the
+config file exists in the override directory, it will continue to be used as the
+fan presence configuration instead of the config file located under the
 appropriate location within the supported directory.
 
-
 ## Loading and Reloading
 
 The config file is loaded when the `phosphor-fan-presence-tach` application
 starts.
 
-To force the application to reload the config file, use the following command
-on the BMC:
+To force the application to reload the config file, use the following command on
+the BMC:
 
 `systemctl kill -s HUP phosphor-fan-presence-tach@0.service`
 
diff --git a/docs/presence/eeprom.md b/docs/presence/eeprom.md
index 919ec69..4d8b57f 100644
--- a/docs/presence/eeprom.md
+++ b/docs/presence/eeprom.md
@@ -1,19 +1,22 @@
 # eeprom
 
 ## Description
-Some fans have EEPROMs on them.  In these cases, the `eeprom` JSON stanza can
-be used to have the application re-bind the EEPROM driver to the EEPROM
-instance after a new fan is detected.  This will trigger the EEPROM to be read
-by the appropriate code if the platform is configured to do so.
+
+Some fans have EEPROMs on them. In these cases, the `eeprom` JSON stanza can be
+used to have the application re-bind the EEPROM driver to the EEPROM instance
+after a new fan is detected. This will trigger the EEPROM to be read by the
+appropriate code if the platform is configured to do so.
 
 This is optional and only required if the above behavior is desired.
 
 ## Keys
-* ["bus_address"](#bus_address)
-* ["driver_name"](#driver_name)
-* ["bind_delay_ms"](#bind_delay_ms)
+
+- ["bus_address"](#bus_address)
+- ["driver_name"](#driver_name)
+- ["bind_delay_ms"](#bind_delay_ms)
 
 ### "bus_address"
+
 The I2C bus and address string of the form BB-AAAA that is used by the I2C
 subsystem in sysfs.
 
@@ -22,6 +25,7 @@
 ```
 
 ### "driver_name"
+
 The name of the eeprom driver in sysfs.
 
 ```
@@ -29,16 +33,17 @@
 ```
 
 ### "bind_delay_ms"
+
 The number of milliseconds to wait after a fan is detected before binding the
 driver to the device in case the device takes some time to initialize after
-being plugged into power.  If no delay is required, a value of zero can be
-used.
+being plugged into power. If no delay is required, a value of zero can be used.
 
 ```
 "bind_delay_ms": 1000
 ```
 
 ## Example
+
 <pre><code>
 [
   {
diff --git a/docs/presence/methods.md b/docs/presence/methods.md
index 3aa9e2d..666a35a 100644
--- a/docs/presence/methods.md
+++ b/docs/presence/methods.md
@@ -1,15 +1,19 @@
 # methods
 
 ## Description
+
 An array of method objects used to detect the fan's present state. Each
 supported method requires its own set of attributes to be provided.
 
 ## Attribute Value(s)
+
 Method `type`:
-* ["tach"](#tach)
-* ["gpio"](#gpio)
+
+- ["tach"](#tach)
+- ["gpio"](#gpio)
 
 ### "tach"
+
 Requires an array of `sensors` of each fan tach D-Bus sensor name to be used to
 determine fan presence. This is the name of the fan tach sensor located under
 the `/xyz/openbmc_project/sensors/fan_tach/` D-Bus path.
@@ -22,6 +26,7 @@
 ```
 
 ### "gpio"
+
 Detects fans with dedicated GPIOs using Linux
 [gpio-keys](https://www.kernel.org/doc/Documentation/devicetree/bindings/input/gpio-keys.txt)
 device tree bindings, where the event number is provided via the `key`
@@ -35,6 +40,7 @@
 ```
 
 ## Example
+
 <pre><code>
 [
   {
diff --git a/docs/presence/name.md b/docs/presence/name.md
index b09b4b1..be4f4ce 100644
--- a/docs/presence/name.md
+++ b/docs/presence/name.md
@@ -1,12 +1,15 @@
 # name
 
 ## Description
+
 A unique identifying name for the fan.
 
 ## Attribute Value(s)
+
 string
 
 ## Example
+
 <pre><code>
 [
   {
diff --git a/docs/presence/path.md b/docs/presence/path.md
index 9012c87..9030cb0 100644
--- a/docs/presence/path.md
+++ b/docs/presence/path.md
@@ -1,15 +1,18 @@
 # path
 
 ## Description
+
 The relative path under inventory where the fan's inventory object exists on
 D-Bus. Inventory's base path is `/xyz/openbmc_project/inventory` resulting in
 the fan's inventory object path being the base path plus what's given here.  
 i.e.) `/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0`
 
 ## Attribute Value(s)
+
 string
 
 ## Example
+
 <pre><code>
 [
   {
diff --git a/docs/presence/rpolicy.md b/docs/presence/rpolicy.md
index 47fd9af..0a2f6cb 100644
--- a/docs/presence/rpolicy.md
+++ b/docs/presence/rpolicy.md
@@ -1,16 +1,20 @@
 # rpolicy
 
 ## Description
+
 The type of redundancy policy to use against the methods of presence detection.
 When there are more than one method of detecting a fan, the policy in which to
 use those methods can be configured based on system expectations.
 
 ## Attribute Value(s)
+
 Policy `type`:
-* ["anyof"](#anyof)
-* ["fallback"](#fallback)
+
+- ["anyof"](#anyof)
+- ["fallback"](#fallback)
 
 ### "anyof"
+
 A policy where if any method of fan presence detection denotes the fan is
 present, results in the fan being marked present. All methods of detection must
 denote the fan as missing to have a fan be not present.
@@ -20,14 +24,16 @@
 ```
 
 ### "fallback"
-A policy to use the first method of fan presence detection and then use the
-next method only when the first method denotes the fan is missing.
+
+A policy to use the first method of fan presence detection and then use the next
+method only when the first method denotes the fan is missing.
 
 ```
 "type": "fallback"
 ```
 
 ## Example
+
 <pre><code>
 [
   {
diff --git a/docs/sensor-monitor/README.md b/docs/sensor-monitor/README.md
index ba09a08..7f199dc 100644
--- a/docs/sensor-monitor/README.md
+++ b/docs/sensor-monitor/README.md
@@ -9,21 +9,21 @@
 This monitor will watch all instances of the
 `xyz.openbmc_project.Sensor.Threshold.HardShutdown` and
 `xyz.openbmc_project.Sensor.Threshold.SoftShutdown` D-Bus interfaces for the
-alarm properties to trip.  When this happens, a configurable timer is started
-at the end of which a power off is executed if the alarms haven't reset by that
-time.  Event logs will also be created.
+alarm properties to trip. When this happens, a configurable timer is started at
+the end of which a power off is executed if the alarms haven't reset by that
+time. Event logs will also be created.
 
 The configuration options `SHUTDOWN_ALARM_HARD_SHUTDOWN_DELAY_MS` and
 `SHUTDOWN_ALARM_SOFT_SHUTDOWN_DELAY_MS` can be used to change the delays.
 
 ### ThresholdAlarmLogger
 
-This monitor will watch the alarm properties on the following threshold
-D-Bus interfaces:
+This monitor will watch the alarm properties on the following threshold D-Bus
+interfaces:
 
 - `xyz.openbmc_project.Sensor.Threshold.Warning`
 - `xyz.openbmc_project.Sensor.Threshold.Critical`
 - `xyz.openbmc_project.Sensor.Threshold.PerformanceLoss`
 
-When the alarm properties are asserted, event logs are created.  When they are
+When the alarm properties are asserted, event logs are created. When they are
 deasserted, informational event logs are created.
diff --git a/monitor/config_files/p10bmc/ibm,bonnell/config.json b/monitor/config_files/p10bmc/ibm,bonnell/config.json
index 859c24e..89dc484 100644
--- a/monitor/config_files/p10bmc/ibm,bonnell/config.json
+++ b/monitor/config_files/p10bmc/ibm,bonnell/config.json
@@ -1,41 +1,40 @@
 {
-  "fans": [
-    {
-      "inventory": "/system/chassis/motherboard/fan0",
-      "method": "count",
-      "count_interval": 1,
-      "deviation": 18,
-      "num_sensors_nonfunc_for_fan_nonfunc": 0,
-      "monitor_start_delay": 30,
-      "fan_missing_error_delay": 20,
-      "nonfunc_rotor_error_delay": 0,
-      "set_func_on_present": true,
-      "sensors": [
+    "fans": [
         {
-          "name": "fan0_0",
-          "threshold": 30,
-          "has_target": true
-        }
-
-      ]
-    },
-    {
-      "inventory": "/system/chassis/motherboard/fan1",
-      "method": "count",
-      "count_interval": 1,
-      "deviation": 18,
-      "num_sensors_nonfunc_for_fan_nonfunc": 0,
-      "monitor_start_delay": 30,
-      "fan_missing_error_delay": 20,
-      "nonfunc_rotor_error_delay": 0,
-      "set_func_on_present": true,
-      "sensors": [
+            "inventory": "/system/chassis/motherboard/fan0",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
         {
-          "name": "fan1_0",
-          "threshold": 30,
-          "has_target": true
+            "inventory": "/system/chassis/motherboard/fan1",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/monitor/config_files/p10bmc/ibm,everest/config.json b/monitor/config_files/p10bmc/ibm,everest/config.json
index d3f21bb..62a6b4a 100644
--- a/monitor/config_files/p10bmc/ibm,everest/config.json
+++ b/monitor/config_files/p10bmc/ibm,everest/config.json
@@ -1,124 +1,122 @@
 {
-   "fans": [
-      {
-         "inventory": "/system/chassis/motherboard/fan0",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan0_0",
-               "threshold": 45,
-               "has_target": true
-            },
-            {
-               "name": "fan0_1",
-               "threshold": 45,
-               "has_target": false
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan1",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan1_0",
-               "threshold": 45,
-               "has_target": true
-            },
-            {
-               "name": "fan1_1",
-               "threshold": 45,
-               "has_target": false
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan2",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan2_0",
-               "threshold": 45,
-               "has_target": true
-            },
-            {
-               "name": "fan2_1",
-               "threshold": 45,
-               "has_target": false
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan3",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan3_0",
-               "threshold": 45,
-               "has_target": true
-            },
-            {
-               "name": "fan3_1",
-               "threshold": 45,
-               "has_target": false
-            }
-         ]
-      }
-   ],
-   "sensor_trust_groups": [
-      {
-         "class": "NonzeroSpeed",
-         "group": [
-            {
-               "name": "fan0_1"
-            },
-            {
-               "name": "fan1_1"
-            },
-            {
-               "name": "fan2_1"
-            },
-            {
-               "name": "fan3_1"
-            }
-         ]
-      }
-   ],
-   "fault_handling":
-   {
-       "num_nonfunc_rotors_before_error": 1,
+    "fans": [
+        {
+            "inventory": "/system/chassis/motherboard/fan0",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "threshold": 45,
+                    "has_target": true
+                },
+                {
+                    "name": "fan0_1",
+                    "threshold": 45,
+                    "has_target": false
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan1",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "threshold": 45,
+                    "has_target": true
+                },
+                {
+                    "name": "fan1_1",
+                    "threshold": 45,
+                    "has_target": false
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan2",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan2_0",
+                    "threshold": 45,
+                    "has_target": true
+                },
+                {
+                    "name": "fan2_1",
+                    "threshold": 45,
+                    "has_target": false
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan3",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan3_0",
+                    "threshold": 45,
+                    "has_target": true
+                },
+                {
+                    "name": "fan3_1",
+                    "threshold": 45,
+                    "has_target": false
+                }
+            ]
+        }
+    ],
+    "sensor_trust_groups": [
+        {
+            "class": "NonzeroSpeed",
+            "group": [
+                {
+                    "name": "fan0_1"
+                },
+                {
+                    "name": "fan1_1"
+                },
+                {
+                    "name": "fan2_1"
+                },
+                {
+                    "name": "fan3_1"
+                }
+            ]
+        }
+    ],
+    "fault_handling": {
+        "num_nonfunc_rotors_before_error": 1,
 
-       "power_off_config":
-       [
-           {
+        "power_off_config": [
+            {
                 "type": "hard",
                 "cause": "missing_fan_frus",
                 "count": 1,
@@ -132,6 +130,6 @@
                 "service_mode_delay": 150,
                 "meltdown_delay": 150
             }
-       ]
-   }
+        ]
+    }
 }
diff --git a/monitor/config_files/p10bmc/ibm,rainier-1s4u/config.json b/monitor/config_files/p10bmc/ibm,rainier-1s4u/config.json
index 454e52a..8f87e99 100644
--- a/monitor/config_files/p10bmc/ibm,rainier-1s4u/config.json
+++ b/monitor/config_files/p10bmc/ibm,rainier-1s4u/config.json
@@ -1,85 +1,83 @@
 {
-   "fans": [
-      {
-         "inventory": "/system/chassis/motherboard/fan0",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan0_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan1",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan1_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan2",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan2_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan4",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan4_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      }
-   ],
-   "fault_handling":
-   {
-       "num_nonfunc_rotors_before_error": 1,
+    "fans": [
+        {
+            "inventory": "/system/chassis/motherboard/fan0",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan1",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan2",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan2_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan4",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan4_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        }
+    ],
+    "fault_handling": {
+        "num_nonfunc_rotors_before_error": 1,
 
-       "power_off_config":
-       [
-           {
+        "power_off_config": [
+            {
                 "type": "hard",
                 "cause": "missing_fan_frus",
                 "count": 1,
@@ -93,6 +91,6 @@
                 "service_mode_delay": 60,
                 "meltdown_delay": 60
             }
-       ]
-   }
+        ]
+    }
 }
diff --git a/monitor/config_files/p10bmc/ibm,rainier-2u/config.json b/monitor/config_files/p10bmc/ibm,rainier-2u/config.json
index 8d180c7..0a54f21 100644
--- a/monitor/config_files/p10bmc/ibm,rainier-2u/config.json
+++ b/monitor/config_files/p10bmc/ibm,rainier-2u/config.json
@@ -1,165 +1,163 @@
 // MAX31785revB w/ latest fan hardware
 // *Note: Sensor trust groups are removed with revB
 {
-   "fans": [
-      {
-         "inventory": "/system/chassis/motherboard/fan0",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 18,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan0_0",
-               "threshold": 30,
-               "has_target": true
-            },
-            {
-               "name": "fan0_1",
-               "threshold": 30,
-               "has_target": false,
-               "factor": 0.625,
-               "offset": 1100
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan1",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 18,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan1_0",
-               "threshold": 30,
-               "has_target": true
-            },
-            {
-               "name": "fan1_1",
-               "threshold": 30,
-               "has_target": false,
-               "factor": 0.625,
-               "offset": 1100
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan2",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 18,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan2_0",
-               "threshold": 30,
-               "has_target": true
-            },
-            {
-               "name": "fan2_1",
-               "threshold": 30,
-               "has_target": false,
-               "factor": 0.625,
-               "offset": 1100
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan3",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 18,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan3_0",
-               "threshold": 30,
-               "has_target": true
-            },
-            {
-               "name": "fan3_1",
-               "threshold": 30,
-               "has_target": false,
-               "factor": 0.625,
-               "offset": 1100
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan4",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 18,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan4_0",
-               "threshold": 30,
-               "has_target": true
-            },
-            {
-               "name": "fan4_1",
-               "threshold": 30,
-               "has_target": false,
-               "factor": 0.625,
-               "offset": 1100
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan5",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 18,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan5_0",
-               "threshold": 30,
-               "has_target": true
-            },
-            {
-               "name": "fan5_1",
-               "threshold": 30,
-               "has_target": false,
-               "factor": 0.625,
-               "offset": 1100
-            }
-         ]
-      }
-   ],
-   "fault_handling":
-   {
-       "num_nonfunc_rotors_before_error": 1,
+    "fans": [
+        {
+            "inventory": "/system/chassis/motherboard/fan0",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "threshold": 30,
+                    "has_target": true
+                },
+                {
+                    "name": "fan0_1",
+                    "threshold": 30,
+                    "has_target": false,
+                    "factor": 0.625,
+                    "offset": 1100
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan1",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "threshold": 30,
+                    "has_target": true
+                },
+                {
+                    "name": "fan1_1",
+                    "threshold": 30,
+                    "has_target": false,
+                    "factor": 0.625,
+                    "offset": 1100
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan2",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan2_0",
+                    "threshold": 30,
+                    "has_target": true
+                },
+                {
+                    "name": "fan2_1",
+                    "threshold": 30,
+                    "has_target": false,
+                    "factor": 0.625,
+                    "offset": 1100
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan3",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan3_0",
+                    "threshold": 30,
+                    "has_target": true
+                },
+                {
+                    "name": "fan3_1",
+                    "threshold": 30,
+                    "has_target": false,
+                    "factor": 0.625,
+                    "offset": 1100
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan4",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan4_0",
+                    "threshold": 30,
+                    "has_target": true
+                },
+                {
+                    "name": "fan4_1",
+                    "threshold": 30,
+                    "has_target": false,
+                    "factor": 0.625,
+                    "offset": 1100
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan5",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 18,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan5_0",
+                    "threshold": 30,
+                    "has_target": true
+                },
+                {
+                    "name": "fan5_1",
+                    "threshold": 30,
+                    "has_target": false,
+                    "factor": 0.625,
+                    "offset": 1100
+                }
+            ]
+        }
+    ],
+    "fault_handling": {
+        "num_nonfunc_rotors_before_error": 1,
 
-       "power_off_config":
-       [
-           {
+        "power_off_config": [
+            {
                 "type": "hard",
                 "cause": "missing_fan_frus",
                 "count": 1,
@@ -173,6 +171,6 @@
                 "service_mode_delay": 60,
                 "meltdown_delay": 60
             }
-       ]
-   }
+        ]
+    }
 }
diff --git a/monitor/config_files/p10bmc/ibm,rainier-4u/config.json b/monitor/config_files/p10bmc/ibm,rainier-4u/config.json
index 29bf384..9a0b884 100644
--- a/monitor/config_files/p10bmc/ibm,rainier-4u/config.json
+++ b/monitor/config_files/p10bmc/ibm,rainier-4u/config.json
@@ -1,121 +1,119 @@
 {
-   "fans": [
-      {
-         "inventory": "/system/chassis/motherboard/fan0",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan0_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan1",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan1_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan2",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan2_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan3",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan3_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan4",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan4_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan5",
-         "method": "count",
-         "count_interval": 1,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 0,
-         "monitor_start_delay": 30,
-         "fan_missing_error_delay": 20,
-         "nonfunc_rotor_error_delay": 0,
-         "set_func_on_present": true,
-         "sensors": [
-            {
-               "name": "fan5_0",
-               "threshold": 30,
-               "has_target": true
-            }
-         ]
-      }
-   ],
-   "fault_handling":
-   {
-       "num_nonfunc_rotors_before_error": 1,
+    "fans": [
+        {
+            "inventory": "/system/chassis/motherboard/fan0",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan1",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan2",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan2_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan3",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan3_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan4",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan4_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan5",
+            "method": "count",
+            "count_interval": 1,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 0,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "set_func_on_present": true,
+            "sensors": [
+                {
+                    "name": "fan5_0",
+                    "threshold": 30,
+                    "has_target": true
+                }
+            ]
+        }
+    ],
+    "fault_handling": {
+        "num_nonfunc_rotors_before_error": 1,
 
-       "power_off_config":
-       [
-           {
+        "power_off_config": [
+            {
                 "type": "hard",
                 "cause": "missing_fan_frus",
                 "count": 1,
@@ -129,6 +127,6 @@
                 "service_mode_delay": 60,
                 "meltdown_delay": 60
             }
-       ]
-   }
+        ]
+    }
 }
diff --git a/monitor/config_files/witherspoon/config.json b/monitor/config_files/witherspoon/config.json
index f0df157..d57ac83 100644
--- a/monitor/config_files/witherspoon/config.json
+++ b/monitor/config_files/witherspoon/config.json
@@ -1,125 +1,125 @@
 {
-   "fans": [
-      {
-         "inventory": "/system/chassis/motherboard/fan0",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 1,
-         "monitor_start_delay": 20,
-         "sensors": [
-            {
-               "name": "fan0_0",
-               "has_target": true
-            },
-            {
-               "name": "fan0_1",
-               "has_target": false
-            }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan1",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 1,
-         "monitor_start_delay": 20,
-         "sensors": [
-            {
-               "name": "fan1_0",
-               "has_target": true
-            },
-            {
-               "name": "fan1_1",
-               "has_target": false
-            }
-         ],
-         "condition": {
-            "name": "propertiesMatch",
-            "properties": [
-               {
-                  "object": "/xyz/openbmc_project/inventory/system/chassis",
-                  "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType",
-                  "property": {
-                     "name": "WaterCooled",
-                     "type": "bool",
-                     "value": false
-                  }
-               }
+    "fans": [
+        {
+            "inventory": "/system/chassis/motherboard/fan0",
+            "functional_delay": 5,
+            "allowed_out_of_range_time": 30,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 20,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "has_target": true
+                },
+                {
+                    "name": "fan0_1",
+                    "has_target": false
+                }
             ]
-         }
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan2",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 1,
-         "monitor_start_delay": 20,
-         "sensors": [
-            {
-               "name": "fan2_0",
-               "has_target": true
-            },
-            {
-               "name": "fan2_1",
-               "has_target": false
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan1",
+            "functional_delay": 5,
+            "allowed_out_of_range_time": 30,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 20,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "has_target": true
+                },
+                {
+                    "name": "fan1_1",
+                    "has_target": false
+                }
+            ],
+            "condition": {
+                "name": "propertiesMatch",
+                "properties": [
+                    {
+                        "object": "/xyz/openbmc_project/inventory/system/chassis",
+                        "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType",
+                        "property": {
+                            "name": "WaterCooled",
+                            "type": "bool",
+                            "value": false
+                        }
+                    }
+                ]
             }
-         ]
-      },
-      {
-         "inventory": "/system/chassis/motherboard/fan3",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
-         "deviation": 15,
-         "num_sensors_nonfunc_for_fan_nonfunc": 1,
-         "monitor_start_delay": 20,
-         "sensors": [
-            {
-               "name": "fan3_0",
-               "has_target": true
-            },
-            {
-               "name": "fan3_1",
-               "has_target": false
-            }
-         ]
-      }
-   ],
-   "sensor_trust_groups": [
-      {
-         "class": "NonzeroSpeed",
-         "group": [
-            {
-               "name": "fan0_1"
-            },
-            {
-               "name": "fan1_1"
-            },
-            {
-               "name": "fan2_1"
-            },
-            {
-               "name": "fan3_1"
-            },
-            {
-               "name": "fan0_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan1_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan2_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan3_0",
-               "in_trust": false
-            }
-         ]
-      }
-   ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan2",
+            "functional_delay": 5,
+            "allowed_out_of_range_time": 30,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 20,
+            "sensors": [
+                {
+                    "name": "fan2_0",
+                    "has_target": true
+                },
+                {
+                    "name": "fan2_1",
+                    "has_target": false
+                }
+            ]
+        },
+        {
+            "inventory": "/system/chassis/motherboard/fan3",
+            "functional_delay": 5,
+            "allowed_out_of_range_time": 30,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 20,
+            "sensors": [
+                {
+                    "name": "fan3_0",
+                    "has_target": true
+                },
+                {
+                    "name": "fan3_1",
+                    "has_target": false
+                }
+            ]
+        }
+    ],
+    "sensor_trust_groups": [
+        {
+            "class": "NonzeroSpeed",
+            "group": [
+                {
+                    "name": "fan0_1"
+                },
+                {
+                    "name": "fan1_1"
+                },
+                {
+                    "name": "fan2_1"
+                },
+                {
+                    "name": "fan3_1"
+                },
+                {
+                    "name": "fan0_0",
+                    "in_trust": false
+                },
+                {
+                    "name": "fan1_0",
+                    "in_trust": false
+                },
+                {
+                    "name": "fan2_0",
+                    "in_trust": false
+                },
+                {
+                    "name": "fan3_0",
+                    "in_trust": false
+                }
+            ]
+        }
+    ]
 }
diff --git a/monitor/example/config.json b/monitor/example/config.json
index 53c3421..515eec0 100644
--- a/monitor/example/config.json
+++ b/monitor/example/config.json
@@ -1,184 +1,184 @@
 {
-  "comments": "List of fans with the attributes used to monitor them.",
-  "fans": [
-    {
-      "comments": [
-        "The first fan in the system that has two sensor(dual rotor) feedbacks",
-        "that are allowed to deviate from any given target by 15% for up-to 30",
-        "seconds before being marked nonfunctional in inventory. The first",
-        "sensor object contains the target property and the second sensor",
-        "object's feedback speed is adjusted by a factor of 1.45 and offset",
-        "by -909 to accomodate how its hardware reacts to any given target. It",
-        "takes 1 sensor to mark this fan nonfunctional and once marked",
-        "nonfunctional, the nonfunctional sensor(s) must be within 15% of the",
-        "target for 5 seconds before being updated to functional again.",
-        "Each sensor has an error logged after 0 seconds being marked",
-        "nonfunctional and the fan has an error logged if its been not",
-        "present for 20 seconds.",
-        "In addition, this fan is not monitored for the first 30 seconds after",
-        "a poweron to allow the fan to spin-up."
-      ],
-      "inventory": "/system/chassis/motherboard/fan0",
-      "functional_delay": 5,
-      "allowed_out_of_range_time": 30,
-      "deviation": 15,
-      "num_sensors_nonfunc_for_fan_nonfunc": 1,
-      "monitor_start_delay": 30,
-      "fan_missing_error_delay": 20,
-      "nonfunc_rotor_error_delay": 0,
-      "sensors": [
+    "comments": "List of fans with the attributes used to monitor them.",
+    "fans": [
         {
-          "name": "fan0_0",
-          "has_target": true
+            "comments": [
+                "The first fan in the system that has two sensor(dual rotor) feedbacks",
+                "that are allowed to deviate from any given target by 15% for up-to 30",
+                "seconds before being marked nonfunctional in inventory. The first",
+                "sensor object contains the target property and the second sensor",
+                "object's feedback speed is adjusted by a factor of 1.45 and offset",
+                "by -909 to accomodate how its hardware reacts to any given target. It",
+                "takes 1 sensor to mark this fan nonfunctional and once marked",
+                "nonfunctional, the nonfunctional sensor(s) must be within 15% of the",
+                "target for 5 seconds before being updated to functional again.",
+                "Each sensor has an error logged after 0 seconds being marked",
+                "nonfunctional and the fan has an error logged if its been not",
+                "present for 20 seconds.",
+                "In addition, this fan is not monitored for the first 30 seconds after",
+                "a poweron to allow the fan to spin-up."
+            ],
+            "inventory": "/system/chassis/motherboard/fan0",
+            "functional_delay": 5,
+            "allowed_out_of_range_time": 30,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "sensors": [
+                {
+                    "name": "fan0_0",
+                    "has_target": true
+                },
+                {
+                    "name": "fan0_1",
+                    "has_target": false,
+                    "factor": 1.45,
+                    "offset": -909
+                }
+            ]
         },
         {
-          "name": "fan0_1",
-          "has_target": false,
-          "factor": 1.45,
-          "offset": -909
-        }
-      ]
-    },
-    {
-      "comments": [
-        "The second fan in the system has one sensor(single rotor) feedback",
-        "that is only monitored with the `WaterCooled` property is false. The",
-        "sensor is monitored using a 'count' method where a counter is",
-        "incremented each tick the fan deviates 15% from a target and",
-        "decrements back to zero each tick the fan is within spec. When the",
-        "sensor reaches the threshold of 25 ticks, the fan is marked",
-        "nonfunctional and only returns to being functional when the counter",
-        "is decremented back to 0. This differs from the default 'timebased'",
-        "method where the fan must deviate contiguously for a set amount of",
-        "time to be marked nonfunctional. It takes 1 sensor to mark this fan",
-        "nonfunctional.",
-        "Each sensor has an error logged after 0 seconds being marked",
-        "nonfunctional and the fan has an error logged if its been not present",
-        "for 20 seconds.",
-        "In addition, this fan is not monitored for the first 30 seconds after",
-        "a poweron to allow the fan to spin-up."
-      ],
-      "inventory": "/system/chassis/motherboard/fan1",
-      "method": "count",
-      "deviation": 15,
-      "num_sensors_nonfunc_for_fan_nonfunc": 1,
-      "monitor_start_delay": 30,
-      "fan_missing_error_delay": 20,
-      "nonfunc_rotor_error_delay": 0,
-      "sensors": [
-        {
-          "name": "fan1_0",
-          "has_target": true,
-          "threshold": 25
-        }
-      ],
-      "condition": {
-        "name": "propertiesMatch",
-        "properties": [
-          {
-            "object": "/xyz/openbmc_project/inventory/system/chassis",
-            "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType",
-            "property": {
-              "name": "WaterCooled",
-              "type": "bool",
-              "value": false
+            "comments": [
+                "The second fan in the system has one sensor(single rotor) feedback",
+                "that is only monitored with the `WaterCooled` property is false. The",
+                "sensor is monitored using a 'count' method where a counter is",
+                "incremented each tick the fan deviates 15% from a target and",
+                "decrements back to zero each tick the fan is within spec. When the",
+                "sensor reaches the threshold of 25 ticks, the fan is marked",
+                "nonfunctional and only returns to being functional when the counter",
+                "is decremented back to 0. This differs from the default 'timebased'",
+                "method where the fan must deviate contiguously for a set amount of",
+                "time to be marked nonfunctional. It takes 1 sensor to mark this fan",
+                "nonfunctional.",
+                "Each sensor has an error logged after 0 seconds being marked",
+                "nonfunctional and the fan has an error logged if its been not present",
+                "for 20 seconds.",
+                "In addition, this fan is not monitored for the first 30 seconds after",
+                "a poweron to allow the fan to spin-up."
+            ],
+            "inventory": "/system/chassis/motherboard/fan1",
+            "method": "count",
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "sensors": [
+                {
+                    "name": "fan1_0",
+                    "has_target": true,
+                    "threshold": 25
+                }
+            ],
+            "condition": {
+                "name": "propertiesMatch",
+                "properties": [
+                    {
+                        "object": "/xyz/openbmc_project/inventory/system/chassis",
+                        "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType",
+                        "property": {
+                            "name": "WaterCooled",
+                            "type": "bool",
+                            "value": false
+                        }
+                    }
+                ]
             }
-          }
-        ]
-      }
-    },
-    {
-      "comments": [
-        "The third fan in the system that has one sensor(single rotor)",
-        "feedback using the default 'timebased' method that allows it to",
-        "deviate from any given target by 15% for up-to 30 seconds before",
-        "being marked nonfunctional in inventory. Instead of using the default",
-        "'xyz.openbmc_project.Control.FanSpeed' target interface, the sensor",
-        "uses the 'xyz.openbmc_project.Control.FanPwm' target interface and",
-        "applies a factor of 21 and offset of 1600 to accomodate the",
-        "difference in target PWM versus the RPM feedback of the sensor to",
-        "determine if the fan sensor is nonfunctional or not. It takes 1",
-        "sensor to mark this fan nonfunctional and when marked nonfunctional,",
-        "it is immediately marked functional again once within 15% of the",
-        "target.",
-        "Each sensor has an error logged after 0 seconds being marked",
-        "nonfunctional and the fan has an error logged if its been not present",
-        "for 20 seconds.",
-        "In addition, this fan is not monitored for the first 30 seconds after",
-        "a poweron to allow the fan to spin-up. "
-      ],
-      "inventory": "/system/chassis/motherboard/fan2",
-      "method": "timebased",
-      "allowed_out_of_range_time": 30,
-      "deviation": 15,
-      "num_sensors_nonfunc_for_fan_nonfunc": 1,
-      "monitor_start_delay": 30,
-      "fan_missing_error_delay": 20,
-      "nonfunc_rotor_error_delay": 0,
-      "sensors": [
-        {
-          "name": "fan2_0",
-          "target_interface": "xyz.openbmc_project.Control.FanPwm",
-          "has_target": true,
-          "factor": 21,
-          "offset": 1600
-        }
-      ]
-    }
-  ],
-  "sensor_trust_groups": [
-    {
-      "comments": [
-        "OPTIONAL - A section to create `trust groups` consisting of fan tach",
-        "sensors that can be used to trust the tach feedback reading or",
-        "disregard it when determining if the fan is functional or not. Here,",
-        "the fan sensor feedbacks within the group are only trusted when any",
-        "one of them shows a non-zero feedback speed. At any time all fan",
-        "sensor feedbacks report a speed of 0, the monitoring of each sensor",
-        "in the group is cancelled, only to resume being monitored when any",
-        "one of them reports a non-zero feedback speed."
-      ],
-      "class": "NonzeroSpeed",
-      "group": [
-        {
-          "name": "fan0_0"
         },
         {
-          "name": "fan1_0"
-        },
-        {
-          "name": "fan2_0"
+            "comments": [
+                "The third fan in the system that has one sensor(single rotor)",
+                "feedback using the default 'timebased' method that allows it to",
+                "deviate from any given target by 15% for up-to 30 seconds before",
+                "being marked nonfunctional in inventory. Instead of using the default",
+                "'xyz.openbmc_project.Control.FanSpeed' target interface, the sensor",
+                "uses the 'xyz.openbmc_project.Control.FanPwm' target interface and",
+                "applies a factor of 21 and offset of 1600 to accomodate the",
+                "difference in target PWM versus the RPM feedback of the sensor to",
+                "determine if the fan sensor is nonfunctional or not. It takes 1",
+                "sensor to mark this fan nonfunctional and when marked nonfunctional,",
+                "it is immediately marked functional again once within 15% of the",
+                "target.",
+                "Each sensor has an error logged after 0 seconds being marked",
+                "nonfunctional and the fan has an error logged if its been not present",
+                "for 20 seconds.",
+                "In addition, this fan is not monitored for the first 30 seconds after",
+                "a poweron to allow the fan to spin-up. "
+            ],
+            "inventory": "/system/chassis/motherboard/fan2",
+            "method": "timebased",
+            "allowed_out_of_range_time": 30,
+            "deviation": 15,
+            "num_sensors_nonfunc_for_fan_nonfunc": 1,
+            "monitor_start_delay": 30,
+            "fan_missing_error_delay": 20,
+            "nonfunc_rotor_error_delay": 0,
+            "sensors": [
+                {
+                    "name": "fan2_0",
+                    "target_interface": "xyz.openbmc_project.Control.FanPwm",
+                    "has_target": true,
+                    "factor": 21,
+                    "offset": 1600
+                }
+            ]
         }
-      ]
-    }
-  ],
-  "fault_handling": {
-    "comments": [
-      "OPTIONAL - A section to handle faults caused by missing or",
-      "nonfunctional fans. An error is logged when 1 rotor is nonfunctional",
-      "across all the fans being monitored. The system is immediately hard",
-      "powered off after a poweron is started when 1 fan has been missing for",
-      "25 seconds.",
-      "An EPOW shutdown is issued when 2 or more nonfunctional fan sensors",
-      "exist, which (specific to EPOW) has a service mode delay of 300 seconds",
-      "and then a meltdown delay of 300 seconds."
     ],
-    "num_nonfunc_rotors_before_error": 1,
-    "power_off_config": [
-      {
-        "type": "hard",
-        "cause": "missing_fan_frus",
-        "count": 1,
-        "delay": 25,
-        "state": "at_pgood"
-      },
-      {
-        "type": "epow",
-        "cause": "nonfunc_fan_rotors",
-        "count": 2,
-        "service_mode_delay": 300,
-        "meltdown_delay": 300
-      }
-    ]
-  }
+    "sensor_trust_groups": [
+        {
+            "comments": [
+                "OPTIONAL - A section to create `trust groups` consisting of fan tach",
+                "sensors that can be used to trust the tach feedback reading or",
+                "disregard it when determining if the fan is functional or not. Here,",
+                "the fan sensor feedbacks within the group are only trusted when any",
+                "one of them shows a non-zero feedback speed. At any time all fan",
+                "sensor feedbacks report a speed of 0, the monitoring of each sensor",
+                "in the group is cancelled, only to resume being monitored when any",
+                "one of them reports a non-zero feedback speed."
+            ],
+            "class": "NonzeroSpeed",
+            "group": [
+                {
+                    "name": "fan0_0"
+                },
+                {
+                    "name": "fan1_0"
+                },
+                {
+                    "name": "fan2_0"
+                }
+            ]
+        }
+    ],
+    "fault_handling": {
+        "comments": [
+            "OPTIONAL - A section to handle faults caused by missing or",
+            "nonfunctional fans. An error is logged when 1 rotor is nonfunctional",
+            "across all the fans being monitored. The system is immediately hard",
+            "powered off after a poweron is started when 1 fan has been missing for",
+            "25 seconds.",
+            "An EPOW shutdown is issued when 2 or more nonfunctional fan sensors",
+            "exist, which (specific to EPOW) has a service mode delay of 300 seconds",
+            "and then a meltdown delay of 300 seconds."
+        ],
+        "num_nonfunc_rotors_before_error": 1,
+        "power_off_config": [
+            {
+                "type": "hard",
+                "cause": "missing_fan_frus",
+                "count": 1,
+                "delay": 25,
+                "state": "at_pgood"
+            },
+            {
+                "type": "epow",
+                "cause": "nonfunc_fan_rotors",
+                "count": 2,
+                "service_mode_delay": 300,
+                "meltdown_delay": 300
+            }
+        ]
+    }
 }
diff --git a/presence/config_files/p10bmc/ibm,bonnell/config.json b/presence/config_files/p10bmc/ibm,bonnell/config.json
index 4fed0ca..1cd3b24 100644
--- a/presence/config_files/p10bmc/ibm,bonnell/config.json
+++ b/presence/config_files/p10bmc/ibm,bonnell/config.json
@@ -1,46 +1,40 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "BMC",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "BMC",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "BMC",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "BMC",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,everest/config.json b/presence/config_files/p10bmc/ibm,everest/config.json
index 3ee7500..0fe01b0 100644
--- a/presence/config_files/p10bmc/ibm,everest/config.json
+++ b/presence/config_files/p10bmc/ibm,everest/config.json
@@ -1,110 +1,98 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 15,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "31-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 14,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "32-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 13,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "33-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 12,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "34-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 15,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "31-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 14,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "32-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 13,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0", "fan2_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "33-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 12,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0", "fan3_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "34-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json b/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
index 65697e5..b17359b 100644
--- a/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
+++ b/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
@@ -1,86 +1,78 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 8,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan4",
+        "path": "/system/chassis/motherboard/fan4",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 10,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan4_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,rainier-2u/config.json b/presence/config_files/p10bmc/ibm,rainier-2u/config.json
index a5cc1bf..f06ca9f 100644
--- a/presence/config_files/p10bmc/ibm,rainier-2u/config.json
+++ b/presence/config_files/p10bmc/ibm,rainier-2u/config.json
@@ -1,134 +1,116 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 9,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0",
-               "fan4_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan5",
-      "path": "/system/chassis/motherboard/fan5",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 11,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan5_0",
-               "fan5_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 8,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0", "fan2_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 9,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0", "fan3_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan4",
+        "path": "/system/chassis/motherboard/fan4",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 10,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan4_0", "fan4_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan5",
+        "path": "/system/chassis/motherboard/fan5",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 11,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan5_0", "fan5_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,rainier-4u/config.json b/presence/config_files/p10bmc/ibm,rainier-4u/config.json
index 620a329..854ff8e 100644
--- a/presence/config_files/p10bmc/ibm,rainier-4u/config.json
+++ b/presence/config_files/p10bmc/ibm,rainier-4u/config.json
@@ -1,128 +1,116 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 9,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan5",
-      "path": "/system/chassis/motherboard/fan5",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 11,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan5_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 8,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 9,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan4",
+        "path": "/system/chassis/motherboard/fan4",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 10,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan4_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan5",
+        "path": "/system/chassis/motherboard/fan5",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 11,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan5_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/witherspoon/config.json b/presence/config_files/witherspoon/config.json
index 52262fe..7365a81 100644
--- a/presence/config_files/witherspoon/config.json
+++ b/presence/config_files/witherspoon/config.json
@@ -1,90 +1,78 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 4,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 5,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 4,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 5,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0", "fan2_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0", "fan3_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/example/config.json b/presence/example/config.json
index 08883b7..52bfbf0 100644
--- a/presence/example/config.json
+++ b/presence/example/config.json
@@ -1,100 +1,94 @@
 [
-  {
-    "comments": [
-      "Example fan with tach feedback detection method. Fans without any",
-      "special presence detection hardware can use one or more tach speed",
-      "sensor feedbacks as an indicator of presence. Listed sensors are",
-      "expected to be found in the /xyz/openbmc_project/sensors/fan_tach",
-      "namespace as required by the OpenBMC DBus API. Supported policy types",
-      "are fallback or anyof. The fan_missing_error_time value is the amount",
-      "of time in seconds that a fan must be missing before an event log is",
-      "created."
-    ],
-    "name": "Example Fan0",
-    "path": "/system/chassis/motherboard/fan0",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "tach",
-        "sensors": [
-          "fan0"
+    {
+        "comments": [
+            "Example fan with tach feedback detection method. Fans without any",
+            "special presence detection hardware can use one or more tach speed",
+            "sensor feedbacks as an indicator of presence. Listed sensors are",
+            "expected to be found in the /xyz/openbmc_project/sensors/fan_tach",
+            "namespace as required by the OpenBMC DBus API. Supported policy types",
+            "are fallback or anyof. The fan_missing_error_time value is the amount",
+            "of time in seconds that a fan must be missing before an event log is",
+            "created."
+        ],
+        "name": "Example Fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "tach",
+                "sensors": ["fan0"]
+            }
         ]
-      }
-    ]
-  },
-  {
-    "comments": [
-      "Example fan with gpio detection method. Fans with dedicated gpios can",
-      "use the gpio detection method. The gpio detection uses Linux gpio-keys,",
-      "where the event number is provided via the `key` property."
-    ],
-    "name": "Example Fan1",
-    "path": "/system/chassis/motherboard/fan1",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "gpio",
-        "key": 123,
-        "physpath": "/sys/devices/foo/bar",
-        "devpath": "/dev/input/by-path/platform-gpio-keys-event"
-      }
-    ]
-  },
-  {
-    "comments": [
-      "Example fan with fallback redundancy policy. Multiple detection methods",
-      "for a single fan are allowed. When multiple detection methods are",
-      "provided a redundancy algorithm must be specified with the rpolicy",
-      "attribute. Note that the redundancy policy algorithm may or may not",
-      "factor the order the detection methods are listed into its logic. The",
-      "fallback algorithm falls back to subsequently listed detection methods",
-      "when the first method does not detect a fan and the second method does."
-    ],
-    "name": "Example Fan2",
-    "path": "/system/chassis/motherboard/fan2",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "gpio",
-        "key": 124,
-        "physpath": "/sys/devices/foo/bar",
-        "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-      },
-      {
-        "type": "tach",
-        "sensors": [
-          "fan2"
+    },
+    {
+        "comments": [
+            "Example fan with gpio detection method. Fans with dedicated gpios can",
+            "use the gpio detection method. The gpio detection uses Linux gpio-keys,",
+            "where the event number is provided via the `key` property."
+        ],
+        "name": "Example Fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 123,
+                "physpath": "/sys/devices/foo/bar",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-event"
+            }
         ]
-      }
-    ],
-    "rpolicy": {
-      "type": "fallback"
+    },
+    {
+        "comments": [
+            "Example fan with fallback redundancy policy. Multiple detection methods",
+            "for a single fan are allowed. When multiple detection methods are",
+            "provided a redundancy algorithm must be specified with the rpolicy",
+            "attribute. Note that the redundancy policy algorithm may or may not",
+            "factor the order the detection methods are listed into its logic. The",
+            "fallback algorithm falls back to subsequently listed detection methods",
+            "when the first method does not detect a fan and the second method does."
+        ],
+        "name": "Example Fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 124,
+                "physpath": "/sys/devices/foo/bar",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2"]
+            }
+        ],
+        "rpolicy": {
+            "type": "fallback"
+        }
+    },
+    {
+        "comments": [
+            "Example fan with anyof redundancy policy. The anyof algorithm reports",
+            "true if any redundancy set component sensors report true."
+        ],
+        "name": "Example Fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 125,
+                "physpath": "/sys/devices/foo/bar",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
     }
-  },
-  {
-    "comments": [
-      "Example fan with anyof redundancy policy. The anyof algorithm reports",
-      "true if any redundancy set component sensors report true."
-    ],
-    "name": "Example Fan3",
-    "path": "/system/chassis/motherboard/fan3",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "gpio",
-        "key": 125,
-        "physpath": "/sys/devices/foo/bar",
-        "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-      },
-      {
-        "type": "tach",
-        "sensors": [
-          "fan3"
-        ]
-      }
-    ],
-    "rpolicy": {
-      "type": "anyof"
-    }
-  }
 ]
diff --git a/presence/example/example.yaml b/presence/example/example.yaml
index 877bd5c..6cf4867 100644
--- a/presence/example/example.yaml
+++ b/presence/example/example.yaml
@@ -10,76 +10,73 @@
 
 - name: Example Fan0
   description: >
-    'Example fan with tach feedback detection method.
+      'Example fan with tach feedback detection method.
 
-    Fans without any special presence detection hardware
-    can use one or more tach speed sensor feedbacks as
-    an indicator of presence.  Listed sensors are expected to
-    be found in the /xyz/openbmc_project/sensors/fan_tach
-    namespace as required by the OpenBMC DBus API.
+      Fans without any special presence detection hardware can use one or more
+      tach speed sensor feedbacks as an indicator of presence.  Listed sensors
+      are expected to be found in the /xyz/openbmc_project/sensors/fan_tach
+      namespace as required by the OpenBMC DBus API.
 
-    Supported policy types are fallback or anyof.'
+      Supported policy types are fallback or anyof.'
   path: /system/chassis/motherboard/fan0
   methods:
-    - type: tach
-      sensors:
-        - fan0
+      - type: tach
+        sensors:
+            - fan0
 
 - name: Example Fan1
   description: >
-    'Example fan with gpio detection method.
+      'Example fan with gpio detection method.
 
-    Fans with dedicated gpios can use the gpio detection
-    method.  The gpio detection uses Linux gpio-keys: the
-    event number must be provided via the key property.'
+      Fans with dedicated gpios can use the gpio detection method.  The gpio
+      detection uses Linux gpio-keys: the event number must be provided via the
+      key property.'
   path: /system/chassis/motherboard/fan1
   methods:
-    - type: gpio
-      key: 123
-      physpath: /sys/devices/foo/bar
-      devpath: /dev/input/by-path/platform-gpio-keys-event
+      - type: gpio
+        key: 123
+        physpath: /sys/devices/foo/bar
+        devpath: /dev/input/by-path/platform-gpio-keys-event
 
 - name: Example Fan2
   description: >
-    'Example fan with fallback redundancy policy.
+      'Example fan with fallback redundancy policy.
 
-    Multiple detection methods for a single fan are allowed.
-    When multiple detection methods are provided a redundancy
-    algorithm must be specified with the rpolicy attribute.
+      Multiple detection methods for a single fan are allowed. When multiple
+      detection methods are provided a redundancy algorithm must be specified
+      with the rpolicy attribute.
 
-    Note that the redundancy policy algorithm may or may not
-    factor the order the detection methods are listed into
-    its logic.
+      Note that the redundancy policy algorithm may or may not factor the order
+      the detection methods are listed into its logic.
 
-    The fallback algorithm falls back to subsequently listed
-    detection methods when the first method does not detect
-    a fan and the second method does.'
+      The fallback algorithm falls back to subsequently listed detection methods
+      when the first method does not detect a fan and the second method does.'
   path: /system/chassis/motherboard/fan2
   methods:
-    - type: gpio
-      key: 124
-      physpath: /sys/devices/foo/bar
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan2
+      - type: gpio
+        key: 124
+        physpath: /sys/devices/foo/bar
+        devpath: /dev/input/by-path/platform-gpio-keys-polled-event
+      - type: tach
+        sensors:
+            - fan2
   rpolicy:
-    type: fallback
+      type: fallback
 
 - name: Example Fan3
   description: >
-    'Example fan with anyof redundancy policy.
+      'Example fan with anyof redundancy policy.
 
-    The anyof algorithm reports true if any redundancy set
-    component sensors report true.'
+      The anyof algorithm reports true if any redundancy set component sensors
+      report true.'
   path: /system/chassis/motherboard/fan3
   methods:
-    - type: gpio
-      key: 125
-      physpath: /sys/devices/foo/bar
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan3
+      - type: gpio
+        key: 125
+        physpath: /sys/devices/foo/bar
+        devpath: /dev/input/by-path/platform-gpio-keys-polled-event
+      - type: tach
+        sensors:
+            - fan3
   rpolicy:
-    type: anyof
+      type: anyof