diff --git a/data/Barreleye.py b/data/Barreleye.py
index 1c9c1be..537477e 100755
--- a/data/Barreleye.py
+++ b/data/Barreleye.py
@@ -234,13 +234,18 @@
     '<inventory_root>/system/chassis/motherboard': {'fru_type': 'MAIN_PLANAR', 'is_fru': True, },
     '<inventory_root>/system/chassis/io_board': {'fru_type': 'DAUGHTER_CARD', 'is_fru': True, },
     '<inventory_root>/system/chassis/sas_expander': {'fru_type': 'DAUGHTER_CARD', 'is_fru': True, },
-    '<inventory_root>/system/chassis/hdd_backplane': {'fru_type': 'DAUGHTER_CARD', 'is_fru': True, },
+    '<inventory_root>/system/chassis/hdd_backplane': {'fru_type': 'DAUGHTER_CARD',
+                                                      'is_fru': True, },
 
     '<inventory_root>/system/systemevent': {'fru_type': 'SYSTEM_EVENT', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR',
+                                                             'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR',
+                                                             'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR',
+                                                         'is_fru': False, },
 
     '<inventory_root>/system/chassis/fan0': {'fru_type': 'FAN', 'is_fru': True, },
     '<inventory_root>/system/chassis/fan1': {'fru_type': 'FAN', 'is_fru': True, },
@@ -249,45 +254,78 @@
     '<inventory_root>/system/chassis/fan4': {'fru_type': 'FAN', 'is_fru': True, },
     '<inventory_root>/system/chassis/fan5': {'fru_type': 'FAN', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False, 'manufacturer': 'ASPEED'},
