diff --git a/data/Palmetto.py b/data/Palmetto.py
index bb4d6f2..ee966e9 100755
--- a/data/Palmetto.py
+++ b/data/Palmetto.py
@@ -173,24 +173,23 @@
 	'<inventory_root>/system/chassis/fan3' : { 'fru_type' : 'FAN','is_fru' : True, },
 	'<inventory_root>/system/chassis/fan4' : { 'fru_type' : 'FAN','is_fru' : True, },
 
-	'<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 
+	'<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/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/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/membuf0' : { '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,},
@@ -211,8 +210,8 @@
 	'FRU' : {
 		0x0d : '<inventory_root>/system/chassis',
 		0x34 : '<inventory_root>/system/chassis/motherboard',
-		0x01 : '<inventory_root>/system/chassis/motherboard/cpu0',
-		0x02 : '<inventory_root>/system/chassis/motherboard/membuf0',
+		0x01 : '<inventory_root>/system/chassis/motherboard/cpu',
+		0x02 : '<inventory_root>/system/chassis/motherboard/membuf',
 		0x03 : '<inventory_root>/system/chassis/motherboard/dimm0',
 		0x04 : '<inventory_root>/system/chassis/motherboard/dimm1',
 		0x05 : '<inventory_root>/system/chassis/motherboard/dimm2',
@@ -222,8 +221,8 @@
 	'FRU_STR' : {
 		'PRODUCT_15' : '<inventory_root>/system',
 		'CHASSIS_2' : '<inventory_root>/system/chassis',
-		'BOARD_1'   : '<inventory_root>/system/chassis/motherboard/cpu0',
-		'BOARD_2'   : '<inventory_root>/system/chassis/motherboard/membuf0',
+		'BOARD_1'   : '<inventory_root>/system/chassis/motherboard/cpu',
+		'BOARD_2'   : '<inventory_root>/system/chassis/motherboard/membuf',
 		'BOARD_14'   : '<inventory_root>/system/chassis/motherboard',
 		'PRODUCT_3'   : '<inventory_root>/system/chassis/motherboard/dimm0',
 		'PRODUCT_4'   : '<inventory_root>/system/chassis/motherboard/dimm1',
@@ -232,25 +231,24 @@
 	},
 	'SENSOR' : {
 		0x34 : '<inventory_root>/system/chassis/motherboard',
-		0x35 : '<inventory_root>/system/systemevent',
 		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',
-		0x2f : '<inventory_root>/system/chassis/motherboard/cpu0',
-		0x22 : '<inventory_root>/system/chassis/motherboard/cpu0/core0',
-		0x23 : '<inventory_root>/system/chassis/motherboard/cpu0/core1',
-		0x24 : '<inventory_root>/system/chassis/motherboard/cpu0/core2',
-		0x25 : '<inventory_root>/system/chassis/motherboard/cpu0/core3',
-		0x26 : '<inventory_root>/system/chassis/motherboard/cpu0/core4',
-		0x27 : '<inventory_root>/system/chassis/motherboard/cpu0/core5',
-		0x28 : '<inventory_root>/system/chassis/motherboard/cpu0/core6',
-		0x29 : '<inventory_root>/system/chassis/motherboard/cpu0/core7',
-		0x2a : '<inventory_root>/system/chassis/motherboard/cpu0/core8',
-		0x2b : '<inventory_root>/system/chassis/motherboard/cpu0/core9',
-		0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core10',
-		0x2d : '<inventory_root>/system/chassis/motherboard/cpu0/core11',
-		0x2e : '<inventory_root>/system/chassis/motherboard/membuf0',
+		0x3A : '<inventory_root>/system/chassis/apss',
+		0x2f : '<inventory_root>/system/chassis/motherboard/cpu',
+		0x22 : '<inventory_root>/system/chassis/motherboard/cpu/core1',
+		0x23 : '<inventory_root>/system/chassis/motherboard/cpu/core2',
+		0x24 : '<inventory_root>/system/chassis/motherboard/cpu/core3',
+		0x25 : '<inventory_root>/system/chassis/motherboard/cpu/core4',
+		0x26 : '<inventory_root>/system/chassis/motherboard/cpu/core5',
+		0x27 : '<inventory_root>/system/chassis/motherboard/cpu/core6',
+		0x28 : '<inventory_root>/system/chassis/motherboard/cpu/core9',
+		0x29 : '<inventory_root>/system/chassis/motherboard/cpu/core10',
+		0x2a : '<inventory_root>/system/chassis/motherboard/cpu/core11',
+		0x2b : '<inventory_root>/system/chassis/motherboard/cpu/core12',
+		0x2c : '<inventory_root>/system/chassis/motherboard/cpu/core13',
+		0x2d : '<inventory_root>/system/chassis/motherboard/cpu/core14',
+		0x2e : '<inventory_root>/system/chassis/motherboard/membuf',
 		0x1e : '<inventory_root>/system/chassis/motherboard/dimm0',
 		0x1f : '<inventory_root>/system/chassis/motherboard/dimm1',
 		0x20 : '<inventory_root>/system/chassis/motherboard/dimm2',