Added new colorized static text widget to tech board.

Added option to go back to job/jobs from running job view.
Fixed issue with bug reporting.
Fixed other bugs.

157 files changed, 939 insertions, 440 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 61bf2d50f..28da79e71 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 b6156a8f0..1a6bcb391 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Graphics/text.png b/Software/Graphics/text.png
new file mode 100644
index 000000000..c6c17bdad
--- /dev/null
+++ b/Software/Graphics/text.png
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index 398d25b35..0cd7509c5 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
index 77d9cc0d8..680f48306 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")]
-[assembly: AssemblyVersion("2.0.10.1159")]
+[assembly: AssemblyVersion("2.0.11.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
index fe6b7a013..46d358e4f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio DB Module")]
-[assembly: AssemblyVersion("2.0.9.1159")]
+[assembly: AssemblyVersion("2.0.10.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
index 01b5df038..2f6544d99 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")]
-[assembly: AssemblyVersion("2.0.10.1159")]
+[assembly: AssemblyVersion("2.0.11.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
index c29c487ae..87c13caf5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")]
-[assembly: AssemblyVersion("2.0.17.1159")]
+[assembly: AssemblyVersion("2.0.18.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index cc9831ad9..dc96f7112 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -359,7 +359,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 60c2e65f9..55dd370d1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -644,6 +644,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// Gets or sets the reload machines command.
         /// </summary>
         public RelayCommand ReloadMachinesCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the back to job command.
+        /// </summary>
+        public RelayCommand BackToJobCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets to running job command.
+        /// </summary>
+        public RelayCommand ToRunningJobCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -717,6 +727,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     return null;
                 }
             });
+
+            BackToJobCommand = new RelayCommand(BackToJob);
+            ToRunningJobCommand = new RelayCommand(ToRunningJob);
         }
 
         #endregion
@@ -1310,6 +1323,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
             }
         }
 
+        private void BackToJob()
+        {
+            _navigation.NavigateTo(DeveloperNavigationView.JobView);
+        }
+
+        private void ToRunningJob()
+        {
+            _navigation.NavigateTo(DeveloperNavigationView.RunningJobView);
+        }
+
         #endregion
 
         #region RML
@@ -1357,7 +1380,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 LogManager.Log("Invalidating liquid factors, process parameters and process group history...");
                 LiquidTypesRmls = ActiveJob.Machine.Configuration.NoneEmptyIdsPacks.Where(x => !x.IsEmpty).OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
 
-                _activeJobDbContext.ProcessParametersTablesGroups.Where(x => x.RmlGuid == SelectedRML.Guid).Include(x => x.ProcessParametersTables).ToList();
+                _activeJobDbContext.Adapter.GetRmlProcessParametersTablesGroups(SelectedRML.Guid);
 
                 RmlProcessParametersTableGroup = SelectedRML.ProcessParametersTablesGroups.ToList().SingleOrDefault(x => x.Active);
 
@@ -1366,7 +1389,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 if (RmlProcessParametersTableGroup != null)
                 {
                     RmlProcessParametersTableGroup = RmlProcessParametersTableGroup.Clone();
-                    RmlProcessParametersTableGroup.ProcessParametersTables = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection();
+                    RmlProcessParametersTableGroup.ProcessParametersTables = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).ToSynchronizedObservableCollection();
                 }
 
 
@@ -1445,7 +1468,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 }
 
                 group.Active = true;
-                group.ProcessParametersTables = tables.ToObservableCollection();
+                group.ProcessParametersTables = tables.ToSynchronizedObservableCollection();
                 group.Rml = SelectedRML;
                 group.Name = response;
                 group.SaveDate = DateTime.UtcNow;
@@ -1509,7 +1532,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
 
                         LogManager.Log("Setting active job...");
-                        ActiveJob = _activeJobDbContext.Jobs.Include(x => x.Rml).Include(x => x.Segments).Include(x => x.Segments.Select(y => y.BrushStops)).SingleOrDefault(x => x.Guid == SelectedMachineJob.Guid);
+                        ActiveJob = _activeJobDbContext.Adapter.GetJob(SelectedMachineJob.Guid);
 
                         _activeJobDbContext.Ccts.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
                         _activeJobDbContext.Cats.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