+    '<inventory_root>/system/chassis/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False,
+                                                        'manufacturer': 'ASPEED'},
 
     '<inventory_root>/system/chassis/motherboard/cpu0': {'fru_type': 'CPU', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/cpu1': {'fru_type': 'CPU', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core0': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core1': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core2': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core3': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core4': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core5': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core6': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core7': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core8': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core9': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core10': {'fru_type': 'CORE',
+                                                                'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core11': {'fru_type': 'CORE',
+                                                                'is_fru': False, },
 
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core0': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core1': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core2': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core3': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core4': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core5': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core6': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core7': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core8': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core9': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core10': {'fru_type': 'CORE',
+                                                                'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core11': {'fru_type': 'CORE',
+                                                                'is_fru': False, },
 
-    '<inventory_root>/system/chassis/motherboard/membuf0': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf1': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf2': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf3': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf4': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf5': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf6': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/membuf7': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf0': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf1': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf2': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf3': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf4': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf5': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf6': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf7': {'fru_type': 'MEMORY_BUFFER',
+                                                            'is_fru': False, },
 
     '<inventory_root>/system/chassis/motherboard/dimm0': {'fru_type': 'DIMM', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/dimm1': {'fru_type': 'DIMM', 'is_fru': True, },
@@ -322,14 +360,22 @@
     '<inventory_root>/system/chassis/motherboard/dimm30': {'fru_type': 'DIMM', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/dimm31': {'fru_type': 'DIMM', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/io_board/pcie_slot0_riser': {'fru_type': 'PCIE_RISER', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_slot1_riser': {'fru_type': 'PCIE_RISER', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_slot2_riser': {'fru_type': 'PCIE_RISER', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_slot0': {'fru_type': 'PCIE_CARD', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_slot1':	{'fru_type': 'PCIE_CARD', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_slot2':	{'fru_type': 'PCIE_CARD', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_mezz0':	{'fru_type': 'PCIE_CARD', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_mezz1':	{'fru_type': 'PCIE_CARD', 'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot0_riser': {'fru_type': 'PCIE_RISER',
+                                                                  'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot1_riser': {'fru_type': 'PCIE_RISER',
+                                                                  'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot2_riser': {'fru_type': 'PCIE_RISER',
+                                                                  'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot0': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot1': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot2': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_mezz0': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_mezz1': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
 }
 
 ID_LOOKUP = {
@@ -561,15 +607,16 @@
     name = name.upper()
     c = name[0:1]
     offset = int(name[1:])
-    a = ord(c)-65
-    base = a*8+GPIO_BASE
-    return base+offset
+    a = ord(c) - 65
+    base = a * 8 + GPIO_BASE
+    return base + offset
 
 
 HWMON_CONFIG = {
-    '0-004a':  {
+    '0-004a': {
         'names': {
-            'temp1_input': {'object_path': 'temperature/ambient', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
+            'temp1_input': {'object_path': 'temperature/ambient', 'poll_interval': 5000,
+                            'scale': 1000, 'units': 'C'},
         }
     },
     '6-002d': {
@@ -577,20 +624,34 @@
             'pwm1': {'object_path': 'speed/fan0', 'poll_interval': 10000, 'scale': 1, 'units': ''},
             'pwm2': {'object_path': 'speed/fan1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
             'pwm3': {'object_path': 'speed/fan2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in1_input': {'object_path': 'voltage/P1V35_CPU0_BUF4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in2_input': {'object_path': 'voltage/P0V9_CPU0_BUF1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in3_input': {'object_path': 'voltage/P0V9_CPU0_BUF2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in4_input': {'object_path': 'voltage/P0V9_CPU0_BUF3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in5_input': {'object_path': 'voltage/P0V9_CPU0_BUF4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in6_input': {'object_path': 'voltage/P1V09_CPU0_BUF1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in7_input': {'object_path': 'voltage/P1V09_CPU0_BUF2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in8_input': {'object_path': 'voltage/P1V09_CPU0_BUF3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in9_input': {'object_path': 'voltage/P1V09_CPU0_BUF4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in10_input': {'object_path': 'voltage/P0V97_CPU0', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in11_input': {'object_path': 'voltage/P1V1_MEM0', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in12_input': {'object_path': 'voltage/P1V35_CPU0_BUF1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in13_input': {'object_path': 'voltage/P1V35_CPU0_BUF2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in14_input': {'object_path': 'voltage/P1V35_CPU0_BUF3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
+            'in1_input': {'object_path': 'voltage/P1V35_CPU0_BUF4', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in2_input': {'object_path': 'voltage/P0V9_CPU0_BUF1', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in3_input': {'object_path': 'voltage/P0V9_CPU0_BUF2', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in4_input': {'object_path': 'voltage/P0V9_CPU0_BUF3', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in5_input': {'object_path': 'voltage/P0V9_CPU0_BUF4', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in6_input': {'object_path': 'voltage/P1V09_CPU0_BUF1', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in7_input': {'object_path': 'voltage/P1V09_CPU0_BUF2', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in8_input': {'object_path': 'voltage/P1V09_CPU0_BUF3', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in9_input': {'object_path': 'voltage/P1V09_CPU0_BUF4', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in10_input': {'object_path': 'voltage/P0V97_CPU0', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in11_input': {'object_path': 'voltage/P1V1_MEM0', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in12_input': {'object_path': 'voltage/P1V35_CPU0_BUF1', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in13_input': {'object_path': 'voltage/P1V35_CPU0_BUF2', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in14_input': {'object_path': 'voltage/P1V35_CPU0_BUF3', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
         }
     },
     '6-002e': {
@@ -598,146 +659,263 @@
             'pwm1': {'object_path': 'speed/fan3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
             'pwm2': {'object_path': 'speed/fan4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
             'pwm3': {'object_path': 'speed/fan5', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in1_input': {'object_path': 'voltage/P1V35_CPU1_BUF4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in2_input': {'object_path': 'voltage/P0V9_CPU1_BUF1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in3_input': {'object_path': 'voltage/P0V9_CPU1_BUF2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in4_input': {'object_path': 'voltage/P0V9_CPU1_BUF3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in5_input': {'object_path': 'voltage/P0V9_CPU1_BUF4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in6_input': {'object_path': 'voltage/P1V09_CPU1_BUF1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in7_input': {'object_path': 'voltage/P1V09_CPU1_BUF2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in8_input': {'object_path': 'voltage/P1V09_CPU1_BUF3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in9_input': {'object_path': 'voltage/P1V09_CPU1_BUF4', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in10_input': {'object_path': 'voltage/P0V97_CPU1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in11_input': {'object_path': 'voltage/P1V1_MEM1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in12_input': {'object_path': 'voltage/P1V35_CPU1_BUF1', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in13_input': {'object_path': 'voltage/P1V35_CPU1_BUF2', 'poll_interval': 10000, 'scale': 1, 'units': ''},
-            'in14_input': {'object_path': 'voltage/P1V35_CPU1_BUF3', 'poll_interval': 10000, 'scale': 1, 'units': ''},
+            'in1_input': {'object_path': 'voltage/P1V35_CPU1_BUF4', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in2_input': {'object_path': 'voltage/P0V9_CPU1_BUF1', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in3_input': {'object_path': 'voltage/P0V9_CPU1_BUF2', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in4_input': {'object_path': 'voltage/P0V9_CPU1_BUF3', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in5_input': {'object_path': 'voltage/P0V9_CPU1_BUF4', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in6_input': {'object_path': 'voltage/P1V09_CPU1_BUF1', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in7_input': {'object_path': 'voltage/P1V09_CPU1_BUF2', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in8_input': {'object_path': 'voltage/P1V09_CPU1_BUF3', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in9_input': {'object_path': 'voltage/P1V09_CPU1_BUF4', 'poll_interval': 10000,
+                          'scale': 1, 'units': ''},
+            'in10_input': {'object_path': 'voltage/P0V97_CPU1', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in11_input': {'object_path': 'voltage/P1V1_MEM1', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in12_input': {'object_path': 'voltage/P1V35_CPU1_BUF1', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in13_input': {'object_path': 'voltage/P1V35_CPU1_BUF2', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
+            'in14_input': {'object_path': 'voltage/P1V35_CPU1_BUF3', 'poll_interval': 10000,
+                           'scale': 1, 'units': ''},
         }
     },
     '3-0050': {
         'names': {
-            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_curr_powerreading': {'object_path': 'powercap/system_power', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_curr_powerreading': {'object_path': 'powercap/system_power',
+                                       'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000,
+                                     'scale': 1, 'units': 'W'},
         },
         'labels': {
-            '176':  {'object_path': 'temperature/cpu0/core0', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '177':  {'object_path': 'temperature/cpu0/core1', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '178':  {'object_path': 'temperature/cpu0/core2', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '179':  {'object_path': 'temperature/cpu0/core3', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '180':  {'object_path': 'temperature/cpu0/core4', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '181':  {'object_path': 'temperature/cpu0/core5', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '182':  {'object_path': 'temperature/cpu0/core6', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '183':  {'object_path': 'temperature/cpu0/core7', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '184':  {'object_path': 'temperature/cpu0/core8', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '185':  {'object_path': 'temperature/cpu0/core9', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '186':  {'object_path': 'temperature/cpu0/core10', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '187':  {'object_path': 'temperature/cpu0/core11', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '102':  {'object_path': 'temperature/dimm0', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '103':  {'object_path': 'temperature/dimm1', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '104':  {'object_path': 'temperature/dimm2', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '105':  {'object_path': 'temperature/dimm3', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '106':  {'object_path': 'temperature/dimm4', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '107':  {'object_path': 'temperature/dimm5', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '108':  {'object_path': 'temperature/dimm6', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '109':  {'object_path': 'temperature/dimm7', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '110':  {'object_path': 'temperature/dimm8', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '111':  {'object_path': 'temperature/dimm9', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '112':  {'object_path': 'temperature/dimm10', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '113':  {'object_path': 'temperature/dimm11', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '114':  {'object_path': 'temperature/dimm12', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '115':  {'object_path': 'temperature/dimm13', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '116':  {'object_path': 'temperature/dimm14', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '117':  {'object_path': 'temperature/dimm15', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '94':  {'object_path': 'temperature/membuf0', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '95':  {'object_path': 'temperature/membuf1', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '96':  {'object_path': 'temperature/membuf2', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '97':  {'object_path': 'temperature/membuf3', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
+            '176': {'object_path': 'temperature/cpu0/core0', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '177': {'object_path': 'temperature/cpu0/core1', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '178': {'object_path': 'temperature/cpu0/core2', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '179': {'object_path': 'temperature/cpu0/core3', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '180': {'object_path': 'temperature/cpu0/core4', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '181': {'object_path': 'temperature/cpu0/core5', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '182': {'object_path': 'temperature/cpu0/core6', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '183': {'object_path': 'temperature/cpu0/core7', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '184': {'object_path': 'temperature/cpu0/core8', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '185': {'object_path': 'temperature/cpu0/core9', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '186': {'object_path': 'temperature/cpu0/core10', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '187': {'object_path': 'temperature/cpu0/core11', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '102': {'object_path': 'temperature/dimm0', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '103': {'object_path': 'temperature/dimm1', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '104': {'object_path': 'temperature/dimm2', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '105': {'object_path': 'temperature/dimm3', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '106': {'object_path': 'temperature/dimm4', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '107': {'object_path': 'temperature/dimm5', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '108': {'object_path': 'temperature/dimm6', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '109': {'object_path': 'temperature/dimm7', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '110': {'object_path': 'temperature/dimm8', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '111': {'object_path': 'temperature/dimm9', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '112': {'object_path': 'temperature/dimm10', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '113': {'object_path': 'temperature/dimm11', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '114': {'object_path': 'temperature/dimm12', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '115': {'object_path': 'temperature/dimm13', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '116': {'object_path': 'temperature/dimm14', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '117': {'object_path': 'temperature/dimm15', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '94': {'object_path': 'temperature/membuf0', 'poll_interval': 5000, 'scale': 1000,
+                   'units': 'C'},
+            '95': {'object_path': 'temperature/membuf1', 'poll_interval': 5000, 'scale': 1000,
+                   'units': 'C'},
+            '96': {'object_path': 'temperature/membuf2', 'poll_interval': 5000, 'scale': 1000,
+                   'units': 'C'},
+            '97': {'object_path': 'temperature/membuf3', 'poll_interval': 5000, 'scale': 1000,
+                   'units': 'C'},
         }
     },
     '3-0051': {
-        'labels':  {
-            '188':  {'object_path': 'temperature/cpu1/core0', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '189':  {'object_path': 'temperature/cpu1/core1', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '190':  {'object_path': 'temperature/cpu1/core2', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '191':  {'object_path': 'temperature/cpu1/core3', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '192':  {'object_path': 'temperature/cpu1/core4', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '193':  {'object_path': 'temperature/cpu1/core5', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '194':  {'object_path': 'temperature/cpu1/core6', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '195':  {'object_path': 'temperature/cpu1/core7', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '196':  {'object_path': 'temperature/cpu1/core8', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '197':  {'object_path': 'temperature/cpu1/core9', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '198':  {'object_path': 'temperature/cpu1/core10', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '199':  {'object_path': 'temperature/cpu1/core11', 'poll_interval': 5000, 'scale': 1000, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '118':  {'object_path': 'temperature/dimm16', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '119':  {'object_path': 'temperature/dimm17', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '120':  {'object_path': 'temperature/dimm18', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '121':  {'object_path': 'temperature/dimm19', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '122':  {'object_path': 'temperature/dimm20', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '123':  {'object_path': 'temperature/dimm21', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '124':  {'object_path': 'temperature/dimm22', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '125':  {'object_path': 'temperature/dimm23', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '126':  {'object_path': 'temperature/dimm24', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '127':  {'object_path': 'temperature/dimm25', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '128':  {'object_path': 'temperature/dimm26', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '129':  {'object_path': 'temperature/dimm27', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '130':  {'object_path': 'temperature/dimm28', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '131':  {'object_path': 'temperature/dimm29', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '132':  {'object_path': 'temperature/dimm30', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '133':  {'object_path': 'temperature/dimm31', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '98':  {'object_path': 'temperature/membuf4', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '99':  {'object_path': 'temperature/membuf5', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '100':  {'object_path': 'temperature/membuf6', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
-            '101':  {'object_path': 'temperature/membuf7', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
+        'labels': {
+            '188': {'object_path': 'temperature/cpu1/core0', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '189': {'object_path': 'temperature/cpu1/core1', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '190': {'object_path': 'temperature/cpu1/core2', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '191': {'object_path': 'temperature/cpu1/core3', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '192': {'object_path': 'temperature/cpu1/core4', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '193': {'object_path': 'temperature/cpu1/core5', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '194': {'object_path': 'temperature/cpu1/core6', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '195': {'object_path': 'temperature/cpu1/core7', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '196': {'object_path': 'temperature/cpu1/core8', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '197': {'object_path': 'temperature/cpu1/core9', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '198': {'object_path': 'temperature/cpu1/core10', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '199': {'object_path': 'temperature/cpu1/core11', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '118': {'object_path': 'temperature/dimm16', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '119': {'object_path': 'temperature/dimm17', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '120': {'object_path': 'temperature/dimm18', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '121': {'object_path': 'temperature/dimm19', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '122': {'object_path': 'temperature/dimm20', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '123': {'object_path': 'temperature/dimm21', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '124': {'object_path': 'temperature/dimm22', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '125': {'object_path': 'temperature/dimm23', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '126': {'object_path': 'temperature/dimm24', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '127': {'object_path': 'temperature/dimm25', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '128': {'object_path': 'temperature/dimm26', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '129': {'object_path': 'temperature/dimm27', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '130': {'object_path': 'temperature/dimm28', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '131': {'object_path': 'temperature/dimm29', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '132': {'object_path': 'temperature/dimm30', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '133': {'object_path': 'temperature/dimm31', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '98': {'object_path': 'temperature/membuf4', 'poll_interval': 5000, 'scale': 1000,
+                   'units': 'C'},
+            '99': {'object_path': 'temperature/membuf5', 'poll_interval': 5000, 'scale': 1000,
+                   'units': 'C'},
+            '100': {'object_path': 'temperature/membuf6', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
+            '101': {'object_path': 'temperature/membuf7', 'poll_interval': 5000, 'scale': 1000,
+                    'units': 'C'},
         }
     },
-    '4-0010':  {
+    '4-0010': {
         'names': {
             # Barreleye uses 0.25 millioohms sense resistor for adm1278
-            # To convert Iout register value Y to real-world value X, use an equation:
-            # X= 1/m * (Y * 10^-R - b), here m = 800 * R_sense, and R_sense is expressed in milliohms.
-            # The adm1278 driver did the conversion, but the R_sense is set here as a scale factor.
-            'curr1_input': {'object_path': 'HSCA/Iout', 'poll_interval': 5000, 'scale': 0.25, 'units': 'mA'},
-            'in2_input': {'object_path': 'HSCA/Vout', 'poll_interval': 5000, 'scale': 1, 'units': 'mV'},
+            # To convert Iout register value Y to real-world value X, use an
+            # equation:
+            # X= 1/m * (Y * 10^-R - b), here m = 800 * R_sense, and R_sense
+            # is expressed in milliohms.
+            # The adm1278 driver did the conversion, but the R_sense is set
+            # here as a scale factor.
+            'curr1_input': {'object_path': 'HSCA/Iout', 'poll_interval': 5000, 'scale': 0.25,
+                            'units': 'mA'},
+            'in2_input': {'object_path': 'HSCA/Vout', 'poll_interval': 5000, 'scale': 1,
+                          'units': 'mV'},
         }
     },
-    '5-0010':  {
+    '5-0010': {
         'names': {
-            'curr1_input': {'object_path': 'HSCB/Iout', 'poll_interval': 5000, 'scale': 0.25, 'units': 'mA'},
-            'in2_input': {'object_path': 'HSCB/Vout', 'poll_interval': 5000, 'scale': 1, 'units': 'mV'},
+            'curr1_input': {'object_path': 'HSCB/Iout', 'poll_interval': 5000, 'scale': 0.25,
+                            'units': 'mA'},
+            'in2_input': {'object_path': 'HSCB/Vout', 'poll_interval': 5000, 'scale': 1,
+                          'units': 'mV'},
         }
     },
-    '6-0010':  {
+    '6-0010': {
         'names': {
-            'curr1_input': {'object_path': 'HSCC/Iout', 'poll_interval': 5000, 'scale': 0.25, 'units': 'mA'},
-            'in2_input': {'object_path': 'HSCC/Vout', 'poll_interval': 5000, 'scale': 1, 'units': 'mV'},
+            'curr1_input': {'object_path': 'HSCC/Iout', 'poll_interval': 5000, 'scale': 0.25,
+                            'units': 'mA'},
+            'in2_input': {'object_path': 'HSCC/Vout', 'poll_interval': 5000, 'scale': 1,
+                          'units': 'mV'},
         }
     },
 }
diff --git a/data/Palmetto.py b/data/Palmetto.py
index fa39929..05a14a1 100755
--- a/data/Palmetto.py
+++ b/data/Palmetto.py
@@ -176,34 +176,53 @@
     '<inventory_root>/system/chassis/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False,
                                                         'manufacturer': 'ASPEED'},
     '<inventory_root>/system/chassis/motherboard/cpu': {'fru_type': 'CPU', 'is_fru': True, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core0': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core1': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core2': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core3': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core4': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core5': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core6': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core7': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core8': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core9': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core10': {'fru_type': 'CORE', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/cpu/core11': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core0': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core1': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core2': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core3': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core4': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core5': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core6': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core7': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core8': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core9': {'fru_type': 'CORE',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core10': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu/core11': {'fru_type': 'CORE',
+                                                               'is_fru': False, },
 
-    '<inventory_root>/system/chassis/motherboard/membuf': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf': {'fru_type': 'MEMORY_BUFFER',
+                                                           'is_fru': False, },
 
     '<inventory_root>/system/chassis/motherboard/dimm0': {'fru_type': 'DIMM', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/dimm1': {'fru_type': 'DIMM', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/dimm2': {'fru_type': 'DIMM', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/dimm3': {'fru_type': 'DIMM', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/io_board/pcie_slot0': {'fru_type': 'PCIE_CARD', 'is_fru': True, },
-    '<inventory_root>/system/chassis/io_board/pcie_slot1': {'fru_type': 'PCIE_CARD', 'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot0': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
+    '<inventory_root>/system/chassis/io_board/pcie_slot1': {'fru_type': 'PCIE_CARD',
+                                                            'is_fru': True, },
 
     '<inventory_root>/system/systemevent': {'fru_type': 'SYSTEM_EVENT', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR',
+                                                             'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR',
+                                                             'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR',
+                                                         'is_fru': False, },
 }
 
 ID_LOOKUP = {
@@ -291,25 +310,32 @@
     name = name.upper()
     c = name[0:1]
     offset = int(name[1:])
-    a = ord(c)-65
-    base = a*8+GPIO_BASE
-    return base+offset
+    a = ord(c) - 65
+    base = a * 8 + GPIO_BASE
+    return base + offset
 
 
 HWMON_CONFIG = {
-    '2-004c':  {
+    '2-004c': {
         'names': {
-            'temp1_input': {'object_path': 'temperature/ambient', 'poll_interval': 5000, 'scale': 1000, 'units': 'C'},
+            'temp1_input': {'object_path': 'temperature/ambient', 'poll_interval': 5000,
+                            'scale': 1000, 'units': 'C'},
         }
     },
     '3-0050': {
         'names': {
-            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_curr_powerreading': {'object_path': 'powercap/system_power', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_curr_powerreading': {'object_path': 'powercap/system_power',
+                                       'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000,
+                                     'scale': 1, 'units': 'W'},
         }
     }
 }
diff --git a/data/Romulus.py b/data/Romulus.py
index dcb8b92..13c405c 100644
--- a/data/Romulus.py
+++ b/data/Romulus.py
@@ -35,17 +35,22 @@
     '<inventory_root>/system/chassis/motherboard': {'fru_type': 'MAIN_PLANAR', 'is_fru': True, },
 
     '<inventory_root>/system/systemevent': {'fru_type': 'SYSTEM_EVENT', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
-    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR',
+                                                             'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR',
+                                                              'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR',
+                                                             'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR',
+                                                         'is_fru': False, },
 
     '<inventory_root>/system/chassis/fan0': {'fru_type': 'FAN', 'is_fru': True, },
     '<inventory_root>/system/chassis/fan1': {'fru_type': 'FAN', 'is_fru': True, },
     '<inventory_root>/system/chassis/fan2': {'fru_type': 'FAN', 'is_fru': True, },
     '<inventory_root>/system/chassis/fan3': {'fru_type': 'FAN', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False, 'manufacturer': 'ASPEED'},
+    '<inventory_root>/system/chassis/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False,
+                                                        'manufacturer': 'ASPEED'},
 
     '<inventory_root>/system/chassis/motherboard/cpu0': {'fru_type': 'CPU', 'is_fru': True, },
     '<inventory_root>/system/chassis/motherboard/cpu1': {'fru_type': 'CPU', 'is_fru': True, },
@@ -291,82 +296,152 @@
 HWMON_CONFIG = {
     '4-0050': {
         'names': {
-            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_curr_powerreading': {'object_path': 'powercap/system_power', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
-            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_curr_powercap': {'object_path': 'powercap/curr_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_curr_powerreading': {'object_path': 'powercap/system_power',
+                                       'poll_interval': 10000, 'scale': 1, 'units': 'W'},
+            'caps_max_powercap': {'object_path': 'powercap/max_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_min_powercap': {'object_path': 'powercap/min_cap', 'poll_interval': 10000,
+                                  'scale': 1, 'units': 'W'},
+            'caps_norm_powercap': {'object_path': 'powercap/n_cap', 'poll_interval': 10000,
+                                   'scale': 1, 'units': 'W'},
+            'caps_user_powerlimit': {'object_path': 'powercap/user_cap', 'poll_interval': 10000,
+                                     'scale': 1, 'units': 'W'},
         },
         'labels': {
-            '176':  {'object_path': 'temperature/cpu0/core0', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '177':  {'object_path': 'temperature/cpu0/core1', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '178':  {'object_path': 'temperature/cpu0/core2', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '179':  {'object_path': 'temperature/cpu0/core3', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '180':  {'object_path': 'temperature/cpu0/core4', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '181':  {'object_path': 'temperature/cpu0/core5', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '182':  {'object_path': 'temperature/cpu0/core6', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '183':  {'object_path': 'temperature/cpu0/core7', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '184':  {'object_path': 'temperature/cpu0/core8', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '185':  {'object_path': 'temperature/cpu0/core9', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '186':  {'object_path': 'temperature/cpu0/core10', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '187':  {'object_path': 'temperature/cpu0/core11', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '102':  {'object_path': 'temperature/dimm0', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '103':  {'object_path': 'temperature/dimm1', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '104':  {'object_path': 'temperature/dimm2', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '105':  {'object_path': 'temperature/dimm3', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '106':  {'object_path': 'temperature/dimm4', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '107':  {'object_path': 'temperature/dimm5', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '108':  {'object_path': 'temperature/dimm6', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '109':  {'object_path': 'temperature/dimm7', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
+            '176': {'object_path': 'temperature/cpu0/core0', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '177': {'object_path': 'temperature/cpu0/core1', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '178': {'object_path': 'temperature/cpu0/core2', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '179': {'object_path': 'temperature/cpu0/core3', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '180': {'object_path': 'temperature/cpu0/core4', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '181': {'object_path': 'temperature/cpu0/core5', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '182': {'object_path': 'temperature/cpu0/core6', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '183': {'object_path': 'temperature/cpu0/core7', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '184': {'object_path': 'temperature/cpu0/core8', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '185': {'object_path': 'temperature/cpu0/core9', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '186': {'object_path': 'temperature/cpu0/core10', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '187': {'object_path': 'temperature/cpu0/core11', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '102': {'object_path': 'temperature/dimm0', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '103': {'object_path': 'temperature/dimm1', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '104': {'object_path': 'temperature/dimm2', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '105': {'object_path': 'temperature/dimm3', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '106': {'object_path': 'temperature/dimm4', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '107': {'object_path': 'temperature/dimm5', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '108': {'object_path': 'temperature/dimm6', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '109': {'object_path': 'temperature/dimm7', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
         }
     },
     '5-0050': {
-        'labels':  {
-            '188':  {'object_path': 'temperature/cpu1/core0', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '189':  {'object_path': 'temperature/cpu1/core1', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '190':  {'object_path': 'temperature/cpu1/core2', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '191':  {'object_path': 'temperature/cpu1/core3', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '192':  {'object_path': 'temperature/cpu1/core4', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '193':  {'object_path': 'temperature/cpu1/core5', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '194':  {'object_path': 'temperature/cpu1/core6', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '195':  {'object_path': 'temperature/cpu1/core7', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '196':  {'object_path': 'temperature/cpu1/core8', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '197':  {'object_path': 'temperature/cpu1/core9', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '198':  {'object_path': 'temperature/cpu1/core10', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '199':  {'object_path': 'temperature/cpu1/core11', 'poll_interval': 5000, 'scale': -3, 'units': 'C',
-                     'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90, 'warning_lower': -99, 'emergency_enabled': True},
-            '110':  {'object_path': 'temperature/dimm8', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '111':  {'object_path': 'temperature/dimm9', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '112':  {'object_path': 'temperature/dimm10', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '113':  {'object_path': 'temperature/dimm11', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '114':  {'object_path': 'temperature/dimm12', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '115':  {'object_path': 'temperature/dimm13', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '116':  {'object_path': 'temperature/dimm14', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
-            '117':  {'object_path': 'temperature/dimm15', 'poll_interval': 5000, 'scale': -3, 'units': 'C'},
+        'labels': {
+            '188': {'object_path': 'temperature/cpu1/core0', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '189': {'object_path': 'temperature/cpu1/core1', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '190': {'object_path': 'temperature/cpu1/core2', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '191': {'object_path': 'temperature/cpu1/core3', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '192': {'object_path': 'temperature/cpu1/core4', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '193': {'object_path': 'temperature/cpu1/core5', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '194': {'object_path': 'temperature/cpu1/core6', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '195': {'object_path': 'temperature/cpu1/core7', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '196': {'object_path': 'temperature/cpu1/core8', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '197': {'object_path': 'temperature/cpu1/core9', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '198': {'object_path': 'temperature/cpu1/core10', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '199': {'object_path': 'temperature/cpu1/core11', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C',
+                    'critical_upper': 100, 'critical_lower': -100, 'warning_upper': 90,
+                    'warning_lower': -99, 'emergency_enabled': True},
+            '110': {'object_path': 'temperature/dimm8', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '111': {'object_path': 'temperature/dimm9', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '112': {'object_path': 'temperature/dimm10', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '113': {'object_path': 'temperature/dimm11', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '114': {'object_path': 'temperature/dimm12', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '115': {'object_path': 'temperature/dimm13', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '116': {'object_path': 'temperature/dimm14', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
+            '117': {'object_path': 'temperature/dimm15', 'poll_interval': 5000, 'scale': -3,
+                    'units': 'C'},
         }
     },
 }
diff --git a/data/Witherspoon.py b/data/Witherspoon.py
index 6c72415..6ae00fc 100755
--- a/data/Witherspoon.py
+++ b/data/Witherspoon.py
@@ -1,9 +1,9 @@
 #! /usr/bin/python
 
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
+# System states
+# state can change to next state in 2 ways:
+# - a process emits a GotoSystemState signal with state name to goto
+# - objects specified in EXIT_STATE_DEPEND have started
 SYSTEM_STATES = [
     'BASE_APPS',
     'BMC_STARTING',
@@ -16,328 +16,329 @@
 ]
 
 EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
+    'BASE_APPS': {
         '/org/openbmc/sensors': 0,
     },
-    'BMC_STARTING' : {
+    'BMC_STARTING': {
         '/org/openbmc/control/chassis0': 0,
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/flash/bios' : 0,
+        '/org/openbmc/control/power0': 0,
+        '/org/openbmc/control/flash/bios': 0,
     },
 }
 
 FRU_INSTANCES = {
-    '<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/bios' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
-    '<inventory_root>/system/misc' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
+    '<inventory_root>/system': {'fru_type': 'SYSTEM', 'is_fru': True, 'present': "True"},
+    '<inventory_root>/system/bios': {'fru_type': 'SYSTEM', 'is_fru': True, 'present': "True"},
+    '<inventory_root>/system/misc': {'fru_type': 'SYSTEM', 'is_fru': False, },
 
-    '<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
+    '<inventory_root>/system/chassis': {'fru_type': 'SYSTEM', 'is_fru': True, 'present': "True"},
 
-    '<inventory_root>/system/chassis/motherboard' : { 'fru_type' : 'MAIN_PLANAR','is_fru' : True, },
+    '<inventory_root>/system/chassis/motherboard': {'fru_type': 'MAIN_PLANAR', 'is_fru': True, },
 
-    '<inventory_root>/system/systemevent'                  : { 'fru_type' : 'SYSTEM_EVENT', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/refclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/pcieclock': { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/todclock' : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/apss'     : { 'fru_type' : 'MAIN_PLANAR', 'is_fru' : False, },
+    '<inventory_root>/system/systemevent': {'fru_type': 'SYSTEM_EVENT', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/refclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/pcieclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/todclock': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/apss': {'fru_type': 'MAIN_PLANAR', 'is_fru': False, },
 
-    '<inventory_root>/system/chassis/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan2' : { 'fru_type' : 'FAN','is_fru' : True, },
-    '<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
+    '<inventory_root>/system/chassis/fan0': {'fru_type': 'FAN', 'is_fru': True, },
+    '<inventory_root>/system/chassis/fan1': {'fru_type': 'FAN', 'is_fru': True, },
+    '<inventory_root>/system/chassis/fan2': {'fru_type': 'FAN', 'is_fru': True, },
+    '<inventory_root>/system/chassis/fan3': {'fru_type': 'FAN', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
+    '<inventory_root>/system/chassis/motherboard/bmc': {'fru_type': 'BMC', 'is_fru': False,
+                                                        'manufacturer': 'ASPEED'},
 
-    '<inventory_root>/system/chassis/motherboard/cpu0' : { 'fru_type' : 'CPU', 'is_fru' : True, },
-    '<inventory_root>/system/chassis/motherboard/cpu1' : { 'fru_type' : 'CPU', 'is_fru' : True, },
+    '<inventory_root>/system/chassis/motherboard/cpu0': {'fru_type': 'CPU', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/cpu1': {'fru_type': 'CPU', 'is_fru': True, },
 
-    '<inventory_root>/system/chassis/motherboard/cpu0/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core10': { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu0/core11': { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core0': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core1': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core2': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core3': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core4': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core5': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core6': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core7': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core8': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core9': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core10': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu0/core11': {'fru_type': 'CORE', 'is_fru': False, },
 
-    '<inventory_root>/system/chassis/motherboard/cpu1/core0' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core1' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core2' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core3' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core4' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core5' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core6' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core7' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core8' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core9' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core10' : { 'fru_type' : 'CORE', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core0': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core1': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core2': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core3': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core4': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core5': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core6': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core7': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core8': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core9': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core10': {'fru_type': 'CORE', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/cpu1/core11': {'fru_type': 'CORE', 'is_fru': False, },
 
-    '<inventory_root>/system/chassis/motherboard/membuf0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf2' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf3' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf4' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf5' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf6' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
-    '<inventory_root>/system/chassis/motherboard/membuf7' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
+    '<inventory_root>/system/chassis/motherboard/membuf0': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf1': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf2': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf3': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf4': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf5': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf6': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
+    '<inventory_root>/system/chassis/motherboard/membuf7': {'fru_type': 'MEMORY_BUFFER', 'is_fru': False, },
 
-    '<inventory_root>/system/chassis/motherboard/dimm0' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm1' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm2' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm3' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm4' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm5' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm6' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm7' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm8' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm9' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm10' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm11' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm12' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm13' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm14' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm15' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm16' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm17' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm18' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm19' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm20' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm21' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm22' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm23' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm24' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm25' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm26' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm27' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm28' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm29' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm30' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
-    '<inventory_root>/system/chassis/motherboard/dimm31' : { 'fru_type' : 'DIMM', 'is_fru' : True,},
+    '<inventory_root>/system/chassis/motherboard/dimm0': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm1': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm2': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm3': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm4': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm5': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm6': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm7': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm8': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm9': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm10': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm11': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm12': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm13': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm14': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm15': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm16': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm17': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm18': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm19': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm20': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm21': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm22': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm23': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm24': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm25': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm26': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm27': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm28': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm29': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm30': {'fru_type': 'DIMM', 'is_fru': True, },
+    '<inventory_root>/system/chassis/motherboard/dimm31': {'fru_type': 'DIMM', 'is_fru': True, },
 }
 
 ID_LOOKUP = {
-    'FRU' : {
-        0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0x02 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x03 : '<inventory_root>/system/chassis/motherboard',
-        0x04 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x05 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x06 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x07 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x08 : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x09 : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x0c : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x0d : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x0e : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x0f : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x10 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x11 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x12 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x13 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x14 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x15 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x16 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x17 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x18 : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x19 : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x1a : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x1b : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x1c : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x1d : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm31',
+    'FRU': {
+        0x01: '<inventory_root>/system/chassis/motherboard/cpu0',
+        0x02: '<inventory_root>/system/chassis/motherboard/cpu1',
+        0x03: '<inventory_root>/system/chassis/motherboard',
+        0x04: '<inventory_root>/system/chassis/motherboard/membuf0',
+        0x05: '<inventory_root>/system/chassis/motherboard/membuf1',
+        0x06: '<inventory_root>/system/chassis/motherboard/membuf2',
+        0x07: '<inventory_root>/system/chassis/motherboard/membuf3',
+        0x08: '<inventory_root>/system/chassis/motherboard/membuf4',
+        0x09: '<inventory_root>/system/chassis/motherboard/membuf5',
+        0x0c: '<inventory_root>/system/chassis/motherboard/dimm0',
+        0x0d: '<inventory_root>/system/chassis/motherboard/dimm1',
+        0x0e: '<inventory_root>/system/chassis/motherboard/dimm2',
+        0x0f: '<inventory_root>/system/chassis/motherboard/dimm3',
+        0x10: '<inventory_root>/system/chassis/motherboard/dimm4',
+        0x11: '<inventory_root>/system/chassis/motherboard/dimm5',
+        0x12: '<inventory_root>/system/chassis/motherboard/dimm6',
+        0x13: '<inventory_root>/system/chassis/motherboard/dimm7',
+        0x14: '<inventory_root>/system/chassis/motherboard/dimm8',
+        0x15: '<inventory_root>/system/chassis/motherboard/dimm9',
+        0x16: '<inventory_root>/system/chassis/motherboard/dimm10',
+        0x17: '<inventory_root>/system/chassis/motherboard/dimm11',
+        0x18: '<inventory_root>/system/chassis/motherboard/dimm12',
+        0x19: '<inventory_root>/system/chassis/motherboard/dimm13',
+        0x1a: '<inventory_root>/system/chassis/motherboard/dimm14',
+        0x1b: '<inventory_root>/system/chassis/motherboard/dimm15',
+        0x1c: '<inventory_root>/system/chassis/motherboard/dimm16',
+        0x1d: '<inventory_root>/system/chassis/motherboard/dimm17',
+        0x1e: '<inventory_root>/system/chassis/motherboard/dimm18',
+        0x1f: '<inventory_root>/system/chassis/motherboard/dimm19',
+        0x20: '<inventory_root>/system/chassis/motherboard/dimm20',
+        0x21: '<inventory_root>/system/chassis/motherboard/dimm21',
+        0x22: '<inventory_root>/system/chassis/motherboard/dimm22',
+        0x23: '<inventory_root>/system/chassis/motherboard/dimm23',
+        0x24: '<inventory_root>/system/chassis/motherboard/dimm24',
+        0x25: '<inventory_root>/system/chassis/motherboard/dimm25',
+        0x26: '<inventory_root>/system/chassis/motherboard/dimm26',
+        0x27: '<inventory_root>/system/chassis/motherboard/dimm27',
+        0x28: '<inventory_root>/system/chassis/motherboard/dimm28',
+        0x29: '<inventory_root>/system/chassis/motherboard/dimm29',
+        0x2a: '<inventory_root>/system/chassis/motherboard/dimm30',
+        0x2b: '<inventory_root>/system/chassis/motherboard/dimm31',
     },
-    'FRU_STR' : {
-        'PRODUCT_0'  : '<inventory_root>/system/bios',
-        'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
-        'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
-        'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
-        'BOARD_3'    : '<inventory_root>/system/misc',
-        'BOARD_4'    : '<inventory_root>/system/chassis/motherboard/membuf0',
-        'BOARD_5'    : '<inventory_root>/system/chassis/motherboard/membuf1',
-        'BOARD_6'    : '<inventory_root>/system/chassis/motherboard/membuf2',
-        'BOARD_7'    : '<inventory_root>/system/chassis/motherboard/membuf3',
-        'BOARD_8'    : '<inventory_root>/system/chassis/motherboard/membuf4',
-        'BOARD_9'    : '<inventory_root>/system/chassis/motherboard/membuf5',
-        'BOARD_10'   : '<inventory_root>/system/chassis/motherboard/membuf6',
-        'BOARD_11'   : '<inventory_root>/system/chassis/motherboard/membuf7',
-        'PRODUCT_12'   : '<inventory_root>/system/chassis/motherboard/dimm0',
-        'PRODUCT_13'   : '<inventory_root>/system/chassis/motherboard/dimm1',
-        'PRODUCT_14'   : '<inventory_root>/system/chassis/motherboard/dimm2',
-        'PRODUCT_15'   : '<inventory_root>/system/chassis/motherboard/dimm3',
-        'PRODUCT_16'   : '<inventory_root>/system/chassis/motherboard/dimm4',
-        'PRODUCT_17'   : '<inventory_root>/system/chassis/motherboard/dimm5',
-        'PRODUCT_18'   : '<inventory_root>/system/chassis/motherboard/dimm6',
-        'PRODUCT_19'   : '<inventory_root>/system/chassis/motherboard/dimm7',
-        'PRODUCT_20'   : '<inventory_root>/system/chassis/motherboard/dimm8',
-        'PRODUCT_21'   : '<inventory_root>/system/chassis/motherboard/dimm9',
-        'PRODUCT_22'   : '<inventory_root>/system/chassis/motherboard/dimm10',
-        'PRODUCT_23'   : '<inventory_root>/system/chassis/motherboard/dimm11',
-        'PRODUCT_24'   : '<inventory_root>/system/chassis/motherboard/dimm12',
-        'PRODUCT_25'   : '<inventory_root>/system/chassis/motherboard/dimm13',
-        'PRODUCT_26'   : '<inventory_root>/system/chassis/motherboard/dimm14',
-        'PRODUCT_27'   : '<inventory_root>/system/chassis/motherboard/dimm15',
-        'PRODUCT_28'   : '<inventory_root>/system/chassis/motherboard/dimm16',
-        'PRODUCT_29'   : '<inventory_root>/system/chassis/motherboard/dimm17',
-        'PRODUCT_30'   : '<inventory_root>/system/chassis/motherboard/dimm18',
-        'PRODUCT_31'   : '<inventory_root>/system/chassis/motherboard/dimm19',
-        'PRODUCT_32'   : '<inventory_root>/system/chassis/motherboard/dimm20',
-        'PRODUCT_33'   : '<inventory_root>/system/chassis/motherboard/dimm21',
-        'PRODUCT_34'   : '<inventory_root>/system/chassis/motherboard/dimm22',
-        'PRODUCT_35'   : '<inventory_root>/system/chassis/motherboard/dimm23',
-        'PRODUCT_36'   : '<inventory_root>/system/chassis/motherboard/dimm24',
-        'PRODUCT_37'   : '<inventory_root>/system/chassis/motherboard/dimm25',
-        'PRODUCT_38'   : '<inventory_root>/system/chassis/motherboard/dimm26',
-        'PRODUCT_39'   : '<inventory_root>/system/chassis/motherboard/dimm27',
-        'PRODUCT_40'   : '<inventory_root>/system/chassis/motherboard/dimm28',
-        'PRODUCT_41'   : '<inventory_root>/system/chassis/motherboard/dimm29',
-        'PRODUCT_42'   : '<inventory_root>/system/chassis/motherboard/dimm30',
-        'PRODUCT_43'   : '<inventory_root>/system/chassis/motherboard/dimm31',
-        'PRODUCT_47'   : '<inventory_root>/system/misc',
+    'FRU_STR': {
+        'PRODUCT_0': '<inventory_root>/system/bios',
+        'BOARD_1': '<inventory_root>/system/chassis/motherboard/cpu0',
+        'BOARD_2': '<inventory_root>/system/chassis/motherboard/cpu1',
+        'CHASSIS_3': '<inventory_root>/system/chassis/motherboard',
+        'BOARD_3': '<inventory_root>/system/misc',
+        'BOARD_4': '<inventory_root>/system/chassis/motherboard/membuf0',
+        'BOARD_5': '<inventory_root>/system/chassis/motherboard/membuf1',
+        'BOARD_6': '<inventory_root>/system/chassis/motherboard/membuf2',
+        'BOARD_7': '<inventory_root>/system/chassis/motherboard/membuf3',
+        'BOARD_8': '<inventory_root>/system/chassis/motherboard/membuf4',
+        'BOARD_9': '<inventory_root>/system/chassis/motherboard/membuf5',
+        'BOARD_10': '<inventory_root>/system/chassis/motherboard/membuf6',
+        'BOARD_11': '<inventory_root>/system/chassis/motherboard/membuf7',
+        'PRODUCT_12': '<inventory_root>/system/chassis/motherboard/dimm0',
+        'PRODUCT_13': '<inventory_root>/system/chassis/motherboard/dimm1',
+        'PRODUCT_14': '<inventory_root>/system/chassis/motherboard/dimm2',
+        'PRODUCT_15': '<inventory_root>/system/chassis/motherboard/dimm3',
+        'PRODUCT_16': '<inventory_root>/system/chassis/motherboard/dimm4',
+        'PRODUCT_17': '<inventory_root>/system/chassis/motherboard/dimm5',
+        'PRODUCT_18': '<inventory_root>/system/chassis/motherboard/dimm6',
+        'PRODUCT_19': '<inventory_root>/system/chassis/motherboard/dimm7',
+        'PRODUCT_20': '<inventory_root>/system/chassis/motherboard/dimm8',
+        'PRODUCT_21': '<inventory_root>/system/chassis/motherboard/dimm9',
+        'PRODUCT_22': '<inventory_root>/system/chassis/motherboard/dimm10',
+        'PRODUCT_23': '<inventory_root>/system/chassis/motherboard/dimm11',
+        'PRODUCT_24': '<inventory_root>/system/chassis/motherboard/dimm12',
+        'PRODUCT_25': '<inventory_root>/system/chassis/motherboard/dimm13',
+        'PRODUCT_26': '<inventory_root>/system/chassis/motherboard/dimm14',
+        'PRODUCT_27': '<inventory_root>/system/chassis/motherboard/dimm15',
+        'PRODUCT_28': '<inventory_root>/system/chassis/motherboard/dimm16',
+        'PRODUCT_29': '<inventory_root>/system/chassis/motherboard/dimm17',
+        'PRODUCT_30': '<inventory_root>/system/chassis/motherboard/dimm18',
+        'PRODUCT_31': '<inventory_root>/system/chassis/motherboard/dimm19',
+        'PRODUCT_32': '<inventory_root>/system/chassis/motherboard/dimm20',
+        'PRODUCT_33': '<inventory_root>/system/chassis/motherboard/dimm21',
+        'PRODUCT_34': '<inventory_root>/system/chassis/motherboard/dimm22',
+        'PRODUCT_35': '<inventory_root>/system/chassis/motherboard/dimm23',
+        'PRODUCT_36': '<inventory_root>/system/chassis/motherboard/dimm24',
+        'PRODUCT_37': '<inventory_root>/system/chassis/motherboard/dimm25',
+        'PRODUCT_38': '<inventory_root>/system/chassis/motherboard/dimm26',
+        'PRODUCT_39': '<inventory_root>/system/chassis/motherboard/dimm27',
+        'PRODUCT_40': '<inventory_root>/system/chassis/motherboard/dimm28',
+        'PRODUCT_41': '<inventory_root>/system/chassis/motherboard/dimm29',
+        'PRODUCT_42': '<inventory_root>/system/chassis/motherboard/dimm30',
+        'PRODUCT_43': '<inventory_root>/system/chassis/motherboard/dimm31',
+        'PRODUCT_47': '<inventory_root>/system/misc',
     },
-    'SENSOR' : {
-        0x02 : '/org/openbmc/sensors/host/HostStatus',
-        0x03 : '/org/openbmc/sensors/host/BootProgress',
-        0x5a : '<inventory_root>/system/chassis/motherboard/cpu0',
-        0xa4 : '<inventory_root>/system/chassis/motherboard/cpu1',
-        0x1e : '<inventory_root>/system/chassis/motherboard/dimm3',
-        0x1f : '<inventory_root>/system/chassis/motherboard/dimm2',
-        0x20 : '<inventory_root>/system/chassis/motherboard/dimm1',
-        0x21 : '<inventory_root>/system/chassis/motherboard/dimm0',
-        0x22 : '<inventory_root>/system/chassis/motherboard/dimm7',
-        0x23 : '<inventory_root>/system/chassis/motherboard/dimm6',
-        0x24 : '<inventory_root>/system/chassis/motherboard/dimm5',
-        0x25 : '<inventory_root>/system/chassis/motherboard/dimm4',
-        0x26 : '<inventory_root>/system/chassis/motherboard/dimm11',
-        0x27 : '<inventory_root>/system/chassis/motherboard/dimm10',
-        0x28 : '<inventory_root>/system/chassis/motherboard/dimm9',
-        0x29 : '<inventory_root>/system/chassis/motherboard/dimm8',
-        0x2a : '<inventory_root>/system/chassis/motherboard/dimm15',
-        0x2b : '<inventory_root>/system/chassis/motherboard/dimm14',
-        0x2c : '<inventory_root>/system/chassis/motherboard/dimm13',
-        0x2d : '<inventory_root>/system/chassis/motherboard/dimm12',
-        0x2e : '<inventory_root>/system/chassis/motherboard/dimm19',
-        0x2f : '<inventory_root>/system/chassis/motherboard/dimm18',
-        0x30 : '<inventory_root>/system/chassis/motherboard/dimm17',
-        0x31 : '<inventory_root>/system/chassis/motherboard/dimm16',
-        0x32 : '<inventory_root>/system/chassis/motherboard/dimm23',
-        0x33 : '<inventory_root>/system/chassis/motherboard/dimm22',
-        0x34 : '<inventory_root>/system/chassis/motherboard/dimm21',
-        0x35 : '<inventory_root>/system/chassis/motherboard/dimm20',
-        0x36 : '<inventory_root>/system/chassis/motherboard/dimm27',
-        0x37 : '<inventory_root>/system/chassis/motherboard/dimm26',
-        0x38 : '<inventory_root>/system/chassis/motherboard/dimm25',
-        0x39 : '<inventory_root>/system/chassis/motherboard/dimm24',
-        0x3a : '<inventory_root>/system/chassis/motherboard/dimm31',
-        0x3b : '<inventory_root>/system/chassis/motherboard/dimm30',
-        0x3c : '<inventory_root>/system/chassis/motherboard/dimm29',
-        0x3d : '<inventory_root>/system/chassis/motherboard/dimm28',
-        0x3e : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-        0x3f : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-        0x40 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-        0x41 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-        0x42 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-        0x43 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-        0x44 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-        0x45 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-        0x46 : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-        0x47 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-        0x48 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-        0x49 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-        0x4a : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
-        0x4b : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
-        0x4c : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
-        0x4d : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
-        0x4e : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
-        0x4f : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
-        0x50 : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
-        0x51 : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
-        0x52 : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
-        0x53 : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
-        0x54 : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
-        0x55 : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
-        0x56 : '<inventory_root>/system/chassis/motherboard/membuf0',
-        0x57 : '<inventory_root>/system/chassis/motherboard/membuf1',
-        0x58 : '<inventory_root>/system/chassis/motherboard/membuf2',
-        0x59 : '<inventory_root>/system/chassis/motherboard/membuf3',
-        0x5a : '<inventory_root>/system/chassis/motherboard/membuf4',
-        0x5b : '<inventory_root>/system/chassis/motherboard/membuf5',
-        0x5c : '<inventory_root>/system/chassis/motherboard/membuf6',
-        0x5d : '<inventory_root>/system/chassis/motherboard/membuf7',
-        0x07 : '/org/openbmc/sensors/host/BootCount',
-        0x0c : '<inventory_root>/system/chassis/motherboard',
-        0x01 : '<inventory_root>/system/systemevent',
-        0x08 : '<inventory_root>/system/powerlimit',
-        0x0d : '<inventory_root>/system/chassis/motherboard/refclock',
-        0x0e : '<inventory_root>/system/chassis/motherboard/pcieclock',
-        0x0f : '<inventory_root>/system/chassis/motherboard/todclock',
-        0x10 : '<inventory_root>/system/chassis/motherboard/apss',
-        0x02 : '/org/openbmc/sensors/host/OperatingSystemStatus',
-        0x04 : '<inventory_root>/system/chassis/motherboard/pcielink',
-        0x0b : '/xyz/openbmc_project/sensors/chassis/PowerSupplyRedundancy',
-        0xda : '/org/openbmc/sensors/host/TurboAllowed',
-        0xD8 : '/org/openbmc/sensors/host/PowerSupplyDerating',
+    'SENSOR': {
+        0x02: '/org/openbmc/sensors/host/HostStatus',
+        0x03: '/org/openbmc/sensors/host/BootProgress',
+        0x5a: '<inventory_root>/system/chassis/motherboard/cpu0',
+        0xa4: '<inventory_root>/system/chassis/motherboard/cpu1',
+        0x1e: '<inventory_root>/system/chassis/motherboard/dimm3',
+        0x1f: '<inventory_root>/system/chassis/motherboard/dimm2',
+        0x20: '<inventory_root>/system/chassis/motherboard/dimm1',
+        0x21: '<inventory_root>/system/chassis/motherboard/dimm0',
+        0x22: '<inventory_root>/system/chassis/motherboard/dimm7',
+        0x23: '<inventory_root>/system/chassis/motherboard/dimm6',
+        0x24: '<inventory_root>/system/chassis/motherboard/dimm5',
+        0x25: '<inventory_root>/system/chassis/motherboard/dimm4',
+        0x26: '<inventory_root>/system/chassis/motherboard/dimm11',
+        0x27: '<inventory_root>/system/chassis/motherboard/dimm10',
+        0x28: '<inventory_root>/system/chassis/motherboard/dimm9',
+        0x29: '<inventory_root>/system/chassis/motherboard/dimm8',
+        0x2a: '<inventory_root>/system/chassis/motherboard/dimm15',
+        0x2b: '<inventory_root>/system/chassis/motherboard/dimm14',
+        0x2c: '<inventory_root>/system/chassis/motherboard/dimm13',
+        0x2d: '<inventory_root>/system/chassis/motherboard/dimm12',
+        0x2e: '<inventory_root>/system/chassis/motherboard/dimm19',
+        0x2f: '<inventory_root>/system/chassis/motherboard/dimm18',
+        0x30: '<inventory_root>/system/chassis/motherboard/dimm17',
+        0x31: '<inventory_root>/system/chassis/motherboard/dimm16',
+        0x32: '<inventory_root>/system/chassis/motherboard/dimm23',
+        0x33: '<inventory_root>/system/chassis/motherboard/dimm22',
+        0x34: '<inventory_root>/system/chassis/motherboard/dimm21',
+        0x35: '<inventory_root>/system/chassis/motherboard/dimm20',
+        0x36: '<inventory_root>/system/chassis/motherboard/dimm27',
+        0x37: '<inventory_root>/system/chassis/motherboard/dimm26',
+        0x38: '<inventory_root>/system/chassis/motherboard/dimm25',
+        0x39: '<inventory_root>/system/chassis/motherboard/dimm24',
+        0x3a: '<inventory_root>/system/chassis/motherboard/dimm31',
+        0x3b: '<inventory_root>/system/chassis/motherboard/dimm30',
+        0x3c: '<inventory_root>/system/chassis/motherboard/dimm29',
+        0x3d: '<inventory_root>/system/chassis/motherboard/dimm28',
+        0x3e: '<inventory_root>/system/chassis/motherboard/cpu0/core0',
+        0x3f: '<inventory_root>/system/chassis/motherboard/cpu0/core1',
+        0x40: '<inventory_root>/system/chassis/motherboard/cpu0/core2',
+        0x41: '<inventory_root>/system/chassis/motherboard/cpu0/core3',
+        0x42: '<inventory_root>/system/chassis/motherboard/cpu0/core4',
+        0x43: '<inventory_root>/system/chassis/motherboard/cpu0/core5',
+        0x44: '<inventory_root>/system/chassis/motherboard/cpu0/core6',
+        0x45: '<inventory_root>/system/chassis/motherboard/cpu0/core7',
+        0x46: '<inventory_root>/system/chassis/motherboard/cpu0/core8',
+        0x47: '<inventory_root>/system/chassis/motherboard/cpu0/core9',
+        0x48: '<inventory_root>/system/chassis/motherboard/cpu0/core10',
+        0x49: '<inventory_root>/system/chassis/motherboard/cpu0/core11',
+        0x4a: '<inventory_root>/system/chassis/motherboard/cpu1/core0',
+        0x4b: '<inventory_root>/system/chassis/motherboard/cpu1/core1',
+        0x4c: '<inventory_root>/system/chassis/motherboard/cpu1/core2',
+        0x4d: '<inventory_root>/system/chassis/motherboard/cpu1/core3',
+        0x4e: '<inventory_root>/system/chassis/motherboard/cpu1/core4',
+        0x4f: '<inventory_root>/system/chassis/motherboard/cpu1/core5',
+        0x50: '<inventory_root>/system/chassis/motherboard/cpu1/core6',
+        0x51: '<inventory_root>/system/chassis/motherboard/cpu1/core7',
+        0x52: '<inventory_root>/system/chassis/motherboard/cpu1/core8',
+        0x53: '<inventory_root>/system/chassis/motherboard/cpu1/core9',
+        0x54: '<inventory_root>/system/chassis/motherboard/cpu1/core10',
+        0x55: '<inventory_root>/system/chassis/motherboard/cpu1/core11',
+        0x56: '<inventory_root>/system/chassis/motherboard/membuf0',
+        0x57: '<inventory_root>/system/chassis/motherboard/membuf1',
+        0x58: '<inventory_root>/system/chassis/motherboard/membuf2',
+        0x59: '<inventory_root>/system/chassis/motherboard/membuf3',
+        0x5a: '<inventory_root>/system/chassis/motherboard/membuf4',
+        0x5b: '<inventory_root>/system/chassis/motherboard/membuf5',
+        0x5c: '<inventory_root>/system/chassis/motherboard/membuf6',
+        0x5d: '<inventory_root>/system/chassis/motherboard/membuf7',
+        0x07: '/org/openbmc/sensors/host/BootCount',
+        0x0c: '<inventory_root>/system/chassis/motherboard',
+        0x01: '<inventory_root>/system/systemevent',
+        0x08: '<inventory_root>/system/powerlimit',
+        0x0d: '<inventory_root>/system/chassis/motherboard/refclock',
+        0x0e: '<inventory_root>/system/chassis/motherboard/pcieclock',
+        0x0f: '<inventory_root>/system/chassis/motherboard/todclock',
+        0x10: '<inventory_root>/system/chassis/motherboard/apss',
+        0x02: '/org/openbmc/sensors/host/OperatingSystemStatus',
+        0x04: '<inventory_root>/system/chassis/motherboard/pcielink',
+        0x0b: '/xyz/openbmc_project/sensors/chassis/PowerSupplyRedundancy',
+        0xda: '/org/openbmc/sensors/host/TurboAllowed',
+        0xD8: '/org/openbmc/sensors/host/PowerSupplyDerating',
     },
-    'GPIO_PRESENT' : {}
+    'GPIO_PRESENT': {}
 }
 
 GPIO_CONFIG = {}
 GPIO_CONFIG['BMC_POWER_UP'] = \
-        {'gpio_pin': 'D1', 'direction': 'out'}
+    {'gpio_pin': 'D1', 'direction': 'out'}
 GPIO_CONFIG['SOFTWARE_PGOOD'] = \
-        {'gpio_pin': 'R1', 'direction': 'out'}
+    {'gpio_pin': 'R1', 'direction': 'out'}
 GPIO_CONFIG['SYS_PWROK_BUFF'] = \
-        {'gpio_pin': 'D2', 'direction': 'in'}
+    {'gpio_pin': 'D2', 'direction': 'in'}
 
 # PV_CP_MD_JTAG_ATTENTION_N
 GPIO_CONFIG['CHECKSTOP'] = \
-        {'gpio_pin': 'J2', 'direction': 'falling'}
+    {'gpio_pin': 'J2', 'direction': 'falling'}
 
 GPIO_CONFIG['BMC_CP0_RESET_N'] = \
-        {'gpio_pin': 'A1', 'direction': 'out'}
+    {'gpio_pin': 'A1', 'direction': 'out'}
 # pcie switch reset
 GPIO_CONFIG['BMC_VS1_PERST_N'] = \
-        {'gpio_pin': 'B7', 'direction': 'out'}
+    {'gpio_pin': 'B7', 'direction': 'out'}
 # pcie slots reset - not connected?
 GPIO_CONFIG['BMC_CP0_PERST_ENABLE_R'] = \
-        {'gpio_pin': 'A3', 'direction': 'out'}
+    {'gpio_pin': 'A3', 'direction': 'out'}
 
 # SOFT_FSI_DAT
 GPIO_CONFIG['FSI_DATA'] = \
-        {'gpio_pin': 'E0', 'direction': 'out'}
+    {'gpio_pin': 'E0', 'direction': 'out'}
 # SOFT_FSI_CLK
 GPIO_CONFIG['FSI_CLK'] = \
-        {'gpio_pin': 'AA0', 'direction': 'out'}
+    {'gpio_pin': 'AA0', 'direction': 'out'}
 # BMC_FSI_IN_ENA
 GPIO_CONFIG['FSI_ENABLE'] = \
-        {'gpio_pin': 'D0', 'direction': 'out'}
+    {'gpio_pin': 'D0', 'direction': 'out'}
 # FSI_JMFG0_PRSNT_N
 GPIO_CONFIG['CRONUS_SEL'] = \
-        {'gpio_pin': 'A6', 'direction': 'out'}
+    {'gpio_pin': 'A6', 'direction': 'out'}
 
 # FP_PWR_BTN_N
 GPIO_CONFIG['POWER_BUTTON'] = \
-        {'gpio_pin': 'I3', 'direction': 'both'}
+    {'gpio_pin': 'I3', 'direction': 'both'}
 # BMC_NMIBTN_IN_N
 GPIO_CONFIG['RESET_BUTTON'] = \
-        {'gpio_pin': 'J1', 'direction': 'both'}
+    {'gpio_pin': 'J1', 'direction': 'both'}
 
 # FIXME: needed for Witherspoon?
 # Tracked by openbmc/openbmc#814
@@ -347,22 +348,22 @@
 
 # TODO openbmc/openbmc#2288 - Determine if any pci resets needed
 GPIO_CONFIGS = {
-    'power_config' : {
-        'power_good_in' : 'SYS_PWROK_BUFF',
-        'power_up_outs' : [
+    'power_config': {
+        'power_good_in': 'SYS_PWROK_BUFF',
+        'power_up_outs': [
             ('SOFTWARE_PGOOD', True),
             ('BMC_POWER_UP', True),
         ],
-        'reset_outs' : [
+        'reset_outs': [
             ('BMC_CP0_RESET_N', False),
         ],
     },
-    'hostctl_config' : {
-        'fsi_data' : 'FSI_DATA',
-        'fsi_clk' : 'FSI_CLK',
-        'fsi_enable' : 'FSI_ENABLE',
-        'cronus_sel' : 'CRONUS_SEL',
-        'optionals' : [
+    'hostctl_config': {
+        'fsi_data': 'FSI_DATA',
+        'fsi_clk': 'FSI_CLK',
+        'fsi_enable': 'FSI_ENABLE',
+        'cronus_sel': 'CRONUS_SEL',
+        'optionals': [
         ],
     },
 }
@@ -371,13 +372,13 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {
-    0x07 : { 'class' : 'BootCountSensor' },
-    0x03 : { 'class' : 'BootProgressSensor' },
-    0x02 : { 'class' : 'OperatingSystemStatusSensor' },
+    0x07: {'class': 'BootCountSensor'},
+    0x03: {'class': 'BootProgressSensor'},
+    0x02: {'class': 'OperatingSystemStatusSensor'},
     # Garrison value is used, Not in P9 XML yet.
-    0x0b : { 'class' : 'PowerSupplyRedundancySensor'},
-    0xda : { 'class' : 'TurboAllowedSensor' },
-    0xD8 : { 'class' : 'PowerSupplyDeratingSensor' },
+    0x0b: {'class': 'PowerSupplyRedundancySensor'},
+    0xda: {'class': 'TurboAllowedSensor'},
+    0xD8: {'class': 'PowerSupplyDeratingSensor'},
 }
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/data/ipmi_raw_cmd_table.py b/data/ipmi_raw_cmd_table.py
index 589b97b..b4766dc 100644
--- a/data/ipmi_raw_cmd_table.py
+++ b/data/ipmi_raw_cmd_table.py
@@ -8,7 +8,9 @@
 """
 
 # The currently supported cipher level list.
-# Refer: openbmc/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json
+# Refer:
+# openbmc/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipe
+# s-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json
 valid_cipher_list = [1, 2, 3, 15, 16, 17]
 
 IPMI_RAW_CMD = {
diff --git a/data/ipmi_rest_fru_field_map.py b/data/ipmi_rest_fru_field_map.py
index 4e278cb..80f8479 100644
--- a/data/ipmi_rest_fru_field_map.py
+++ b/data/ipmi_rest_fru_field_map.py
@@ -52,4 +52,3 @@
         # "board_mfg_date": "BuildDate",
     }
 }
-
diff --git a/data/model.py b/data/model.py
index e8b232c..926371b 100755
--- a/data/model.py
+++ b/data/model.py
@@ -31,20 +31,20 @@
 
 def get_inventory_list(module_name):
 
-    l = []
+    inventory_list = []
     m = imp.load_source('module.name', module_name)
 
     for i in m.ID_LOOKUP['FRU']:
         s = m.ID_LOOKUP['FRU'][i]
         s = s.replace('<inventory_root>', m.INVENTORY_ROOT)
-        l.append(s)
+        inventory_list.append(s)
 
-    return l
+    return inventory_list
 
 
 def get_inventory_fru_type_list(module_name, fru_type):
 
-    l = []
+    inventory_list = []
     m = imp.load_source('module.name', module_name)
 
     for i in m.FRU_INSTANCES.keys():
@@ -52,9 +52,9 @@
             print 'found one'
 
             s = i.replace('<inventory_root>', m.INVENTORY_ROOT)
-            l.append(s)
+            inventory_list.append(s)
 
-    return l
+    return inventory_list
 
 
 def call_keyword(keyword):
diff --git a/data/variables.py b/data/variables.py
index 8e840f6..3abaa8b 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -152,7 +152,7 @@
         l_https_port = os.getenv('HTTPS_PORT')
         if l_https_port:
             l_suffix = ':' + l_https_port
-    except:
+    except BaseException:
         print "Environment variable HTTPS_PORT not set,\
               using default HTTPS port"
     return l_suffix