UPdated BIT definitions and UI.

22 files changed, 1011 insertions, 936 deletions

diff --git a/Software/DB/PPC/PPC Test/Tango.mdf b/Software/DB/PPC/PPC Test/Tango.mdf
index 047af553a..53f3618f7 100644
--- a/Software/DB/PPC/PPC Test/Tango.mdf
+++ b/Software/DB/PPC/PPC Test/Tango.mdf
diff --git a/Software/DB/PPC/PPC Test/Tango_log.ldf b/Software/DB/PPC/PPC Test/Tango_log.ldf
index 4db222dee..3d28afa30 100644
--- a/Software/DB/PPC/PPC Test/Tango_log.ldf
+++ b/Software/DB/PPC/PPC Test/Tango_log.ldf
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 4588de47d..49a9a3f84 100644
--- a/Software/DB/PPC/Tango.mdf
+++ b/Software/DB/PPC/Tango.mdf
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 6157eaa92..727158a9f 100644
--- a/Software/DB/PPC/Tango_log.ldf
+++ b/Software/DB/PPC/Tango_log.ldf
diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf
index c9a811514..0e9b01247 100644
--- a/Software/DB/TCC/TCC.mdf
+++ b/Software/DB/TCC/TCC.mdf
diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf
index bdaa498bf..932a4f377 100644
--- a/Software/DB/TCC/TCC_log.ldf
+++ b/Software/DB/TCC/TCC_log.ldf
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index a7cbb8039..a395f858c 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 47181300a..9d93fc808 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/PMR/Messages/Diagnostics/BitType.proto b/Software/PMR/Messages/Diagnostics/BitType.proto
index 93bf4fb4d..79dc38f8a 100644
--- a/Software/PMR/Messages/Diagnostics/BitType.proto
+++ b/Software/PMR/Messages/Diagnostics/BitType.proto
@@ -43,29 +43,29 @@ enum BitType
     //Waste 2 RFID Reader
     Waste2RFIDReader = 2002;
 
-    //Dispenser 1  I2C Comm
-    Dispenser1I2CComm = 3000;
+    //Dispenser K I2C Comm
+    DispenserKI2CComm = 3000;
 
-    //Dispenser 2 I2C Comm
-    Dispenser2I2CComm = 3001;
+    //Dispenser C I2C Comm
+    DispenserCI2CComm = 3001;
 
-    //Dispenser 3 I2C Comm
-    Dispenser3I2CComm = 3002;
+    //Dispenser M I2C Comm
+    DispenserMI2CComm = 3002;
 
-    //Dispenser 4 I2C Comm
-    Dispenser4I2CComm = 3003;
+    //Dispenser Y I2C Comm
+    DispenserYI2CComm = 3003;
 
-    //Dispenser 5 I2C Comm
-    Dispenser5I2CComm = 3004;
+    //Dispenser TI I2C Comm
+    DispenserTII2CComm = 3004;
 
-    //Dispenser 6 I2C Comm
-    Dispenser6I2CComm = 3005;
+    //Dispenser LC I2C Comm
+    DispenserLCI2CComm = 3005;
 
-    //Dispenser 7 I2C Comm
-    Dispenser7I2CComm = 3006;
+    //Dispenser LM I2C Comm
+    DispenserLMI2CComm = 3006;
 
-    //Dispenser 8 I2C Comm
-    Dispenser8I2CComm = 3007;
+    //Dispenser LY I2C Comm
+    DispenserLYI2CComm = 3007;
 
     //Head Type Identified
     HeadTypeIdentified = 3008;
@@ -82,20 +82,20 @@ enum BitType
     //USB Communication
     USBCommunication = 5000;
 
-    //Drawer Big Fan 
-    DrawerBigFan = 6000;
+    //EC Big Fan 
+    ECBigFan = 6000;
 
-    //Drawer Small 1 Fan
-    DrawerSmall1Fan = 6001;
+    //EC Small 1 Fan
+    ECSmall1Fan = 6001;
 
-    //Drawer Small 2 Fan
-    DrawerSmall2Fan = 6002;
+    //EC Small 2 Fan
+    ECSmall2Fan = 6002;
 
-    //Drawer Small 3 Fan
-    DrawerSmall3Fan = 6003;
+    //EC Small 3 Fan
+    ECSmall3Fan = 6003;
 
-    //Drawer Small 4 Fan
-    DrawerSmall4Fan = 6004;
+    //EC Small 4 Fan
+    ECSmall4Fan = 6004;
 
     //System Fan 1
     SystemFan1 = 6005;
@@ -127,44 +127,44 @@ enum BitType
     //Pt100 Read Dryer 2
     Pt100ReadDryer2 = 8002;
 
-    //Pt100 Read Head 1
-    Pt100ReadHead1 = 8003;
+    //Pt100 Read Head Zone 1
+    Pt100ReadHeadZone1 = 8003;
 
-    //Pt100 Read Head 2
-    Pt100ReadHead2 = 8004;
+    //Pt100 Read Head Zone 2
+    Pt100ReadHeadZone2 = 8004;
 
-    //Pt100 Read Head 3
-    Pt100ReadHead3 = 8005;
+    //Pt100 Read Head Zone 3
+    Pt100ReadHeadZone3 = 8005;
 
-    //Pt100 Read Head 4
-    Pt100ReadHead4 = 8006;
+    //Pt100 Read Head Zone 4
+    Pt100ReadHeadZone4 = 8006;
 
-    //Pt100 Read Head 5
-    Pt100ReadHead5 = 8007;
+    //Pt100 Read Head Zone 5
+    Pt100ReadHeadZone5 = 8007;
 
-    //Pt100 Read Head 6
-    Pt100ReadHead6 = 8008;
+    //Pt100 Read Head Zone 6
+    Pt100ReadHeadZone6 = 8008;
 
     //Pt100 Read Mixer
     Pt100ReadMixer = 8009;
 
-    //Pt100 Read Head 7
-    Pt100ReadHead7 = 8010;
+    //Pt100 Read Head Zone 7
+    Pt100ReadHeadZone7 = 8010;
 
-    //Pt100 Read Head 8
-    Pt100ReadHead8 = 8011;
+    //Pt100 Read Head Zone 8
+    Pt100ReadHeadZone8 = 8011;
 
-    //Pt100 Read Head 9
-    Pt100ReadHead9 = 8012;
+    //Pt100 Read Head Zone 9
+    Pt100ReadHeadZone9 = 8012;
 
-    //Pt100 Read Head 10
-    Pt100ReadHead10 = 8013;
+    //Pt100 Read Head Zone 10
+    Pt100ReadHeadZone10 = 8013;
 
-    //Pt100 Read Head 11
-    Pt100ReadHead11 = 8014;
+    //Pt100 Read Head Zone 11
+    Pt100ReadHeadZone11 = 8014;
 
-    //Pt100 Read Head 12
-    Pt100ReadHead12 = 8015;
+    //Pt100 Read Head Zone 12
+    Pt100ReadHeadZone12 = 8015;
 
     //Pt100 Read Head Blower In
     Pt100ReadHeadBlowerIn = 8016;
@@ -187,44 +187,44 @@ enum BitType
     //Current Break  Dryer 2
     CurrentBreakDryer2 = 8022;
 
-    //Current Break  Head 1
-    CurrentBreakHead1 = 8023;
+    //Current Break Head Zone 1
+    CurrentBreakHeadZone1 = 8023;
 
-    //Current Break  Head 2
-    CurrentBreakHead2 = 8024;
+    //Current Break Head Zone 2
+    CurrentBreakHeadZone2 = 8024;
 
-    //Current Break  Head 3
-    CurrentBreakHead3 = 8025;
+    //Current Break Head Zone 3
+    CurrentBreakHeadZone3 = 8025;
 
-    //Current Break  Head 4
-    CurrentBreakHead4 = 8026;
+    //Current Break Head Zone 4
+    CurrentBreakHeadZone4 = 8026;
 
-    //Current Break  Head 5
-    CurrentBreakHead5 = 8027;
+    //Current Break Head Zone 5
+    CurrentBreakHeadZone5 = 8027;
 
-    //Current Break  Head 6
-    CurrentBreakHead6 = 8028;
+    //Current Break Head Zone 6
+    CurrentBreakHeadZone6 = 8028;
 
     //Current Break Mixer
     CurrentBreakMixer = 8029;
 
-    //Current Break  Head 7
-    CurrentBreakHead7 = 8030;
+    //Current Break Head Zone 7
+    CurrentBreakHeadZone7 = 8030;
 
-    //Current Break  Head 8
-    CurrentBreakHead8 = 8031;
+    //Current Break Head Zone 8
+    CurrentBreakHeadZone8 = 8031;
 
-    //Current Break  Head 9
-    CurrentBreakHead9 = 8032;
+    //Current Break Head Zone 9
+    CurrentBreakHeadZone9 = 8032;
 
-    //Current Break  Head 10
-    CurrentBreakHead10 = 8033;
+    //Current Break Head Zone 10
+    CurrentBreakHeadZone10 = 8033;
 
-    //Current Break  Head 11
-    CurrentBreakHead11 = 8034;
+    //Current Break Head Zone 11
+    CurrentBreakHeadZone11 = 8034;
 
-    //Current Break  Head 12
-    CurrentBreakHead12 = 8035;
+    //Current Break Head Zone 12
+    CurrentBreakHeadZone12 = 8035;
 
     //Current Break  Head Blower In
     CurrentBreakHeadBlowerIn = 8036;
@@ -238,44 +238,44 @@ enum BitType
     //Current Dryer 2
     CurrentDryer2 = 8039;
 
-    //Current Head 1
-    CurrentHead1 = 8040;
+    //Current Head Zone 1
+    CurrentHeadZone1 = 8040;
 
-    //Current Head 2
-    CurrentHead2 = 8041;
+    //Current Head Zone 2
+    CurrentHeadZone2 = 8041;
 
-    //Current Head 3
-    CurrentHead3 = 8042;
+    //Current Head Zone 3
+    CurrentHeadZone3 = 8042;
 
-    //Current Head 4
-    CurrentHead4 = 8043;
+    //Current Head Zone 4
+    CurrentHeadZone4 = 8043;
 
-    //Current Head 5
-    CurrentHead5 = 8044;
+    //Current Head Zone 5
+    CurrentHeadZone5 = 8044;
 
-    //Current Head 6
-    CurrentHead6 = 8045;
+    //Current Head Zone 6
+    CurrentHeadZone6 = 8045;
 
     //Current Mixer
     CurrentMixer = 8046;
 
-    //Current Head 7
-    CurrentHead7 = 8047;
+    //Current Head Zone 7
+    CurrentHeadZone7 = 8047;
 
-    //Current Head 8
-    CurrentHead8 = 8048;
+    //Current Head Zone 8
+    CurrentHeadZone8 = 8048;
 
-    //Current Head 9
-    CurrentHead9 = 8049;
+    //Current Head Zone 9
+    CurrentHeadZone9 = 8049;
 
-    //Current Head 10
-    CurrentHead10 = 8050;
+    //Current Head Zone 10
+    CurrentHeadZone10 = 8050;
 
-    //Current Head 11
-    CurrentHead11 = 8051;
+    //Current Head Zone 11
+    CurrentHeadZone11 = 8051;
 
-    //Current Head 12
-    CurrentHead12 = 8052;
+    //Current Head Zone 12
+    CurrentHeadZone12 = 8052;
 
     //Current Head Blower In
     CurrentHeadBlowerIn = 8053;
@@ -289,44 +289,44 @@ enum BitType
     //Heater Dryer 2
     HeaterDryer2 = 8056;
 
-    //Heater Head 1
-    HeaterHead1 = 8057;
+    //Heater Head Zone 1
+    HeaterHeadZone1 = 8057;
 
-    //Heater Head 2
-    HeaterHead2 = 8058;
+    //Heater Head Zone 2
+    HeaterHeadZone2 = 8058;
 
-    //Heater Head 3
-    HeaterHead3 = 8059;
+    //Heater Head Zone 3
+    HeaterHeadZone3 = 8059;
 
-    //Heater Head 4
-    HeaterHead4 = 8060;
+    //Heater Head Zone 4
+    HeaterHeadZone4 = 8060;
 
-    //Heater Head 5
-    HeaterHead5 = 8061;
+    //Heater Head Zone 5
+    HeaterHeadZone5 = 8061;
 
-    //Heater Head 6
-    HeaterHead6 = 8062;
+    //Heater Head Zone 6
+    HeaterHeadZone6 = 8062;
 
     //Heater Mixer
     HeaterMixer = 8063;
 
-    //Heater Head 7
-    HeaterHead7 = 8064;
+    //Heater Head Zone 7
+    HeaterHeadZone7 = 8064;
 
-    //Heater Head 8
-    HeaterHead8 = 8065;
+    //Heater Head Zone 8
+    HeaterHeadZone8 = 8065;
 
-    //Heater Head 9
-    HeaterHead9 = 8066;
+    //Heater Head Zone 9
+    HeaterHeadZone9 = 8066;
 
-    //Heater Head 10
-    HeaterHead10 = 8067;
+    //Heater Head Zone 10
+    HeaterHeadZone10 = 8067;
 
-    //Heater Head 11
-    HeaterHead11 = 8068;
+    //Heater Head Zone 11
+    HeaterHeadZone11 = 8068;
 
-    //Heater Head 12
-    HeaterHead12 = 8069;
+    //Heater Head Zone 12
+    HeaterHeadZone12 = 8069;
 
     //Heater Head Blower In
     HeaterHeadBlowerIn = 8070;
@@ -352,29 +352,29 @@ enum BitType
     //Powerstep Dryer Loadarm
     PowerstepDryerLoadarm = 9005;
 
-    //Powerstep Dispenser 1
-    PowerstepDispenser1 = 9006;
+    //Powerstep Dispenser K
+    PowerstepDispenserK = 9006;
 
-    //Powerstep Dispenser 2
-    PowerstepDispenser2 = 9007;
+    //Powerstep Dispenser C
+    PowerstepDispenserC = 9007;
 
-    //Powerstep Dispenser 3
-    PowerstepDispenser3 = 9008;
+    //Powerstep Dispenser M
+    PowerstepDispenserM = 9008;
 
-    //Powerstep Dispenser 4
-    PowerstepDispenser4 = 9009;
+    //Powerstep Dispenser Y
+    PowerstepDispenserY = 9009;
 
-    //Powerstep Dispenser 5
-    PowerstepDispenser5 = 9010;
+    //Powerstep Dispenser TI
+    PowerstepDispenserTI = 9010;
 
-    //Powerstep Dispenser 6
-    PowerstepDispenser6 = 9011;
+    //Powerstep Dispenser LC
+    PowerstepDispenserLC = 9011;
 
-    //Powerstep Dispenser 7
-    PowerstepDispenser7 = 9012;
+    //Powerstep Dispenser LM
+    PowerstepDispenserLM = 9012;
 
-    //Powerstep Dispenser 8
-    PowerstepDispenser8 = 9013;
+    //Powerstep Dispenser LY
+    PowerstepDispenserLY = 9013;
 
     //Powerstep Screw 
     PowerstepScrew = 9014;
@@ -442,29 +442,29 @@ enum BitType
     //Motor Wire Read Dryer Loadarm
     MotorWireReadDryerLoadarm = 9035;
 
