diff --git a/configurations/Tyan_S7106_Baseboard.json b/configurations/Tyan_S7106_Baseboard.json
index e1453b5..9018d3a 100644
--- a/configurations/Tyan_S7106_Baseboard.json
+++ b/configurations/Tyan_S7106_Baseboard.json
@@ -4,85 +4,115 @@
             "Index": 0,
             "Name": "pvccp_p0",
             "ScaleFactor": 0.75,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 0
         },
         {
             "Index": 1,
             "Name": "pvccio_p0",
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 0
         },
         {
             "Index": 2,
             "Name": "pvddq_p0",
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 0
         },
         {
             "Index": 3,
             "Name": "pvpp_p0",
             "ScaleFactor": 0.541666667,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 0
         },
         {
             "Index": 4,
             "Name": "pvccp_p1",
             "ScaleFactor": 0.75,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 1
         },
         {
             "Index": 5,
             "Name": "pvccio_p1",
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 1
         },
         {
             "Index": 6,
             "Name": "pvddq_p1",
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 1
         },
         {
             "Index": 7,
             "Name": "pvpp_p1",
             "ScaleFactor": 0.541666667,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 3,
+            "EntityInstance": 1
         },
         {
             "Index": 8,
             "Name": "vcc12",
             "ScaleFactor": 0.112166667,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Index": 9,
             "Name": "vcc5",
             "ScaleFactor": 0.2666,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Index": 10,
             "Name": "vcc3",
             "ScaleFactor": 0.405151515,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Index": 11,
             "Name": "vcc3_aux",
             "ScaleFactor": 0.405151515,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Index": 12,
             "Name": "p1v8_pch",
             "ScaleFactor": 0.75,
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Index": 13,
             "Name": "pvnn_pch",
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Index": 14,
             "Name": "p1v05_pch",
-            "Type": "ADC"
+            "Type": "ADC",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -94,7 +124,9 @@
             },
             "Index": 0,
             "Name": "cpufan0",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 3,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -106,7 +138,9 @@
             },
             "Index": 1,
             "Name": "cpufan1",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 3,
+            "EntityInstance": 1
         },
         {
             "Connector": {
@@ -118,7 +152,9 @@
             },
             "Index": 2,
             "Name": "fan1",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -130,7 +166,9 @@
             },
             "Index": 3,
             "Name": "fan2",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -142,7 +180,9 @@
             },
             "Index": 4,
             "Name": "fan3",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -154,7 +194,9 @@
             },
             "Index": 5,
             "Name": "fan4",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -166,7 +208,9 @@
             },
             "Index": 6,
             "Name": "fan5",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Connector": {
@@ -178,7 +222,9 @@
             },
             "Index": 7,
             "Name": "fan6",
-            "Type": "AspeedFan"
+            "Type": "AspeedFan",
+            "EntityId": 7,
+            "EntityInstance": 0
         },
         {
             "Address": "0x28",
@@ -187,7 +233,9 @@
             "Name1": "mb_air_inlet",
             "Name2": "sys_air_outlet",
             "Name3": "pch_temp",
-            "Type": "TMP421"
+            "Type": "TMP421",
+            "EntityId": 7,
+            "EntityInstance": 0
         }
     ],
     "Name": "Tyan S7106 Baseboard",