@@ -1646,18 +1669,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 using (_notification.PushTaskItem("Loading selected machine..."))
                 {
                     await _machineDbContext.Jobs.Where(x => x.MachineGuid == SelectedMachine.Guid).Include(x => x.User).Include(x => x.User.Contact).LoadAsync();
-                    await _machineDbContext.Configurations.SingleOrDefaultAsync(x => x.Guid == SelectedMachine.ConfigurationGuid);
 
                     await _machineDbContext.ColorSpaces.LoadAsync();
 
-                    SelectedMachine.Configuration.IdsPacks.EnableCrossThreadOperations();
-
-                    await _machineDbContext.IdsPacks.OrderBy(x => x.PackIndex).Where(x => x.ConfigurationGuid == SelectedMachine.ConfigurationGuid).
-                        Include(x => x.CartridgeType).
-                        Include(x => x.DispenserType).
-                        Include(x => x.LiquidType).
-                        Include(x => x.IdsPackFormula).
-                        Include(x => x.MidTankType).LoadAsync();
+                    await Task.Factory.StartNew(() =>
+                    {
+                        _machineDbContext.Adapter.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
+                    });
 
                     RaisePropertyChanged(nameof(SelectedMachine));
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 016718075..ea350767c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1159,7 +1159,7 @@
                                     </Grid>
 
                                     <Grid DockPanel.Dock="Right" Margin="0 0 10 0">
-                                        <StackPanel Orientation="Horizontal">
+                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Button Height="60" Width="280" Command="{Binding StartJobCommand}" Click="OnJobStartClick">
                                                 <StackPanel Orientation="Horizontal">
                                                     <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="ClockFast" />
@@ -1170,6 +1170,12 @@
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Width="38" Height="38" Kind="Record" Foreground="#FF6D6D" />
                                             </Button>
                                         </StackPanel>
+                                        <Button Command="{Binding ToRunningJobCommand}" Width="280" Height="60" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <StackPanel Orientation="Horizontal">
+                                                <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="AlertCircle" />
+                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="18">VIEW RUNNING JOB</TextBlock>
+                                            </StackPanel>
+                                        </Button>
                                     </Grid>
 
                                     <Grid Margin="0 -18 0 0">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 2942d36af..e6a528612 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -73,7 +73,7 @@ namespace Tango.MachineStudio.Developer.Views
                         segments.Add(new Segment()
                         {
                             Length = _vm.ActiveJob.InterSegmentLength,
-                            BrushStops = new System.Collections.ObjectModel.ObservableCollection<BrushStop>()
+                            BrushStops = new SynchronizedObservableCollection<BrushStop>()
                             {
                                 new BrushStop()
                                 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 279a9daf3..1cb8536e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -168,10 +168,10 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="NAME" CanUserSort="True" SortMemberPath="Name">
+                                        <DataGridTemplateColumn Header="NAME" CanUserSort="True" SortMemberPath="Name" MaxWidth="100">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" FontSize="14"></TextBlock>
+                                                    <TextBlock Text="{Binding Name}" ToolTip="{Binding Name}"  TextWrapping="Wrap" MaxHeight="40" TextTrimming="CharacterEllipsis" VerticalAlignment="Center" FontSize="14"></TextBlock>
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index dd2e541f5..11c60c1ef 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -25,10 +25,10 @@
 
                 <Grid DockPanel.Dock="Bottom" Height="40">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 0 0">
-                        <Button Command="{Binding ExportToExcelCommand}" Style="{StaticResource MaterialDesignFlatButton}">
+                        <Button Command="{Binding BackToJobCommand}" Style="{StaticResource MaterialDesignFlatButton}" FontSize="16">
                             <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="FileExcel"></materialDesign:PackIcon>
-                                <TextBlock Margin="10 0 0 0">EXPORT TO EXCEL</TextBlock>
+                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="KeyboardBackspace" Width="24" Height="24"></materialDesign:PackIcon>
+                                <TextBlock Margin="10 0 0 0">BACK TO JOB</TextBlock>
                             </StackPanel>
                         </Button>
                     </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
index 6807ed5c8..78e77f844 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")]
-[assembly: AssemblyVersion("2.0.10.1159")]
+[assembly: AssemblyVersion("2.0.11.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index 6ba28cb72..c46b1dec1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -103,13 +103,13 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
             _db = ObservablesContext.CreateDefault();
 
-            CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).ToObservableCollection();
-            CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).ToObservableCollection();
-            CurrentVersion.HardwarePidControls = _db.HardwarePidControlTypes.ToList().Select(x => new HardwarePidControl() { HardwarePidControlType = x }).ToObservableCollection();
-            CurrentVersion.HardwareWinders = _db.HardwareWinderTypes.ToList().Select(x => new HardwareWinder() { HardwareWinderType = x }).ToObservableCollection();
-            CurrentVersion.HardwareSpeedSensors = _db.HardwareSpeedSensorTypes.ToList().Select(x => new HardwareSpeedSensor() { HardwareSpeedSensorType = x }).ToObservableCollection();
-            CurrentVersion.HardwareBlowers = _db.HardwareBlowerTypes.ToList().Select(x => new HardwareBlower() { HardwareBlowerType = x }).ToObservableCollection();
-            CurrentVersion.HardwareBreakSensors = _db.HardwareBreakSensorTypes.ToList().Select(x => new HardwareBreakSensor() { HardwareBreakSensorType = x }).ToObservableCollection();
+            CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwarePidControls = _db.HardwarePidControlTypes.ToList().Select(x => new HardwarePidControl() { HardwarePidControlType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareWinders = _db.HardwareWinderTypes.ToList().Select(x => new HardwareWinder() { HardwareWinderType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareSpeedSensors = _db.HardwareSpeedSensorTypes.ToList().Select(x => new HardwareSpeedSensor() { HardwareSpeedSensorType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareBlowers = _db.HardwareBlowerTypes.ToList().Select(x => new HardwareBlower() { HardwareBlowerType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareBreakSensors = _db.HardwareBreakSensorTypes.ToList().Select(x => new HardwareBreakSensor() { HardwareBreakSensorType = x }).ToSynchronizedObservableCollection();
         }
 
         private void RefreshVersions()
@@ -143,7 +143,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwareMotors = CurrentVersion.HardwareMotors.OrderBy(x => x.HardwareMotorType.Code).ToObservableCollection();
+                CurrentVersion.HardwareMotors = CurrentVersion.HardwareMotors.OrderBy(x => x.HardwareMotorType.Code).ToSynchronizedObservableCollection();
 
                 ObservablesStaticCollections.Instance.HardwareDancerTypes.Where(x => !CurrentVersion.HardwareDancers.ToList().Exists(y => y.HardwareDancerType.Code == x.Code)).ToList().ForEach(x =>
                 {
@@ -153,7 +153,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwareDancers = CurrentVersion.HardwareDancers.OrderBy(x => x.HardwareDancerType.Code).ToObservableCollection();
+                CurrentVersion.HardwareDancers = CurrentVersion.HardwareDancers.OrderBy(x => x.HardwareDancerType.Code).ToSynchronizedObservableCollection();
 
                 ObservablesStaticCollections.Instance.HardwarePidControlTypes.Where(x => !CurrentVersion.HardwarePidControls.ToList().Exists(y => y.HardwarePidControlType.Code == x.Code)).ToList().ForEach(x =>
                 {
@@ -163,7 +163,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwarePidControls = CurrentVersion.HardwarePidControls.OrderBy(x => x.HardwarePidControlType.Code).ToObservableCollection();
+                CurrentVersion.HardwarePidControls = CurrentVersion.HardwarePidControls.OrderBy(x => x.HardwarePidControlType.Code).ToSynchronizedObservableCollection();
 
                 ObservablesStaticCollections.Instance.HardwareWinderTypes.Where(x => !CurrentVersion.HardwareWinders.ToList().Exists(y => y.HardwareWinderType.Code == x.Code)).ToList().ForEach(x =>
                 {
@@ -173,7 +173,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwareWinders = CurrentVersion.HardwareWinders.OrderBy(x => x.HardwareWinderType.Code).ToObservableCollection();
+                CurrentVersion.HardwareWinders = CurrentVersion.HardwareWinders.OrderBy(x => x.HardwareWinderType.Code).ToSynchronizedObservableCollection();
 
                 ObservablesStaticCollections.Instance.HardwareSpeedSensorTypes.Where(x => !CurrentVersion.HardwareSpeedSensors.ToList().Exists(y => y.HardwareSpeedSensorType.Code == x.Code)).ToList().ForEach(x =>
                 {
@@ -183,7 +183,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwareSpeedSensors = CurrentVersion.HardwareSpeedSensors.OrderBy(x => x.HardwareSpeedSensorType.Code).ToObservableCollection();
+                CurrentVersion.HardwareSpeedSensors = CurrentVersion.HardwareSpeedSensors.OrderBy(x => x.HardwareSpeedSensorType.Code).ToSynchronizedObservableCollection();
 
                 ObservablesStaticCollections.Instance.HardwareBlowerTypes.Where(x => !CurrentVersion.HardwareBlowers.ToList().Exists(y => y.HardwareBlowerType.Code == x.Code)).ToList().ForEach(x =>
                 {
@@ -193,7 +193,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwareBlowers = CurrentVersion.HardwareBlowers.OrderBy(x => x.HardwareBlowerType.Code).ToObservableCollection();
+                CurrentVersion.HardwareBlowers = CurrentVersion.HardwareBlowers.OrderBy(x => x.HardwareBlowerType.Code).ToSynchronizedObservableCollection();
 
                 ObservablesStaticCollections.Instance.HardwareBreakSensorTypes.Where(x => !CurrentVersion.HardwareBreakSensors.ToList().Exists(y => y.HardwareBreakSensorType.Code == x.Code)).ToList().ForEach(x =>
                 {
@@ -203,7 +203,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     });
                 });
 
-                CurrentVersion.HardwareBreakSensors = CurrentVersion.HardwareBreakSensors.OrderBy(x => x.HardwareBreakSensorType.Code).ToObservableCollection();
+                CurrentVersion.HardwareBreakSensors = CurrentVersion.HardwareBreakSensors.OrderBy(x => x.HardwareBreakSensorType.Code).ToSynchronizedObservableCollection();
             });
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
index f0713376c..d36d85f22 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")]
-[assembly: AssemblyVersion("2.0.17.1159")]
+[assembly: AssemblyVersion("2.0.18.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
index a5e99504c..e0203d2bd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")]
-[assembly: AssemblyVersion("2.0.10.1159")]
+[assembly: AssemblyVersion("2.0.11.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
index 220526a23..cdf55c4db 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")]
-[assembly: AssemblyVersion("2.0.9.1159")]
+[assembly: AssemblyVersion("2.0.10.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/TextElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/TextElementEditor.xaml
new file mode 100644
index 000000000..33b0645ab
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/TextElementEditor.xaml
@@ -0,0 +1,95 @@
+<local:ElementEditor x:Class="Tango.MachineStudio.Technician.Editors.TextElementEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems"
+             xmlns:converters="clr-namespace:Tango.Editors.Converters;assembly=Tango.Editors"
+             xmlns:visuals="clr-namespace:Tango.Visuals;assembly=Tango.Visuals"
+             xmlns:local="clr-namespace:Tango.Editors;assembly=Tango.Editors"
+             mc:Ignorable="d" Background="Transparent" ClipToBounds="False" BorderThickness="0" MinWidth="1" MinHeight="1" RenderTransformOrigin="0.5,0.5" d:DataContext="{d:DesignInstance Type=items:TextItem, IsDesignTimeCreatable=False}" Height="99.188" Width="163.459">
+
+    <UserControl.Resources>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"></converters:BoolToVisibilityConverter>
+        <sharedConverters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
+
+        <!--Theme-->
+        <SolidColorBrush x:Key="BorderBrush" Color="Transparent"></SolidColorBrush>
+        <SolidColorBrush x:Key="CornersBrush" Color="Red"></SolidColorBrush>
+    </UserControl.Resources>
+
+    <UserControl.RenderTransform>
+        <RotateTransform Angle="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=Angle}"></RotateTransform>
+    </UserControl.RenderTransform>
+
+    <Grid>
+
+
+        <!--Content-->
+        <Grid>
+            <Viewbox Stretch="Fill">
+                <TextBox PreviewKeyDown="TextBox_PreviewKeyDown" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Text,UpdateSourceTrigger=PropertyChanged}" CaretBrush="Transparent">
+                    <TextBox.Foreground>
+                        <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
+                    </TextBox.Foreground>
+                </TextBox>
+            </Viewbox>
+        </Grid>
+        <!--Content-->
+
+
+        <Border BorderThickness="1" BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=BorderBrush,TargetNullValue={StaticResource BorderBrush},FallbackValue={StaticResource BorderBrush}}">
+            <Border.Style>
+                <Style TargetType="Border">
+                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                    <Style.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=(local:ElementsEditor.IsSelected)}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+
+                            <Setter Property="Visibility" Value="Visible"></Setter>
+                        </MultiDataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Border.Style>
+            <Grid>
+                <ContentPresenter Content="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=InnerContent}"></ContentPresenter>
+
+                <Thumb Opacity="0" DragDelta="MoveDrag" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb HorizontalAlignment="Left" Cursor="SizeWE" Opacity="0" DragDelta="DragLeft" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb HorizontalAlignment="Right" Cursor="SizeWE" Opacity="0" DragDelta="DragRight" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb VerticalAlignment="Top" Cursor="SizeNS" Opacity="0" DragDelta="DragTop" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb VerticalAlignment="Bottom" Cursor="SizeNS" Opacity="0" DragDelta="DragBottom" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+
+                <Grid ClipToBounds="False" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 -20 0 0" Width="10" Height="10">
+                    <Ellipse Stroke="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" StrokeThickness="2"></Ellipse>
+                    <Rectangle HorizontalAlignment="Center" VerticalAlignment="Stretch" Margin="0 10 0 -8" StrokeThickness="1" Stroke="Red"></Rectangle>
+                    <Thumb Opacity="0" DragDelta="DragAngle" DragStarted="DragStarted" Cursor="Arrow" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="-8 -8 0 0">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="2 2 0 0"></Border>
+                    <Thumb Opacity="0" DragDelta="DragTopLeft" DragStarted="DragStarted" Cursor="SizeNWSE" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -8 -8 0">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="0 2 2 0"></Border>
+                    <Thumb Opacity="0" DragDelta="DragTopRight" DragStarted="DragStarted" Cursor="SizeNESW" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -8 -8">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="0 0 2 2"></Border>
+                    <Thumb Opacity="0" DragDelta="DragBottomRight" DragStarted="DragStarted" Cursor="SizeNWSE" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="-8 0 0 -8">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="2 0 0 2"></Border>
+                    <Thumb Opacity="0" DragDelta="DragBottomLeft" DragStarted="DragStarted" Cursor="SizeNESW" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+            </Grid>
+        </Border>
+    </Grid>
+</local:ElementEditor>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/TextElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/TextElementEditor.xaml.cs
new file mode 100644
index 000000000..e7505fa35
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/TextElementEditor.xaml.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.Editors;
+using Tango.BL.Entities;
+using Tango.MachineStudio.Technician.TechItems;
+using Tango.Core;
+
+namespace Tango.MachineStudio.Technician.Editors
+{
+    [ContentProperty("InnerContent")]
+    public partial class TextElementEditor : ElementEditor
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MonitorElementEditor"/> class.
+        /// </summary>
+        public TextElementEditor()
+            : base()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MonitorElementEditor"/> class.
+        /// </summary>
+        /// <param name="frameworkElement">The framework element.</param>
+        public TextElementEditor(TextItem textItem)
+            : this()
+        {
+            TextItem = textItem;
+            DataContext = TextItem;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MonitorElementEditor"/> class.
+        /// </summary>
+        /// <param name="frameworkElement">The framework element.</param>
+        /// <param name="bounds">The bounds.</param>
+        public TextElementEditor(TextItem textItem, Rect bounds)
+            : this(textItem)
+        {
+            Left = bounds.Left;
+            Top = bounds.Top;
+            Width = bounds.Width;
+            Height = bounds.Height;
+        }
+
+        private TextItem _textItem;
+
+        public TextItem TextItem
+        {
+            get { return _textItem; }
+            set { _textItem = value; RaisePropertyChanged(nameof(TextItem)); }
+        }
+
+
+        /// <summary>
+        /// Clones this instance.
+        /// </summary>
+        /// <returns></returns>
+        public override IElementEditor Clone()
+        {
+            try
+            {
+                var clonedItem = TextItem.Clone() as TextItem;
+                TextElementEditor cloned = new TextElementEditor(clonedItem);
+                cloned.Top = Top;
+                cloned.Left = Left;
+                cloned.Width = Width;
+                cloned.Height = Height;
+                cloned.Angle = Angle;
+                return cloned;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Could not clone this editor. You may have to create a custom editor and implement a custom Clone method.", ex);
+            }
+        }
+
+        /// <summary>
+        /// Gets the hosted element.
+        /// </summary>
+        [ParameterIgnore]
+        public override Object HostedElement
+        {
+            get { return TextItem; }
+        }
+
+        private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (Keyboard.IsKeyDown(Key.LeftCtrl) && e.Key == Key.V)
+            {
+                e.Handled = true;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/text.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/text.png
new file mode 100644
index 000000000..c6c17bdad
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/text.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
index b66227b98..69eb9c7ee 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")]
-[assembly: AssemblyVersion("2.0.14.1159")]
+[assembly: AssemblyVersion("2.0.15.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/TextTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/TextTemplate.xaml
new file mode 100644
index 000000000..2193e6df4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/TextTemplate.xaml
@@ -0,0 +1,43 @@
+<UserControl x:Class="Tango.MachineStudio.Technician.PropertiesTemplates.TextTemplate"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:converters="clr-namespace:Tango.MachineStudio.Technician.Converters"
+             xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems"
+             xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
+             xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Technician.PropertiesTemplates"
+             mc:Ignorable="d" 
+             d:DesignHeight="500" d:DesignWidth="200" d:DataContext="{d:DesignInstance Type=items:TextItem, IsDesignTimeCreatable=False}">
+
+    <UserControl.Resources>
+        <sharedConverters:DoubleToIntConverter x:Key="DoubleToIntConverter" />
+
+        <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
+            <Setter Property="mahApps:ControlsHelper.HeaderFontSize" Value="14" />
+            <Setter Property="Margin" Value="2" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <StackPanel>
+            <GroupBox Header="STATIC TEXT">
+                <StackPanel>
+                    <TextBlock FontSize="10">Text</TextBlock>
+                    <TextBox Margin="0 5 0 0" Text="{Binding Text,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                </StackPanel>
+            </GroupBox>
+            
+            <GroupBox Header="COLOR" Margin="0 10 0 0">
+                <StackPanel>
+                    <Viewbox Margin="0 5 0 0">
+                        <colorPicker:ColorCanvas SelectedColor="{Binding Color,Mode=TwoWay}" Background="Transparent" />
+                    </Viewbox>
+                </StackPanel>
+            </GroupBox>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/TextTemplate.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/TextTemplate.xaml.cs
new file mode 100644
index 000000000..e5c204bef
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/TextTemplate.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.Technician.PropertiesTemplates
+{
+    /// <summary>
+    /// Interaction logic for MonitorTemplate.xaml
+    /// </summary>
+    public partial class TextTemplate : UserControl
+    {
+        public TextTemplate()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
index e187db982..73039bc4b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
@@ -100,6 +100,9 @@
     <Compile Include="Converters\TechIosToDigitalInsConverter.cs" />
     <Compile Include="Converters\TechIosToDigitalOutsConverter.cs" />
     <Compile Include="Converters\TransitionLinkConverter.cs" />
+    <Compile Include="Editors\TextElementEditor.xaml.cs">
+      <DependentUpon>TextElementEditor.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Editors\ControllerElementEditor.xaml.cs">
       <DependentUpon>ControllerElementEditor.xaml</DependentUpon>
     </Compile>
@@ -165,6 +168,9 @@
     <Compile Include="Models\TechRecordingData.cs" />
     <Compile Include="Models\TechRecordingValue.cs" />
     <Compile Include="Project\MachineTechViewProject.cs" />
+    <Compile Include="PropertiesTemplates\TextTemplate.xaml.cs">
+      <DependentUpon>TextTemplate.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PropertiesTemplates\JobRunnerTemplate.xaml.cs">
       <DependentUpon>JobRunnerTemplate.xaml</DependentUpon>
     </Compile>
@@ -234,6 +240,7 @@
     <Compile Include="TechItems\DancerItem.cs" />
     <Compile Include="TechItems\ProcessParametersItem.cs" />
     <Compile Include="TechItems\SpeedSensorItem.cs" />
+    <Compile Include="TechItems\TextItem.cs" />
     <Compile Include="TechItems\WinderItem.cs" />
     <Compile Include="TechItems\PidItem.cs" />
     <Compile Include="TechItems\MotorItem.cs" />
@@ -251,6 +258,10 @@
     <Compile Include="Views\MachineTechView.xaml.cs">
       <DependentUpon>MachineTechView.xaml</DependentUpon>
     </Compile>
+    <Page Include="Editors\TextElementEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Editors\ControllerElementEditor.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -327,6 +338,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="PropertiesTemplates\TextTemplate.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="PropertiesTemplates\JobRunnerTemplate.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -616,10 +631,13 @@
   <ItemGroup>
     <Resource Include="Images\blower-big.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\text.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
index 7945c5b73..d3cd9622f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
@@ -63,7 +63,11 @@ namespace Tango.MachineStudio.Technician.TechItems
                 if (_techDispenser != null)
                 {
                     DispenserType = DispenserTypes.SingleOrDefault(x => x.Code == int.Parse(_techDispenser.Name.Replace("Dispenser", "")) - 1);
-                    DisplayName = _techDispenser.Description;
+
+                    if (String.IsNullOrEmpty(DisplayName))
+                    {
+                        DisplayName = _techDispenser.Description;
+                    }
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
index b6ebf2857..04b6c1fab 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
@@ -38,6 +38,7 @@ namespace Tango.MachineStudio.Technician.TechItems
     [XmlInclude(typeof(BreakSensorItem))]
     [XmlInclude(typeof(ProcessParametersItem))]
     [XmlInclude(typeof(JobRunnerItem))]
+    [XmlInclude(typeof(TextItem))]
     public abstract class TechItem : ExtendedObject
     {
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs
new file mode 100644
index 000000000..939809504
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.Technician.TechItems
+{
+    [TechItem(25)]
+    public class TextItem : TechItem
+    {
+        private String _text;
+        public String Text
+        {
+            get { return _text; }
+            set { _text = value; RaisePropertyChangedAuto(); }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MeterItem"/> class.
+        /// </summary>
+        public TextItem() : base()
+        {
+            Name = "Static Text";
+            Description = "Static Text";
+            Text = "Static Text";
+            Image = ResourceHelper.GetImageFromResources("Images/text.png");
+            Color = Colors.DodgerBlue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextItem"/> class.
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        public TextItem(Object obj) : this()
+        {
+
+        }
+
+        public override TechItem Clone()
+        {
+            TextItem cloned = base.Clone() as TextItem;
+            cloned.Text = Text;
+            return cloned;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 55235b3c2..9ecfa2312 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -635,6 +635,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 var editor = CreateElement<JobRunnerElementEditor, JobRunnerItem, object>(bounds, null);
                 InitJobRunnerItem(editor.JobRunnerItem);
             }
+            else if (item is TextItem)
+            {
+                CreateElement<TextElementEditor, TextItem, object>(bounds, null);
+            }
         }
 
         /// <summary>
@@ -774,6 +778,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 var editor = CreateElement<JobRunnerElementEditor>(item);
                 InitJobRunnerItem(editor.JobRunnerItem);
             }
+            else if (item is TextItem)
+            {
+                CreateElement<TextElementEditor>(item);
+            }
         }
 
         /// <summary>
@@ -1574,7 +1582,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
         public override void OnApplicationReady()
         {
-            
+
         }
 
         #endregion
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index cc6ade388..3fe82944c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -394,6 +394,9 @@
                                         <DataTemplate DataType="{x:Type sys:Nullable}">
    
                                         </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:TextItem}">
+                                            <templates:TextTemplate/>
+                                        </DataTemplate>
                                         <DataTemplate DataType="{x:Type items:JobRunnerItem}">
                                             <templates:JobRunnerTemplate/>
                                         </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
index b5f0f2d5b..288202752 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")]
-[assembly: AssemblyVersion("2.0.9.1159")]
+[assembly: AssemblyVersion("2.0.10.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
index cd70982d5..f6a6563dc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Common Components")]
-[assembly: AssemblyVersion("2.0.26.1159")]
+[assembly: AssemblyVersion("2.0.27.1737")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 4e1c36593..9c69bee75 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -22,6 +22,7 @@ using Tango.MachineStudio.UI.ViewModels;
 using Tango.MachineStudio.UI.Views;
 using Tango.MachineStudio.Common;
 using Tango.Core;
+using Tango.BL;
 
 namespace Tango.MachineStudio.UI
 {
@@ -35,6 +36,8 @@ namespace Tango.MachineStudio.UI
 
         protected override void OnStartup(StartupEventArgs e)
         {
+            ObservableEntityCollectionSettings.SetDispatcher(Application.Current.Dispatcher);
+
 
 #if DEBUG
             CoreSettings.DefaultDataSource = new DataSource()
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index c16f76449..fd68ed8d1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -60,6 +60,8 @@ namespace Tango.MachineStudio.UI.Authentication
 
                 User user = db.Users
                     .Include(x => x.UsersRoles)
+                    .Include(x => x.Contact)
+                    .Include(x => x.Address)
                     .Include(x => x.Organization).SingleOrDefault(x => x.Email.ToLower() == email.ToLower() && x.Password == hash);
 
                 if (user == null)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 2ba2c2d37..067d30413 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("3.1.32.18235")]
+[assembly: AssemblyVersion("3.2.35.18238")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
index 10e0e252e..d492849fa 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Updater Utility")]
-[assembly: AssemblyVersion("2.0.8.1159")]
+[assembly: AssemblyVersion("2.0.9.1737")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
index 7e97f99ed..4bb196598 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20.1159")]
+[assembly: AssemblyVersion("1.0.21.1737")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
index f45705ea0..f08291975 100644
--- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows.Markup;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20.1159")]
+[assembly: AssemblyVersion("1.0.21.1737")]
 [assembly: AssemblyFileVersion("1.0.0.8")]
diff --git a/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs b/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs
index c68ecd8c5..9d50f7bdb 100644
--- a/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs
+++ b/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs
@@ -29,7 +29,7 @@ namespace Tango.BL.ColorConversion
 
             if (output.HasError)
             {
-                throw LogManager.Default.Log(new ExternalException($"Color Conversion Error: {output.ErrorMessage}!"), LogCategory.Warning);
+                throw new ExternalException($"Color Conversion Error: {output.ErrorMessage}!");
             }
 
             return output;
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs
index 0ff5d8621..5c5dacfa0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<EventTypesAction> _eventtypesactions;
+        protected SynchronizedObservableCollection<EventTypesAction> _eventtypesactions;
 
         /// <summary>
         /// Gets or sets the actiontype event types actions.
         /// </summary>
 
-        public virtual ObservableCollection<EventTypesAction> EventTypesActions
+        public virtual SynchronizedObservableCollection<EventTypesAction> EventTypesActions
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public ActionType() : base()
         {
 
-            EventTypesActions = new ObservableCollection<EventTypesAction>();
-            EventTypesActions.EnableCrossThreadOperations();
+            EventTypesActions = new SynchronizedObservableCollection<EventTypesAction>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Address.cs b/Software/Visual_Studio/Tango.BL/Entities/Address.cs
index 242ba6131..c6c609343 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Address.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Address.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -200,13 +201,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Organization> _organizations;
+        protected SynchronizedObservableCollection<Organization> _organizations;
 
         /// <summary>
         /// Gets or sets the address organizations.
         /// </summary>
 
-        public virtual ObservableCollection<Organization> Organizations
+        public virtual SynchronizedObservableCollection<Organization> Organizations
         {
             get 
             {
@@ -220,13 +221,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<User> _users;
+        protected SynchronizedObservableCollection<User> _users;
 
         /// <summary>
         /// Gets or sets the address users.
         /// </summary>
 
-        public virtual ObservableCollection<User> Users
+        public virtual SynchronizedObservableCollection<User> Users
         {
             get 
             {
@@ -246,11 +247,9 @@ namespace Tango.BL.Entities
         public Address() : base()
         {
 
-            Organizations = new ObservableCollection<Organization>();
-            Organizations.EnableCrossThreadOperations();
+            Organizations = new SynchronizedObservableCollection<Organization>();
 
-            Users = new ObservableCollection<User>();
-            Users.EnableCrossThreadOperations();
+            Users = new SynchronizedObservableCollection<User>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs
index c16873e96..de728349f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Configuration> _configurations;
+        protected SynchronizedObservableCollection<Configuration> _configurations;
 
         /// <summary>
         /// Gets or sets the applicationdisplaypanelversion configurations.
         /// </summary>
 
-        public virtual ObservableCollection<Configuration> Configurations
+        public virtual SynchronizedObservableCollection<Configuration> Configurations
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public ApplicationDisplayPanelVersion() : base()
         {
 
-            Configurations = new ObservableCollection<Configuration>();
-            Configurations.EnableCrossThreadOperations();
+            Configurations = new SynchronizedObservableCollection<Configuration>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs
index b8dbd3217..3de81ba46 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Configuration> _configurations;
+        protected SynchronizedObservableCollection<Configuration> _configurations;
 
         /// <summary>
         /// Gets or sets the applicationfirmwareversion configurations.
         /// </summary>
 
-        public virtual ObservableCollection<Configuration> Configurations
+        public virtual SynchronizedObservableCollection<Configuration> Configurations
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public ApplicationFirmwareVersion() : base()
         {
 
-            Configurations = new ObservableCollection<Configuration>();
-            Configurations.EnableCrossThreadOperations();
+            Configurations = new SynchronizedObservableCollection<Configuration>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs
index dd0d6372f..2606978d9 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Configuration> _configurations;
+        protected SynchronizedObservableCollection<Configuration> _configurations;
 
         /// <summary>
         /// Gets or sets the applicationosversion configurations.
         /// </summary>
 
-        public virtual ObservableCollection<Configuration> Configurations
+        public virtual SynchronizedObservableCollection<Configuration> Configurations
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public ApplicationOsVersion() : base()
         {
 
-            Configurations = new ObservableCollection<Configuration>();
-            Configurations.EnableCrossThreadOperations();
+            Configurations = new SynchronizedObservableCollection<Configuration>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index b80c99552..1700d028e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs
index df75748a5..e8e184b89 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<IdsPack> _idspacks;
+        protected SynchronizedObservableCollection<IdsPack> _idspacks;
 
         /// <summary>
         /// Gets or sets the cartridgetype ids packs.
         /// </summary>
 
-        public virtual ObservableCollection<IdsPack> IdsPacks
+        public virtual SynchronizedObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public CartridgeType() : base()
         {
 
-            IdsPacks = new ObservableCollection<IdsPack>();
-            IdsPacks.EnableCrossThreadOperations();
+            IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Cat.cs b/Software/Visual_Studio/Tango.BL/Entities/Cat.cs
index da276f56d..adfd49698 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Cat.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Cat.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Cct.cs b/Software/Visual_Studio/Tango.BL/Entities/Cct.cs
index 40140f46b..936938022 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Cct.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Cct.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
index 087a93d27..79f1e5d47 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -509,13 +510,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<BrushStop> _brushstops;
+        protected SynchronizedObservableCollection<BrushStop> _brushstops;
 
         /// <summary>
         /// Gets or sets the colorcatalog brush stops.
         /// </summary>
 
-        public virtual ObservableCollection<BrushStop> BrushStops
+        public virtual SynchronizedObservableCollection<BrushStop> BrushStops
         {
             get 
             {
@@ -557,8 +558,7 @@ namespace Tango.BL.Entities
         public ColorCatalog() : base()
         {
 
-            BrushStops = new ObservableCollection<BrushStop>();
-            BrushStops.EnableCrossThreadOperations();
+            BrushStops = new SynchronizedObservableCollection<BrushStop>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs
index 7aa2e448b..32b93c545 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<BrushStop> _brushstops;
+        protected SynchronizedObservableCollection<BrushStop> _brushstops;
 
         /// <summary>
         /// Gets or sets the colorspace brush stops.
         /// </summary>
 
-        public virtual ObservableCollection<BrushStop> BrushStops
+        public virtual SynchronizedObservableCollection<BrushStop> BrushStops
         {
             get 
             {
@@ -110,13 +111,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<ColorCatalog> _colorcatalogs;
+        protected SynchronizedObservableCollection<ColorCatalog> _colorcatalogs;
 
         /// <summary>
         /// Gets or sets the colorspace color catalogs.
         /// </summary>
 
-        public virtual ObservableCollection<ColorCatalog> ColorCatalogs
+        public virtual SynchronizedObservableCollection<ColorCatalog> ColorCatalogs
         {
             get 
             {
@@ -130,13 +131,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the colorspace jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -150,13 +151,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the colorspace machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -176,17 +177,13 @@ namespace Tango.BL.Entities
         public ColorSpace() : base()
         {
 
-            BrushStops = new ObservableCollection<BrushStop>();
-            BrushStops.EnableCrossThreadOperations();
+            BrushStops = new SynchronizedObservableCollection<BrushStop>();
 
-            ColorCatalogs = new ObservableCollection<ColorCatalog>();
-            ColorCatalogs.EnableCrossThreadOperations();
+            ColorCatalogs = new SynchronizedObservableCollection<ColorCatalog>();
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
index df7e69e3c..db618a910 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -293,13 +294,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<IdsPack> _idspacks;
+        protected SynchronizedObservableCollection<IdsPack> _idspacks;
 
         /// <summary>
         /// Gets or sets the configuration ids packs.
         /// </summary>
 
-        public virtual ObservableCollection<IdsPack> IdsPacks
+        public virtual SynchronizedObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
@@ -313,13 +314,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachineVersion> _machineversions;
+        protected SynchronizedObservableCollection<MachineVersion> _machineversions;
 
         /// <summary>
         /// Gets or sets the configuration machine versions.
         /// </summary>
 
-        public virtual ObservableCollection<MachineVersion> MachineVersions
+        public virtual SynchronizedObservableCollection<MachineVersion> MachineVersions
         {
             get 
             {
@@ -333,13 +334,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the configuration machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -353,13 +354,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachinesConfiguration> _machinesconfigurations;
+        protected SynchronizedObservableCollection<MachinesConfiguration> _machinesconfigurations;
 
         /// <summary>
         /// Gets or sets the configuration machines configurations.
         /// </summary>
 
-        public virtual ObservableCollection<MachinesConfiguration> MachinesConfigurations
+        public virtual SynchronizedObservableCollection<MachinesConfiguration> MachinesConfigurations
         {
             get 
             {
@@ -379,17 +380,13 @@ namespace Tango.BL.Entities
         public Configuration() : base()
         {
 
-            IdsPacks = new ObservableCollection<IdsPack>();
-            IdsPacks.EnableCrossThreadOperations();
+            IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
-            MachineVersions = new ObservableCollection<MachineVersion>();
-            MachineVersions.EnableCrossThreadOperations();
+            MachineVersions = new SynchronizedObservableCollection<MachineVersion>();
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
-            MachinesConfigurations = new ObservableCollection<MachinesConfiguration>();
-            MachinesConfigurations.EnableCrossThreadOperations();
+            MachinesConfigurations = new SynchronizedObservableCollection<MachinesConfiguration>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Contact.cs b/Software/Visual_Studio/Tango.BL/Entities/Contact.cs
index a6c7bd319..a9596c571 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Contact.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Contact.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -178,13 +179,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Organization> _organizations;
+        protected SynchronizedObservableCollection<Organization> _organizations;
 
         /// <summary>
         /// Gets or sets the contact organizations.
         /// </summary>
 
-        public virtual ObservableCollection<Organization> Organizations
+        public virtual SynchronizedObservableCollection<Organization> Organizations
         {
             get 
             {
@@ -198,13 +199,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<User> _users;
+        protected SynchronizedObservableCollection<User> _users;
 
         /// <summary>
         /// Gets or sets the contact users.
         /// </summary>
 
-        public virtual ObservableCollection<User> Users
+        public virtual SynchronizedObservableCollection<User> Users
         {
             get 
             {
@@ -224,11 +225,9 @@ namespace Tango.BL.Entities
         public Contact() : base()
         {
 
-            Organizations = new ObservableCollection<Organization>();
-            Organizations.EnableCrossThreadOperations();
+            Organizations = new SynchronizedObservableCollection<Organization>();
 
-            Users = new ObservableCollection<User>();
-            Users.EnableCrossThreadOperations();
+            Users = new SynchronizedObservableCollection<User>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs
index 57a76a6bd..c2a368a2d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -91,13 +92,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the customer jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -117,8 +118,7 @@ namespace Tango.BL.Entities
         public Customer() : base()
         {
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs
index 4b47e35ce..671f92a68 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -112,13 +113,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<IdsPack> _idspacks;
+        protected SynchronizedObservableCollection<IdsPack> _idspacks;
 
         /// <summary>
         /// Gets or sets the dispensertype ids packs.
         /// </summary>
 
-        public virtual ObservableCollection<IdsPack> IdsPacks
+        public virtual SynchronizedObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
@@ -138,8 +139,7 @@ namespace Tango.BL.Entities
         public DispenserType() : base()
         {
 
-            IdsPacks = new ObservableCollection<IdsPack>();
-            IdsPacks.EnableCrossThreadOperations();
+            IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs
index 8d5995a7b..c1c1018d4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Configuration> _configurations;
+        protected SynchronizedObservableCollection<Configuration> _configurations;
 
         /// <summary>
         /// Gets or sets the embeddedfirmwareversion configurations.
         /// </summary>
 
-        public virtual ObservableCollection<Configuration> Configurations
+        public virtual SynchronizedObservableCollection<Configuration> Configurations
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public EmbeddedFirmwareVersion() : base()
         {
 
-            Configurations = new ObservableCollection<Configuration>();
-            Configurations.EnableCrossThreadOperations();
+            Configurations = new SynchronizedObservableCollection<Configuration>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs
index 766e0a4f1..bc752c38d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -269,13 +270,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<EventTypesAction> _eventtypesactions;
+        protected SynchronizedObservableCollection<EventTypesAction> _eventtypesactions;
 
         /// <summary>
         /// Gets or sets the eventtype event types actions.
         /// </summary>
 
-        public virtual ObservableCollection<EventTypesAction> EventTypesActions
+        public virtual SynchronizedObservableCollection<EventTypesAction> EventTypesActions
         {
             get 
             {
@@ -289,13 +290,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachinesEvent> _machinesevents;
+        protected SynchronizedObservableCollection<MachinesEvent> _machinesevents;
 
         /// <summary>
         /// Gets or sets the eventtype machines events.
         /// </summary>
 
-        public virtual ObservableCollection<MachinesEvent> MachinesEvents
+        public virtual SynchronizedObservableCollection<MachinesEvent> MachinesEvents
         {
             get 
             {
@@ -315,11 +316,9 @@ namespace Tango.BL.Entities
         public EventType() : base()
         {
 
-            EventTypesActions = new ObservableCollection<EventTypesAction>();
-            EventTypesActions.EnableCrossThreadOperations();
+            EventTypesActions = new SynchronizedObservableCollection<EventTypesAction>();
 
-            MachinesEvents = new ObservableCollection<MachinesEvent>();
-            MachinesEvents.EnableCrossThreadOperations();
+            MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs
index 7c81f4b4f..0c1cbf059 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs
index 00faaee7d..9a368cfcd 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<EventType> _eventtypes;
+        protected SynchronizedObservableCollection<EventType> _eventtypes;
 
         /// <summary>
         /// Gets or sets the eventtypescategory event types.
         /// </summary>
 
-        public virtual ObservableCollection<EventType> EventTypes
+        public virtual SynchronizedObservableCollection<EventType> EventTypes
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public EventTypesCategory() : base()
         {
 
-            EventTypes = new ObservableCollection<EventType>();
-            EventTypes.EnableCrossThreadOperations();
+            EventTypes = new SynchronizedObservableCollection<EventType>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs
index d2bc9bd40..35d3d197c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<EventType> _eventtypes;
+        protected SynchronizedObservableCollection<EventType> _eventtypes;
 
         /// <summary>
         /// Gets or sets the eventtypesgroup event types.
         /// </summary>
 
-        public virtual ObservableCollection<EventType> EventTypes
+        public virtual SynchronizedObservableCollection<EventType> EventTypes
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public EventTypesGroup() : base()
         {
 
-            EventTypes = new ObservableCollection<EventType>();
-            EventTypes.EnableCrossThreadOperations();
+            EventTypes = new SynchronizedObservableCollection<EventType>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs
index 4bf2f4bf9..ff82a810b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the fibershape rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public FiberShape() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs
index d3555f5fb..3a7b1c8ed 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the fibersynth rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public FiberSynth() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs
index b49c913a1..a6637d902 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs
index b8915b389..6fa469da0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareBlower> _hardwareblowers;
+        protected SynchronizedObservableCollection<HardwareBlower> _hardwareblowers;
 
         /// <summary>
         /// Gets or sets the hardwareblowertype hardware blowers.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareBlower> HardwareBlowers
+        public virtual SynchronizedObservableCollection<HardwareBlower> HardwareBlowers
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public HardwareBlowerType() : base()
         {
 
-            HardwareBlowers = new ObservableCollection<HardwareBlower>();
-            HardwareBlowers.EnableCrossThreadOperations();
+            HardwareBlowers = new SynchronizedObservableCollection<HardwareBlower>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs
index 34bd84036..133db0b21 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs
index c452377c5..0a340dcf7 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareBreakSensor> _hardwarebreaksensors;
+        protected SynchronizedObservableCollection<HardwareBreakSensor> _hardwarebreaksensors;
 
         /// <summary>
         /// Gets or sets the hardwarebreaksensortype hardware break sensors.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareBreakSensor> HardwareBreakSensors
+        public virtual SynchronizedObservableCollection<HardwareBreakSensor> HardwareBreakSensors
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public HardwareBreakSensorType() : base()
         {
 
-            HardwareBreakSensors = new ObservableCollection<HardwareBreakSensor>();
-            HardwareBreakSensors.EnableCrossThreadOperations();
+            HardwareBreakSensors = new SynchronizedObservableCollection<HardwareBreakSensor>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
index 7fed45b85..1e6c615e9 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs
index 1480441b8..3ca346ce0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareDancer> _hardwaredancers;
+        protected SynchronizedObservableCollection<HardwareDancer> _hardwaredancers;
 
         /// <summary>
         /// Gets or sets the hardwaredancertype hardware dancers.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareDancer> HardwareDancers
+        public virtual SynchronizedObservableCollection<HardwareDancer> HardwareDancers
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public HardwareDancerType() : base()
         {
 
-            HardwareDancers = new ObservableCollection<HardwareDancer>();
-            HardwareDancers.EnableCrossThreadOperations();
+            HardwareDancers = new SynchronizedObservableCollection<HardwareDancer>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs
index 260e79f78..2518cb8ea 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs
index 60afa6c25..51c52142a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -112,13 +113,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareMotor> _hardwaremotors;
+        protected SynchronizedObservableCollection<HardwareMotor> _hardwaremotors;
 
         /// <summary>
         /// Gets or sets the hardwaremotortype hardware motors.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareMotor> HardwareMotors
+        public virtual SynchronizedObservableCollection<HardwareMotor> HardwareMotors
         {
             get 
             {
@@ -138,8 +139,7 @@ namespace Tango.BL.Entities
         public HardwareMotorType() : base()
         {
 
-            HardwareMotors = new ObservableCollection<HardwareMotor>();
-            HardwareMotors.EnableCrossThreadOperations();
+            HardwareMotors = new SynchronizedObservableCollection<HardwareMotor>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs
index 3a1af1bfd..4b8bc1664 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs
index a5983d4c2..fc90c3898 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwarePidControl> _hardwarepidcontrols;
+        protected SynchronizedObservableCollection<HardwarePidControl> _hardwarepidcontrols;
 
         /// <summary>
         /// Gets or sets the hardwarepidcontroltype hardware pid controls.
         /// </summary>
 
-        public virtual ObservableCollection<HardwarePidControl> HardwarePidControls
+        public virtual SynchronizedObservableCollection<HardwarePidControl> HardwarePidControls
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public HardwarePidControlType() : base()
         {
 
-            HardwarePidControls = new ObservableCollection<HardwarePidControl>();
-            HardwarePidControls.EnableCrossThreadOperations();
+            HardwarePidControls = new SynchronizedObservableCollection<HardwarePidControl>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
index 85de0170f..d0c394586 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
index 774a3a241..5efddd114 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
+        protected SynchronizedObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
 
         /// <summary>
         /// Gets or sets the hardwarespeedsensortype hardware speed sensors.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
+        public virtual SynchronizedObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public HardwareSpeedSensorType() : base()
         {
 
-            HardwareSpeedSensors = new ObservableCollection<HardwareSpeedSensor>();
-            HardwareSpeedSensors.EnableCrossThreadOperations();
+            HardwareSpeedSensors = new SynchronizedObservableCollection<HardwareSpeedSensor>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
index 9641896d9..be855f1e1 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Configuration> _configurations;
+        protected SynchronizedObservableCollection<Configuration> _configurations;
 
         /// <summary>
         /// Gets or sets the hardwareversion configurations.
         /// </summary>
 
-        public virtual ObservableCollection<Configuration> Configurations
+        public virtual SynchronizedObservableCollection<Configuration> Configurations
         {
             get 
             {
@@ -88,13 +89,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareBlower> _hardwareblowers;
+        protected SynchronizedObservableCollection<HardwareBlower> _hardwareblowers;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware blowers.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareBlower> HardwareBlowers
+        public virtual SynchronizedObservableCollection<HardwareBlower> HardwareBlowers
         {
             get 
             {
@@ -108,13 +109,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareBreakSensor> _hardwarebreaksensors;
+        protected SynchronizedObservableCollection<HardwareBreakSensor> _hardwarebreaksensors;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware break sensors.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareBreakSensor> HardwareBreakSensors
+        public virtual SynchronizedObservableCollection<HardwareBreakSensor> HardwareBreakSensors
         {
             get 
             {
@@ -128,13 +129,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareDancer> _hardwaredancers;
+        protected SynchronizedObservableCollection<HardwareDancer> _hardwaredancers;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware dancers.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareDancer> HardwareDancers
+        public virtual SynchronizedObservableCollection<HardwareDancer> HardwareDancers
         {
             get 
             {
@@ -148,13 +149,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareMotor> _hardwaremotors;
+        protected SynchronizedObservableCollection<HardwareMotor> _hardwaremotors;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware motors.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareMotor> HardwareMotors
+        public virtual SynchronizedObservableCollection<HardwareMotor> HardwareMotors
         {
             get 
             {
@@ -168,13 +169,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwarePidControl> _hardwarepidcontrols;
+        protected SynchronizedObservableCollection<HardwarePidControl> _hardwarepidcontrols;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware pid controls.
         /// </summary>
 
-        public virtual ObservableCollection<HardwarePidControl> HardwarePidControls
+        public virtual SynchronizedObservableCollection<HardwarePidControl> HardwarePidControls
         {
             get 
             {
@@ -188,13 +189,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
+        protected SynchronizedObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware speed sensors.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
+        public virtual SynchronizedObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
         {
             get 
             {
@@ -208,13 +209,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareWinder> _hardwarewinders;
+        protected SynchronizedObservableCollection<HardwareWinder> _hardwarewinders;
 
         /// <summary>
         /// Gets or sets the hardwareversion hardware winders.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareWinder> HardwareWinders
+        public virtual SynchronizedObservableCollection<HardwareWinder> HardwareWinders
         {
             get 
             {
@@ -234,21 +235,21 @@ namespace Tango.BL.Entities
         public HardwareVersion() : base()
         {
 
-            Configurations = new ObservableCollection<Configuration>();
+            Configurations = new SynchronizedObservableCollection<Configuration>();
 
-            HardwareBlowers = new ObservableCollection<HardwareBlower>();
+            HardwareBlowers = new SynchronizedObservableCollection<HardwareBlower>();
 
-            HardwareBreakSensors = new ObservableCollection<HardwareBreakSensor>();
+            HardwareBreakSensors = new SynchronizedObservableCollection<HardwareBreakSensor>();
 
-            HardwareDancers = new ObservableCollection<HardwareDancer>();
+            HardwareDancers = new SynchronizedObservableCollection<HardwareDancer>();
 
-            HardwareMotors = new ObservableCollection<HardwareMotor>();
+            HardwareMotors = new SynchronizedObservableCollection<HardwareMotor>();
 
-            HardwarePidControls = new ObservableCollection<HardwarePidControl>();
+            HardwarePidControls = new SynchronizedObservableCollection<HardwarePidControl>();
 
-            HardwareSpeedSensors = new ObservableCollection<HardwareSpeedSensor>();
+            HardwareSpeedSensors = new SynchronizedObservableCollection<HardwareSpeedSensor>();
 
-            HardwareWinders = new ObservableCollection<HardwareWinder>();
+            HardwareWinders = new SynchronizedObservableCollection<HardwareWinder>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs
index d8c15494f..11252cb69 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs
index d5e2f2ead..5c699e656 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<HardwareWinder> _hardwarewinders;
+        protected SynchronizedObservableCollection<HardwareWinder> _hardwarewinders;
 
         /// <summary>
         /// Gets or sets the hardwarewindertype hardware winders.
         /// </summary>
 
-        public virtual ObservableCollection<HardwareWinder> HardwareWinders
+        public virtual SynchronizedObservableCollection<HardwareWinder> HardwareWinders
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public HardwareWinderType() : base()
         {
 
-            HardwareWinders = new ObservableCollection<HardwareWinder>();
-            HardwareWinders.EnableCrossThreadOperations();
+            HardwareWinders = new SynchronizedObservableCollection<HardwareWinder>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs
index e1cf0844b..f5be6afba 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -112,13 +113,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<EventType> _eventtypes;
+        protected SynchronizedObservableCollection<EventType> _eventtypes;
 
         /// <summary>
         /// Gets or sets the htmlpage event types.
         /// </summary>
 
-        public virtual ObservableCollection<EventType> EventTypes
+        public virtual SynchronizedObservableCollection<EventType> EventTypes
         {
             get 
             {
@@ -138,8 +139,7 @@ namespace Tango.BL.Entities
         public HtmlPage() : base()
         {
 
-            EventTypes = new ObservableCollection<EventType>();
-            EventTypes.EnableCrossThreadOperations();
+            EventTypes = new SynchronizedObservableCollection<EventType>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs
index bcc261e45..7b3c40312 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs
index 9236ef00a..e1083b8b1 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -112,13 +113,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<IdsPack> _idspacks;
+        protected SynchronizedObservableCollection<IdsPack> _idspacks;
 
         /// <summary>
         /// Gets or sets the idspackformula ids packs.
         /// </summary>
 
-        public virtual ObservableCollection<IdsPack> IdsPacks
+        public virtual SynchronizedObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
@@ -138,8 +139,7 @@ namespace Tango.BL.Entities
         public IdsPackFormula() : base()
         {
 
-            IdsPacks = new ObservableCollection<IdsPack>();
-            IdsPacks.EnableCrossThreadOperations();
+            IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
index fcac42b74..2e809f56f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -794,13 +795,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<JobRun> _jobruns;
+        protected SynchronizedObservableCollection<JobRun> _jobruns;
 
         /// <summary>
         /// Gets or sets the job job runs.
         /// </summary>
 
-        public virtual ObservableCollection<JobRun> JobRuns
+        public virtual SynchronizedObservableCollection<JobRun> JobRuns
         {
             get 
             {
@@ -924,13 +925,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Segment> _segments;
+        protected SynchronizedObservableCollection<Segment> _segments;
 
         /// <summary>
         /// Gets or sets the job segments.
         /// </summary>
 
-        public virtual ObservableCollection<Segment> Segments
+        public virtual SynchronizedObservableCollection<Segment> Segments
         {
             get 
             {
@@ -950,11 +951,9 @@ namespace Tango.BL.Entities
         public Job() : base()
         {
 
-            JobRuns = new ObservableCollection<JobRun>();
-            JobRuns.EnableCrossThreadOperations();
+            JobRuns = new SynchronizedObservableCollection<JobRun>();
 
-            Segments = new ObservableCollection<Segment>();
-            Segments.EnableCrossThreadOperations();
+            Segments = new SynchronizedObservableCollection<Segment>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
index 5ab4a8b62..1a00e802d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs
index 418d1b9be..a47b9c8fd 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the linearmassdensityunit rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public LinearMassDensityUnit() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
index 2a305d4f5..1ab155ed1 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -112,13 +113,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Cat> _cats;
+        protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
         /// Gets or sets the liquidtype cats.
         /// </summary>
 
-        public virtual ObservableCollection<Cat> Cats
+        public virtual SynchronizedObservableCollection<Cat> Cats
         {
             get 
             {
@@ -132,13 +133,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<IdsPack> _idspacks;
+        protected SynchronizedObservableCollection<IdsPack> _idspacks;
 
         /// <summary>
         /// Gets or sets the liquidtype ids packs.
         /// </summary>
 
-        public virtual ObservableCollection<IdsPack> IdsPacks
+        public virtual SynchronizedObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
@@ -152,13 +153,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<LiquidTypesRml> _liquidtypesrmls;
+        protected SynchronizedObservableCollection<LiquidTypesRml> _liquidtypesrmls;
 
         /// <summary>
         /// Gets or sets the liquidtype liquid types rmls.
         /// </summary>
 
-        public virtual ObservableCollection<LiquidTypesRml> LiquidTypesRmls
+        public virtual SynchronizedObservableCollection<LiquidTypesRml> LiquidTypesRmls
         {
             get 
             {
@@ -178,14 +179,11 @@ namespace Tango.BL.Entities
         public LiquidType() : base()
         {
 
-            Cats = new ObservableCollection<Cat>();
-            Cats.EnableCrossThreadOperations();
+            Cats = new SynchronizedObservableCollection<Cat>();
 
-            IdsPacks = new ObservableCollection<IdsPack>();
-            IdsPacks.EnableCrossThreadOperations();
+            IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
-            LiquidTypesRmls = new ObservableCollection<LiquidTypesRml>();
-            LiquidTypesRmls.EnableCrossThreadOperations();
+            LiquidTypesRmls = new SynchronizedObservableCollection<LiquidTypesRml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs
index 81442551f..2464111da 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
index 8fbf80cd9..a9117845a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -338,13 +339,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Cat> _cats;
+        protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
         /// Gets or sets the machine cats.
         /// </summary>
 
-        public virtual ObservableCollection<Cat> Cats
+        public virtual SynchronizedObservableCollection<Cat> Cats
         {
             get 
             {
@@ -402,13 +403,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the machine jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -444,13 +445,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachinesConfiguration> _machinesconfigurations;
+        protected SynchronizedObservableCollection<MachinesConfiguration> _machinesconfigurations;
 
         /// <summary>
         /// Gets or sets the machine machines configurations.
         /// </summary>
 
-        public virtual ObservableCollection<MachinesConfiguration> MachinesConfigurations
+        public virtual SynchronizedObservableCollection<MachinesConfiguration> MachinesConfigurations
         {
             get 
             {
@@ -464,13 +465,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachinesEvent> _machinesevents;
+        protected SynchronizedObservableCollection<MachinesEvent> _machinesevents;
 
         /// <summary>
         /// Gets or sets the machine machines events.
         /// </summary>
 
-        public virtual ObservableCollection<MachinesEvent> MachinesEvents
+        public virtual SynchronizedObservableCollection<MachinesEvent> MachinesEvents
         {
             get 
             {
@@ -556,17 +557,13 @@ namespace Tango.BL.Entities
         public Machine() : base()
         {
 
-            Cats = new ObservableCollection<Cat>();
-            Cats.EnableCrossThreadOperations();
+            Cats = new SynchronizedObservableCollection<Cat>();
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
-            MachinesConfigurations = new ObservableCollection<MachinesConfiguration>();
-            MachinesConfigurations.EnableCrossThreadOperations();
+            MachinesConfigurations = new SynchronizedObservableCollection<MachinesConfiguration>();
 
-            MachinesEvents = new ObservableCollection<MachinesEvent>();
-            MachinesEvents.EnableCrossThreadOperations();
+            MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs
index 69a00ba83..c070d964b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
index a19a2066a..605e168cb 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -113,13 +114,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the machineversion machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -133,13 +134,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<TangoVersion> _tangoversions;
+        protected SynchronizedObservableCollection<TangoVersion> _tangoversions;
 
         /// <summary>
         /// Gets or sets the machineversion tango versions.
         /// </summary>
 
-        public virtual ObservableCollection<TangoVersion> TangoVersions
+        public virtual SynchronizedObservableCollection<TangoVersion> TangoVersions
         {
             get 
             {
@@ -159,11 +160,9 @@ namespace Tango.BL.Entities
         public MachineVersion() : base()
         {
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
-            TangoVersions = new ObservableCollection<TangoVersion>();
-            TangoVersions.EnableCrossThreadOperations();
+            TangoVersions = new SynchronizedObservableCollection<TangoVersion>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs
index 92fcb8fb8..b13b5007c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs
index 584926e19..b535d1380 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs
index 2c0141136..c61f221d5 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -112,13 +113,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the mediacolor rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -138,8 +139,7 @@ namespace Tango.BL.Entities
         public MediaColor() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs
index ef55b87a3..02a4cbd42 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the mediacondition rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public MediaCondition() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs
index 4817db217..de34b3b2a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the mediamaterial rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public MediaMaterial() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs
index 2acd79c75..2d5cd30c5 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -68,13 +69,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Rml> _rmls;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
         /// Gets or sets the mediapurpos rmls.
         /// </summary>
 
-        public virtual ObservableCollection<Rml> Rmls
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
@@ -94,8 +95,7 @@ namespace Tango.BL.Entities
         public MediaPurpos() : base()
         {
 
-            Rmls = new ObservableCollection<Rml>();
-            Rmls.EnableCrossThreadOperations();
+            Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs b/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs
index 65866bd8c..ab9c79e7a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<IdsPack> _idspacks;
+        protected SynchronizedObservableCollection<IdsPack> _idspacks;
 
         /// <summary>
         /// Gets or sets the midtanktype ids packs.
         /// </summary>
 
-        public virtual ObservableCollection<IdsPack> IdsPacks
+        public virtual SynchronizedObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public MidTankType() : base()
         {
 
-            IdsPacks = new ObservableCollection<IdsPack>();
-            IdsPacks.EnableCrossThreadOperations();
+            IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs
index 3c4b263b9..b1eef5ec2 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -136,13 +137,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Customer> _customers;
+        protected SynchronizedObservableCollection<Customer> _customers;
 
         /// <summary>
         /// Gets or sets the organization customers.
         /// </summary>
 
-        public virtual ObservableCollection<Customer> Customers
+        public virtual SynchronizedObservableCollection<Customer> Customers
         {
             get 
             {
@@ -156,13 +157,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the organization machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -176,13 +177,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<User> _users;
+        protected SynchronizedObservableCollection<User> _users;
 
         /// <summary>
         /// Gets or sets the organization users.
         /// </summary>
 
-        public virtual ObservableCollection<User> Users
+        public virtual SynchronizedObservableCollection<User> Users
         {
             get 
             {
@@ -202,14 +203,11 @@ namespace Tango.BL.Entities
         public Organization() : base()
         {
 
-            Customers = new ObservableCollection<Customer>();
-            Customers.EnableCrossThreadOperations();
+            Customers = new SynchronizedObservableCollection<Customer>();
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
-            Users = new ObservableCollection<User>();
-            Users.EnableCrossThreadOperations();
+            Users = new SynchronizedObservableCollection<User>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Permission.cs b/Software/Visual_Studio/Tango.BL/Entities/Permission.cs
index dc49de94d..4fdb22389 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Permission.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Permission.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<RolesPermission> _rolespermissions;
+        protected SynchronizedObservableCollection<RolesPermission> _rolespermissions;
 
         /// <summary>
         /// Gets or sets the permission roles permissions.
         /// </summary>
 
-        public virtual ObservableCollection<RolesPermission> RolesPermissions
+        public virtual SynchronizedObservableCollection<RolesPermission> RolesPermissions
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public Permission() : base()
         {
 
-            RolesPermissions = new ObservableCollection<RolesPermission>();
-            RolesPermissions.EnableCrossThreadOperations();
+            RolesPermissions = new SynchronizedObservableCollection<RolesPermission>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
index f8e83e053..8192cfbfa 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs
index ed04cc846..b989138d2 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -113,13 +114,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<ProcessParametersTable> _processparameterstables;
+        protected SynchronizedObservableCollection<ProcessParametersTable> _processparameterstables;
 
         /// <summary>
         /// Gets or sets the processparameterstablesgroup process parameters tables.
         /// </summary>
 
-        public virtual ObservableCollection<ProcessParametersTable> ProcessParametersTables
+        public virtual SynchronizedObservableCollection<ProcessParametersTable> ProcessParametersTables
         {
             get 
             {
@@ -161,8 +162,7 @@ namespace Tango.BL.Entities
         public ProcessParametersTablesGroup() : base()
         {
 
-            ProcessParametersTables = new ObservableCollection<ProcessParametersTable>();
-            ProcessParametersTables.EnableCrossThreadOperations();
+            ProcessParametersTables = new SynchronizedObservableCollection<ProcessParametersTable>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 190082311..1e37993c4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -471,13 +472,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Cat> _cats;
+        protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
         /// Gets or sets the rml cats.
         /// </summary>
 
-        public virtual ObservableCollection<Cat> Cats
+        public virtual SynchronizedObservableCollection<Cat> Cats
         {
             get 
             {
@@ -491,13 +492,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Cct> _ccts;
+        protected SynchronizedObservableCollection<Cct> _ccts;
 
         /// <summary>
         /// Gets or sets the rml ccts.
         /// </summary>
 
-        public virtual ObservableCollection<Cct> Ccts
+        public virtual SynchronizedObservableCollection<Cct> Ccts
         {
             get 
             {
@@ -555,13 +556,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the rml jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -597,13 +598,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<LiquidTypesRml> _liquidtypesrmls;
+        protected SynchronizedObservableCollection<LiquidTypesRml> _liquidtypesrmls;
 
         /// <summary>
         /// Gets or sets the rml liquid types rmls.
         /// </summary>
 
-        public virtual ObservableCollection<LiquidTypesRml> LiquidTypesRmls
+        public virtual SynchronizedObservableCollection<LiquidTypesRml> LiquidTypesRmls
         {
             get 
             {
@@ -617,13 +618,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the rml machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -725,13 +726,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<ProcessParametersTablesGroup> _processparameterstablesgroups;
+        protected SynchronizedObservableCollection<ProcessParametersTablesGroup> _processparameterstablesgroups;
 
         /// <summary>
         /// Gets or sets the rml process parameters tables groups.
         /// </summary>
 
-        public virtual ObservableCollection<ProcessParametersTablesGroup> ProcessParametersTablesGroups
+        public virtual SynchronizedObservableCollection<ProcessParametersTablesGroup> ProcessParametersTablesGroups
         {
             get 
             {
@@ -751,23 +752,17 @@ namespace Tango.BL.Entities
         public Rml() : base()
         {
 
-            Cats = new ObservableCollection<Cat>();
-            Cats.EnableCrossThreadOperations();
+            Cats = new SynchronizedObservableCollection<Cat>();
 
-            Ccts = new ObservableCollection<Cct>();
-            Ccts.EnableCrossThreadOperations();
+            Ccts = new SynchronizedObservableCollection<Cct>();
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
-            LiquidTypesRmls = new ObservableCollection<LiquidTypesRml>();
-            LiquidTypesRmls.EnableCrossThreadOperations();
+            LiquidTypesRmls = new SynchronizedObservableCollection<LiquidTypesRml>();
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
-            ProcessParametersTablesGroups = new ObservableCollection<ProcessParametersTablesGroup>();
-            ProcessParametersTablesGroups.EnableCrossThreadOperations();
+            ProcessParametersTablesGroups = new SynchronizedObservableCollection<ProcessParametersTablesGroup>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Role.cs b/Software/Visual_Studio/Tango.BL/Entities/Role.cs
index a11624616..eafe7e020 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Role.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Role.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<RolesPermission> _rolespermissions;
+        protected SynchronizedObservableCollection<RolesPermission> _rolespermissions;
 
         /// <summary>
         /// Gets or sets the role roles permissions.
         /// </summary>
 
-        public virtual ObservableCollection<RolesPermission> RolesPermissions
+        public virtual SynchronizedObservableCollection<RolesPermission> RolesPermissions
         {
             get 
             {
@@ -110,13 +111,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<UsersRole> _usersroles;
+        protected SynchronizedObservableCollection<UsersRole> _usersroles;
 
         /// <summary>
         /// Gets or sets the role users roles.
         /// </summary>
 
-        public virtual ObservableCollection<UsersRole> UsersRoles
+        public virtual SynchronizedObservableCollection<UsersRole> UsersRoles
         {
             get 
             {
@@ -136,11 +137,9 @@ namespace Tango.BL.Entities
         public Role() : base()
         {
 
-            RolesPermissions = new ObservableCollection<RolesPermission>();
-            RolesPermissions.EnableCrossThreadOperations();
+            RolesPermissions = new SynchronizedObservableCollection<RolesPermission>();
 
-            UsersRoles = new ObservableCollection<UsersRole>();
-            UsersRoles.EnableCrossThreadOperations();
+            UsersRoles = new SynchronizedObservableCollection<UsersRole>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs
index ef47be99a..f25f1e40f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs
index 7d1d94530..c6e13ee3c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -113,13 +114,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<BrushStop> _brushstops;
+        protected SynchronizedObservableCollection<BrushStop> _brushstops;
 
         /// <summary>
         /// Gets or sets the segment brush stops.
         /// </summary>
 
-        public virtual ObservableCollection<BrushStop> BrushStops
+        public virtual SynchronizedObservableCollection<BrushStop> BrushStops
         {
             get 
             {
@@ -161,8 +162,7 @@ namespace Tango.BL.Entities
         public Segment() : base()
         {
 
-            BrushStops = new ObservableCollection<BrushStop>();
-            BrushStops.EnableCrossThreadOperations();
+            BrushStops = new SynchronizedObservableCollection<BrushStop>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
index e15aa88d2..09c54f3ff 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -244,13 +245,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the spooltype jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -264,13 +265,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Machine> _machines;
+        protected SynchronizedObservableCollection<Machine> _machines;
 
         /// <summary>
         /// Gets or sets the spooltype machines.
         /// </summary>
 
-        public virtual ObservableCollection<Machine> Machines
+        public virtual SynchronizedObservableCollection<Machine> Machines
         {
             get 
             {
@@ -290,11 +291,9 @@ namespace Tango.BL.Entities
         public SpoolType() : base()
         {
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
-            Machines = new ObservableCollection<Machine>();
-            Machines.EnableCrossThreadOperations();
+            Machines = new SynchronizedObservableCollection<Machine>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SyncConfiguration.cs b/Software/Visual_Studio/Tango.BL/Entities/SyncConfiguration.cs
index b0882786c..cf29cf1df 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SyncConfiguration.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SyncConfiguration.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs b/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs
index d79aa5557..043b2e064 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -24,13 +25,13 @@ namespace Tango.BL.Entities
     public partial class Sysdiagram : ObservableEntity<Sysdiagram>
     {
 
-        protected ObservableCollection<Int32> _version;
+        protected SynchronizedObservableCollection<Int32> _version;
 
         /// <summary>
         /// Gets or sets the sysdiagram version.
         /// </summary>
 
-        public virtual ObservableCollection<Int32> Version
+        public virtual SynchronizedObservableCollection<Int32> Version
         {
             get 
             {
@@ -72,8 +73,7 @@ namespace Tango.BL.Entities
         public Sysdiagram() : base()
         {
 
-            Version = new ObservableCollection<Int32>();
-            Version.EnableCrossThreadOperations();
+            Version = new SynchronizedObservableCollection<Int32>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs
index a2d2272f5..563f48b92 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechController.cs b/Software/Visual_Studio/Tango.BL/Entities/TechController.cs
index 336fd706a..2a9e98510 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechController.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechController.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs b/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs
index 7978552fd..8e730e6b4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs b/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs
index be2053ad2..068d9f2d0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs b/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs
index d1f703be1..d47fd5955 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechValf.cs b/Software/Visual_Studio/Tango.BL/Entities/TechValf.cs
index 0c7e6b406..3310f83b2 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechValf.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechValf.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/User.cs b/Software/Visual_Studio/Tango.BL/Entities/User.cs
index c5c4bb5f9..1a121217b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/User.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/User.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -225,13 +226,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the user jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -245,13 +246,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachineStudioVersion> _machinestudioversions;
+        protected SynchronizedObservableCollection<MachineStudioVersion> _machinestudioversions;
 
         /// <summary>
         /// Gets or sets the user machine studio versions.
         /// </summary>
 
-        public virtual ObservableCollection<MachineStudioVersion> MachineStudioVersions
+        public virtual SynchronizedObservableCollection<MachineStudioVersion> MachineStudioVersions
         {
             get 
             {
@@ -265,13 +266,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<MachinesEvent> _machinesevents;
+        protected SynchronizedObservableCollection<MachinesEvent> _machinesevents;
 
         /// <summary>
         /// Gets or sets the user machines events.
         /// </summary>
 
-        public virtual ObservableCollection<MachinesEvent> MachinesEvents
+        public virtual SynchronizedObservableCollection<MachinesEvent> MachinesEvents
         {
             get 
             {
@@ -307,13 +308,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<TangoVersion> _tangoversions;
+        protected SynchronizedObservableCollection<TangoVersion> _tangoversions;
 
         /// <summary>
         /// Gets or sets the user tango versions.
         /// </summary>
 
-        public virtual ObservableCollection<TangoVersion> TangoVersions
+        public virtual SynchronizedObservableCollection<TangoVersion> TangoVersions
         {
             get 
             {
@@ -327,13 +328,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<UsersRole> _usersroles;
+        protected SynchronizedObservableCollection<UsersRole> _usersroles;
 
         /// <summary>
         /// Gets or sets the user users roles.
         /// </summary>
 
-        public virtual ObservableCollection<UsersRole> UsersRoles
+        public virtual SynchronizedObservableCollection<UsersRole> UsersRoles
         {
             get 
             {
@@ -353,20 +354,15 @@ namespace Tango.BL.Entities
         public User() : base()
         {
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
-            MachineStudioVersions = new ObservableCollection<MachineStudioVersion>();
-            MachineStudioVersions.EnableCrossThreadOperations();
+            MachineStudioVersions = new SynchronizedObservableCollection<MachineStudioVersion>();
 
-            MachinesEvents = new ObservableCollection<MachinesEvent>();
-            MachinesEvents.EnableCrossThreadOperations();
+            MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>();
 
-            TangoVersions = new ObservableCollection<TangoVersion>();
-            TangoVersions.EnableCrossThreadOperations();
+            TangoVersions = new SynchronizedObservableCollection<TangoVersion>();
 
-            UsersRoles = new ObservableCollection<UsersRole>();
-            UsersRoles.EnableCrossThreadOperations();
+            UsersRoles = new SynchronizedObservableCollection<UsersRole>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs
index 785069761..9839028a0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
diff --git a/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs b/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs
index 28f3bed9a..6d3978591 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -90,13 +91,13 @@ namespace Tango.BL.Entities
 
         }
 
-        protected ObservableCollection<Job> _jobs;
+        protected SynchronizedObservableCollection<Job> _jobs;
 
         /// <summary>
         /// Gets or sets the windingmethod jobs.
         /// </summary>
 
-        public virtual ObservableCollection<Job> Jobs
+        public virtual SynchronizedObservableCollection<Job> Jobs
         {
             get 
             {
@@ -116,8 +117,7 @@ namespace Tango.BL.Entities
         public WindingMethod() : base()
         {
 
-            Jobs = new ObservableCollection<Job>();
-            Jobs.EnableCrossThreadOperations();
+            Jobs = new SynchronizedObservableCollection<Job>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/HardwareVersion.cs
index 5ce0938b3..7a09f9f65 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/HardwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/HardwareVersion.cs
@@ -11,13 +11,13 @@ namespace Tango.BL.Entities
         public override HardwareVersion Clone()
         {
             var cloned = base.Clone();
-            cloned.HardwareMotors = HardwareMotors.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
-            cloned.HardwareDancers = HardwareDancers.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
-            cloned.HardwarePidControls = HardwarePidControls.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
-            cloned.HardwareWinders = HardwareWinders.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
-            cloned.HardwareSpeedSensors = HardwareSpeedSensors.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
-            cloned.HardwareBlowers = HardwareBlowers.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
-            cloned.HardwareBreakSensors = HardwareBreakSensors.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToObservableCollection();
+            cloned.HardwareMotors = HardwareMotors.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
+            cloned.HardwareDancers = HardwareDancers.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
+            cloned.HardwarePidControls = HardwarePidControls.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
+            cloned.HardwareWinders = HardwareWinders.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
+            cloned.HardwareSpeedSensors = HardwareSpeedSensors.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
+            cloned.HardwareBlowers = HardwareBlowers.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
+            cloned.HardwareBreakSensors = HardwareBreakSensors.Select(x => x.Clone(y => y.HardwareVersion = cloned)).ToSynchronizedObservableCollection();
             return cloned;
         }
 
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
index fb7298957..4ee3ec804 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using Tango.BL.Attributes;
 using Tango.BL.Enumerations;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -311,7 +312,7 @@ namespace Tango.BL.Entities
             cloned.Rml = Rml;
             cloned.SpoolType = SpoolType;
             cloned.WindingMethod = WindingMethod;
-            cloned.Segments = Segments.Select(x => x.Clone(cloned)).ToObservableCollection();
+            cloned.Segments = Segments.Select(x => x.Clone(cloned)).ToSynchronizedObservableCollection();
 
             foreach (var segment in cloned.Segments)
             {
@@ -477,7 +478,7 @@ namespace Tango.BL.Entities
             {
                 IsInterSegment = true,
                 Length = length,
-                BrushStops = new ObservableCollection<BrushStop>()
+                BrushStops = new SynchronizedObservableCollection<BrushStop>()
                             {
                                 new BrushStop()
                                 {
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/ProcessParametersTablesGroup.cs
index 1c7094096..3ea5dbb45 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/ProcessParametersTablesGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/ProcessParametersTablesGroup.cs
@@ -21,7 +21,7 @@ namespace Tango.BL.Entities
                 tables.Add(newTable);
             }
 
-            cloned.ProcessParametersTables = tables.ToObservableCollection();
+            cloned.ProcessParametersTables = tables.ToSynchronizedObservableCollection();
 
             return cloned;
         }
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs
index 63356345c..5cb341613 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs
@@ -142,7 +142,7 @@ namespace Tango.BL.Entities
         {
             Segment cloned = base.Clone();
 
-            cloned.BrushStops = BrushStops.Select(x => x.Clone()).ToObservableCollection();
+            cloned.BrushStops = BrushStops.Select(x => x.Clone()).ToSynchronizedObservableCollection();
 
             foreach (var stop in cloned.BrushStops)
             {
@@ -157,7 +157,7 @@ namespace Tango.BL.Entities
         {
             Segment cloned = base.Clone();
 
-            cloned.BrushStops = BrushStops.Select(x => x.Clone(cloned)).ToObservableCollection();
+            cloned.BrushStops = BrushStops.Select(x => x.Clone(cloned)).ToSynchronizedObservableCollection();
 
             cloned.Job = job;
             cloned.JobGuid = job.Guid;
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs
index 805afaf67..33a252b8a 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs
@@ -52,12 +52,12 @@ namespace Tango.BL
         {
             var config = _db.Configurations.SingleOrDefault(condition);
 
-            config.IdsPacks = _db.IdsPacks.Where(x => x.ConfigurationGuid == config.Guid)
+            var l = _db.IdsPacks.Where(x => x.ConfigurationGuid == config.Guid)
                 .Include(x => x.LiquidType)
                 .Include(x => x.DispenserType)
                 .Include(x => x.CartridgeType)
                 .Include(x => x.DispenserType)
-                .Include(x => x.IdsPackFormula).OrderBy(x => x.PackIndex).ToObservableCollection();
+                .Include(x => x.IdsPackFormula).OrderBy(x => x.PackIndex).ToList();
 
             return config;
         }
@@ -71,13 +71,13 @@ namespace Tango.BL
         {
             HardwareVersion version = _db.HardwareVersions.SingleOrDefault(condition);
 
-            version.HardwareBlowers = _db.HardwareBlowers.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareBlowerType).ToList().OrderBy(x => x.HardwareBlowerType.Code).ToObservableCollection();
-            version.HardwareBreakSensors = _db.HardwareBreakSensors.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareBreakSensorType).ToList().OrderBy(x => x.HardwareBreakSensorType.Code).ToObservableCollection();
-            version.HardwareDancers = _db.HardwareDancers.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareDancerType).ToList().OrderBy(x => x.HardwareDancerType.Code).ToObservableCollection();
-            version.HardwareMotors = _db.HardwareMotors.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareMotorType).ToList().OrderBy(x => x.HardwareMotorType.Code).ToObservableCollection();
-            version.HardwarePidControls = _db.HardwarePidControls.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwarePidControlType).ToList().OrderBy(x => x.HardwarePidControlType.Code).ToObservableCollection();
-            version.HardwareSpeedSensors = _db.HardwareSpeedSensors.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareSpeedSensorType).ToList().OrderBy(x => x.HardwareSpeedSensorType.Code).ToObservableCollection();
-            version.HardwareWinders = _db.HardwareWinders.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareWinderType).ToList().OrderBy(x => x.HardwareWinderType.Code).ToObservableCollection();
+            version.HardwareBlowers = _db.HardwareBlowers.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareBlowerType).ToList().OrderBy(x => x.HardwareBlowerType.Code).ToSynchronizedObservableCollection();
+            version.HardwareBreakSensors = _db.HardwareBreakSensors.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareBreakSensorType).ToList().OrderBy(x => x.HardwareBreakSensorType.Code).ToSynchronizedObservableCollection();
+            version.HardwareDancers = _db.HardwareDancers.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareDancerType).ToList().OrderBy(x => x.HardwareDancerType.Code).ToSynchronizedObservableCollection();
+            version.HardwareMotors = _db.HardwareMotors.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareMotorType).ToList().OrderBy(x => x.HardwareMotorType.Code).ToSynchronizedObservableCollection();
+            version.HardwarePidControls = _db.HardwarePidControls.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwarePidControlType).ToList().OrderBy(x => x.HardwarePidControlType.Code).ToSynchronizedObservableCollection();
+            version.HardwareSpeedSensors = _db.HardwareSpeedSensors.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareSpeedSensorType).ToList().OrderBy(x => x.HardwareSpeedSensorType.Code).ToSynchronizedObservableCollection();
+            version.HardwareWinders = _db.HardwareWinders.Where(x => x.HardwareVersionGuid == version.Guid).Include(x => x.HardwareWinderType).ToList().OrderBy(x => x.HardwareWinderType.Code).ToSynchronizedObservableCollection();
 
             return version;
         }
@@ -104,6 +104,23 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets the RML process parameters tables groups.
+        /// </summary>
+        /// <param name="rmlGuid">The RML unique identifier.</param>
+        /// <returns></returns>
+        public List<ProcessParametersTablesGroup> GetRmlProcessParametersTablesGroups(String rmlGuid)
+        {
+            var groups = _db.ProcessParametersTablesGroups.Where(x => x.RmlGuid == rmlGuid).ToList();
+
+            foreach (var group in groups)
+            {
+                group.ProcessParametersTables = _db.ProcessParametersTables.Where(x => x.ProcessParametersTablesGroupGuid == group.Guid).OrderBy(x => x.TableIndex).ToSynchronizedObservableCollection();
+            }
+
+            return groups;
+        }
+
+        /// <summary>
         /// Gets the RML CCTS.
         /// </summary>
         /// <param name="rmlGuid">The RML unique identifier.</param>
@@ -154,7 +171,7 @@ namespace Tango.BL
             org.Users = _db.Users.Where(x => x.OrganizationGuid == organizationGuid)
                 .Include(x => x.Address)
                 .Include(x => x.Contact)
-                .Include(x => x.UsersRoles).ToObservableCollection();
+                .Include(x => x.UsersRoles).ToSynchronizedObservableCollection();
 
             return org;
         }
@@ -177,6 +194,24 @@ namespace Tango.BL
                 .FirstOrDefault();
         }
 
+        public Job GetJob(String jobGuid)
+        {
+            Job job = _db.Jobs.Where(x => x.Guid == jobGuid)
+                .Include(x => x.Rml)
+                .Include(x => x.ColorSpace)
+                .Include(x => x.WindingMethod)
+                .Include(x => x.SpoolType).FirstOrDefault();
+
+            job.Segments = _db.Segments.Where(x => x.JobGuid == jobGuid).OrderBy(x => x.SegmentIndex).ToSynchronizedObservableCollection();
+
+            foreach (var segment in job.Segments)
+            {
+                segment.BrushStops = _db.BrushStops.Where(x => x.SegmentGuid == segment.Guid).OrderBy(x => x.StopIndex).ToSynchronizedObservableCollection();
+            }
+
+            return job;
+        }
+
         /// <summary>
         /// Disposes the underlying <see cref="ObservablesContext"/>.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs
index 4fdaf9071..827e8f96f 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs
@@ -144,14 +144,14 @@ namespace Tango.BL
 
                 foreach (var role in Roles)
                 {
-                    role.RolesPermissions = role.RolesPermissions.ToObservableCollection();
+                    role.RolesPermissions = role.RolesPermissions.ToSynchronizedObservableCollection();
                 }
 
                 Configurations = Context.Configurations.ToList().OrderBy(x => x.LastUpdated).ToObservableCollection();
 
                 foreach (var config in Configurations)
                 {
-                    config.IdsPacks = config.IdsPacks.ToObservableCollection();
+                    //config.IdsPacks = config.IdsPacks.ToObservableCollection2();
                 }
 
                 ApplicationOsVersions = Context.ApplicationOsVersions.ToList().OrderBy(x => x.Version).ToObservableCollection();
@@ -188,7 +188,7 @@ namespace Tango.BL
 
                 foreach (var eventType in EventTypes)
                 {
-                    eventType.EventTypesActions = eventType.EventTypesActions.ToObservableCollection();
+                    eventType.EventTypesActions = eventType.EventTypesActions.ToSynchronizedObservableCollection();
                 }
 
                 MediaMaterials = Context.MediaMaterials.ToObservableCollection();
@@ -219,7 +219,7 @@ namespace Tango.BL
 
                 foreach (var group in ProcessParametersTablesGroups)
                 {
-                    group.ProcessParametersTables = group.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection();
+                    group.ProcessParametersTables = group.ProcessParametersTables.OrderBy(x => x.TableIndex).ToSynchronizedObservableCollection();
                 }
 
                 WindingMethods = Context.WindingMethods.ToObservableCollection();
diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
index 25e54b896..618bd7a61 100644
--- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
@@ -4,4 +4,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Business logic components")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.32.1159")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.33.1737")]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index bfc1a033a..b3d7ff2a0 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -323,7 +323,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
index 1a30d2c82..2348b2c09 100644
--- a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@ using System.Windows;
 using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Tango - Brush Picker Control")]
-[assembly: AssemblyVersion("2.0.8.1159")]
+[assembly: AssemblyVersion("2.0.9.1737")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
diff --git a/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs b/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs
index 344308dac..a0b0cbc69 100644
--- a/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs
+++ b/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs
@@ -1141,6 +1141,8 @@ namespace Tango.CircularGauge
         //Drawing the scale with the Scale Radius
         private void DrawScale()
         {
+            if (rootGrid == null) return;
+
             try
             {
                 foreach (var item in _toClear)
diff --git a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
index 774817e96..4188f3f04 100644
--- a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Circular Gauge Control")]
-[assembly: AssemblyVersion("2.0.9.1159")]
+[assembly: AssemblyVersion("2.0.10.1737")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
index 20dcb4bd3..7d9db14a8 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Code Generation Components")]
-[assembly: AssemblyVersion("2.0.16.1159")]
+[assembly: AssemblyVersion("2.0.17.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index cb8760755..2231c30f1 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -17,6 +17,7 @@ using System.Xml.Serialization;
 using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
+using Tango.Core;
 
 namespace Tango.BL.Entities
 {
@@ -74,7 +75,6 @@ namespace Tango.BL.Entities
                 {
                     <div>
                         @(prop.Name) = new @(prop.Type)();
-                        @(prop.Name).EnableCrossThreadOperations();
                     </div>
                 }
             }
diff --git a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
index 197519c5d..d4b613b39 100644
--- a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Color Picker Control")]
-[assembly: AssemblyVersion("2.0.19.1159")]
+[assembly: AssemblyVersion("2.0.20.1737")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs
index 0f15ad060..f4192a88b 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
 
 /// <summary>
 /// Contains <see cref="IEnumerable{T}"/> extension methods.
@@ -22,6 +23,17 @@ public static class IEnumerableExtensions
     }
 
     /// <summary>
+    /// Creates a new synchronized observable collection from the specified enumerable.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="enumerable">The enumerable.</param>
+    /// <returns></returns>
+    public static SynchronizedObservableCollection<T> ToSynchronizedObservableCollection<T>(this IEnumerable<T> enumerable)
+    {
+        return new SynchronizedObservableCollection<T>(enumerable);
+    }
+
+    /// <summary>
     /// Creates a new read-only collection from the specified enumerable.
     /// </summary>
     /// <typeparam name="T"></typeparam>
diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
index 5aaa2dc89..d65b42a7d 100644
--- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Core Components")]
-[assembly: AssemblyVersion("2.0.29.1159")]
+[assembly: AssemblyVersion("2.0.30.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Core/SynchronizedObservableCollection.cs b/Software/Visual_Studio/Tango.Core/SynchronizedObservableCollection.cs
new file mode 100644
index 000000000..f0a13b3c9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/SynchronizedObservableCollection.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace Tango.Core
+{
+    public class SynchronizedObservableCollection<T> : ObservableCollection<T>
+    {
+        public SynchronizedObservableCollection() : base()
+        {
+            this.EnableCrossThreadOperations();
+        }
+
+        public SynchronizedObservableCollection(IEnumerable<T> collection) : base(collection)
+        {
+
+        }
+
+        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (ObservableEntityCollectionSettings._dispatcher != null)
+            {
+                ObservableEntityCollectionSettings._dispatcher.BeginInvoke(new Action(() =>
+                {
+                    base.OnCollectionChanged(e);
+                }));
+            }
+            else
+            {
+                base.OnCollectionChanged(e);
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Core/SynchronizedObservableCollectionSettings.cs b/Software/Visual_Studio/Tango.Core/SynchronizedObservableCollectionSettings.cs
new file mode 100644
index 000000000..e46e4c451
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/SynchronizedObservableCollectionSettings.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+
+namespace Tango.Core
+{
+    public static class ObservableEntityCollectionSettings
+    {
+        internal static Dispatcher _dispatcher;
+
+        public static void SetDispatcher(Dispatcher dispatcher)
+        {
+            _dispatcher = dispatcher;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index 194a2ec54..bbb497dee 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -126,6 +126,7 @@
     <Compile Include="ExtensionMethods\IParameterizedExtensions.cs" />
     <Compile Include="ExtensionMethods\ObjectExtensions.cs" />
     <Compile Include="ExtensionMethods\TypeExtensions.cs" />
+    <Compile Include="SynchronizedObservableCollection.cs" />
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
@@ -146,6 +147,7 @@
     <Compile Include="IParameterized.cs" />
     <Compile Include="Json\HtmlContractResolver.cs" />
     <Compile Include="Json\DynamicContractResolver.cs" />
+    <Compile Include="SynchronizedObservableCollectionSettings.cs" />
     <Compile Include="ParameterIgnoreAttribute.cs" />
     <Compile Include="ParameterItem.cs" />
     <Compile Include="ParameterItemAttribute.cs" />
@@ -184,7 +186,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
index 503358e52..db56a1e95 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Local Data Access Layer")]
-[assembly: AssemblyVersion("2.0.15.1159")]
+[assembly: AssemblyVersion("2.0.16.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
index 0451b40cb..6c6b76d31 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Remote Data Access Layer")]
-[assembly: AssemblyVersion("2.0.28.1159")]
+[assembly: AssemblyVersion("2.0.29.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
index 59c4db84b..d081c2642 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Drag & Drop Components")]
-[assembly: AssemblyVersion("2.0.25.1159")]
+[assembly: AssemblyVersion("2.0.26.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
index 4817edcea..833e4ace7 100644
--- a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Visual Diagram Editing Components")]
-[assembly: AssemblyVersion("2.0.19.1159")]
+[assembly: AssemblyVersion("2.0.20.1737")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
index 7e9d1cccb..d3af848f3 100644
--- a/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.7.1159")]
+[assembly: AssemblyVersion("1.0.8.1737")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
index 4a4e9ba07..be724cd0c 100644
--- a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Emulation Components")]
-[assembly: AssemblyVersion("2.0.11.1159")]
+[assembly: AssemblyVersion("2.0.12.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
index e4f6aa19e..8741d2b15 100644
--- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Hive UI Components")]
-[assembly: AssemblyVersion("2.0.13.1159")]
+[assembly: AssemblyVersion("2.0.14.1737")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
index f48c6c5b6..9d679e9f1 100644
--- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
-[assembly: AssemblyVersion("2.0.28.1159")]
+[assembly: AssemblyVersion("2.0.29.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
index 6ef3fa46f..0e7d51021 100644
--- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
-[assembly: AssemblyVersion("2.0.33.1159")]
+[assembly: AssemblyVersion("2.0.34.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
index 84ebdca0f..1e753ea6f 100644
--- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Message Repository")]
-[assembly: AssemblyVersion("2.0.36.1159")]
+[assembly: AssemblyVersion("2.0.37.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
index 90e96b55c..7cc4ad54c 100644
--- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Components")]
-[assembly: AssemblyVersion("2.0.28.1159")]
+[assembly: AssemblyVersion("2.0.29.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
index 509606483..6f8b4b0bd 100644
--- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")]
-[assembly: AssemblyVersion("2.0.26.1159")]
+[assembly: AssemblyVersion("2.0.27.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
index 7663cf129..37784ffb4 100644
--- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Serialization Components")]
-[assembly: AssemblyVersion("2.0.27.1159")]
+[assembly: AssemblyVersion("2.0.28.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
index 54befdff8..54a6de96c 100644
--- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Global Settings")]
-[assembly: AssemblyVersion("2.0.27.1159")]
+[assembly: AssemblyVersion("2.0.28.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
index 4d4770aa0..f60d4b757 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Shared UI Components")]
-[assembly: AssemblyVersion("2.0.27.1159")]
+[assembly: AssemblyVersion("2.0.28.1737")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
index 2c571b4d3..5a9492aeb 100644
--- a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs Collection")]
-[assembly: AssemblyVersion("2.0.9.1159")]
+[assembly: AssemblyVersion("2.0.10.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
index 6d538d5ab..93b86366f 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - DataBase Synchronization Components")]
-[assembly: AssemblyVersion("2.0.16.1159")]
+[assembly: AssemblyVersion("2.0.17.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
index 421240036..8f3cd2297 100644
--- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - VSTS API Library")]
-[assembly: AssemblyVersion("2.0.19.1159")]
+[assembly: AssemblyVersion("2.0.20.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
index 37ca91140..405d596b7 100644
--- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Transport Components")]
-[assembly: AssemblyVersion("2.0.28.1159")]
+[assembly: AssemblyVersion("2.0.29.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
index a82036b41..aa63c9991 100644
--- a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Video Components")]
-[assembly: AssemblyVersion("2.0.19.1159")]
+[assembly: AssemblyVersion("2.0.20.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
index b3ec2c4f9..ae265d0d3 100644
--- a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Exotic Visual Elements")]
-[assembly: AssemblyVersion("2.0.8.1159")]
+[assembly: AssemblyVersion("2.0.9.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs
index 59bfed1bd..fc2245e80 100644
--- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs
@@ -91,7 +91,7 @@ namespace Tango.DBObservablesGenerator.CLI
                         }
                         else
                         {
-                            codeField.Type = String.Format("ObservableCollection<{0}>", DalNameToStandardName(field.PropertyType.GenericTypeArguments.Single().Name).SingularizeMVC());
+                            codeField.Type = String.Format("SynchronizedObservableCollection<{0}>", DalNameToStandardName(field.PropertyType.GenericTypeArguments.Single().Name).SingularizeMVC());
                             codeField.Construct = true;
                         }
                     }
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
index 3693ab6c7..3e6bdbcd3 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")]
-[assembly: AssemblyVersion("2.0.24.1159")]
+[assembly: AssemblyVersion("2.0.25.1737")]
 [assembly: ComVisible(false)]
\ No newline at end of file