-    //Motor Wire Read Dispenser 1
-    MotorWireReadDispenser1 = 9036;
+    //Motor Wire Read Dispenser K
+    MotorWireReadDispenserK = 9036;
 
-    //Motor Wire Read Dispenser 2
-    MotorWireReadDispenser2 = 9037;
+    //Motor Wire Read Dispenser C
+    MotorWireReadDispenserC = 9037;
 
-    //Motor Wire Read Dispenser 3
-    MotorWireReadDispenser3 = 9038;
+    //Motor Wire Read Dispenser M
+    MotorWireReadDispenserM = 9038;
 
-    //Motor Wire Read Dispenser 4
-    MotorWireReadDispenser4 = 9039;
+    //Motor Wire Read Dispenser Y
+    MotorWireReadDispenserY = 9039;
 
-    //Motor Wire Read Dispenser 5
-    MotorWireReadDispenser5 = 9040;
+    //Motor Wire Read Dispenser TI
+    MotorWireReadDispenserTI = 9040;
 
-    //Motor Wire Read Dispenser 6
-    MotorWireReadDispenser6 = 9041;
+    //Motor Wire Read Dispenser LC
+    MotorWireReadDispenserLC = 9041;
 
-    //Motor Wire Read Dispenser 7
-    MotorWireReadDispenser7 = 9042;
+    //Motor Wire Read Dispenser LM
+    MotorWireReadDispenserLM = 9042;
 
-    //Motor Wire Read Dispenser 8
-    MotorWireReadDispenser8 = 9043;
+    //Motor Wire Read Dispenser LY
+    MotorWireReadDispenserLY = 9043;
 
     //Motor Wire Read Screw 
     MotorWireReadScrew = 9044;
@@ -544,52 +544,52 @@ enum BitType
     //WHS Other Sensor Failure
     WHSOtherSensorFailure = 10009;
 
-    //Pressure Building Up 1
-    PressureBuildingUp1 = 11000;
+    //Pressure Building Up K
+    PressureBuildingUpK = 11000;
 
-    //Pressure Building Up 2
-    PressureBuildingUp2 = 11001;
+    //Pressure Building Up C
+    PressureBuildingUpC = 11001;
 
-    //Pressure Building Up 3
-    PressureBuildingUp3 = 11002;
+    //Pressure Building Up M
+    PressureBuildingUpM = 11002;
 
-    //Pressure Building Up 4
-    PressureBuildingUp4 = 11003;
+    //Pressure Building Up Y
+    PressureBuildingUpY = 11003;
 
-    //Pressure Building Up 5
-    PressureBuildingUp5 = 11004;
+    //Pressure Building Up TI
+    PressureBuildingUpTI = 11004;
 
-    //Pressure Building Up 6
-    PressureBuildingUp6 = 11005;
+    //Pressure Building Up LC
+    PressureBuildingUpLC = 11005;
 
-    //Pressure Building Up 7
-    PressureBuildingUp7 = 11006;
+    //Pressure Building Up LM
+    PressureBuildingUpLM = 11006;
 
-    //Pressure Building Up 8
-    PressureBuildingUp8 = 11007;
+    //Pressure Building Up LY
+    PressureBuildingUpLY = 11007;
 
-    //Pressure Released 1
-    PressureReleased1 = 11008;
+    //Pressure Released K
+    PressureReleasedK = 11008;
 
-    //Pressure Released 2
-    PressureReleased2 = 11009;
+    //Pressure Released C
+    PressureReleasedC = 11009;
 
-    //Pressure Released 3
-    PressureReleased3 = 11010;
+    //Pressure Released M
+    PressureReleasedM = 11010;
 
-    //Pressure Released 4
-    PressureReleased4 = 11011;
+    //Pressure Released Y
+    PressureReleasedY = 11011;
 
-    //Pressure Released 5
-    PressureReleased5 = 11012;
+    //Pressure Released TI
+    PressureReleasedTI = 11012;
 
-    //Pressure Released 6
-    PressureReleased6 = 11013;
+    //Pressure Released LC
+    PressureReleasedLC = 11013;
 
-    //Pressure Released 7
-    PressureReleased7 = 11014;
+    //Pressure Released LM
+    PressureReleasedLM = 11014;
 
-    //Pressure Released 8
-    PressureReleased8 = 11015;
+    //Pressure Released LY
+    PressureReleasedLY = 11015;
 
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml
index 59bff14eb..a2e42ac3f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml
@@ -6,7 +6,7 @@
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs"
              mc:Ignorable="d" 
-             Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="700" Height="1000" d:DataContext="{d:DesignInstance Type=local:BitResultsViewVM, IsDesignTimeCreatable=False}">
+             Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="750" Height="1000" d:DataContext="{d:DesignInstance Type=local:BitResultsViewVM, IsDesignTimeCreatable=False}">
     <Grid Margin="20">
         <DockPanel>
 
@@ -15,7 +15,10 @@
             </Grid>
 
             <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center">
-                <Image Source="../Images/machine.png" Stretch="Uniform" Width="100" RenderOptions.BitmapScalingMode="Fant" />
+                <Grid Width="100">
+                    <Image Source="../Images/machine.png" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" />
+                    <Image Source="../Images/bit.png" Stretch="None" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -20 -5" />
+                </Grid>
                 <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Machine BIT Results</TextBlock>
             </StackPanel>
 
@@ -90,8 +93,17 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTextColumn Header="Test" Width="250" Binding="{Binding BitType.Name}" />
-                        <DataGridTextColumn Header="Subject" Width="100" Binding="{Binding BitType.Subject}" />
+                        <DataGridTemplateColumn Header="Test" Width="360">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                        <Run>#</Run><Run Text="{Binding BitType.Code,Mode=OneWay}"></Run>
+                                        <Run Text="{Binding BitType.Description,Mode=OneWay}"></Run>
+                                    </TextBlock>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <!--<DataGridTextColumn Header="Subject" Width="100" Binding="{Binding BitType.Subject}" />-->
                         <DataGridTextColumn Header="Description" Width="1*" Binding="{Binding BitResult.Description}" />
                     </DataGrid.Columns>
                 </touch:TouchSimpleDataGrid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png
new file mode 100644
index 000000000..246be3c17
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index fcffb0dcc..6d2c3ff44 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -484,6 +484,7 @@
     <Resource Include="Images\ThreadLoading\NewThread\ReadyForLoading\arc\6.JPG" />
     <Resource Include="Images\ThreadLoading\NewThread\ReadyForLoading\arc\7.jpg" />
     <Resource Include="Images\ThreadLoading\NewThread\machine_full.jpg" />
+    <Resource Include="Images\bit.png" />
     <Content Include="Manifests\release.xml" />
     <Content Include="Manifests\debug.xml" />
     <None Include="firmware_package.tfp">
diff --git a/Software/Visual_Studio/Resources/BIT/Built InTest List Rev 9.0.xlsx b/Software/Visual_Studio/Resources/BIT/Built InTest List Rev 9.0.xlsx
new file mode 100644
index 000000000..474f6c855
--- /dev/null
+++ b/Software/Visual_Studio/Resources/BIT/Built InTest List Rev 9.0.xlsx
diff --git a/Software/Visual_Studio/Tango.BL/DTO/BitTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BitTypeDTOBase.cs
index 983641c8f..a8e77ff1c 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/BitTypeDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/BitTypeDTOBase.cs
@@ -38,6 +38,14 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// description
+        /// </summary>
+        public String Description 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// subject
         /// </summary>
         public String Subject 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BitTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BitTypeBase.cs
index a87f71725..64da21c4c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BitTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BitTypeBase.cs
@@ -31,6 +31,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> NameChanged;
 
+        public event EventHandler<String> DescriptionChanged;
+
         public event EventHandler<String> SubjectChanged;
 
         public event EventHandler<Int32> ComponentIndexChanged;
@@ -91,6 +93,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _description;
+
+        /// <summary>
+        /// Gets or sets the bittypebase description.
+        /// </summary>
+
+        [Column("DESCRIPTION")]
+
+        public  String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                if (_description != value)
+                {
+                    _description = value;
+
+                    OnDescriptionChanged(value);
+
+                }
+            }
+        }
+
         protected String _subject;
 
         /// <summary>
@@ -191,6 +220,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
         /// Called when the Subject has changed.
         /// </summary>
         protected virtual void OnSubjectChanged(String subject)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs
