diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index bd0b096..2623dae 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -188,13 +188,19 @@
 INVENTORY_ROOT = '/org/openbmc/inventory'
 
 FRU_INSTANCES = {
-	'<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, },
+	'<inventory_root>/system' : { 'fru_type' : 'SYSTEM','is_fru' : True, 'present' : "True" },
+	'<inventory_root>/system/na' : { 'fru_type' : 'SYSTEM','is_fru' : False, },
 
-	'<inventory_root>/system/chassis' : { 'fru_type' : 'SYSTEM','is_fru' : 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/io_board' : { '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/fan0' : { 'fru_type' : 'FAN','is_fru' : True, },
 	'<inventory_root>/system/chassis/fan1' : { 'fru_type' : 'FAN','is_fru' : True, },
@@ -231,7 +237,7 @@
 	'<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/cpu0/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
+	'<inventory_root>/system/chassis/motherboard/cpu1/core11' : { 'fru_type' : 'CORE', 'is_fru' : False, },
 	
 	'<inventory_root>/system/chassis/motherboard/centaur0' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
 	'<inventory_root>/system/chassis/motherboard/centaur1' : { 'fru_type' : 'MEMORY_BUFFER', 'is_fru' : False, },
@@ -277,12 +283,12 @@
 
 	'<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 = {
@@ -334,11 +340,16 @@
 		0x33 : '<inventory_root>/system',
 	},
 	'FRU_STR' : {
+		'PRODUCT_0'  : '<inventory_root>/system/na',
+		'BOARD_3'    : '<inventory_root>/system/na',
 		'PRODUCT_15' : '<inventory_root>/system',
-		'CHASSIS_2'  : '<inventory_root>/system/chassis',
+		'PRODUCT_33' : '<inventory_root>/system',
+		'PRODUCT_51' : '<inventory_root>/system',
 		'PRODUCT_100': '<inventory_root>/system',
+		'CHASSIS_2'  : '<inventory_root>/system/chassis',
 		'CHASSIS_100': '<inventory_root>/system/chassis',
 		'BOARD_100'  : '<inventory_root>/system/chassis/io_board',
+		'CHASSIS_3'  : '<inventory_root>/system/chassis/motherboard',
 		'BOARD_1'    : '<inventory_root>/system/chassis/motherboard/cpu0',
 		'BOARD_2'    : '<inventory_root>/system/chassis/motherboard/cpu1',
 		'BOARD_4'    : '<inventory_root>/system/chassis/motherboard/centaur0',
@@ -384,7 +395,15 @@
 	},
 	'SENSOR' : {
                 0x35 : '<inventory_root>/system',
+		0x33 : '<inventory_root>/system/powercap',
+		0x35 : '<inventory_root>/system/systemevent',
+		0x36 : '<inventory_root>/system/powerlimit',
                 0x34 : '<inventory_root>/system/chassis/motherboard',
+		0x31 : '<inventory_root>/system/chassis/motherboard/pcielink',
+		0x37 : '<inventory_root>/system/chassis/motherboard/refclock',
+		0x38 : '<inventory_root>/system/chassis/motherboard/pcieclock',
+		0x39 : '<inventory_root>/system/chassis/motherboard/todclock',
+		0x3A : '<inventory_root>/system/chassis/motherboard/apss', 
 		0x0c : '<inventory_root>/system/chassis/motherboard/cpu0',
                 0x0e : '<inventory_root>/system/chassis/motherboard/cpu1',
 		0xc8 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
@@ -399,18 +418,18 @@
 		0xd1 : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
 		0xd2 : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
 		0xd3 : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-                0xd4 : '<inventory_root>/system/chassis/motherboard/cpu0/core12',
-                0xd5 : '<inventory_root>/system/chassis/motherboard/cpu0/core13',
-                0xd6 : '<inventory_root>/system/chassis/motherboard/cpu0/core14',
-                0xd7 : '<inventory_root>/system/chassis/motherboard/cpu0/core15',
-                0xd8 : '<inventory_root>/system/chassis/motherboard/cpu0/core16',
-                0xd9 : '<inventory_root>/system/chassis/motherboard/cpu0/core17',
-                0xda : '<inventory_root>/system/chassis/motherboard/cpu0/core18',
-                0xdb : '<inventory_root>/system/chassis/motherboard/cpu0/core19',
-                0xdc : '<inventory_root>/system/chassis/motherboard/cpu0/core20',
-                0xdd : '<inventory_root>/system/chassis/motherboard/cpu0/core21',
-                0xde : '<inventory_root>/system/chassis/motherboard/cpu0/core22',
-                0xdf : '<inventory_root>/system/chassis/motherboard/cpu0/core23',
+                0xd4 : '<inventory_root>/system/chassis/motherboard/cpu1/core0',
+                0xd5 : '<inventory_root>/system/chassis/motherboard/cpu1/core1',
+                0xd6 : '<inventory_root>/system/chassis/motherboard/cpu1/core2',
+                0xd7 : '<inventory_root>/system/chassis/motherboard/cpu1/core3',
+                0xd8 : '<inventory_root>/system/chassis/motherboard/cpu1/core4',
+                0xd9 : '<inventory_root>/system/chassis/motherboard/cpu1/core5',
+                0xda : '<inventory_root>/system/chassis/motherboard/cpu1/core6',
+                0xdb : '<inventory_root>/system/chassis/motherboard/cpu1/core7',
+                0xdc : '<inventory_root>/system/chassis/motherboard/cpu1/core8',
+                0xdd : '<inventory_root>/system/chassis/motherboard/cpu1/core9',
+                0xde : '<inventory_root>/system/chassis/motherboard/cpu1/core10',
+                0xdf : '<inventory_root>/system/chassis/motherboard/cpu1/core11',
 		0x40 : '<inventory_root>/system/chassis/motherboard/centaur0',
     	        0x41 : '<inventory_root>/system/chassis/motherboard/centaur1',
        		0x42 : '<inventory_root>/system/chassis/motherboard/centaur2',