index b8409e5f1..e0c35c0c5 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs
@@ -20,1149 +20,1149 @@ namespace Tango.BL.Enumerations
     {
 
         /// <summary>
-        /// (Incoming Voltage Too High)
+        /// ()
         /// </summary>
-        [Description("Incoming Voltage Too High")]
+        [Description("")]
         IncomingVoltageTooHigh = 1000,
 
         /// <summary>
-        /// (Incoming Voltage Too Low)
+        /// ()
         /// </summary>
-        [Description("Incoming Voltage Too Low")]
+        [Description("")]
         IncomingVoltageTooLow = 1001,
 
         /// <summary>
-        /// (Flash File System Missing)
+        /// ()
         /// </summary>
-        [Description("Flash File System Missing")]
+        [Description("")]
         FlashFileSystemMissing = 1002,
 
         /// <summary>
-        /// (HW Version File Missing)
+        /// ()
         /// </summary>
-        [Description("HW Version File Missing")]
+        [Description("")]
         HWVersionFileMissing = 1003,
 
         /// <summary>
-        /// (Alarm File Missing)
+        /// ()
         /// </summary>
-        [Description("Alarm File Missing")]
+        [Description("")]
         AlarmFileMissing = 1004,
 
         /// <summary>
-        /// (Ink RFID Reader)
+        /// ()
         /// </summary>
-        [Description("Ink RFID Reader")]
+        [Description("")]
         InkRFIDReader = 2000,
 
         /// <summary>
-        /// (Waste 1 RFID Reader)
+        /// ()
         /// </summary>
-        [Description("Waste 1 RFID Reader")]
+        [Description("")]
         Waste1RFIDReader = 2001,
 
         /// <summary>
-        /// (Waste 2 RFID Reader)
+        /// ()
         /// </summary>
-        [Description("Waste 2 RFID Reader")]
+        [Description("")]
         Waste2RFIDReader = 2002,
 
         /// <summary>
-        /// (Dispenser 1  I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 1  I2C Comm")]
+        [Description("")]
         Dispenser1I2CComm = 3000,
 
         /// <summary>
-        /// (Dispenser 2 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 2 I2C Comm")]
+        [Description("")]
         Dispenser2I2CComm = 3001,
 
         /// <summary>
-        /// (Dispenser 3 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 3 I2C Comm")]
+        [Description("")]
         Dispenser3I2CComm = 3002,
 
         /// <summary>
-        /// (Dispenser 4 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 4 I2C Comm")]
+        [Description("")]
         Dispenser4I2CComm = 3003,
 
         /// <summary>
-        /// (Dispenser 5 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 5 I2C Comm")]
+        [Description("")]
         Dispenser5I2CComm = 3004,
 
         /// <summary>
-        /// (Dispenser 6 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 6 I2C Comm")]
+        [Description("")]
         Dispenser6I2CComm = 3005,
 
         /// <summary>
-        /// (Dispenser 7 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 7 I2C Comm")]
+        [Description("")]
         Dispenser7I2CComm = 3006,
 
         /// <summary>
-        /// (Dispenser 8 I2C Comm)
+        /// ()
         /// </summary>
-        [Description("Dispenser 8 I2C Comm")]
+        [Description("")]
         Dispenser8I2CComm = 3007,
 
         /// <summary>
-        /// (Head Type Identified)
+        /// ()
         /// </summary>
-        [Description("Head Type Identified")]
+        [Description("")]
         HeadTypeIdentified = 3008,
 
         /// <summary>
-        /// (WHS Type Identified)
+        /// ()
         /// </summary>
-        [Description("WHS Type Identified")]
+        [Description("")]
         WHSTypeIdentified = 3009,
 
         /// <summary>
-        /// (Communication With Shinko)
+        /// ()
         /// </summary>
-        [Description("Communication With Shinko")]
+        [Description("")]
         CommunicationWithShinko = 4000,
 
         /// <summary>
-        /// (Communication With BTSR)
+        /// ()
         /// </summary>
-        [Description("Communication With BTSR")]
+        [Description("")]
         CommunicationWithBTSR = 4001,
 
         /// <summary>
-        /// (USB Communication)
+        /// ()
         /// </summary>
-        [Description("USB Communication")]
+        [Description("")]
         USBCommunication = 5000,
 
         /// <summary>
-        /// (Drawer Big Fan )
+        /// ()
         /// </summary>
-        [Description("Drawer Big Fan ")]
+        [Description("")]
         DrawerBigFan = 6000,
 
         /// <summary>
-        /// (Drawer Small 1 Fan)
+        /// ()
         /// </summary>
-        [Description("Drawer Small 1 Fan")]
+        [Description("")]
         DrawerSmall1Fan = 6001,
 
         /// <summary>
-        /// (Drawer Small 2 Fan)
+        /// ()
         /// </summary>
-        [Description("Drawer Small 2 Fan")]
+        [Description("")]
         DrawerSmall2Fan = 6002,
 
         /// <summary>
-        /// (Drawer Small 3 Fan)
+        /// ()
         /// </summary>
-        [Description("Drawer Small 3 Fan")]
+        [Description("")]
         DrawerSmall3Fan = 6003,
 
         /// <summary>
-        /// (Drawer Small 4 Fan)
+        /// ()
         /// </summary>
-        [Description("Drawer Small 4 Fan")]
+        [Description("")]
         DrawerSmall4Fan = 6004,
 
         /// <summary>
-        /// (System Fan 1)
+        /// ()
         /// </summary>
-        [Description("System Fan 1")]
+        [Description("")]
         SystemFan1 = 6005,
 
         /// <summary>
-        /// (System Fan 2)
+        /// ()
         /// </summary>
-        [Description("System Fan 2")]
+        [Description("")]
         SystemFan2 = 6006,
 
         /// <summary>
-        /// (System Fan 3)
+        /// ()
         /// </summary>
-        [Description("System Fan 3")]
+        [Description("")]
         SystemFan3 = 6007,
 
         /// <summary>
-        /// (Winder Dancer Status Read)
+        /// ()
         /// </summary>
-        [Description("Winder Dancer Status Read")]
+        [Description("")]
         WinderDancerStatusRead = 7000,
 
         /// <summary>
-        /// (Puller Dancer Status Read)
+        /// ()
         /// </summary>
-        [Description("Puller Dancer Status Read")]
+        [Description("")]
         PullerDancerStatusRead = 7001,
 
         /// <summary>
-        /// (Feeder Dancer Status Read)
+        /// ()
         /// </summary>
-        [Description("Feeder Dancer Status Read")]
+        [Description("")]
         FeederDancerStatusRead = 7002,
 
         /// <summary>
-        /// (Dryer Encoder Status Read)
+        /// ()
         /// </summary>
-        [Description("Dryer Encoder Status Read")]
+        [Description("")]
         DryerEncoderStatusRead = 7003,
 
         /// <summary>
-        /// (Pt100 Read Dryer Air)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Dryer Air")]
+        [Description("")]
         Pt100ReadDryerAir = 8000,
 
         /// <summary>
-        /// (Pt100 Read Dryer 1)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Dryer 1")]
+        [Description("")]
         Pt100ReadDryer1 = 8001,
 
         /// <summary>
-        /// (Pt100 Read Dryer 2)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Dryer 2")]
+        [Description("")]
         Pt100ReadDryer2 = 8002,
 
         /// <summary>
-        /// (Pt100 Read Head 1)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 1")]
+        [Description("")]
         Pt100ReadHead1 = 8003,
 
         /// <summary>
-        /// (Pt100 Read Head 2)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 2")]
+        [Description("")]
         Pt100ReadHead2 = 8004,
 
         /// <summary>
-        /// (Pt100 Read Head 3)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 3")]
+        [Description("")]
         Pt100ReadHead3 = 8005,
 
         /// <summary>
-        /// (Pt100 Read Head 4)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 4")]
+        [Description("")]
         Pt100ReadHead4 = 8006,
 
         /// <summary>
-        /// (Pt100 Read Head 5)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 5")]
+        [Description("")]
         Pt100ReadHead5 = 8007,
 
         /// <summary>
-        /// (Pt100 Read Head 6)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 6")]
+        [Description("")]
         Pt100ReadHead6 = 8008,
 
         /// <summary>
-        /// (Pt100 Read Mixer)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Mixer")]
+        [Description("")]
         Pt100ReadMixer = 8009,
 
         /// <summary>
-        /// (Pt100 Read Head 7)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 7")]
+        [Description("")]
         Pt100ReadHead7 = 8010,
 
         /// <summary>
-        /// (Pt100 Read Head 8)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 8")]
+        [Description("")]
         Pt100ReadHead8 = 8011,
 
         /// <summary>
-        /// (Pt100 Read Head 9)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 9")]
+        [Description("")]
         Pt100ReadHead9 = 8012,
 
         /// <summary>
-        /// (Pt100 Read Head 10)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 10")]
+        [Description("")]
         Pt100ReadHead10 = 8013,
 
         /// <summary>
-        /// (Pt100 Read Head 11)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 11")]
+        [Description("")]
         Pt100ReadHead11 = 8014,
 
         /// <summary>
-        /// (Pt100 Read Head 12)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head 12")]
+        [Description("")]
         Pt100ReadHead12 = 8015,
 
         /// <summary>
-        /// (Pt100 Read Head Blower In)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head Blower In")]
+        [Description("")]
         Pt100ReadHeadBlowerIn = 8016,
 
         /// <summary>
-        /// (Pt100 Read Head Blower Out)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Head Blower Out")]
+        [Description("")]
         Pt100ReadHeadBlowerOut = 8017,
 
         /// <summary>
-        /// (Pt100 Read WHS)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read WHS")]
+        [Description("")]
         Pt100ReadWHS = 8018,
 
         /// <summary>
-        /// (Pt100 Read Electrical Cabinet)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Electrical Cabinet")]
+        [Description("")]
         Pt100ReadElectricalCabinet = 8019,
 
         /// <summary>
-        /// (Pt100 Read Machine)
+        /// ()
         /// </summary>
-        [Description("Pt100 Read Machine")]
+        [Description("")]
         Pt100ReadMachine = 8020,
 
         /// <summary>
-        /// (Current Break  Dryer 1)
+        /// ()
         /// </summary>
-        [Description("Current Break  Dryer 1")]
+        [Description("")]
         CurrentBreakDryer1 = 8021,
 
         /// <summary>
-        /// (Current Break  Dryer 2)
+        /// ()
         /// </summary>
-        [Description("Current Break  Dryer 2")]
+        [Description("")]
         CurrentBreakDryer2 = 8022,
 
         /// <summary>
-        /// (Current Break  Head 1)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 1")]
+        [Description("")]
         CurrentBreakHead1 = 8023,
 
         /// <summary>
-        /// (Current Break  Head 2)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 2")]
+        [Description("")]
         CurrentBreakHead2 = 8024,
 
         /// <summary>
-        /// (Current Break  Head 3)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 3")]
+        [Description("")]
         CurrentBreakHead3 = 8025,
 
         /// <summary>
-        /// (Current Break  Head 4)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 4")]
+        [Description("")]
         CurrentBreakHead4 = 8026,
 
         /// <summary>
-        /// (Current Break  Head 5)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 5")]
+        [Description("")]
         CurrentBreakHead5 = 8027,
 
         /// <summary>
-        /// (Current Break  Head 6)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 6")]
+        [Description("")]
         CurrentBreakHead6 = 8028,
 
         /// <summary>
-        /// (Current Break Mixer)
+        /// ()
         /// </summary>
-        [Description("Current Break Mixer")]
+        [Description("")]
         CurrentBreakMixer = 8029,
 
         /// <summary>
-        /// (Current Break  Head 7)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 7")]
+        [Description("")]
         CurrentBreakHead7 = 8030,
 
         /// <summary>
-        /// (Current Break  Head 8)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 8")]
+        [Description("")]
         CurrentBreakHead8 = 8031,
 
         /// <summary>
-        /// (Current Break  Head 9)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 9")]
+        [Description("")]
         CurrentBreakHead9 = 8032,
 
         /// <summary>
-        /// (Current Break  Head 10)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 10")]
+        [Description("")]
         CurrentBreakHead10 = 8033,
 
         /// <summary>
-        /// (Current Break  Head 11)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 11")]
+        [Description("")]
         CurrentBreakHead11 = 8034,
 
         /// <summary>
-        /// (Current Break  Head 12)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head 12")]
+        [Description("")]
         CurrentBreakHead12 = 8035,
 
         /// <summary>
-        /// (Current Break  Head Blower In)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head Blower In")]
+        [Description("")]
         CurrentBreakHeadBlowerIn = 8036,
 
         /// <summary>
-        /// (Current Break  Head Blower Out)
+        /// ()
         /// </summary>
-        [Description("Current Break  Head Blower Out")]
+        [Description("")]
         CurrentBreakHeadBlowerOut = 8037,
 
         /// <summary>
-        /// (Current Dryer 1)
+        /// ()
         /// </summary>
-        [Description("Current Dryer 1")]
+        [Description("")]
         CurrentDryer1 = 8038,
 
         /// <summary>
-        /// (Current Dryer 2)
+        /// ()
         /// </summary>
-        [Description("Current Dryer 2")]
+        [Description("")]
         CurrentDryer2 = 8039,
 
         /// <summary>
-        /// (Current Head 1)
+        /// ()
         /// </summary>
-        [Description("Current Head 1")]
+        [Description("")]
         CurrentHead1 = 8040,
 
         /// <summary>
-        /// (Current Head 2)
+        /// ()
         /// </summary>
-        [Description("Current Head 2")]
+        [Description("")]
         CurrentHead2 = 8041,
 
         /// <summary>
-        /// (Current Head 3)
+        /// ()
         /// </summary>
-        [Description("Current Head 3")]
+        [Description("")]
         CurrentHead3 = 8042,
 
         /// <summary>
-        /// (Current Head 4)
+        /// ()
         /// </summary>
-        [Description("Current Head 4")]
+        [Description("")]
         CurrentHead4 = 8043,
 
         /// <summary>
-        /// (Current Head 5)
+        /// ()
         /// </summary>
-        [Description("Current Head 5")]
+        [Description("")]
         CurrentHead5 = 8044,
 
         /// <summary>
-        /// (Current Head 6)
+        /// ()
         /// </summary>
-        [Description("Current Head 6")]
+        [Description("")]
         CurrentHead6 = 8045,
 
         /// <summary>
-        /// (Current Mixer)
+        /// ()
         /// </summary>
-        [Description("Current Mixer")]
+        [Description("")]
         CurrentMixer = 8046,
 
         /// <summary>
-        /// (Current Head 7)
+        /// ()
         /// </summary>
-        [Description("Current Head 7")]
+        [Description("")]
         CurrentHead7 = 8047,
 
         /// <summary>
-        /// (Current Head 8)
+        /// ()
         /// </summary>
-        [Description("Current Head 8")]
+        [Description("")]
         CurrentHead8 = 8048,
 
         /// <summary>
-        /// (Current Head 9)
+        /// ()
         /// </summary>
-        [Description("Current Head 9")]
+        [Description("")]
         CurrentHead9 = 8049,
 
         /// <summary>
-        /// (Current Head 10)
+        /// ()
         /// </summary>
-        [Description("Current Head 10")]
+        [Description("")]
         CurrentHead10 = 8050,
 
         /// <summary>
-        /// (Current Head 11)
+        /// ()
         /// </summary>
-        [Description("Current Head 11")]
+        [Description("")]
         CurrentHead11 = 8051,
 
         /// <summary>
-        /// (Current Head 12)
+        /// ()
         /// </summary>
-        [Description("Current Head 12")]
+        [Description("")]
         CurrentHead12 = 8052,
 
         /// <summary>
-        /// (Current Head Blower In)
+        /// ()
         /// </summary>
-        [Description("Current Head Blower In")]
+        [Description("")]
         CurrentHeadBlowerIn = 8053,
 
         /// <summary>
-        /// (Current Head Blower Out)
+        /// ()
         /// </summary>
-        [Description("Current Head Blower Out")]
+        [Description("")]
         CurrentHeadBlowerOut = 8054,
 
         /// <summary>
-        /// (Heater Dryer 1)
+        /// ()
         /// </summary>
-        [Description("Heater Dryer 1")]
+        [Description("")]
         HeaterDryer1 = 8055,
 
         /// <summary>
-        /// (Heater Dryer 2)
+        /// ()
         /// </summary>
-        [Description("Heater Dryer 2")]
+        [Description("")]
         HeaterDryer2 = 8056,
 
         /// <summary>
-        /// (Heater Head 1)
+        /// ()
         /// </summary>
-        [Description("Heater Head 1")]
+        [Description("")]
         HeaterHead1 = 8057,
 
         /// <summary>
-        /// (Heater Head 2)
+        /// ()
         /// </summary>
-        [Description("Heater Head 2")]
+        [Description("")]
         HeaterHead2 = 8058,
 
         /// <summary>
-        /// (Heater Head 3)
+        /// ()
         /// </summary>
-        [Description("Heater Head 3")]
+        [Description("")]
         HeaterHead3 = 8059,
 
         /// <summary>
-        /// (Heater Head 4)
+        /// ()
         /// </summary>
-        [Description("Heater Head 4")]
+        [Description("")]
         HeaterHead4 = 8060,
 
         /// <summary>
-        /// (Heater Head 5)
+        /// ()
         /// </summary>
-        [Description("Heater Head 5")]
+        [Description("")]
         HeaterHead5 = 8061,
 
         /// <summary>
-        /// (Heater Head 6)
+        /// ()
         /// </summary>
-        [Description("Heater Head 6")]
+        [Description("")]
         HeaterHead6 = 8062,
 
         /// <summary>
-        /// (Heater Mixer)
+        /// ()
         /// </summary>
-        [Description("Heater Mixer")]
+        [Description("")]
         HeaterMixer = 8063,
 
         /// <summary>
-        /// (Heater Head 7)
+        /// ()
         /// </summary>
-        [Description("Heater Head 7")]
+        [Description("")]
         HeaterHead7 = 8064,
 
         /// <summary>
-        /// (Heater Head 8)
+        /// ()
         /// </summary>
-        [Description("Heater Head 8")]
+        [Description("")]
         HeaterHead8 = 8065,
 
         /// <summary>
-        /// (Heater Head 9)
+        /// ()
         /// </summary>
-        [Description("Heater Head 9")]
+        [Description("")]
         HeaterHead9 = 8066,
 
         /// <summary>
-        /// (Heater Head 10)
+        /// ()
         /// </summary>
-        [Description("Heater Head 10")]
+        [Description("")]
         HeaterHead10 = 8067,
 
         /// <summary>
-        /// (Heater Head 11)
+        /// ()
         /// </summary>
-        [Description("Heater Head 11")]
+        [Description("")]
         HeaterHead11 = 8068,
 
         /// <summary>
-        /// (Heater Head 12)
+        /// ()
         /// </summary>
-        [Description("Heater Head 12")]
+        [Description("")]
         HeaterHead12 = 8069,
 
         /// <summary>
-        /// (Heater Head Blower In)
+        /// ()
         /// </summary>
-        [Description("Heater Head Blower In")]
+        [Description("")]
         HeaterHeadBlowerIn = 8070,
 
         /// <summary>
-        /// (Heater Head Blower Out)
+        /// ()
         /// </summary>
-        [Description("Heater Head Blower Out")]
+        [Description("")]
         HeaterHeadBlowerOut = 8071,
 
         /// <summary>
-        /// (Powerstep Dh Clean Head)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dh Clean Head")]
+        [Description("")]
         PowerstepDhCleanHead = 9000,
 
         /// <summary>
-        /// (Powerstep Dh Clean Mech)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dh Clean Mech")]
+        [Description("")]
         PowerstepDhCleanMech = 9001,
 
         /// <summary>
-        /// (Powerstep Dyeing Head Lid )
+        /// ()
         /// </summary>
-        [Description("Powerstep Dyeing Head Lid ")]
+        [Description("")]
         PowerstepDyeingHeadLid = 9002,
 
         /// <summary>
-        /// (Powerstep Dryer Driving)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dryer Driving")]
+        [Description("")]
         PowerstepDryerDriving = 9003,
 
         /// <summary>
-        /// (Powerstep Dryer Lid )
+        /// ()
         /// </summary>
-        [Description("Powerstep Dryer Lid ")]
+        [Description("")]
         PowerstepDryerLid = 9004,
 
         /// <summary>
-        /// (Powerstep Dryer Loadarm)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dryer Loadarm")]
+        [Description("")]
         PowerstepDryerLoadarm = 9005,
 
         /// <summary>
-        /// (Powerstep Dispenser 1)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 1")]
+        [Description("")]
         PowerstepDispenser1 = 9006,
 
         /// <summary>
-        /// (Powerstep Dispenser 2)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 2")]
+        [Description("")]
         PowerstepDispenser2 = 9007,
 
         /// <summary>
-        /// (Powerstep Dispenser 3)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 3")]
+        [Description("")]
         PowerstepDispenser3 = 9008,
 
         /// <summary>
-        /// (Powerstep Dispenser 4)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 4")]
+        [Description("")]
         PowerstepDispenser4 = 9009,
 
         /// <summary>
-        /// (Powerstep Dispenser 5)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 5")]
+        [Description("")]
         PowerstepDispenser5 = 9010,
 
         /// <summary>
-        /// (Powerstep Dispenser 6)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 6")]
+        [Description("")]
         PowerstepDispenser6 = 9011,
 
         /// <summary>
-        /// (Powerstep Dispenser 7)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 7")]
+        [Description("")]
         PowerstepDispenser7 = 9012,
 
         /// <summary>
-        /// (Powerstep Dispenser 8)
+        /// ()
         /// </summary>
-        [Description("Powerstep Dispenser 8")]
+        [Description("")]
         PowerstepDispenser8 = 9013,
 
         /// <summary>
-        /// (Powerstep Screw )
+        /// ()
         /// </summary>
-        [Description("Powerstep Screw ")]
+        [Description("")]
         PowerstepScrew = 9014,
 
         /// <summary>
-        /// (Powerstep Winder )
+        /// ()
         /// </summary>
-        [Description("Powerstep Winder ")]
+        [Description("")]
         PowerstepWinder = 9015,
 
         /// <summary>
-        /// (Powerstep Left Dancer )
+        /// ()
         /// </summary>
-        [Description("Powerstep Left Dancer ")]
+        [Description("")]
         PowerstepLeftDancer = 9016,
 
         /// <summary>
-        /// (Powerstep Middle Dancer)
+        /// ()
         /// </summary>
-        [Description("Powerstep Middle Dancer")]
+        [Description("")]
         PowerstepMiddleDancer = 9017,
 
         /// <summary>
-        /// (Powerstep Left Driving )
+        /// ()
         /// </summary>
-        [Description("Powerstep Left Driving ")]
+        [Description("")]
         PowerstepLeftDriving = 9018,
 
         /// <summary>
-        /// (Powerstep Left Rockers )
+        /// ()
         /// </summary>
-        [Description("Powerstep Left Rockers ")]
+        [Description("")]
         PowerstepLeftRockers = 9019,
 
         /// <summary>
-        /// (Powerstep Left Pivot )
+        /// ()
         /// </summary>
-        [Description("Powerstep Left Pivot ")]
+        [Description("")]
         PowerstepLeftPivot = 9020,
 
         /// <summary>
-        /// (Powerstep Right Dancer )
+        /// ()
         /// </summary>
-        [Description("Powerstep Right Dancer ")]
+        [Description("")]
         PowerstepRightDancer = 9021,
 
         /// <summary>
-        /// (Powerstep Right Driving)
+        /// ()
         /// </summary>
-        [Description("Powerstep Right Driving")]
+        [Description("")]
         PowerstepRightDriving = 9022,
 
         /// <summary>
-        /// (Powerstep Right Loadarm)
+        /// ()
         /// </summary>
-        [Description("Powerstep Right Loadarm")]
+        [Description("")]
         PowerstepRightLoadarm = 9023,
 
         /// <summary>
-        /// (Powerstep Right Rockers)
+        /// ()
         /// </summary>
-        [Description("Powerstep Right Rockers")]
+        [Description("")]
         PowerstepRightRockers = 9024,
 
         /// <summary>
-        /// (Powerstep Spare1_1)
+        /// ()
         /// </summary>
-        [Description("Powerstep Spare1_1")]
+        [Description("")]
         PowerstepSpare1_1 = 9025,
 
         /// <summary>
-        /// (Powerstep Spare1_2)
+        /// ()
         /// </summary>
-        [Description("Powerstep Spare1_2")]
+        [Description("")]
         PowerstepSpare1_2 = 9026,
 
         /// <summary>
-        /// (Powerstep Spare2_1)
+        /// ()
         /// </summary>
-        [Description("Powerstep Spare2_1")]
+        [Description("")]
         PowerstepSpare2_1 = 9027,
 
         /// <summary>
-        /// (Powerstep Spare2_2)
+        /// ()
         /// </summary>
-        [Description("Powerstep Spare2_2")]
+        [Description("")]
         PowerstepSpare2_2 = 9028,
 
         /// <summary>
-        /// (Powerstep Spare3_1)
+        /// ()
         /// </summary>
-        [Description("Powerstep Spare3_1")]
+        [Description("")]
         PowerstepSpare3_1 = 9029,
 
         /// <summary>
-        /// (Motor Wire Read Dh Clean Head)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dh Clean Head")]
+        [Description("")]
         MotorWireReadDhCleanHead = 9030,
 
         /// <summary>
-        /// (Motor Wire Read Dh Clean Mech)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dh Clean Mech")]
+        [Description("")]
         MotorWireReadDhCleanMech = 9031,
 
         /// <summary>
-        /// (Motor Wire Read Dyeing Head Lid )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dyeing Head Lid ")]
+        [Description("")]
         MotorWireReadDyeingHeadLid = 9032,
 
         /// <summary>
-        /// (Motor Wire Read Dryer Driving)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dryer Driving")]
+        [Description("")]
         MotorWireReadDryerDriving = 9033,
 
         /// <summary>
-        /// (Motor Wire Read Dryer Lid )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dryer Lid ")]
+        [Description("")]
         MotorWireReadDryerLid = 9034,
 
         /// <summary>
-        /// (Motor Wire Read Dryer Loadarm)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dryer Loadarm")]
+        [Description("")]
         MotorWireReadDryerLoadarm = 9035,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 1)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 1")]
+        [Description("")]
         MotorWireReadDispenser1 = 9036,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 2)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 2")]
+        [Description("")]
         MotorWireReadDispenser2 = 9037,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 3)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 3")]
+        [Description("")]
         MotorWireReadDispenser3 = 9038,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 4)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 4")]
+        [Description("")]
         MotorWireReadDispenser4 = 9039,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 5)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 5")]
+        [Description("")]
         MotorWireReadDispenser5 = 9040,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 6)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 6")]
+        [Description("")]
         MotorWireReadDispenser6 = 9041,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 7)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 7")]
+        [Description("")]
         MotorWireReadDispenser7 = 9042,
 
         /// <summary>
-        /// (Motor Wire Read Dispenser 8)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Dispenser 8")]
+        [Description("")]
         MotorWireReadDispenser8 = 9043,
 
         /// <summary>
-        /// (Motor Wire Read Screw )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Screw ")]
+        [Description("")]
         MotorWireReadScrew = 9044,
 
         /// <summary>
-        /// (Motor Wire Read Winder )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Winder ")]
+        [Description("")]
         MotorWireReadWinder = 9045,
 
         /// <summary>
-        /// (Motor Wire Read Left Dancer )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Left Dancer ")]
+        [Description("")]
         MotorWireReadLeftDancer = 9046,
 
         /// <summary>
-        /// (Motor Wire Read Middle Dancer)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Middle Dancer")]
+        [Description("")]
         MotorWireReadMiddleDancer = 9047,
 
         /// <summary>
-        /// (Motor Wire Read Left Driving )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Left Driving ")]
+        [Description("")]
         MotorWireReadLeftDriving = 9048,
 
         /// <summary>
-        /// (Motor Wire Read Left Rockers )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Left Rockers ")]
+        [Description("")]
         MotorWireReadLeftRockers = 9049,
 
         /// <summary>
-        /// (Motor Wire Read Left Pivot )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Left Pivot ")]
+        [Description("")]
         MotorWireReadLeftPivot = 9050,
 
         /// <summary>
-        /// (Motor Wire Read Right Dancer )
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Right Dancer ")]
+        [Description("")]
         MotorWireReadRightDancer = 9051,
 
         /// <summary>
-        /// (Motor Wire Read Right Driving)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Right Driving")]
+        [Description("")]
         MotorWireReadRightDriving = 9052,
 
         /// <summary>
-        /// (Motor Wire Read Right Loadarm)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Right Loadarm")]
+        [Description("")]
         MotorWireReadRightLoadarm = 9053,
 
         /// <summary>
-        /// (Motor Wire Read Right Rockers)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Right Rockers")]
+        [Description("")]
         MotorWireReadRightRockers = 9054,
 
         /// <summary>
-        /// (Motor Wire Read Spare1_1)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Spare1_1")]
+        [Description("")]
         MotorWireReadSpare1_1 = 9055,
 
         /// <summary>
-        /// (Motor Wire Read Spare1_2)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Spare1_2")]
+        [Description("")]
         MotorWireReadSpare1_2 = 9056,
 
         /// <summary>
-        /// (Motor Wire Read Spare2_1)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Spare2_1")]
+        [Description("")]
         MotorWireReadSpare2_1 = 9057,
 
         /// <summary>
-        /// (Motor Wire Read Spare2_2)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Spare2_2")]
+        [Description("")]
         MotorWireReadSpare2_2 = 9058,
 
         /// <summary>
-        /// (Motor Wire Read Spare3_1)
+        /// ()
         /// </summary>
-        [Description("Motor Wire Read Spare3_1")]
+        [Description("")]
         MotorWireReadSpare3_1 = 9059,
 
         /// <summary>
-        /// (In Blower Turn Off)
+        /// ()
         /// </summary>
-        [Description("In Blower Turn Off")]
+        [Description("")]
         InBlowerTurnOff = 10000,
 
         /// <summary>
-        /// (Out Blower Turn Off)
+        /// ()
         /// </summary>
-        [Description("Out Blower Turn Off")]
+        [Description("")]
         OutBlowerTurnOff = 10001,
 
         /// <summary>
-        /// (In Blower Turn On)
+        /// ()
         /// </summary>
-        [Description("In Blower Turn On")]
+        [Description("")]
         InBlowerTurnOn = 10002,
 
         /// <summary>
-        /// (Out Blower Turn On)
+        /// ()
         /// </summary>
-        [Description("Out Blower Turn On")]
+        [Description("")]
         OutBlowerTurnOn = 10003,
 
         /// <summary>
-        /// (In Blower Pressure)
+        /// ()
         /// </summary>
-        [Description("In Blower Pressure")]
+        [Description("")]
         InBlowerPressure = 10004,
 
         /// <summary>
-        /// (Out Blower Pressure)
+        /// ()
         /// </summary>
-        [Description("Out Blower Pressure")]
+        [Description("")]
         OutBlowerPressure = 10005,
 
         /// <summary>
-        /// (WHS Blower Does Not Build Pressure)
+        /// ()
         /// </summary>
-        [Description("WHS Blower Does Not Build Pressure")]
+        [Description("")]
         WHSBlowerDoesNotBuildPressure = 10006,
 
         /// <summary>
-        /// (WHS Dryer Sensor Failure)
+        /// ()
         /// </summary>
-        [Description("WHS Dryer Sensor Failure")]
+        [Description("")]
         WHSDryerSensorFailure = 10007,
 
         /// <summary>
-        /// (WHS Head Sensor Failure)
+        /// ()
         /// </summary>
-        [Description("WHS Head Sensor Failure")]
+        [Description("")]
         WHSHeadSensorFailure = 10008,
 
         /// <summary>
-        /// (WHS Other Sensor Failure)
+        /// ()
         /// </summary>
-        [Description("WHS Other Sensor Failure")]
+        [Description("")]
         WHSOtherSensorFailure = 10009,
 
         /// <summary>
-        /// (Pressure Building Up 1)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 1")]
+        [Description("")]
         PressureBuildingUp1 = 11000,
 
         /// <summary>
-        /// (Pressure Building Up 2)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 2")]
+        [Description("")]
         PressureBuildingUp2 = 11001,
 
         /// <summary>
-        /// (Pressure Building Up 3)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 3")]
+        [Description("")]
         PressureBuildingUp3 = 11002,
 
         /// <summary>
-        /// (Pressure Building Up 4)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 4")]
+        [Description("")]
         PressureBuildingUp4 = 11003,
 
         /// <summary>
-        /// (Pressure Building Up 5)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 5")]
+        [Description("")]
         PressureBuildingUp5 = 11004,
 
         /// <summary>
-        /// (Pressure Building Up 6)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 6")]
+        [Description("")]
         PressureBuildingUp6 = 11005,
 
         /// <summary>
-        /// (Pressure Building Up 7)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 7")]
+        [Description("")]
         PressureBuildingUp7 = 11006,
 
         /// <summary>
-        /// (Pressure Building Up 8)
+        /// ()
         /// </summary>
-        [Description("Pressure Building Up 8")]
+        [Description("")]
         PressureBuildingUp8 = 11007,
 
         /// <summary>
-        /// (Pressure Released 1)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 1")]
+        [Description("")]
         PressureReleased1 = 11008,
 
         /// <summary>
-        /// (Pressure Released 2)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 2")]
+        [Description("")]
         PressureReleased2 = 11009,
 
         /// <summary>
-        /// (Pressure Released 3)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 3")]
+        [Description("")]
         PressureReleased3 = 11010,
 
         /// <summary>
-        /// (Pressure Released 4)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 4")]
+        [Description("")]
         PressureReleased4 = 11011,
 
         /// <summary>
-        /// (Pressure Released 5)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 5")]
+        [Description("")]
         PressureReleased5 = 11012,
 
         /// <summary>
-        /// (Pressure Released 6)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 6")]
+        [Description("")]
         PressureReleased6 = 11013,
 
         /// <summary>
-        /// (Pressure Released 7)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 7")]
+        [Description("")]
         PressureReleased7 = 11014,
 
         /// <summary>
-        /// (Pressure Released 8)
+        /// ()
         /// </summary>
-        [Description("Pressure Released 8")]
+        [Description("")]
         PressureReleased8 = 11015,
 
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BIT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BIT_TYPES.cs
index fc68d84d1..fb18a40ea 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BIT_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BIT_TYPES.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         public System.DateTime LAST_UPDATED { get; set; }
         public int CODE { get; set; }
         public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
         public string SUBJECT { get; set; }
         public int COMPONENT_INDEX { get; set; }
         public int TEST_TYPE { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index af087d2b9..95b85cdae 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -73,6 +73,7 @@
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" />
           <Property Name="SUBJECT" Type="varchar" MaxLength="100" Nullable="false" />
           <Property Name="COMPONENT_INDEX" Type="int" Nullable="false" />
           <Property Name="TEST_TYPE" Type="int" Nullable="false" />
@@ -3563,6 +3564,7 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="DESCRIPTION" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="SUBJECT" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="COMPONENT_INDEX" Type="Int32" Nullable="false" />
           <Property Name="TEST_TYPE" Type="Int32" Nullable="false" />
@@ -6310,6 +6312,7 @@
                 <ScalarProperty Name="TEST_TYPE" ColumnName="TEST_TYPE" />
                 <ScalarProperty Name="COMPONENT_INDEX" ColumnName="COMPONENT_INDEX" />
                 <ScalarProperty Name="SUBJECT" ColumnName="SUBJECT" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 86bb149b3..385da5d6d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,94 +5,94 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="35.25" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="4.5" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="68.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="71.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="74.375" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="32.875" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9.75" PointY="66.125" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="36" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="5.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="74.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="4.5" PointY="57.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="59.75" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="81.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="7.5" PointY="94.625" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9.75" PointY="94.125" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="77.25" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="80.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="28.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="89.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="89.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="97.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9.75" PointY="85.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="89.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="75.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="4.5" PointY="84.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="6.75" PointY="79.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="11.5" PointY="98.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="13.75" PointY="81.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="12.5" PointY="67.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="14.75" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="80.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="12.5" PointY="71.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="14.75" PointY="73.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9.75" PointY="45.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="12" PointY="41.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="29.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="4.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="31.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="65.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="69.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="51.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="27" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9.75" PointY="62.875" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="59.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="1.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="40" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="8.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="10.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="12.25" PointY="47" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="8.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="14.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="16.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="27.625" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="29" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="36.875" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="4.5" PointY="35.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="60.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="67.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="70.75" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="31.25" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="25.25" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="41" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="25.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="63.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="4.5" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="33.875" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="73.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="41.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="40.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="12" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="16.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.5" PointY="78.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11.75" PointY="63.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="74.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="68.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="12.5" PointY="50.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="14.75" PointY="58.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.5" PointY="58" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11.75" PointY="53.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="11.5" PointY="70.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="13.75" PointY="68.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="12.5" PointY="78.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="14.75" PointY="63.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="63.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="47.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="59" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="29.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="9" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="17.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="21.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="10.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="73.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="62.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="14.25" PointY="38.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="34.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="28.375" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="77.125" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="33.375" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="16.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="19" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="7.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="28.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="21.625" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="17.75" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="19.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="44.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="19.75" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="19.75" PointY="14.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="19.75" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="19.75" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="21.75" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="21.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="3.375" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/BitType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/BitType.cs
index d1bd829e2..8d1a1f1a9 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/BitType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/BitType.cs
@@ -22,69 +22,73 @@ namespace Tango.PMR.Diagnostics {
     static BitTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cg1CaXRUeXBlLnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3RpY3Mq+yQKB0Jp",
+            "Cg1CaXRUeXBlLnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3RpY3MquyYKB0Jp",
             "dFR5cGUSEwoPVW5zcGVjaWZpZWRfQml0EAASGwoWSW5jb21pbmdWb2x0YWdl",
             "VG9vSGlnaBDoBxIaChVJbmNvbWluZ1ZvbHRhZ2VUb29Mb3cQ6QcSGwoWRmxh",
             "c2hGaWxlU3lzdGVtTWlzc2luZxDqBxIZChRIV1ZlcnNpb25GaWxlTWlzc2lu",
             "ZxDrBxIVChBBbGFybUZpbGVNaXNzaW5nEOwHEhIKDUlua1JGSURSZWFkZXIQ",
             "0A8SFQoQV2FzdGUxUkZJRFJlYWRlchDRDxIVChBXYXN0ZTJSRklEUmVhZGVy",
-            "ENIPEhYKEURpc3BlbnNlcjFJMkNDb21tELgXEhYKEURpc3BlbnNlcjJJMkND",
-            "b21tELkXEhYKEURpc3BlbnNlcjNJMkNDb21tELoXEhYKEURpc3BlbnNlcjRJ",
-            "MkNDb21tELsXEhYKEURpc3BlbnNlcjVJMkNDb21tELwXEhYKEURpc3BlbnNl",
-            "cjZJMkNDb21tEL0XEhYKEURpc3BlbnNlcjdJMkNDb21tEL4XEhYKEURpc3Bl",
-            "bnNlcjhJMkNDb21tEL8XEhcKEkhlYWRUeXBlSWRlbnRpZmllZBDAFxIWChFX",
-            "SFNUeXBlSWRlbnRpZmllZBDBFxIcChdDb21tdW5pY2F0aW9uV2l0aFNoaW5r",
-            "bxCgHxIaChVDb21tdW5pY2F0aW9uV2l0aEJUU1IQoR8SFQoQVVNCQ29tbXVu",
-            "aWNhdGlvbhCIJxIRCgxEcmF3ZXJCaWdGYW4Q8C4SFAoPRHJhd2VyU21hbGwx",
-            "RmFuEPEuEhQKD0RyYXdlclNtYWxsMkZhbhDyLhIUCg9EcmF3ZXJTbWFsbDNG",
-            "YW4Q8y4SFAoPRHJhd2VyU21hbGw0RmFuEPQuEg8KClN5c3RlbUZhbjEQ9S4S",
-            "DwoKU3lzdGVtRmFuMhD2LhIPCgpTeXN0ZW1GYW4zEPcuEhsKFldpbmRlckRh",
-            "bmNlclN0YXR1c1JlYWQQ2DYSGwoWUHVsbGVyRGFuY2VyU3RhdHVzUmVhZBDZ",
-            "NhIbChZGZWVkZXJEYW5jZXJTdGF0dXNSZWFkENo2EhsKFkRyeWVyRW5jb2Rl",
-            "clN0YXR1c1JlYWQQ2zYSFgoRUHQxMDBSZWFkRHJ5ZXJBaXIQwD4SFAoPUHQx",
-            "MDBSZWFkRHJ5ZXIxEME+EhQKD1B0MTAwUmVhZERyeWVyMhDCPhITCg5QdDEw",
-            "MFJlYWRIZWFkMRDDPhITCg5QdDEwMFJlYWRIZWFkMhDEPhITCg5QdDEwMFJl",
-            "YWRIZWFkMxDFPhITCg5QdDEwMFJlYWRIZWFkNBDGPhITCg5QdDEwMFJlYWRI",
-            "ZWFkNRDHPhITCg5QdDEwMFJlYWRIZWFkNhDIPhITCg5QdDEwMFJlYWRNaXhl",
-            "chDJPhITCg5QdDEwMFJlYWRIZWFkNxDKPhITCg5QdDEwMFJlYWRIZWFkOBDL",
-            "PhITCg5QdDEwMFJlYWRIZWFkORDMPhIUCg9QdDEwMFJlYWRIZWFkMTAQzT4S",
-            "FAoPUHQxMDBSZWFkSGVhZDExEM4+EhQKD1B0MTAwUmVhZEhlYWQxMhDPPhIa",
-            "ChVQdDEwMFJlYWRIZWFkQmxvd2VySW4Q0D4SGwoWUHQxMDBSZWFkSGVhZEJs",
-            "b3dlck91dBDRPhIRCgxQdDEwMFJlYWRXSFMQ0j4SHwoaUHQxMDBSZWFkRWxl",
-            "Y3RyaWNhbENhYmluZXQQ0z4SFQoQUHQxMDBSZWFkTWFjaGluZRDUPhIXChJD",
-            "dXJyZW50QnJlYWtEcnllcjEQ1T4SFwoSQ3VycmVudEJyZWFrRHJ5ZXIyENY+",
-            "EhYKEUN1cnJlbnRCcmVha0hlYWQxENc+EhYKEUN1cnJlbnRCcmVha0hlYWQy",
-            "ENg+EhYKEUN1cnJlbnRCcmVha0hlYWQzENk+EhYKEUN1cnJlbnRCcmVha0hl",
-            "YWQ0ENo+EhYKEUN1cnJlbnRCcmVha0hlYWQ1ENs+EhYKEUN1cnJlbnRCcmVh",
-            "a0hlYWQ2ENw+EhYKEUN1cnJlbnRCcmVha01peGVyEN0+EhYKEUN1cnJlbnRC",
-            "cmVha0hlYWQ3EN4+EhYKEUN1cnJlbnRCcmVha0hlYWQ4EN8+EhYKEUN1cnJl",
-            "bnRCcmVha0hlYWQ5EOA+EhcKEkN1cnJlbnRCcmVha0hlYWQxMBDhPhIXChJD",
-            "dXJyZW50QnJlYWtIZWFkMTEQ4j4SFwoSQ3VycmVudEJyZWFrSGVhZDEyEOM+",
-            "Eh0KGEN1cnJlbnRCcmVha0hlYWRCbG93ZXJJbhDkPhIeChlDdXJyZW50QnJl",
-            "YWtIZWFkQmxvd2VyT3V0EOU+EhIKDUN1cnJlbnREcnllcjEQ5j4SEgoNQ3Vy",
-            "cmVudERyeWVyMhDnPhIRCgxDdXJyZW50SGVhZDEQ6D4SEQoMQ3VycmVudEhl",
-            "YWQyEOk+EhEKDEN1cnJlbnRIZWFkMxDqPhIRCgxDdXJyZW50SGVhZDQQ6z4S",
-            "EQoMQ3VycmVudEhlYWQ1EOw+EhEKDEN1cnJlbnRIZWFkNhDtPhIRCgxDdXJy",
-            "ZW50TWl4ZXIQ7j4SEQoMQ3VycmVudEhlYWQ3EO8+EhEKDEN1cnJlbnRIZWFk",
-            "OBDwPhIRCgxDdXJyZW50SGVhZDkQ8T4SEgoNQ3VycmVudEhlYWQxMBDyPhIS",
-            "Cg1DdXJyZW50SGVhZDExEPM+EhIKDUN1cnJlbnRIZWFkMTIQ9D4SGAoTQ3Vy",
-            "cmVudEhlYWRCbG93ZXJJbhD1PhIZChRDdXJyZW50SGVhZEJsb3dlck91dBD2",
-            "PhIRCgxIZWF0ZXJEcnllcjEQ9z4SEQoMSGVhdGVyRHJ5ZXIyEPg+EhAKC0hl",
-            "YXRlckhlYWQxEPk+EhAKC0hlYXRlckhlYWQyEPo+EhAKC0hlYXRlckhlYWQz",
-            "EPs+EhAKC0hlYXRlckhlYWQ0EPw+EhAKC0hlYXRlckhlYWQ1EP0+EhAKC0hl",
-            "YXRlckhlYWQ2EP4+EhAKC0hlYXRlck1peGVyEP8+EhAKC0hlYXRlckhlYWQ3",
-            "EIA/EhAKC0hlYXRlckhlYWQ4EIE/EhAKC0hlYXRlckhlYWQ5EII/EhEKDEhl",
-            "YXRlckhlYWQxMBCDPxIRCgxIZWF0ZXJIZWFkMTEQhD8SEQoMSGVhdGVySGVh",
-            "ZDEyEIU/EhcKEkhlYXRlckhlYWRCbG93ZXJJbhCGPxIYChNIZWF0ZXJIZWFk",
-            "Qmxvd2VyT3V0EIc/EhkKFFBvd2Vyc3RlcERoQ2xlYW5IZWFkEKhGEhkKFFBv",
-            "d2Vyc3RlcERoQ2xlYW5NZWNoEKlGEhsKFlBvd2Vyc3RlcER5ZWluZ0hlYWRM",
-            "aWQQqkYSGgoVUG93ZXJzdGVwRHJ5ZXJEcml2aW5nEKtGEhYKEVBvd2Vyc3Rl",
-            "cERyeWVyTGlkEKxGEhoKFVBvd2Vyc3RlcERyeWVyTG9hZGFybRCtRhIYChNQ",
-            "b3dlcnN0ZXBEaXNwZW5zZXIxEK5GEhgKE1Bvd2Vyc3RlcERpc3BlbnNlcjIQ",
-            "r0YSGAoTUG93ZXJzdGVwRGlzcGVuc2VyMxCwRhIYChNQb3dlcnN0ZXBEaXNw",
-            "ZW5zZXI0ELFGEhgKE1Bvd2Vyc3RlcERpc3BlbnNlcjUQskYSGAoTUG93ZXJz",
-            "dGVwRGlzcGVuc2VyNhCzRhIYChNQb3dlcnN0ZXBEaXNwZW5zZXI3ELRGEhgK",
-            "E1Bvd2Vyc3RlcERpc3BlbnNlcjgQtUYSEwoOUG93ZXJzdGVwU2NyZXcQtkYS",
+            "ENIPEhYKEURpc3BlbnNlcktJMkNDb21tELgXEhYKEURpc3BlbnNlckNJMkND",
+            "b21tELkXEhYKEURpc3BlbnNlck1JMkNDb21tELoXEhYKEURpc3BlbnNlcllJ",
+            "MkNDb21tELsXEhcKEkRpc3BlbnNlclRJSTJDQ29tbRC8FxIXChJEaXNwZW5z",
+            "ZXJMQ0kyQ0NvbW0QvRcSFwoSRGlzcGVuc2VyTE1JMkNDb21tEL4XEhcKEkRp",
+            "c3BlbnNlckxZSTJDQ29tbRC/FxIXChJIZWFkVHlwZUlkZW50aWZpZWQQwBcS",
+            "FgoRV0hTVHlwZUlkZW50aWZpZWQQwRcSHAoXQ29tbXVuaWNhdGlvbldpdGhT",
+            "aGlua28QoB8SGgoVQ29tbXVuaWNhdGlvbldpdGhCVFNSEKEfEhUKEFVTQkNv",
+            "bW11bmljYXRpb24QiCcSDQoIRUNCaWdGYW4Q8C4SEAoLRUNTbWFsbDFGYW4Q",
+            "8S4SEAoLRUNTbWFsbDJGYW4Q8i4SEAoLRUNTbWFsbDNGYW4Q8y4SEAoLRUNT",
+            "bWFsbDRGYW4Q9C4SDwoKU3lzdGVtRmFuMRD1LhIPCgpTeXN0ZW1GYW4yEPYu",
+            "Eg8KClN5c3RlbUZhbjMQ9y4SGwoWV2luZGVyRGFuY2VyU3RhdHVzUmVhZBDY",
+            "NhIbChZQdWxsZXJEYW5jZXJTdGF0dXNSZWFkENk2EhsKFkZlZWRlckRhbmNl",
+            "clN0YXR1c1JlYWQQ2jYSGwoWRHJ5ZXJFbmNvZGVyU3RhdHVzUmVhZBDbNhIW",
+            "ChFQdDEwMFJlYWREcnllckFpchDAPhIUCg9QdDEwMFJlYWREcnllcjEQwT4S",
+            "FAoPUHQxMDBSZWFkRHJ5ZXIyEMI+EhcKElB0MTAwUmVhZEhlYWRab25lMRDD",
+            "PhIXChJQdDEwMFJlYWRIZWFkWm9uZTIQxD4SFwoSUHQxMDBSZWFkSGVhZFpv",
+            "bmUzEMU+EhcKElB0MTAwUmVhZEhlYWRab25lNBDGPhIXChJQdDEwMFJlYWRI",
+            "ZWFkWm9uZTUQxz4SFwoSUHQxMDBSZWFkSGVhZFpvbmU2EMg+EhMKDlB0MTAw",
+            "UmVhZE1peGVyEMk+EhcKElB0MTAwUmVhZEhlYWRab25lNxDKPhIXChJQdDEw",
+            "MFJlYWRIZWFkWm9uZTgQyz4SFwoSUHQxMDBSZWFkSGVhZFpvbmU5EMw+EhgK",
+            "E1B0MTAwUmVhZEhlYWRab25lMTAQzT4SGAoTUHQxMDBSZWFkSGVhZFpvbmUx",
+            "MRDOPhIYChNQdDEwMFJlYWRIZWFkWm9uZTEyEM8+EhoKFVB0MTAwUmVhZEhl",
+            "YWRCbG93ZXJJbhDQPhIbChZQdDEwMFJlYWRIZWFkQmxvd2VyT3V0ENE+EhEK",
+            "DFB0MTAwUmVhZFdIUxDSPhIfChpQdDEwMFJlYWRFbGVjdHJpY2FsQ2FiaW5l",
+            "dBDTPhIVChBQdDEwMFJlYWRNYWNoaW5lENQ+EhcKEkN1cnJlbnRCcmVha0Ry",
+            "eWVyMRDVPhIXChJDdXJyZW50QnJlYWtEcnllcjIQ1j4SGgoVQ3VycmVudEJy",
+            "ZWFrSGVhZFpvbmUxENc+EhoKFUN1cnJlbnRCcmVha0hlYWRab25lMhDYPhIa",
+            "ChVDdXJyZW50QnJlYWtIZWFkWm9uZTMQ2T4SGgoVQ3VycmVudEJyZWFrSGVh",
+            "ZFpvbmU0ENo+EhoKFUN1cnJlbnRCcmVha0hlYWRab25lNRDbPhIaChVDdXJy",
+            "ZW50QnJlYWtIZWFkWm9uZTYQ3D4SFgoRQ3VycmVudEJyZWFrTWl4ZXIQ3T4S",
+            "GgoVQ3VycmVudEJyZWFrSGVhZFpvbmU3EN4+EhoKFUN1cnJlbnRCcmVha0hl",
+            "YWRab25lOBDfPhIaChVDdXJyZW50QnJlYWtIZWFkWm9uZTkQ4D4SGwoWQ3Vy",
+            "cmVudEJyZWFrSGVhZFpvbmUxMBDhPhIbChZDdXJyZW50QnJlYWtIZWFkWm9u",
+            "ZTExEOI+EhsKFkN1cnJlbnRCcmVha0hlYWRab25lMTIQ4z4SHQoYQ3VycmVu",
+            "dEJyZWFrSGVhZEJsb3dlckluEOQ+Eh4KGUN1cnJlbnRCcmVha0hlYWRCbG93",
+            "ZXJPdXQQ5T4SEgoNQ3VycmVudERyeWVyMRDmPhISCg1DdXJyZW50RHJ5ZXIy",
+            "EOc+EhUKEEN1cnJlbnRIZWFkWm9uZTEQ6D4SFQoQQ3VycmVudEhlYWRab25l",
+            "MhDpPhIVChBDdXJyZW50SGVhZFpvbmUzEOo+EhUKEEN1cnJlbnRIZWFkWm9u",
+            "ZTQQ6z4SFQoQQ3VycmVudEhlYWRab25lNRDsPhIVChBDdXJyZW50SGVhZFpv",
+            "bmU2EO0+EhEKDEN1cnJlbnRNaXhlchDuPhIVChBDdXJyZW50SGVhZFpvbmU3",
+            "EO8+EhUKEEN1cnJlbnRIZWFkWm9uZTgQ8D4SFQoQQ3VycmVudEhlYWRab25l",
+            "ORDxPhIWChFDdXJyZW50SGVhZFpvbmUxMBDyPhIWChFDdXJyZW50SGVhZFpv",
+            "bmUxMRDzPhIWChFDdXJyZW50SGVhZFpvbmUxMhD0PhIYChNDdXJyZW50SGVh",
+            "ZEJsb3dlckluEPU+EhkKFEN1cnJlbnRIZWFkQmxvd2VyT3V0EPY+EhEKDEhl",
+            "YXRlckRyeWVyMRD3PhIRCgxIZWF0ZXJEcnllcjIQ+D4SFAoPSGVhdGVySGVh",
+            "ZFpvbmUxEPk+EhQKD0hlYXRlckhlYWRab25lMhD6PhIUCg9IZWF0ZXJIZWFk",
+            "Wm9uZTMQ+z4SFAoPSGVhdGVySGVhZFpvbmU0EPw+EhQKD0hlYXRlckhlYWRa",
+            "b25lNRD9PhIUCg9IZWF0ZXJIZWFkWm9uZTYQ/j4SEAoLSGVhdGVyTWl4ZXIQ",
+            "/z4SFAoPSGVhdGVySGVhZFpvbmU3EIA/EhQKD0hlYXRlckhlYWRab25lOBCB",
+            "PxIUCg9IZWF0ZXJIZWFkWm9uZTkQgj8SFQoQSGVhdGVySGVhZFpvbmUxMBCD",
+            "PxIVChBIZWF0ZXJIZWFkWm9uZTExEIQ/EhUKEEhlYXRlckhlYWRab25lMTIQ",
+            "hT8SFwoSSGVhdGVySGVhZEJsb3dlckluEIY/EhgKE0hlYXRlckhlYWRCbG93",
+            "ZXJPdXQQhz8SGQoUUG93ZXJzdGVwRGhDbGVhbkhlYWQQqEYSGQoUUG93ZXJz",
+            "dGVwRGhDbGVhbk1lY2gQqUYSGwoWUG93ZXJzdGVwRHllaW5nSGVhZExpZBCq",
+            "RhIaChVQb3dlcnN0ZXBEcnllckRyaXZpbmcQq0YSFgoRUG93ZXJzdGVwRHJ5",
+            "ZXJMaWQQrEYSGgoVUG93ZXJzdGVwRHJ5ZXJMb2FkYXJtEK1GEhgKE1Bvd2Vy",
+            "c3RlcERpc3BlbnNlcksQrkYSGAoTUG93ZXJzdGVwRGlzcGVuc2VyQxCvRhIY",
+            "ChNQb3dlcnN0ZXBEaXNwZW5zZXJNELBGEhgKE1Bvd2Vyc3RlcERpc3BlbnNl",
+            "clkQsUYSGQoUUG93ZXJzdGVwRGlzcGVuc2VyVEkQskYSGQoUUG93ZXJzdGVw",
+            "RGlzcGVuc2VyTEMQs0YSGQoUUG93ZXJzdGVwRGlzcGVuc2VyTE0QtEYSGQoU",
+            "UG93ZXJzdGVwRGlzcGVuc2VyTFkQtUYSEwoOUG93ZXJzdGVwU2NyZXcQtkYS",
             "FAoPUG93ZXJzdGVwV2luZGVyELdGEhgKE1Bvd2Vyc3RlcExlZnREYW5jZXIQ",
             "uEYSGgoVUG93ZXJzdGVwTWlkZGxlRGFuY2VyELlGEhkKFFBvd2Vyc3RlcExl",
             "ZnREcml2aW5nELpGEhkKFFBvd2Vyc3RlcExlZnRSb2NrZXJzELtGEhcKElBv",
@@ -98,37 +102,38 @@ namespace Tango.PMR.Diagnostics {
             "Gk1vdG9yV2lyZVJlYWREeWVpbmdIZWFkTGlkEMhGEh4KGU1vdG9yV2lyZVJl",
             "YWREcnllckRyaXZpbmcQyUYSGgoVTW90b3JXaXJlUmVhZERyeWVyTGlkEMpG",
             "Eh4KGU1vdG9yV2lyZVJlYWREcnllckxvYWRhcm0Qy0YSHAoXTW90b3JXaXJl",
-            "UmVhZERpc3BlbnNlcjEQzEYSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlcjIQ",
-            "zUYSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlcjMQzkYSHAoXTW90b3JXaXJl",
-            "UmVhZERpc3BlbnNlcjQQz0YSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlcjUQ",
-            "0EYSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlcjYQ0UYSHAoXTW90b3JXaXJl",
-            "UmVhZERpc3BlbnNlcjcQ0kYSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlcjgQ",
-            "00YSFwoSTW90b3JXaXJlUmVhZFNjcmV3ENRGEhgKE01vdG9yV2lyZVJlYWRX",
-            "aW5kZXIQ1UYSHAoXTW90b3JXaXJlUmVhZExlZnREYW5jZXIQ1kYSHgoZTW90",
-            "b3JXaXJlUmVhZE1pZGRsZURhbmNlchDXRhIdChhNb3RvcldpcmVSZWFkTGVm",
-            "dERyaXZpbmcQ2EYSHQoYTW90b3JXaXJlUmVhZExlZnRSb2NrZXJzENlGEhsK",
-            "Fk1vdG9yV2lyZVJlYWRMZWZ0UGl2b3QQ2kYSHQoYTW90b3JXaXJlUmVhZFJp",
-            "Z2h0RGFuY2VyENtGEh4KGU1vdG9yV2lyZVJlYWRSaWdodERyaXZpbmcQ3EYS",
-            "HgoZTW90b3JXaXJlUmVhZFJpZ2h0TG9hZGFybRDdRhIeChlNb3RvcldpcmVS",
-            "ZWFkUmlnaHRSb2NrZXJzEN5GEhoKFU1vdG9yV2lyZVJlYWRTcGFyZTFfMRDf",
-            "RhIaChVNb3RvcldpcmVSZWFkU3BhcmUxXzIQ4EYSGgoVTW90b3JXaXJlUmVh",
-            "ZFNwYXJlMl8xEOFGEhoKFU1vdG9yV2lyZVJlYWRTcGFyZTJfMhDiRhIaChVN",
-            "b3RvcldpcmVSZWFkU3BhcmUzXzEQ40YSFAoPSW5CbG93ZXJUdXJuT2ZmEJBO",
-            "EhUKEE91dEJsb3dlclR1cm5PZmYQkU4SEwoOSW5CbG93ZXJUdXJuT24Qkk4S",
-            "FAoPT3V0Qmxvd2VyVHVybk9uEJNOEhUKEEluQmxvd2VyUHJlc3N1cmUQlE4S",
-            "FgoRT3V0Qmxvd2VyUHJlc3N1cmUQlU4SIgodV0hTQmxvd2VyRG9lc05vdEJ1",
-            "aWxkUHJlc3N1cmUQlk4SGgoVV0hTRHJ5ZXJTZW5zb3JGYWlsdXJlEJdOEhkK",
-            "FFdIU0hlYWRTZW5zb3JGYWlsdXJlEJhOEhoKFVdIU090aGVyU2Vuc29yRmFp",
-            "bHVyZRCZThIYChNQcmVzc3VyZUJ1aWxkaW5nVXAxEPhVEhgKE1ByZXNzdXJl",
-            "QnVpbGRpbmdVcDIQ+VUSGAoTUHJlc3N1cmVCdWlsZGluZ1VwMxD6VRIYChNQ",
-            "cmVzc3VyZUJ1aWxkaW5nVXA0EPtVEhgKE1ByZXNzdXJlQnVpbGRpbmdVcDUQ",
-            "/FUSGAoTUHJlc3N1cmVCdWlsZGluZ1VwNhD9VRIYChNQcmVzc3VyZUJ1aWxk",
-            "aW5nVXA3EP5VEhgKE1ByZXNzdXJlQnVpbGRpbmdVcDgQ/1USFgoRUHJlc3N1",
-            "cmVSZWxlYXNlZDEQgFYSFgoRUHJlc3N1cmVSZWxlYXNlZDIQgVYSFgoRUHJl",
-            "c3N1cmVSZWxlYXNlZDMQglYSFgoRUHJlc3N1cmVSZWxlYXNlZDQQg1YSFgoR",
-            "UHJlc3N1cmVSZWxlYXNlZDUQhFYSFgoRUHJlc3N1cmVSZWxlYXNlZDYQhVYS",
-            "FgoRUHJlc3N1cmVSZWxlYXNlZDcQhlYSFgoRUHJlc3N1cmVSZWxlYXNlZDgQ",
-            "h1ZCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z"));
+            "UmVhZERpc3BlbnNlcksQzEYSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlckMQ",
+            "zUYSHAoXTW90b3JXaXJlUmVhZERpc3BlbnNlck0QzkYSHAoXTW90b3JXaXJl",
+            "UmVhZERpc3BlbnNlclkQz0YSHQoYTW90b3JXaXJlUmVhZERpc3BlbnNlclRJ",
+            "ENBGEh0KGE1vdG9yV2lyZVJlYWREaXNwZW5zZXJMQxDRRhIdChhNb3Rvcldp",
+            "cmVSZWFkRGlzcGVuc2VyTE0Q0kYSHQoYTW90b3JXaXJlUmVhZERpc3BlbnNl",
+            "ckxZENNGEhcKEk1vdG9yV2lyZVJlYWRTY3JldxDURhIYChNNb3RvcldpcmVS",
+            "ZWFkV2luZGVyENVGEhwKF01vdG9yV2lyZVJlYWRMZWZ0RGFuY2VyENZGEh4K",
+            "GU1vdG9yV2lyZVJlYWRNaWRkbGVEYW5jZXIQ10YSHQoYTW90b3JXaXJlUmVh",
+            "ZExlZnREcml2aW5nENhGEh0KGE1vdG9yV2lyZVJlYWRMZWZ0Um9ja2VycxDZ",
+            "RhIbChZNb3RvcldpcmVSZWFkTGVmdFBpdm90ENpGEh0KGE1vdG9yV2lyZVJl",
+            "YWRSaWdodERhbmNlchDbRhIeChlNb3RvcldpcmVSZWFkUmlnaHREcml2aW5n",
+            "ENxGEh4KGU1vdG9yV2lyZVJlYWRSaWdodExvYWRhcm0Q3UYSHgoZTW90b3JX",
+            "aXJlUmVhZFJpZ2h0Um9ja2VycxDeRhIaChVNb3RvcldpcmVSZWFkU3BhcmUx",
+            "XzEQ30YSGgoVTW90b3JXaXJlUmVhZFNwYXJlMV8yEOBGEhoKFU1vdG9yV2ly",
+            "ZVJlYWRTcGFyZTJfMRDhRhIaChVNb3RvcldpcmVSZWFkU3BhcmUyXzIQ4kYS",
+            "GgoVTW90b3JXaXJlUmVhZFNwYXJlM18xEONGEhQKD0luQmxvd2VyVHVybk9m",
+            "ZhCQThIVChBPdXRCbG93ZXJUdXJuT2ZmEJFOEhMKDkluQmxvd2VyVHVybk9u",
+            "EJJOEhQKD091dEJsb3dlclR1cm5PbhCTThIVChBJbkJsb3dlclByZXNzdXJl",
+            "EJROEhYKEU91dEJsb3dlclByZXNzdXJlEJVOEiIKHVdIU0Jsb3dlckRvZXNO",
+            "b3RCdWlsZFByZXNzdXJlEJZOEhoKFVdIU0RyeWVyU2Vuc29yRmFpbHVyZRCX",
+            "ThIZChRXSFNIZWFkU2Vuc29yRmFpbHVyZRCYThIaChVXSFNPdGhlclNlbnNv",
+            "ckZhaWx1cmUQmU4SGAoTUHJlc3N1cmVCdWlsZGluZ1VwSxD4VRIYChNQcmVz",
+            "c3VyZUJ1aWxkaW5nVXBDEPlVEhgKE1ByZXNzdXJlQnVpbGRpbmdVcE0Q+lUS",
+            "GAoTUHJlc3N1cmVCdWlsZGluZ1VwWRD7VRIZChRQcmVzc3VyZUJ1aWxkaW5n",
+            "VXBUSRD8VRIZChRQcmVzc3VyZUJ1aWxkaW5nVXBMQxD9VRIZChRQcmVzc3Vy",
+            "ZUJ1aWxkaW5nVXBMTRD+VRIZChRQcmVzc3VyZUJ1aWxkaW5nVXBMWRD/VRIW",
+            "ChFQcmVzc3VyZVJlbGVhc2VkSxCAVhIWChFQcmVzc3VyZVJlbGVhc2VkQxCB",
+            "VhIWChFQcmVzc3VyZVJlbGVhc2VkTRCCVhIWChFQcmVzc3VyZVJlbGVhc2Vk",
+            "WRCDVhIXChJQcmVzc3VyZVJlbGVhc2VkVEkQhFYSFwoSUHJlc3N1cmVSZWxl",
+            "YXNlZExDEIVWEhcKElByZXNzdXJlUmVsZWFzZWRMTRCGVhIXChJQcmVzc3Vy",
+            "ZVJlbGVhc2VkTFkQh1ZCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFnbm9z",
+            "dGljc2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.BitType), }, null));
@@ -175,37 +180,37 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("Waste2RFIDReader")] Waste2Rfidreader = 2002,
     /// <summary>
-    ///Dispenser 1  I2C Comm
+    ///Dispenser K I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser1I2CComm")] Dispenser1I2Ccomm = 3000,
+    [pbr::OriginalName("DispenserKI2CComm")] DispenserKi2Ccomm = 3000,
     /// <summary>
-    ///Dispenser 2 I2C Comm
+    ///Dispenser C I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser2I2CComm")] Dispenser2I2Ccomm = 3001,
+    [pbr::OriginalName("DispenserCI2CComm")] DispenserCi2Ccomm = 3001,
     /// <summary>
-    ///Dispenser 3 I2C Comm
+    ///Dispenser M I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser3I2CComm")] Dispenser3I2Ccomm = 3002,
+    [pbr::OriginalName("DispenserMI2CComm")] DispenserMi2Ccomm = 3002,
     /// <summary>
-    ///Dispenser 4 I2C Comm
+    ///Dispenser Y I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser4I2CComm")] Dispenser4I2Ccomm = 3003,
+    [pbr::OriginalName("DispenserYI2CComm")] DispenserYi2Ccomm = 3003,
     /// <summary>
-    ///Dispenser 5 I2C Comm
+    ///Dispenser TI I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser5I2CComm")] Dispenser5I2Ccomm = 3004,
+    [pbr::OriginalName("DispenserTII2CComm")] DispenserTii2Ccomm = 3004,
     /// <summary>
-    ///Dispenser 6 I2C Comm
+    ///Dispenser LC I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser6I2CComm")] Dispenser6I2Ccomm = 3005,
+    [pbr::OriginalName("DispenserLCI2CComm")] DispenserLci2Ccomm = 3005,
     /// <summary>
-    ///Dispenser 7 I2C Comm
+    ///Dispenser LM I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser7I2CComm")] Dispenser7I2Ccomm = 3006,
+    [pbr::OriginalName("DispenserLMI2CComm")] DispenserLmi2Ccomm = 3006,
     /// <summary>
-    ///Dispenser 8 I2C Comm
+    ///Dispenser LY I2C Comm
     /// </summary>
-    [pbr::OriginalName("Dispenser8I2CComm")] Dispenser8I2Ccomm = 3007,
+    [pbr::OriginalName("DispenserLYI2CComm")] DispenserLyi2Ccomm = 3007,
     /// <summary>
     ///Head Type Identified
     /// </summary>
@@ -227,25 +232,25 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("USBCommunication")] Usbcommunication = 5000,
     /// <summary>
-    ///Drawer Big Fan 
+    ///EC Big Fan 
     /// </summary>
-    [pbr::OriginalName("DrawerBigFan")] DrawerBigFan = 6000,
+    [pbr::OriginalName("ECBigFan")] EcbigFan = 6000,
     /// <summary>
-    ///Drawer Small 1 Fan
+    ///EC Small 1 Fan
     /// </summary>
-    [pbr::OriginalName("DrawerSmall1Fan")] DrawerSmall1Fan = 6001,
+    [pbr::OriginalName("ECSmall1Fan")] Ecsmall1Fan = 6001,
     /// <summary>
-    ///Drawer Small 2 Fan
+    ///EC Small 2 Fan
     /// </summary>
-    [pbr::OriginalName("DrawerSmall2Fan")] DrawerSmall2Fan = 6002,
+    [pbr::OriginalName("ECSmall2Fan")] Ecsmall2Fan = 6002,
     /// <summary>
-    ///Drawer Small 3 Fan
+    ///EC Small 3 Fan
     /// </summary>
-    [pbr::OriginalName("DrawerSmall3Fan")] DrawerSmall3Fan = 6003,
+    [pbr::OriginalName("ECSmall3Fan")] Ecsmall3Fan = 6003,
     /// <summary>
-    ///Drawer Small 4 Fan
+    ///EC Small 4 Fan
     /// </summary>
-    [pbr::OriginalName("DrawerSmall4Fan")] DrawerSmall4Fan = 6004,
+    [pbr::OriginalName("ECSmall4Fan")] Ecsmall4Fan = 6004,
     /// <summary>
     ///System Fan 1
     /// </summary>
@@ -287,57 +292,57 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("Pt100ReadDryer2")] Pt100ReadDryer2 = 8002,
     /// <summary>
-    ///Pt100 Read Head 1
+    ///Pt100 Read Head Zone 1
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead1")] Pt100ReadHead1 = 8003,
+    [pbr::OriginalName("Pt100ReadHeadZone1")] Pt100ReadHeadZone1 = 8003,
     /// <summary>
-    ///Pt100 Read Head 2
+    ///Pt100 Read Head Zone 2
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead2")] Pt100ReadHead2 = 8004,
+    [pbr::OriginalName("Pt100ReadHeadZone2")] Pt100ReadHeadZone2 = 8004,
     /// <summary>
-    ///Pt100 Read Head 3
+    ///Pt100 Read Head Zone 3
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead3")] Pt100ReadHead3 = 8005,
+    [pbr::OriginalName("Pt100ReadHeadZone3")] Pt100ReadHeadZone3 = 8005,
     /// <summary>
-    ///Pt100 Read Head 4
+    ///Pt100 Read Head Zone 4
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead4")] Pt100ReadHead4 = 8006,
+    [pbr::OriginalName("Pt100ReadHeadZone4")] Pt100ReadHeadZone4 = 8006,
     /// <summary>
-    ///Pt100 Read Head 5
+    ///Pt100 Read Head Zone 5
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead5")] Pt100ReadHead5 = 8007,
+    [pbr::OriginalName("Pt100ReadHeadZone5")] Pt100ReadHeadZone5 = 8007,
     /// <summary>
-    ///Pt100 Read Head 6
+    ///Pt100 Read Head Zone 6
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead6")] Pt100ReadHead6 = 8008,
+    [pbr::OriginalName("Pt100ReadHeadZone6")] Pt100ReadHeadZone6 = 8008,
     /// <summary>
     ///Pt100 Read Mixer
     /// </summary>
     [pbr::OriginalName("Pt100ReadMixer")] Pt100ReadMixer = 8009,
     /// <summary>
-    ///Pt100 Read Head 7
+    ///Pt100 Read Head Zone 7
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead7")] Pt100ReadHead7 = 8010,
+    [pbr::OriginalName("Pt100ReadHeadZone7")] Pt100ReadHeadZone7 = 8010,
     /// <summary>
-    ///Pt100 Read Head 8
+    ///Pt100 Read Head Zone 8
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead8")] Pt100ReadHead8 = 8011,
+    [pbr::OriginalName("Pt100ReadHeadZone8")] Pt100ReadHeadZone8 = 8011,
     /// <summary>
-    ///Pt100 Read Head 9
+    ///Pt100 Read Head Zone 9
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead9")] Pt100ReadHead9 = 8012,
+    [pbr::OriginalName("Pt100ReadHeadZone9")] Pt100ReadHeadZone9 = 8012,
     /// <summary>
-    ///Pt100 Read Head 10
+    ///Pt100 Read Head Zone 10
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead10")] Pt100ReadHead10 = 8013,
+    [pbr::OriginalName("Pt100ReadHeadZone10")] Pt100ReadHeadZone10 = 8013,
     /// <summary>
-    ///Pt100 Read Head 11
+    ///Pt100 Read Head Zone 11
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead11")] Pt100ReadHead11 = 8014,
+    [pbr::OriginalName("Pt100ReadHeadZone11")] Pt100ReadHeadZone11 = 8014,
     /// <summary>
-    ///Pt100 Read Head 12
+    ///Pt100 Read Head Zone 12
     /// </summary>
-    [pbr::OriginalName("Pt100ReadHead12")] Pt100ReadHead12 = 8015,
+    [pbr::OriginalName("Pt100ReadHeadZone12")] Pt100ReadHeadZone12 = 8015,
     /// <summary>
     ///Pt100 Read Head Blower In
     /// </summary>
@@ -367,57 +372,57 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("CurrentBreakDryer2")] CurrentBreakDryer2 = 8022,
     /// <summary>
-    ///Current Break  Head 1
+    ///Current Break Head Zone 1
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead1")] CurrentBreakHead1 = 8023,
+    [pbr::OriginalName("CurrentBreakHeadZone1")] CurrentBreakHeadZone1 = 8023,
     /// <summary>
-    ///Current Break  Head 2
+    ///Current Break Head Zone 2
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead2")] CurrentBreakHead2 = 8024,
+    [pbr::OriginalName("CurrentBreakHeadZone2")] CurrentBreakHeadZone2 = 8024,
     /// <summary>
-    ///Current Break  Head 3
+    ///Current Break Head Zone 3
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead3")] CurrentBreakHead3 = 8025,
+    [pbr::OriginalName("CurrentBreakHeadZone3")] CurrentBreakHeadZone3 = 8025,
     /// <summary>
-    ///Current Break  Head 4
+    ///Current Break Head Zone 4
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead4")] CurrentBreakHead4 = 8026,
+    [pbr::OriginalName("CurrentBreakHeadZone4")] CurrentBreakHeadZone4 = 8026,
     /// <summary>
-    ///Current Break  Head 5
+    ///Current Break Head Zone 5
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead5")] CurrentBreakHead5 = 8027,
+    [pbr::OriginalName("CurrentBreakHeadZone5")] CurrentBreakHeadZone5 = 8027,
     /// <summary>
-    ///Current Break  Head 6
+    ///Current Break Head Zone 6
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead6")] CurrentBreakHead6 = 8028,
+    [pbr::OriginalName("CurrentBreakHeadZone6")] CurrentBreakHeadZone6 = 8028,
     /// <summary>
     ///Current Break Mixer
     /// </summary>
     [pbr::OriginalName("CurrentBreakMixer")] CurrentBreakMixer = 8029,
     /// <summary>
-    ///Current Break  Head 7
+    ///Current Break Head Zone 7
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead7")] CurrentBreakHead7 = 8030,
+    [pbr::OriginalName("CurrentBreakHeadZone7")] CurrentBreakHeadZone7 = 8030,
     /// <summary>
-    ///Current Break  Head 8
+    ///Current Break Head Zone 8
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead8")] CurrentBreakHead8 = 8031,
+    [pbr::OriginalName("CurrentBreakHeadZone8")] CurrentBreakHeadZone8 = 8031,
     /// <summary>
-    ///Current Break  Head 9
+    ///Current Break Head Zone 9
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead9")] CurrentBreakHead9 = 8032,
+    [pbr::OriginalName("CurrentBreakHeadZone9")] CurrentBreakHeadZone9 = 8032,
     /// <summary>
-    ///Current Break  Head 10
+    ///Current Break Head Zone 10
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead10")] CurrentBreakHead10 = 8033,
+    [pbr::OriginalName("CurrentBreakHeadZone10")] CurrentBreakHeadZone10 = 8033,
     /// <summary>
-    ///Current Break  Head 11
+    ///Current Break Head Zone 11
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead11")] CurrentBreakHead11 = 8034,
+    [pbr::OriginalName("CurrentBreakHeadZone11")] CurrentBreakHeadZone11 = 8034,
     /// <summary>
-    ///Current Break  Head 12
+    ///Current Break Head Zone 12
     /// </summary>
-    [pbr::OriginalName("CurrentBreakHead12")] CurrentBreakHead12 = 8035,
+    [pbr::OriginalName("CurrentBreakHeadZone12")] CurrentBreakHeadZone12 = 8035,
     /// <summary>
     ///Current Break  Head Blower In
     /// </summary>
@@ -435,57 +440,57 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("CurrentDryer2")] CurrentDryer2 = 8039,
     /// <summary>
-    ///Current Head 1
+    ///Current Head Zone 1
     /// </summary>
-    [pbr::OriginalName("CurrentHead1")] CurrentHead1 = 8040,
+    [pbr::OriginalName("CurrentHeadZone1")] CurrentHeadZone1 = 8040,
     /// <summary>
-    ///Current Head 2
+    ///Current Head Zone 2
     /// </summary>
-    [pbr::OriginalName("CurrentHead2")] CurrentHead2 = 8041,
+    [pbr::OriginalName("CurrentHeadZone2")] CurrentHeadZone2 = 8041,
     /// <summary>
-    ///Current Head 3
+    ///Current Head Zone 3
     /// </summary>
-    [pbr::OriginalName("CurrentHead3")] CurrentHead3 = 8042,
+    [pbr::OriginalName("CurrentHeadZone3")] CurrentHeadZone3 = 8042,
     /// <summary>
-    ///Current Head 4
+    ///Current Head Zone 4
     /// </summary>
-    [pbr::OriginalName("CurrentHead4")] CurrentHead4 = 8043,
+    [pbr::OriginalName("CurrentHeadZone4")] CurrentHeadZone4 = 8043,
     /// <summary>
-    ///Current Head 5
+    ///Current Head Zone 5
     /// </summary>
-    [pbr::OriginalName("CurrentHead5")] CurrentHead5 = 8044,
+    [pbr::OriginalName("CurrentHeadZone5")] CurrentHeadZone5 = 8044,
     /// <summary>
-    ///Current Head 6
+    ///Current Head Zone 6
     /// </summary>
-    [pbr::OriginalName("CurrentHead6")] CurrentHead6 = 8045,
+    [pbr::OriginalName("CurrentHeadZone6")] CurrentHeadZone6 = 8045,
     /// <summary>
     ///Current Mixer
     /// </summary>
     [pbr::OriginalName("CurrentMixer")] CurrentMixer = 8046,
     /// <summary>
-    ///Current Head 7
+    ///Current Head Zone 7
     /// </summary>
-    [pbr::OriginalName("CurrentHead7")] CurrentHead7 = 8047,
+    [pbr::OriginalName("CurrentHeadZone7")] CurrentHeadZone7 = 8047,
     /// <summary>
-    ///Current Head 8
+    ///Current Head Zone 8
     /// </summary>
-    [pbr::OriginalName("CurrentHead8")] CurrentHead8 = 8048,
+    [pbr::OriginalName("CurrentHeadZone8")] CurrentHeadZone8 = 8048,
     /// <summary>
-    ///Current Head 9
+    ///Current Head Zone 9
     /// </summary>
-    [pbr::OriginalName("CurrentHead9")] CurrentHead9 = 8049,
+    [pbr::OriginalName("CurrentHeadZone9")] CurrentHeadZone9 = 8049,
     /// <summary>
-    ///Current Head 10
+    ///Current Head Zone 10
     /// </summary>
-    [pbr::OriginalName("CurrentHead10")] CurrentHead10 = 8050,
+    [pbr::OriginalName("CurrentHeadZone10")] CurrentHeadZone10 = 8050,
     /// <summary>
-    ///Current Head 11
+    ///Current Head Zone 11
     /// </summary>
-    [pbr::OriginalName("CurrentHead11")] CurrentHead11 = 8051,
+    [pbr::OriginalName("CurrentHeadZone11")] CurrentHeadZone11 = 8051,
     /// <summary>
-    ///Current Head 12
+    ///Current Head Zone 12
     /// </summary>
-    [pbr::OriginalName("CurrentHead12")] CurrentHead12 = 8052,
+    [pbr::OriginalName("CurrentHeadZone12")] CurrentHeadZone12 = 8052,
     /// <summary>
     ///Current Head Blower In
     /// </summary>
@@ -503,57 +508,57 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("HeaterDryer2")] HeaterDryer2 = 8056,
     /// <summary>
-    ///Heater Head 1
+    ///Heater Head Zone 1
     /// </summary>
-    [pbr::OriginalName("HeaterHead1")] HeaterHead1 = 8057,
+    [pbr::OriginalName("HeaterHeadZone1")] HeaterHeadZone1 = 8057,
     /// <summary>
-    ///Heater Head 2
+    ///Heater Head Zone 2
     /// </summary>
-    [pbr::OriginalName("HeaterHead2")] HeaterHead2 = 8058,
+    [pbr::OriginalName("HeaterHeadZone2")] HeaterHeadZone2 = 8058,
     /// <summary>
-    ///Heater Head 3
+    ///Heater Head Zone 3
     /// </summary>
-    [pbr::OriginalName("HeaterHead3")] HeaterHead3 = 8059,
+    [pbr::OriginalName("HeaterHeadZone3")] HeaterHeadZone3 = 8059,
     /// <summary>
-    ///Heater Head 4
+    ///Heater Head Zone 4
     /// </summary>
-    [pbr::OriginalName("HeaterHead4")] HeaterHead4 = 8060,
+    [pbr::OriginalName("HeaterHeadZone4")] HeaterHeadZone4 = 8060,
     /// <summary>
-    ///Heater Head 5
+    ///Heater Head Zone 5
     /// </summary>
-    [pbr::OriginalName("HeaterHead5")] HeaterHead5 = 8061,
+    [pbr::OriginalName("HeaterHeadZone5")] HeaterHeadZone5 = 8061,
     /// <summary>
-    ///Heater Head 6
+    ///Heater Head Zone 6
     /// </summary>
-    [pbr::OriginalName("HeaterHead6")] HeaterHead6 = 8062,
+    [pbr::OriginalName("HeaterHeadZone6")] HeaterHeadZone6 = 8062,
     /// <summary>
     ///Heater Mixer
     /// </summary>
     [pbr::OriginalName("HeaterMixer")] HeaterMixer = 8063,
     /// <summary>
-    ///Heater Head 7
+    ///Heater Head Zone 7
     /// </summary>
-    [pbr::OriginalName("HeaterHead7")] HeaterHead7 = 8064,
+    [pbr::OriginalName("HeaterHeadZone7")] HeaterHeadZone7 = 8064,
     /// <summary>
-    ///Heater Head 8
+    ///Heater Head Zone 8
     /// </summary>
-    [pbr::OriginalName("HeaterHead8")] HeaterHead8 = 8065,
+    [pbr::OriginalName("HeaterHeadZone8")] HeaterHeadZone8 = 8065,
     /// <summary>
-    ///Heater Head 9
+    ///Heater Head Zone 9
     /// </summary>
-    [pbr::OriginalName("HeaterHead9")] HeaterHead9 = 8066,
+    [pbr::OriginalName("HeaterHeadZone9")] HeaterHeadZone9 = 8066,
     /// <summary>
-    ///Heater Head 10
+    ///Heater Head Zone 10
     /// </summary>
-    [pbr::OriginalName("HeaterHead10")] HeaterHead10 = 8067,
+    [pbr::OriginalName("HeaterHeadZone10")] HeaterHeadZone10 = 8067,
     /// <summary>
-    ///Heater Head 11
+    ///Heater Head Zone 11
     /// </summary>
-    [pbr::OriginalName("HeaterHead11")] HeaterHead11 = 8068,
+    [pbr::OriginalName("HeaterHeadZone11")] HeaterHeadZone11 = 8068,
     /// <summary>
-    ///Heater Head 12
+    ///Heater Head Zone 12
     /// </summary>
-    [pbr::OriginalName("HeaterHead12")] HeaterHead12 = 8069,
+    [pbr::OriginalName("HeaterHeadZone12")] HeaterHeadZone12 = 8069,
     /// <summary>
     ///Heater Head Blower In
     /// </summary>
@@ -587,37 +592,37 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("PowerstepDryerLoadarm")] PowerstepDryerLoadarm = 9005,
     /// <summary>
-    ///Powerstep Dispenser 1
+    ///Powerstep Dispenser K
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser1")] PowerstepDispenser1 = 9006,
+    [pbr::OriginalName("PowerstepDispenserK")] PowerstepDispenserK = 9006,
     /// <summary>
-    ///Powerstep Dispenser 2
+    ///Powerstep Dispenser C
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser2")] PowerstepDispenser2 = 9007,
+    [pbr::OriginalName("PowerstepDispenserC")] PowerstepDispenserC = 9007,
     /// <summary>
-    ///Powerstep Dispenser 3
+    ///Powerstep Dispenser M
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser3")] PowerstepDispenser3 = 9008,
+    [pbr::OriginalName("PowerstepDispenserM")] PowerstepDispenserM = 9008,
     /// <summary>
-    ///Powerstep Dispenser 4
+    ///Powerstep Dispenser Y
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser4")] PowerstepDispenser4 = 9009,
+    [pbr::OriginalName("PowerstepDispenserY")] PowerstepDispenserY = 9009,
     /// <summary>
-    ///Powerstep Dispenser 5
+    ///Powerstep Dispenser TI
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser5")] PowerstepDispenser5 = 9010,
+    [pbr::OriginalName("PowerstepDispenserTI")] PowerstepDispenserTi = 9010,
     /// <summary>
-    ///Powerstep Dispenser 6
+    ///Powerstep Dispenser LC
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser6")] PowerstepDispenser6 = 9011,
+    [pbr::OriginalName("PowerstepDispenserLC")] PowerstepDispenserLc = 9011,
     /// <summary>
-    ///Powerstep Dispenser 7
+    ///Powerstep Dispenser LM
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser7")] PowerstepDispenser7 = 9012,
+    [pbr::OriginalName("PowerstepDispenserLM")] PowerstepDispenserLm = 9012,
     /// <summary>
-    ///Powerstep Dispenser 8
+    ///Powerstep Dispenser LY
     /// </summary>
-    [pbr::OriginalName("PowerstepDispenser8")] PowerstepDispenser8 = 9013,
+    [pbr::OriginalName("PowerstepDispenserLY")] PowerstepDispenserLy = 9013,
     /// <summary>
     ///Powerstep Screw 
     /// </summary>
@@ -707,37 +712,37 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("MotorWireReadDryerLoadarm")] MotorWireReadDryerLoadarm = 9035,
     /// <summary>
-    ///Motor Wire Read Dispenser 1
+    ///Motor Wire Read Dispenser K
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser1")] MotorWireReadDispenser1 = 9036,
+    [pbr::OriginalName("MotorWireReadDispenserK")] MotorWireReadDispenserK = 9036,
     /// <summary>
-    ///Motor Wire Read Dispenser 2
+    ///Motor Wire Read Dispenser C
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser2")] MotorWireReadDispenser2 = 9037,
+    [pbr::OriginalName("MotorWireReadDispenserC")] MotorWireReadDispenserC = 9037,
     /// <summary>
-    ///Motor Wire Read Dispenser 3
+    ///Motor Wire Read Dispenser M
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser3")] MotorWireReadDispenser3 = 9038,
+    [pbr::OriginalName("MotorWireReadDispenserM")] MotorWireReadDispenserM = 9038,
     /// <summary>
-    ///Motor Wire Read Dispenser 4
+    ///Motor Wire Read Dispenser Y
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser4")] MotorWireReadDispenser4 = 9039,
+    [pbr::OriginalName("MotorWireReadDispenserY")] MotorWireReadDispenserY = 9039,
     /// <summary>
-    ///Motor Wire Read Dispenser 5
+    ///Motor Wire Read Dispenser TI
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser5")] MotorWireReadDispenser5 = 9040,
+    [pbr::OriginalName("MotorWireReadDispenserTI")] MotorWireReadDispenserTi = 9040,
     /// <summary>
-    ///Motor Wire Read Dispenser 6
+    ///Motor Wire Read Dispenser LC
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser6")] MotorWireReadDispenser6 = 9041,
+    [pbr::OriginalName("MotorWireReadDispenserLC")] MotorWireReadDispenserLc = 9041,
     /// <summary>
-    ///Motor Wire Read Dispenser 7
+    ///Motor Wire Read Dispenser LM
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser7")] MotorWireReadDispenser7 = 9042,
+    [pbr::OriginalName("MotorWireReadDispenserLM")] MotorWireReadDispenserLm = 9042,
     /// <summary>
-    ///Motor Wire Read Dispenser 8
+    ///Motor Wire Read Dispenser LY
     /// </summary>
-    [pbr::OriginalName("MotorWireReadDispenser8")] MotorWireReadDispenser8 = 9043,
+    [pbr::OriginalName("MotorWireReadDispenserLY")] MotorWireReadDispenserLy = 9043,
     /// <summary>
     ///Motor Wire Read Screw 
     /// </summary>
@@ -843,69 +848,69 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("WHSOtherSensorFailure")] WhsotherSensorFailure = 10009,
     /// <summary>
-    ///Pressure Building Up 1
+    ///Pressure Building Up K
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp1")] PressureBuildingUp1 = 11000,
+    [pbr::OriginalName("PressureBuildingUpK")] PressureBuildingUpK = 11000,
     /// <summary>
-    ///Pressure Building Up 2
+    ///Pressure Building Up C
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp2")] PressureBuildingUp2 = 11001,
+    [pbr::OriginalName("PressureBuildingUpC")] PressureBuildingUpC = 11001,
     /// <summary>
-    ///Pressure Building Up 3
+    ///Pressure Building Up M
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp3")] PressureBuildingUp3 = 11002,
+    [pbr::OriginalName("PressureBuildingUpM")] PressureBuildingUpM = 11002,
     /// <summary>
-    ///Pressure Building Up 4
+    ///Pressure Building Up Y
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp4")] PressureBuildingUp4 = 11003,
+    [pbr::OriginalName("PressureBuildingUpY")] PressureBuildingUpY = 11003,
     /// <summary>
-    ///Pressure Building Up 5
+    ///Pressure Building Up TI
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp5")] PressureBuildingUp5 = 11004,
+    [pbr::OriginalName("PressureBuildingUpTI")] PressureBuildingUpTi = 11004,
     /// <summary>
-    ///Pressure Building Up 6
+    ///Pressure Building Up LC
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp6")] PressureBuildingUp6 = 11005,
+    [pbr::OriginalName("PressureBuildingUpLC")] PressureBuildingUpLc = 11005,
     /// <summary>
-    ///Pressure Building Up 7
+    ///Pressure Building Up LM
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp7")] PressureBuildingUp7 = 11006,
+    [pbr::OriginalName("PressureBuildingUpLM")] PressureBuildingUpLm = 11006,
     /// <summary>
-    ///Pressure Building Up 8
+    ///Pressure Building Up LY
     /// </summary>
-    [pbr::OriginalName("PressureBuildingUp8")] PressureBuildingUp8 = 11007,
+    [pbr::OriginalName("PressureBuildingUpLY")] PressureBuildingUpLy = 11007,
     /// <summary>
-    ///Pressure Released 1
+    ///Pressure Released K
     /// </summary>
-    [pbr::OriginalName("PressureReleased1")] PressureReleased1 = 11008,
+    [pbr::OriginalName("PressureReleasedK")] PressureReleasedK = 11008,
     /// <summary>
-    ///Pressure Released 2
+    ///Pressure Released C
     /// </summary>
-    [pbr::OriginalName("PressureReleased2")] PressureReleased2 = 11009,
+    [pbr::OriginalName("PressureReleasedC")] PressureReleasedC = 11009,
     /// <summary>
-    ///Pressure Released 3
+    ///Pressure Released M
     /// </summary>
-    [pbr::OriginalName("PressureReleased3")] PressureReleased3 = 11010,
+    [pbr::OriginalName("PressureReleasedM")] PressureReleasedM = 11010,
     /// <summary>
-    ///Pressure Released 4
+    ///Pressure Released Y
     /// </summary>
-    [pbr::OriginalName("PressureReleased4")] PressureReleased4 = 11011,
+    [pbr::OriginalName("PressureReleasedY")] PressureReleasedY = 11011,
     /// <summary>
-    ///Pressure Released 5
+    ///Pressure Released TI
     /// </summary>
-    [pbr::OriginalName("PressureReleased5")] PressureReleased5 = 11012,
+    [pbr::OriginalName("PressureReleasedTI")] PressureReleasedTi = 11012,
     /// <summary>
-    ///Pressure Released 6
+    ///Pressure Released LC
     /// </summary>
-    [pbr::OriginalName("PressureReleased6")] PressureReleased6 = 11013,
+    [pbr::OriginalName("PressureReleasedLC")] PressureReleasedLc = 11013,
     /// <summary>
-    ///Pressure Released 7
+    ///Pressure Released LM
     /// </summary>
-    [pbr::OriginalName("PressureReleased7")] PressureReleased7 = 11014,
+    [pbr::OriginalName("PressureReleasedLM")] PressureReleasedLm = 11014,
     /// <summary>
-    ///Pressure Released 8
+    ///Pressure Released LY
     /// </summary>
-    [pbr::OriginalName("PressureReleased8")] PressureReleased8 = 11015,
+    [pbr::OriginalName("PressureReleasedLY")] PressureReleasedLy = 11015,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Program.cs
index 7fa6ee987..600828b73 100644
--- a/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Program.cs
@@ -13,12 +13,13 @@ namespace Tango.BitTypesGenerator.CLI
 {
     class Program
     {
-        private static string BITS_FILE = "Built InTest List Rev 7.0.xlsx";
+        private static string BITS_FILE = "Built InTest List Rev 9.0.xlsx";
 
         private class ExcelBitType
         {
             public String Code { get; set; }
             public String Name { get; set; }
+            public String Description { get; set; }
             public String Subject { get; set; }
             public String Index { get; set; }
             public String TestType { get; set; }
@@ -93,6 +94,7 @@ namespace Tango.BitTypesGenerator.CLI
         {
             bit.Code = int.Parse(evx.Code);
             bit.Name = evx.Name;
+            bit.Description = evx.Description;
             bit.Subject = evx.Subject;
             bit.ComponentIndex = evx.Index.IsNotNullOrEmpty() ? int.Parse(evx.Index) : -1;
             bit.TestType = int.Parse(evx.TestType);
@@ -105,6 +107,7 @@ namespace Tango.BitTypesGenerator.CLI
 
             if (te.Code != bit.Code) return true;
             if (te.Name != bit.Name) return true;
+            if (te.Description != bit.Description) return true;
             if (te.Subject != bit.Subject) return true;
             if (te.ComponentIndex != bit.ComponentIndex) return true;
             if (te.TestType != bit.TestType) return true;
diff --git a/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Tango.BitTypesGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Tango.BitTypesGenerator.CLI.csproj
index d1da10210..bb681b0e9 100644
--- a/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Tango.BitTypesGenerator.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.BitTypesGenerator.CLI/Tango.BitTypesGenerator.CLI.csproj
@@ -62,6 +62,10 @@
       <Link>Built InTest List Rev 7.0.xlsx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="..\..\Resources\BIT\Built InTest List Rev 9.0.xlsx">
+      <Link>Built InTest List Rev 9.0.xlsx</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="..\..\Resources\BIT\Built InTest List Rev1.0.xlsx">
       <Link>Built InTest List Rev1.0.xlsx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>