Added Ha Amma spool support via sites.

40 files changed, 2741 insertions, 2096 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs
index cacda1e8d..02c9f4346 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs
@@ -63,6 +63,14 @@ namespace Tango.MachineStudio.Sites.ViewModels
             set { _machines = value; RaisePropertyChangedAuto(); }
         }
 
+        private SelectedObjectCollection<SpoolType> _spoolTypes;
+        public SelectedObjectCollection<SpoolType> SpoolTypes
+        {
+            get { return _spoolTypes; }
+            set { _spoolTypes = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public RelayCommand SaveCommand { get; set; }
 
         public SiteDetailsViewVM()
@@ -97,6 +105,7 @@ namespace Tango.MachineStudio.Sites.ViewModels
                     .WithSiteRmls()
                     .WithRmls()
                     .WithOrganization()
+                    .WithSpoolTypes()
                     .BuildAsync();
             }
 
@@ -104,9 +113,18 @@ namespace Tango.MachineStudio.Sites.ViewModels
 
             var rmls = await _db.Rmls.OrderBy(x => x.Name).ToListAsync();
             var catalogs = await _db.ColorCatalogs.OrderBy(x => x.Name).ToListAsync();
+            var spoolTypes = await _db.SpoolTypes.OrderBy(x => x.LastUpdated).ToListAsync();
 
             Rmls = new SelectedObjectCollection<Rml>(rmls.ToObservableCollection(), Site.SitesRmls.Select(x => x.Rml).ToObservableCollection());
             Catalogs = new SelectedObjectCollection<ColorCatalog>(catalogs.ToObservableCollection(), Site.SitesCatalogs.Select(x => x.ColorCatalog).ToObservableCollection());
+            SpoolTypes = new SelectedObjectCollection<SpoolType>(spoolTypes.ToObservableCollection(), Site.SitesSpoolTypes.Select(x => x.SpoolType).ToObservableCollection());
+
+            var standardSpool = SpoolTypes.FirstOrDefault(x => x.Data.Name == "Standard Spool");
+            if (standardSpool != null)
+            {
+                standardSpool.IsEnabled = false;
+                standardSpool.IsSelected = true;
+            }
 
             _siteBeforeSave = SiteDTO.FromObservable(Site);
         }
@@ -134,6 +152,7 @@ namespace Tango.MachineStudio.Sites.ViewModels
                     //Remove site rmls.
                     Site.SitesRmls.ToList().Where(x => !Rmls.SynchedSource.ToList().Exists(y => y.Guid == x.RmlGuid)).ToList().ForEach(x => _db.SitesRmls.Remove(x));
                     Site.SitesCatalogs.ToList().Where(x => !Catalogs.SynchedSource.ToList().Exists(y => y.Guid == x.ColorCatalogGuid)).ToList().ForEach(x => _db.SitesCatalogs.Remove(x));
+                    Site.SitesSpoolTypes.ToList().Where(x => !SpoolTypes.SynchedSource.ToList().Exists(y => y.Guid == x.SpoolTypeGuid)).ToList().ForEach(x => _db.SitesSpoolTypes.Remove(x));
 
                     foreach (var selectedRml in Rmls.SynchedSource.Where(x => !Site.SitesRmls.ToList().Exists(y => y.RmlGuid == x.Guid)))
                     {
@@ -145,6 +164,11 @@ namespace Tango.MachineStudio.Sites.ViewModels
                         _db.SitesCatalogs.Add(new SitesCatalog() { SiteGuid = Site.Guid, ColorCatalogGuid = selectedCatalog.Guid });
                     }
 
+                    foreach (var selectedSpoolType in SpoolTypes.SynchedSource.Where(x => !Site.SitesSpoolTypes.ToList().Exists(y => y.SpoolTypeGuid == x.Guid)))
+                    {
+                        _db.SitesSpoolTypes.Add(new SitesSpoolType() { SiteGuid = Site.Guid, SpoolTypeGuid = selectedSpoolType.Guid });
+                    }
+
                     await _db.SaveChangesAsync();
 
                     if (_isNew)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml
index 182f05be0..b4da6f35c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml
@@ -109,9 +109,9 @@
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
                         </Grid.ColumnDefinitions>
 
-
                         <DockPanel Margin="10">
                             <TextBlock DockPanel.Dock="Top" FontSize="16">SITE RML</TextBlock>
 
@@ -131,7 +131,6 @@
                             </materialDesign:Card>
                         </DockPanel>
 
-
                         <DockPanel Margin="10" Grid.Column="1">
                             <TextBlock DockPanel.Dock="Top" FontSize="16" Text="SITE CATALOGS"/>
                             <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
@@ -151,6 +150,27 @@
                         </DockPanel>
 
                         <DockPanel Margin="10" Grid.Column="2">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16">SITE SPOOL TYPES</TextBlock>
+
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                                <DataGrid ItemsSource="{Binding SpoolTypes}" Style="{StaticResource GridStyle}" CellStyle="{StaticResource CellStyle}">
+                                    <DataGrid.Columns>
+                                        <DataGridTemplateColumn Header="" Width="Auto">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <CheckBox IsEnabled="{Binding IsEnabled}" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+
+                                                    </CheckBox>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTextColumn Header="NAME" IsReadOnly="True" Binding="{Binding Data.Name}" Width="1*" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+
+                        <DockPanel Margin="10" Grid.Column="3">
                             <TextBlock DockPanel.Dock="Top" FontSize="16" Text="SITE MACHINES"/>
                             <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
                                 <DataGrid ItemsSource="{Binding Machines}" Style="{StaticResource GridStyle}" CellStyle="{StaticResource CellStyle}">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index d46113b50..4c1805cce 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -523,7 +523,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 job.UserGuid = null;
                 job.RmlGuid = (Settings.DefaultRmlGuid != null && _rmls.Select(x => x.Guid).Contains(Settings.DefaultRmlGuid)) ? Settings.DefaultRmlGuid : _rmls.FirstOrDefault().Guid;
                 job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid;
-                job.SpoolTypeGuid = Settings.DefaultSpoolTypeGuid != null ? Settings.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
+                job.SpoolTypeGuid = Settings.SpoolTypeGuid != null ? Settings.SpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
 
                 if (vm.SelectedColorSpace == ColorSpaces.Catalog)
                 {
@@ -927,7 +927,7 @@ namespace Tango.PPC.Jobs.ViewModels
                         job.Machine = await new MachineBuilder(db).Set(job.MachineGuid).WithCats().WithConfiguration().BuildAsync();
                         job.Rml = await new RmlBuilder(db).Set(job.RmlGuid).WithActiveParametersGroup().WithCAT(MachineProvider.Machine.Guid).WithCCT().WithLiquidFactors().BuildAsync();
                         job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid;
-                        job.SpoolTypeGuid = Settings.DefaultSpoolTypeGuid != null ? Settings.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
+                        job.SpoolTypeGuid = Settings.SpoolTypeGuid != null ? Settings.SpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
 
                         foreach (var segment in segments)
                         {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
index d6bacb50c..30e2bf8c2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
@@ -170,7 +170,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>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index bba5c2e7d..c5e4d46e7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -10,6 +10,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 using Tango.BL;
+using System.Data.Entity;
 using Tango.BL.Builders;
 using Tango.BL.Entities;
 using Tango.BL.Enumerations;
@@ -107,6 +108,13 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _rmls = value; RaisePropertyChangedAuto(); }
         }
 
+        private ObservableCollection<SpoolType> _spoolTypes;
+        public ObservableCollection<SpoolType> SpoolTypes
+        {
+            get { return _spoolTypes; }
+            set { _spoolTypes = value; RaisePropertyChangedAuto(); }
+        }
+
         private bool _enableHotSpot;
         public bool EnableHotSpot
         {
@@ -170,11 +178,11 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _defaultRML = value; RaisePropertyChangedAuto(); }
         }
 
-        private SpoolType _defaultSpoolType;
-        public SpoolType DefaultSpoolType
+        private SpoolType _selectedSpoolType;
+        public SpoolType SelectedSpoolType
         {
-            get { return _defaultSpoolType; }
-            set { _defaultSpoolType = value; RaisePropertyChangedAuto(); }
+            get { return _selectedSpoolType; }
+            set { _selectedSpoolType = value; RaisePropertyChangedAuto(); }
         }
 
         private bool _synchronizeJobs;
@@ -303,7 +311,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
                 Settings.LockScreenTimeout = TimeSpan.FromMinutes(LockScreenTimeoutMinutes);
                 Settings.LockScreenPassword = LockScreenPassword;
                 Settings.DefaultRmlGuid = DefaultRML?.Guid;
-                Settings.DefaultSpoolTypeGuid = DefaultSpoolType?.Guid;
+                Settings.SpoolTypeGuid = SelectedSpoolType?.Guid;
                 Settings.SynchronizeJobs = SynchronizeJobs;
                 Settings.SynchronizeDiagnostics = SynchronizeDiagnostics;
                 Settings.AutoCheckForUpdates = AutoCheckForUpdates;
@@ -457,6 +465,26 @@ namespace Tango.PPC.MachineSettings.ViewModels
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
                 Rmls = (await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection();
+
+                try
+                {
+                    SpoolTypes = (await db.SitesSpoolTypes.Where(x => x.SiteGuid == MachineProvider.Machine.SiteGuid).Include(x => x.SpoolType).Select(x => x.SpoolType).ToListAsync()).OrderBy(x => x.LastUpdated).ToObservableCollection();
+
+                    if (SpoolTypes.Count == 0)
+                    {
+                        SpoolTypes = new ObservableCollection<SpoolType>();
+                        var standardSpool = await db.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool);
+                        if (standardSpool != null)
+                        {
+                            SpoolTypes.Add(standardSpool);
+                        }
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error getting machine site spool types.");
+                }
             }
         }
 
@@ -489,7 +517,12 @@ namespace Tango.PPC.MachineSettings.ViewModels
             SelectedColorSpaces = new SelectedObjectCollection<ColorSpaces>(Enum.GetValues(typeof(ColorSpaces)).Cast<ColorSpaces>().Where(x => x.IsUserSpace()).ToObservableCollection(), Settings.SupportedColorSpaces.ToObservableCollection());
 
             DefaultRML = Rmls.SingleOrDefault(x => x.Guid == Settings.DefaultRmlGuid);
-            DefaultSpoolType = Adapter.SpoolTypes.SingleOrDefault(x => x.Guid == Settings.DefaultSpoolTypeGuid);
+            SelectedSpoolType = SpoolTypes.SingleOrDefault(x => x.Guid == Settings.SpoolTypeGuid);
+
+            if (SelectedSpoolType == null)
+            {
+                SelectedSpoolType = SpoolTypes.FirstOrDefault(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool);
+            }
 
             SynchronizeJobs = Settings.SynchronizeJobs;
             SynchronizeDiagnostics = Settings.SynchronizeDiagnostics;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index 7e67bbf99..0eb93cc45 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -154,8 +154,8 @@
                                             <TextBlock VerticalAlignment="Bottom">Default Thread</TextBlock>
                                             <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Rmls}" SelectedItem="{Binding DefaultRML}" DisplayMemberPath="FinalName"></touch:TouchComboBox>
 
-                                            <TextBlock VerticalAlignment="Bottom">Default Spool</TextBlock>
-                                            <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Adapter.SpoolTypes}" SelectedItem="{Binding DefaultSpoolType}" DisplayMemberPath="Name"></touch:TouchComboBox>
+                                            <TextBlock VerticalAlignment="Bottom">Spool Type</TextBlock>
+                                            <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding SpoolTypes}" SelectedItem="{Binding SelectedSpoolType}" DisplayMemberPath="Name"></touch:TouchComboBox>
 
                                             <TextBlock VerticalAlignment="Bottom">Default Segment Length</TextBlock>
                                             <touch:TouchNumericTextBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" Minimum="1" Maximum="1000" Value="{Binding Settings.DefaultSegmentLength}" HasDecimalPoint="True" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 8bc753be9..e02352b9b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -165,7 +165,7 @@ namespace Tango.PPC.Common
         /// <summary>
         /// Gets or sets the default spool type unique identifier.
         /// </summary>
-        public String DefaultSpoolTypeGuid { get; set; }
+        public String SpoolTypeGuid { get; set; }
 
         /// <summary>
         /// Gets or sets the default length of the segment.
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs b/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs
index 0bf54e07e..27256cbdb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs
@@ -86,7 +86,7 @@ namespace Tango.PPC.DataSynchronizer.CLI
             };
             var result = process.Execute().Result;
 
-            if (result.ExitCode != ExaminerProcessExitCode.Success)
+            if (result.ExitCode != ExaminerProcessExitCode.Success)  
             {
                 throw new InvalidOperationException(result.Output);
             }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index 4cf8f3da6..c23455fbd 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -86,6 +87,15 @@ namespace Tango.PPC.UI.Printing
                     config.LubricationVolume = (int)rmlLubrication.LubricationLevel;
                 }
 
+                var spoolTypeGuid = settings.SpoolTypeGuid;
+                var spoolType = await context.SpoolTypes.FirstOrDefaultAsync(x => x.Guid == spoolTypeGuid);
+                if (spoolType == null)
+                {
+                    spoolType = await context.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool);
+                }
+
+                job.SpoolType = spoolType;
+
                 handler = await _machineProvider.MachineOperator.Print(job, config);
                 _notificationProvider.ReleaseGlobalBusyMessage();
             }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs
index 938598fc6..e6c6d63f8 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs
@@ -54,5 +54,13 @@ namespace Tango.BL.Builders
                 return query.Include(x => x.Organization);
             });
         }
+
+        public virtual SiteBuilder WithSpoolTypes()
+        {
+            return AddQueryStep(6, (query) =>
+            {
+                return query.Include(x => x.SitesSpoolTypes);
+            });
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesSpoolTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesSpoolTypeDTO.cs
new file mode 100644
index 000000000..d0bff20b8
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/SitesSpoolTypeDTO.cs
@@ -0,0 +1,14 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.DTO
+{
+    public class SitesSpoolTypeDTO : SitesSpoolTypeDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesSpoolTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesSpoolTypeDTOBase.cs
new file mode 100644
index 000000000..3e25edd63
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/SitesSpoolTypeDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class SitesSpoolTypeDTOBase : ObservableEntityDTO<SitesSpoolTypeDTO, SitesSpoolType>
+    {
+
+        /// <summary>
+        /// site guid
+        /// </summary>
+        public String SiteGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// spool type guid
+        /// </summary>
+        public String SpoolTypeGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs
index 071dd7ea9..9753a5077 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs
@@ -37,6 +37,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<SynchronizedObservableCollection<SitesRml>> SitesRmlsChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<SitesSpoolType>> SitesSpoolTypesChanged;
+
         protected String _organizationguid;
 
         /// <summary>
@@ -199,6 +201,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<SitesSpoolType> _sitesspooltypes;
+
+        /// <summary>
+        /// Gets or sets the sitebase sites spool types.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<SitesSpoolType> SitesSpoolTypes
+        {
+            get 
+            {
+                return _sitesspooltypes; 
+            }
+
+            set 
+            {
+                if (_sitesspooltypes != value)
+                {
+                    _sitesspooltypes = value;
+
+                    OnSitesSpoolTypesChanged(value);
+
+                }
+            }
+        }
+
         /// <summary>
         /// Called when the Name has changed.
         /// </summary>
@@ -245,6 +272,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the SitesSpoolTypes has changed.
+        /// </summary>
+        protected virtual void OnSitesSpoolTypesChanged(SynchronizedObservableCollection<SitesSpoolType> sitesspooltypes)
+        {
+            SitesSpoolTypesChanged?.Invoke(this, sitesspooltypes);
+            RaisePropertyChanged(nameof(SitesSpoolTypes));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="SiteBase" /> class.
         /// </summary>
         public SiteBase() : base()
@@ -254,6 +290,8 @@ namespace Tango.BL.Entities
 
             SitesRmls = new SynchronizedObservableCollection<SitesRml>();
 
+            SitesSpoolTypes = new SynchronizedObservableCollection<SitesSpoolType>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesSpoolType.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesSpoolType.cs
new file mode 100644
index 000000000..c694ce783
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/SitesSpoolType.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class SitesSpoolType : SitesSpoolTypeBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesSpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesSpoolTypeBase.cs
new file mode 100644
index 000000000..5174e9c5c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/SitesSpoolTypeBase.cs
@@ -0,0 +1,175 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+using System.ComponentModel;
+using Tango.Core.CustomAttributes;
+
+namespace Tango.BL.Entities
+{
+    [Table("SITES_SPOOL_TYPES")]
+    public abstract class SitesSpoolTypeBase : ObservableEntity<SitesSpoolType>
+    {
+
+        public event EventHandler<Site> SiteChanged;
+
+        public event EventHandler<SpoolType> SpoolTypeChanged;
+
+        protected String _siteguid;
+
+        /// <summary>
+        /// Gets or sets the sitesspooltypebase site guid.
+        /// </summary>
+
+        [Column("SITE_GUID")]
+        [ForeignKey("Site")]
+
+        public  String SiteGuid
+        {
+            get 
+            {
+                return _siteguid; 
+            }
+
+            set 
+            {
+                if (_siteguid != value)
+                {
+                    _siteguid = value;
+
+                }
+            }
+        }
+
+        protected String _spooltypeguid;
+
+        /// <summary>
+        /// Gets or sets the sitesspooltypebase spool type guid.
+        /// </summary>
+
+        [Column("SPOOL_TYPE_GUID")]
+        [ForeignKey("SpoolType")]
+
+        public  String SpoolTypeGuid
+        {
+            get 
+            {
+                return _spooltypeguid; 
+            }
+
+            set 
+            {
+                if (_spooltypeguid != value)
+                {
+                    _spooltypeguid = value;
+
+                }
+            }
+        }
+
+        protected Site _site;
+
+        /// <summary>
+        /// Gets or sets the sitesspooltypebase site.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Site Site
+        {
+            get 
+            {
+                return _site; 
+            }
+
+            set 
+            {
+                if (_site != value)
+                {
+                    _site = value;
+
+                    if (Site != null)
+                    {
+                        SiteGuid = Site.Guid;
+                    }
+
+                    OnSiteChanged(value);
+
+                }
+            }
+        }
+
+        protected SpoolType _spooltype;
+
+        /// <summary>
+        /// Gets or sets the sitesspooltypebase spool types.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual SpoolType SpoolType
+        {
+            get 
+            {
+                return _spooltype; 
+            }
+
+            set 
+            {
+                if (_spooltype != value)
+                {
+                    _spooltype = value;
+
+                    if (SpoolType != null)
+                    {
+                        SpoolTypeGuid = SpoolType.Guid;
+                    }
+
+                    OnSpoolTypeChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Site has changed.
+        /// </summary>
+        protected virtual void OnSiteChanged(Site site)
+        {
+            SiteChanged?.Invoke(this, site);
+            RaisePropertyChanged(nameof(Site));
+        }
+
+        /// <summary>
+        /// Called when the SpoolType has changed.
+        /// </summary>
+        protected virtual void OnSpoolTypeChanged(SpoolType spooltype)
+        {
+            SpoolTypeChanged?.Invoke(this, spooltype);
+            RaisePropertyChanged(nameof(SpoolType));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SitesSpoolTypeBase" /> class.
+        /// </summary>
+        public SitesSpoolTypeBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs
index 5939a3c62..973d6cd2f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs
@@ -55,6 +55,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<SynchronizedObservableCollection<RmlsSpool>> RmlsSpoolsChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<SitesSpoolType>> SitesSpoolTypesChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Spool>> SpoolsChanged;
 
         protected Int32 _code;
@@ -431,6 +433,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<SitesSpoolType> _sitesspooltypes;
+
+        /// <summary>
+        /// Gets or sets the spooltypebase sites spool types.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<SitesSpoolType> SitesSpoolTypes
+        {
+            get 
+            {
+                return _sitesspooltypes; 
+            }
+
+            set 
+            {
+                if (_sitesspooltypes != value)
+                {
+                    _sitesspooltypes = value;
+
+                    OnSitesSpoolTypesChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Spool> _spools;
 
         /// <summary>
@@ -583,6 +610,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the SitesSpoolTypes has changed.
+        /// </summary>
+        protected virtual void OnSitesSpoolTypesChanged(SynchronizedObservableCollection<SitesSpoolType> sitesspooltypes)
+        {
+            SitesSpoolTypesChanged?.Invoke(this, sitesspooltypes);
+            RaisePropertyChanged(nameof(SitesSpoolTypes));
+        }
+
+        /// <summary>
         /// Called when the Spools has changed.
         /// </summary>
         protected virtual void OnSpoolsChanged(SynchronizedObservableCollection<Spool> spools)
@@ -601,6 +637,8 @@ namespace Tango.BL.Entities
 
             RmlsSpools = new SynchronizedObservableCollection<RmlsSpool>();
 
+            SitesSpoolTypes = new SynchronizedObservableCollection<SitesSpoolType>();
+
             Spools = new SynchronizedObservableCollection<Spool>();
 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs
index e0c35c0c5..3f8c9df0f 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/BitTypes.cs
@@ -20,1150 +20,1150 @@ namespace Tango.BL.Enumerations
     {
 
         /// <summary>
-        /// ()
+        /// (Machine input voltage is not too high)
         /// </summary>
-        [Description("")]
+        [Description("Machine input voltage is not too high")]
         IncomingVoltageTooHigh = 1000,
 
         /// <summary>
-        /// ()
+        /// (Machine input voltage is not too low)
         /// </summary>
-        [Description("")]
+        [Description("Machine input voltage is not too low")]
         IncomingVoltageTooLow = 1001,
 
         /// <summary>
-        /// ()
+        /// (Flash file system exists)
         /// </summary>
-        [Description("")]
+        [Description("Flash file system exists")]
         FlashFileSystemMissing = 1002,
 
         /// <summary>
-        /// ()
+        /// (Hardware version file exists)
         /// </summary>
-        [Description("")]
+        [Description("Hardware version file exists")]
         HWVersionFileMissing = 1003,
 
         /// <summary>
-        /// ()
+        /// (Alarms file exists)
         /// </summary>
-        [Description("")]
+        [Description("Alarms file exists")]
         AlarmFileMissing = 1004,
 
         /// <summary>
-        /// ()
+        /// (Communication with ink RFID reader )
         /// </summary>
-        [Description("")]
+        [Description("Communication with ink RFID reader ")]
         InkRFIDReader = 2000,
 
         /// <summary>
-        /// ()
+        /// (Communication with waste 1 RFID reader )
         /// </summary>
-        [Description("")]
+        [Description("Communication with waste 1 RFID reader ")]
         Waste1RFIDReader = 2001,
 
         /// <summary>
-        /// ()
+        /// (Communication with waste 2 RFID reader )
         /// </summary>
-        [Description("")]
+        [Description("Communication with waste 2 RFID reader ")]
         Waste2RFIDReader = 2002,
 
         /// <summary>
-        /// ()
+        /// (Communication with Black dispenser )
         /// </summary>
-        [Description("")]
-        Dispenser1I2CComm = 3000,
+        [Description("Communication with Black dispenser ")]
+        DispenserKI2CComm = 3000,
 
         /// <summary>
-        /// ()
+        /// (Communication with Cyan dispenser )
         /// </summary>
-        [Description("")]
-        Dispenser2I2CComm = 3001,
+        [Description("Communication with Cyan dispenser ")]
+        DispenserCI2CComm = 3001,
 
         /// <summary>
-        /// ()
+        /// (Communication with Magenta dispenser )
         /// </summary>
-        [Description("")]
-        Dispenser3I2CComm = 3002,
+        [Description("Communication with Magenta dispenser ")]
+        DispenserMI2CComm = 3002,
 
         /// <summary>
-        /// ()
+        /// (Communication with Yellow dispenser)
         /// </summary>
-        [Description("")]
-        Dispenser4I2CComm = 3003,
+        [Description("Communication with Yellow dispenser")]
+        DispenserYI2CComm = 3003,
 
         /// <summary>
-        /// ()
+        /// (Communication with Transparent ink dispenser)
         /// </summary>
-        [Description("")]
-        Dispenser5I2CComm = 3004,
+        [Description("Communication with Transparent ink dispenser")]
+        DispenserTII2CComm = 3004,
 
         /// <summary>
-        /// ()
+        /// (Communication with Light Cyan dispenser)
         /// </summary>
-        [Description("")]
-        Dispenser6I2CComm = 3005,
+        [Description("Communication with Light Cyan dispenser")]
+        DispenserLCI2CComm = 3005,
 
         /// <summary>
-        /// ()
+        /// (Communication with Light Magenta dispenser)
         /// </summary>
-        [Description("")]
-        Dispenser7I2CComm = 3006,
+        [Description("Communication with Light Magenta dispenser")]
+        DispenserLMI2CComm = 3006,
 
         /// <summary>
-        /// ()
+        /// (Communication with Light Yellow dispenser)
         /// </summary>
-        [Description("")]
-        Dispenser8I2CComm = 3007,
+        [Description("Communication with Light Yellow dispenser")]
+        DispenserLYI2CComm = 3007,
 
         /// <summary>
-        /// ()
+        /// (Head type identification)
         /// </summary>
-        [Description("")]
+        [Description("Head type identification")]
         HeadTypeIdentified = 3008,
 
         /// <summary>
-        /// ()
+        /// (WHS type identification)
         /// </summary>
-        [Description("")]
+        [Description("WHS type identification")]
         WHSTypeIdentified = 3009,
 
         /// <summary>
-        /// ()
+        /// (Communication with Shinko controller)
         /// </summary>
-        [Description("")]
+        [Description("Communication with Shinko controller")]
         CommunicationWithShinko = 4000,
 
         /// <summary>
-        /// ()
+        /// (Communication with BTSR)
         /// </summary>
-        [Description("")]
+        [Description("Communication with BTSR")]
         CommunicationWithBTSR = 4001,
 
         /// <summary>
-        /// ()
+        /// (USB communication)
         /// </summary>
-        [Description("")]
+        [Description("USB communication")]
         USBCommunication = 5000,
 
         /// <summary>
-        /// ()
+        /// (Read electrical cabinet big fan RPM)
         /// </summary>
-        [Description("")]
-        DrawerBigFan = 6000,
+        [Description("Read electrical cabinet big fan RPM")]
+        ECBigFan = 6000,
 
         /// <summary>
-        /// ()
+        /// (Read electrical cabinet small fan RPM)
         /// </summary>
-        [Description("")]
-        DrawerSmall1Fan = 6001,
+        [Description("Read electrical cabinet small fan RPM")]
+        ECSmall1Fan = 6001,
 
         /// <summary>
-        /// ()
+        /// (Read electrical cabinet small fan RPM)
         /// </summary>
-        [Description("")]
-        DrawerSmall2Fan = 6002,
+        [Description("Read electrical cabinet small fan RPM")]
+        ECSmall2Fan = 6002,
 
         /// <summary>
-        /// ()
+        /// (Read electrical cabinet small fan RPM)
         /// </summary>
-        [Description("")]
-        DrawerSmall3Fan = 6003,
+        [Description("Read electrical cabinet small fan RPM")]
+        ECSmall3Fan = 6003,
 
         /// <summary>
-        /// ()
+        /// (Read electrical cabinet small fan RPM)
         /// </summary>
-        [Description("")]
-        DrawerSmall4Fan = 6004,
+        [Description("Read electrical cabinet small fan RPM")]
+        ECSmall4Fan = 6004,
 
         /// <summary>
-        /// ()
+        /// (Read system fan 1 RPM)
         /// </summary>
-        [Description("")]
+        [Description("Read system fan 1 RPM")]
         SystemFan1 = 6005,
 
         /// <summary>
-        /// ()
+        /// (Read system fan 2 RPM)
         /// </summary>
-        [Description("")]
+        [Description("Read system fan 2 RPM")]
         SystemFan2 = 6006,
 
         /// <summary>
-        /// ()
+        /// (Read system fan 3 RPM)
         /// </summary>
-        [Description("")]
+        [Description("Read system fan 3 RPM")]
         SystemFan3 = 6007,
 
         /// <summary>
-        /// ()
+        /// (Read winder dancer status)
         /// </summary>
-        [Description("")]
+        [Description("Read winder dancer status")]
         WinderDancerStatusRead = 7000,
 
         /// <summary>
-        /// ()
+        /// (Read puller dancer status)
         /// </summary>
-        [Description("")]
+        [Description("Read puller dancer status")]
         PullerDancerStatusRead = 7001,
 
         /// <summary>
-        /// ()
+        /// (Read feeder dancer status)
         /// </summary>
-        [Description("")]
+        [Description("Read feeder dancer status")]
         FeederDancerStatusRead = 7002,
 
         /// <summary>
-        /// ()
+        /// (Read dryer loading arm status)
         /// </summary>
-        [Description("")]
+        [Description("Read dryer loading arm status")]
         DryerEncoderStatusRead = 7003,
 
         /// <summary>
-        /// ()
+        /// (Read dryer air temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read dryer air temperature")]
         Pt100ReadDryerAir = 8000,
 
         /// <summary>
-        /// ()
+        /// (Read dryer zone 1 temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read dryer zone 1 temperature")]
         Pt100ReadDryer1 = 8001,
 
         /// <summary>
-        /// ()
+        /// (Read dryer zone 2 temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read dryer zone 2 temperature")]
         Pt100ReadDryer2 = 8002,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 1 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead1 = 8003,
+        [Description("Read head zone 1 temperature")]
+        Pt100ReadHeadZone1 = 8003,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 2 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead2 = 8004,
+        [Description("Read head zone 2 temperature")]
+        Pt100ReadHeadZone2 = 8004,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 3 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead3 = 8005,
+        [Description("Read head zone 3 temperature")]
+        Pt100ReadHeadZone3 = 8005,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 4 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead4 = 8006,
+        [Description("Read head zone 4 temperature")]
+        Pt100ReadHeadZone4 = 8006,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 5 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead5 = 8007,
+        [Description("Read head zone 5 temperature")]
+        Pt100ReadHeadZone5 = 8007,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 6 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead6 = 8008,
+        [Description("Read head zone 6 temperature")]
+        Pt100ReadHeadZone6 = 8008,
 
         /// <summary>
-        /// ()
+        /// (Read mixer temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read mixer temperature")]
         Pt100ReadMixer = 8009,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 7 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead7 = 8010,
+        [Description("Read head zone 7 temperature")]
+        Pt100ReadHeadZone7 = 8010,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 8 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead8 = 8011,
+        [Description("Read head zone 8 temperature")]
+        Pt100ReadHeadZone8 = 8011,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 9 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead9 = 8012,
+        [Description("Read head zone 9 temperature")]
+        Pt100ReadHeadZone9 = 8012,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 10 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead10 = 8013,
+        [Description("Read head zone 10 temperature")]
+        Pt100ReadHeadZone10 = 8013,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 11 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead11 = 8014,
+        [Description("Read head zone 11 temperature")]
+        Pt100ReadHeadZone11 = 8014,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 12 temperature)
         /// </summary>
-        [Description("")]
-        Pt100ReadHead12 = 8015,
+        [Description("Read head zone 12 temperature")]
+        Pt100ReadHeadZone12 = 8015,
 
         /// <summary>
-        /// ()
+        /// (Read head right blower temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read head right blower temperature")]
         Pt100ReadHeadBlowerIn = 8016,
 
         /// <summary>
-        /// ()
+        /// (Read head left blower temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read head left blower temperature")]
         Pt100ReadHeadBlowerOut = 8017,
 
         /// <summary>
-        /// ()
+        /// (Read WHS cooler temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read WHS cooler temperature")]
         Pt100ReadWHS = 8018,
 
         /// <summary>
-        /// ()
+        /// (Read electrical cabinet temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read electrical cabinet temperature")]
         Pt100ReadElectricalCabinet = 8019,
 
         /// <summary>
-        /// ()
+        /// (Read machine internal temperature)
         /// </summary>
-        [Description("")]
+        [Description("Read machine internal temperature")]
         Pt100ReadMachine = 8020,
 
         /// <summary>
-        /// ()
+        /// (No current break in dryer zone 1)
         /// </summary>
-        [Description("")]
+        [Description("No current break in dryer zone 1")]
         CurrentBreakDryer1 = 8021,
 
         /// <summary>
-        /// ()
+        /// (No current break in dryer zone 2)
         /// </summary>
-        [Description("")]
+        [Description("No current break in dryer zone 2")]
         CurrentBreakDryer2 = 8022,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 1)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead1 = 8023,
+        [Description("No current break in head zone 1")]
+        CurrentBreakHeadZone1 = 8023,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 2)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead2 = 8024,
+        [Description("No current break in head zone 2")]
+        CurrentBreakHeadZone2 = 8024,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 3)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead3 = 8025,
+        [Description("No current break in head zone 3")]
+        CurrentBreakHeadZone3 = 8025,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 4)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead4 = 8026,
+        [Description("No current break in head zone 4")]
+        CurrentBreakHeadZone4 = 8026,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 5)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead5 = 8027,
+        [Description("No current break in head zone 5")]
+        CurrentBreakHeadZone5 = 8027,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 6)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead6 = 8028,
+        [Description("No current break in head zone 6")]
+        CurrentBreakHeadZone6 = 8028,
 
         /// <summary>
-        /// ()
+        /// (No current break in mixer)
         /// </summary>
-        [Description("")]
+        [Description("No current break in mixer")]
         CurrentBreakMixer = 8029,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 7)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead7 = 8030,
+        [Description("No current break in head zone 7")]
+        CurrentBreakHeadZone7 = 8030,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 8)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead8 = 8031,
+        [Description("No current break in head zone 8")]
+        CurrentBreakHeadZone8 = 8031,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 9)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead9 = 8032,
+        [Description("No current break in head zone 9")]
+        CurrentBreakHeadZone9 = 8032,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 10)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead10 = 8033,
+        [Description("No current break in head zone 10")]
+        CurrentBreakHeadZone10 = 8033,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 11)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead11 = 8034,
+        [Description("No current break in head zone 11")]
+        CurrentBreakHeadZone11 = 8034,
 
         /// <summary>
-        /// ()
+        /// (No current break in head zone 12)
         /// </summary>
-        [Description("")]
-        CurrentBreakHead12 = 8035,
+        [Description("No current break in head zone 12")]
+        CurrentBreakHeadZone12 = 8035,
 
         /// <summary>
-        /// ()
+        /// (No current break in head right blower)
         /// </summary>
-        [Description("")]
+        [Description("No current break in head right blower")]
         CurrentBreakHeadBlowerIn = 8036,
 
         /// <summary>
-        /// ()
+        /// (No current break in head left blower)
         /// </summary>
-        [Description("")]
+        [Description("No current break in head left blower")]
         CurrentBreakHeadBlowerOut = 8037,
 
         /// <summary>
-        /// ()
+        /// (Read dryer zone 1 current)
         /// </summary>
-        [Description("")]
+        [Description("Read dryer zone 1 current")]
         CurrentDryer1 = 8038,
 
         /// <summary>
-        /// ()
+        /// (Read dryer zone 2 current)
         /// </summary>
-        [Description("")]
+        [Description("Read dryer zone 2 current")]
         CurrentDryer2 = 8039,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 1 current)
         /// </summary>
-        [Description("")]
-        CurrentHead1 = 8040,
+        [Description("Read head zone 1 current")]
+        CurrentHeadZone1 = 8040,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 2 current)
         /// </summary>
-        [Description("")]
-        CurrentHead2 = 8041,
+        [Description("Read head zone 2 current")]
+        CurrentHeadZone2 = 8041,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 3 current)
         /// </summary>
-        [Description("")]
-        CurrentHead3 = 8042,
+        [Description("Read head zone 3 current")]
+        CurrentHeadZone3 = 8042,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 4 current)
         /// </summary>
-        [Description("")]
-        CurrentHead4 = 8043,
+        [Description("Read head zone 4 current")]
+        CurrentHeadZone4 = 8043,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 5 current)
         /// </summary>
-        [Description("")]
-        CurrentHead5 = 8044,
+        [Description("Read head zone 5 current")]
+        CurrentHeadZone5 = 8044,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 6 current)
         /// </summary>
-        [Description("")]
-        CurrentHead6 = 8045,
+        [Description("Read head zone 6 current")]
+        CurrentHeadZone6 = 8045,
 
         /// <summary>
-        /// ()
+        /// (Read mixer current)
         /// </summary>
-        [Description("")]
+        [Description("Read mixer current")]
         CurrentMixer = 8046,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 7 current)
         /// </summary>
-        [Description("")]
-        CurrentHead7 = 8047,
+        [Description("Read head zone 7 current")]
+        CurrentHeadZone7 = 8047,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 8 current)
         /// </summary>
-        [Description("")]
-        CurrentHead8 = 8048,
+        [Description("Read head zone 8 current")]
+        CurrentHeadZone8 = 8048,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 9 current)
         /// </summary>
-        [Description("")]
-        CurrentHead9 = 8049,
+        [Description("Read head zone 9 current")]
+        CurrentHeadZone9 = 8049,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 10 current)
         /// </summary>
-        [Description("")]
-        CurrentHead10 = 8050,
+        [Description("Read head zone 10 current")]
+        CurrentHeadZone10 = 8050,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 11 current)
         /// </summary>
-        [Description("")]
-        CurrentHead11 = 8051,
+        [Description("Read head zone 11 current")]
+        CurrentHeadZone11 = 8051,
 
         /// <summary>
-        /// ()
+        /// (Read head zone 12 current)
         /// </summary>
-        [Description("")]
-        CurrentHead12 = 8052,
+        [Description("Read head zone 12 current")]
+        CurrentHeadZone12 = 8052,
 
         /// <summary>
-        /// ()
+        /// (Read head right blower current)
         /// </summary>
-        [Description("")]
+        [Description("Read head right blower current")]
         CurrentHeadBlowerIn = 8053,
 
         /// <summary>
-        /// ()
+        /// (Read head left blower current )
         /// </summary>
-        [Description("")]
+        [Description("Read head left blower current ")]
         CurrentHeadBlowerOut = 8054,
 
         /// <summary>
-        /// ()
+        /// (Dryer zone 1 heat up)
         /// </summary>
-        [Description("")]
+        [Description("Dryer zone 1 heat up")]
         HeaterDryer1 = 8055,
 
         /// <summary>
-        /// ()
+        /// (Dryer zone 2 heat up)
         /// </summary>
-        [Description("")]
+        [Description("Dryer zone 2 heat up")]
         HeaterDryer2 = 8056,
 
         /// <summary>
-        /// ()
+        /// (Head zone 1 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead1 = 8057,
+        [Description("Head zone 1 heat up")]
+        HeaterHeadZone1 = 8057,
 
         /// <summary>
-        /// ()
+        /// (Head zone 2 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead2 = 8058,
+        [Description("Head zone 2 heat up")]
+        HeaterHeadZone2 = 8058,
 
         /// <summary>
-        /// ()
+        /// (Head zone 3 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead3 = 8059,
+        [Description("Head zone 3 heat up")]
+        HeaterHeadZone3 = 8059,
 
         /// <summary>
-        /// ()
+        /// (Head zone 4 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead4 = 8060,
+        [Description("Head zone 4 heat up")]
+        HeaterHeadZone4 = 8060,
 
         /// <summary>
-        /// ()
+        /// (Head zone 5 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead5 = 8061,
+        [Description("Head zone 5 heat up")]
+        HeaterHeadZone5 = 8061,
 
         /// <summary>
-        /// ()
+        /// (Head zone 6 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead6 = 8062,
+        [Description("Head zone 6 heat up")]
+        HeaterHeadZone6 = 8062,
 
         /// <summary>
-        /// ()
+        /// (Mixer heat up)
         /// </summary>
-        [Description("")]
+        [Description("Mixer heat up")]
         HeaterMixer = 8063,
 
         /// <summary>
-        /// ()
+        /// (Head zone 7 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead7 = 8064,
+        [Description("Head zone 7 heat up")]
+        HeaterHeadZone7 = 8064,
 
         /// <summary>
-        /// ()
+        /// (Head zone 8 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead8 = 8065,
+        [Description("Head zone 8 heat up")]
+        HeaterHeadZone8 = 8065,
 
         /// <summary>
-        /// ()
+        /// (Head zone 9 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead9 = 8066,
+        [Description("Head zone 9 heat up")]
+        HeaterHeadZone9 = 8066,
 
         /// <summary>
-        /// ()
+        /// (Head zone 10 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead10 = 8067,
+        [Description("Head zone 10 heat up")]
+        HeaterHeadZone10 = 8067,
 
         /// <summary>
-        /// ()
+        /// (Head zone 11 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead11 = 8068,
+        [Description("Head zone 11 heat up")]
+        HeaterHeadZone11 = 8068,
 
         /// <summary>
-        /// ()
+        /// (Head zone 12 heat up)
         /// </summary>
-        [Description("")]
-        HeaterHead12 = 8069,
+        [Description("Head zone 12 heat up")]
+        HeaterHeadZone12 = 8069,
 
         /// <summary>
-        /// ()
+        /// (Head right blower heat up)
         /// </summary>
-        [Description("")]
+        [Description("Head right blower heat up")]
         HeaterHeadBlowerIn = 8070,
 
         /// <summary>
-        /// ()
+        /// (Head left blower heat up)
         /// </summary>
-        [Description("")]
+        [Description("Head left blower heat up")]
         HeaterHeadBlowerOut = 8071,
 
         /// <summary>
-        /// ()
+        /// (Communication with head cleaning motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with head cleaning motor driver")]
         PowerstepDhCleanHead = 9000,
 
         /// <summary>
-        /// ()
+        /// (Communication with head cleaning mechanism motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with head cleaning mechanism motor driver")]
         PowerstepDhCleanMech = 9001,
 
         /// <summary>
-        /// ()
+        /// (Communication with head lid motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with head lid motor driver")]
         PowerstepDyeingHeadLid = 9002,
 
         /// <summary>
-        /// ()
+        /// (Communication with dryer driving motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with dryer driving motor driver")]
         PowerstepDryerDriving = 9003,
 
         /// <summary>
-        /// ()
+        /// (Communication with dryer lid motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with dryer lid motor driver")]
         PowerstepDryerLid = 9004,
 
         /// <summary>
-        /// ()
+        /// (Communication with dryer loading arm motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with dryer loading arm motor driver")]
         PowerstepDryerLoadarm = 9005,
 
         /// <summary>
-        /// ()
+        /// (Communication with black dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser1 = 9006,
+        [Description("Communication with black dispenser motor driver")]
+        PowerstepDispenserK = 9006,
 
         /// <summary>
-        /// ()
+        /// (Communication with cyan dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser2 = 9007,
+        [Description("Communication with cyan dispenser motor driver")]
+        PowerstepDispenserC = 9007,
 
         /// <summary>
-        /// ()
+        /// (Communication with magenta dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser3 = 9008,
+        [Description("Communication with magenta dispenser motor driver")]
+        PowerstepDispenserM = 9008,
 
         /// <summary>
-        /// ()
+        /// (Communication with yellow dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser4 = 9009,
+        [Description("Communication with yellow dispenser motor driver")]
+        PowerstepDispenserY = 9009,
 
         /// <summary>
-        /// ()
+        /// (Communication with transparent ink dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser5 = 9010,
+        [Description("Communication with transparent ink dispenser motor driver")]
+        PowerstepDispenserTI = 9010,
 
         /// <summary>
-        /// ()
+        /// (Communication with light cyan dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser6 = 9011,
+        [Description("Communication with light cyan dispenser motor driver")]
+        PowerstepDispenserLC = 9011,
 
         /// <summary>
-        /// ()
+        /// (Communication with light magenta dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser7 = 9012,
+        [Description("Communication with light magenta dispenser motor driver")]
+        PowerstepDispenserLM = 9012,
 
         /// <summary>
-        /// ()
+        /// (Communication with light yellow dispenser motor driver)
         /// </summary>
-        [Description("")]
-        PowerstepDispenser8 = 9013,
+        [Description("Communication with light yellow dispenser motor driver")]
+        PowerstepDispenserLY = 9013,
 
         /// <summary>
-        /// ()
+        /// (Communication with screw motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with screw motor driver")]
         PowerstepScrew = 9014,
 
         /// <summary>
-        /// ()
+        /// (Communication with winder motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with winder motor driver")]
         PowerstepWinder = 9015,
 
         /// <summary>
-        /// ()
+        /// (Communication with winder dancer motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with winder dancer motor driver")]
         PowerstepLeftDancer = 9016,
 
         /// <summary>
-        /// ()
+        /// (Communication with puller dancer motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with puller dancer motor driver")]
         PowerstepMiddleDancer = 9017,
 
         /// <summary>
-        /// ()
+        /// (Communication with lubricant pump motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with lubricant pump motor driver")]
         PowerstepLeftDriving = 9018,
 
         /// <summary>
-        /// ()
+        /// (Communication with left rockers motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with left rockers motor driver")]
         PowerstepLeftRockers = 9019,
 
         /// <summary>
-        /// ()
+        /// (Communication with left pivot motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with left pivot motor driver")]
         PowerstepLeftPivot = 9020,
 
         /// <summary>
-        /// ()
+        /// (Communication with feeder dancer motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with feeder dancer motor driver")]
         PowerstepRightDancer = 9021,
 
         /// <summary>
-        /// ()
+        /// (Communication with right driving motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with right driving motor driver")]
         PowerstepRightDriving = 9022,
 
         /// <summary>
-        /// ()
+        /// (Communication with right loadarm motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with right loadarm motor driver")]
         PowerstepRightLoadarm = 9023,
 
         /// <summary>
-        /// ()
+        /// (Communication with cleaner motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with cleaner motor driver")]
         PowerstepRightRockers = 9024,
 
         /// <summary>
-        /// ()
+        /// (Communication with spare motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with spare motor driver")]
         PowerstepSpare1_1 = 9025,
 
         /// <summary>
-        /// ()
+        /// (Communication with spare motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with spare motor driver")]
         PowerstepSpare1_2 = 9026,
 
         /// <summary>
-        /// ()
+        /// (Communication with spare motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with spare motor driver")]
         PowerstepSpare2_1 = 9027,
 
         /// <summary>
-        /// ()
+        /// (Communication with spare motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with spare motor driver")]
         PowerstepSpare2_2 = 9028,
 
         /// <summary>
-        /// ()
+        /// (Communication with spare motor driver)
         /// </summary>
-        [Description("")]
+        [Description("Communication with spare motor driver")]
         PowerstepSpare3_1 = 9029,
 
         /// <summary>
-        /// ()
+        /// (Head cleaning motor function)
         /// </summary>
-        [Description("")]
+        [Description("Head cleaning motor function")]
         MotorWireReadDhCleanHead = 9030,
 
         /// <summary>
-        /// ()
+        /// (Head cleaning mechanism motor function)
         /// </summary>
-        [Description("")]
+        [Description("Head cleaning mechanism motor function")]
         MotorWireReadDhCleanMech = 9031,
 
         /// <summary>
-        /// ()
+        /// (Head lid motor function)
         /// </summary>
-        [Description("")]
+        [Description("Head lid motor function")]
         MotorWireReadDyeingHeadLid = 9032,
 
         /// <summary>
-        /// ()
+        /// (Dryer driving motor mechanism function)
         /// </summary>
-        [Description("")]
+        [Description("Dryer driving motor mechanism function")]
         MotorWireReadDryerDriving = 9033,
 
         /// <summary>
-        /// ()
+        /// (Dryer lid motor function)
         /// </summary>
-        [Description("")]
+        [Description("Dryer lid motor function")]
         MotorWireReadDryerLid = 9034,
 
         /// <summary>
-        /// ()
+        /// (Dryer loading arm motor function)
         /// </summary>
-        [Description("")]
+        [Description("Dryer loading arm motor function")]
         MotorWireReadDryerLoadarm = 9035,
 
         /// <summary>
-        /// ()
+        /// (Black dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser1 = 9036,
+        [Description("Black dispenser motor function")]
+        MotorWireReadDispenserK = 9036,
 
         /// <summary>
-        /// ()
+        /// (Cyan dispesner motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser2 = 9037,
+        [Description("Cyan dispesner motor function")]
+        MotorWireReadDispenserC = 9037,
 
         /// <summary>
-        /// ()
+        /// (Magenta dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser3 = 9038,
+        [Description("Magenta dispenser motor function")]
+        MotorWireReadDispenserM = 9038,
 
         /// <summary>
-        /// ()
+        /// (Yellow dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser4 = 9039,
+        [Description("Yellow dispenser motor function")]
+        MotorWireReadDispenserY = 9039,
 
         /// <summary>
-        /// ()
+        /// (Tranparent ink dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser5 = 9040,
+        [Description("Tranparent ink dispenser motor function")]
+        MotorWireReadDispenserTI = 9040,
 
         /// <summary>
-        /// ()
+        /// (Light cyan dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser6 = 9041,
+        [Description("Light cyan dispenser motor function")]
+        MotorWireReadDispenserLC = 9041,
 
         /// <summary>
-        /// ()
+        /// (Light magenta dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser7 = 9042,
+        [Description("Light magenta dispenser motor function")]
+        MotorWireReadDispenserLM = 9042,
 
         /// <summary>
-        /// ()
+        /// (Light yellow dispenser motor function)
         /// </summary>
-        [Description("")]
-        MotorWireReadDispenser8 = 9043,
+        [Description("Light yellow dispenser motor function")]
+        MotorWireReadDispenserLY = 9043,
 
         /// <summary>
-        /// ()
+        /// (Screw motor function)
         /// </summary>
-        [Description("")]
+        [Description("Screw motor function")]
         MotorWireReadScrew = 9044,
 
         /// <summary>
-        /// ()
+        /// (Winder motor function)
         /// </summary>
-        [Description("")]
+        [Description("Winder motor function")]
         MotorWireReadWinder = 9045,
 
         /// <summary>
-        /// ()
+        /// (Winder dancer motor function)
         /// </summary>
-        [Description("")]
+        [Description("Winder dancer motor function")]
         MotorWireReadLeftDancer = 9046,
 
         /// <summary>
-        /// ()
+        /// (Puller dancer motor function)
         /// </summary>
-        [Description("")]
+        [Description("Puller dancer motor function")]
         MotorWireReadMiddleDancer = 9047,
 
         /// <summary>
-        /// ()
+        /// (Lubricant pump motor function)
         /// </summary>
-        [Description("")]
+        [Description("Lubricant pump motor function")]
         MotorWireReadLeftDriving = 9048,
 
         /// <summary>
-        /// ()
+        /// (Left rockers motor function)
         /// </summary>
-        [Description("")]
+        [Description("Left rockers motor function")]
         MotorWireReadLeftRockers = 9049,
 
         /// <summary>
-        /// ()
+        /// (Left pivot motors function)
         /// </summary>
-        [Description("")]
+        [Description("Left pivot motors function")]
         MotorWireReadLeftPivot = 9050,
 
         /// <summary>
-        /// ()
+        /// (Feeder dancer motor function)
         /// </summary>
-        [Description("")]
+        [Description("Feeder dancer motor function")]
         MotorWireReadRightDancer = 9051,
 
         /// <summary>
-        /// ()
+        /// (Right driving motor function)
         /// </summary>
-        [Description("")]
+        [Description("Right driving motor function")]
         MotorWireReadRightDriving = 9052,
 
         /// <summary>
-        /// ()
+        /// (Right load arm motor function)
         /// </summary>
-        [Description("")]
+        [Description("Right load arm motor function")]
         MotorWireReadRightLoadarm = 9053,
 
         /// <summary>
-        /// ()
+        /// (Cleaner motor function)
         /// </summary>
-        [Description("")]
+        [Description("Cleaner motor function")]
         MotorWireReadRightRockers = 9054,
 
         /// <summary>
-        /// ()
+        /// (Spare motor function)
         /// </summary>
-        [Description("")]
+        [Description("Spare motor function")]
         MotorWireReadSpare1_1 = 9055,
 
         /// <summary>
-        /// ()
+        /// (Spare motor function)
         /// </summary>
-        [Description("")]
+        [Description("Spare motor function")]
         MotorWireReadSpare1_2 = 9056,
 
         /// <summary>
-        /// ()
+        /// (Spare motor function)
         /// </summary>
-        [Description("")]
+        [Description("Spare motor function")]
         MotorWireReadSpare2_1 = 9057,
 
         /// <summary>
-        /// ()
+        /// (Spare motor function)
         /// </summary>
-        [Description("")]
+        [Description("Spare motor function")]
         MotorWireReadSpare2_2 = 9058,
 
         /// <summary>
-        /// ()
+        /// (Spare motor function)
         /// </summary>
-        [Description("")]
+        [Description("Spare motor function")]
         MotorWireReadSpare3_1 = 9059,
 
         /// <summary>
-        /// ()
+        /// (Head right blower turn off)
         /// </summary>
-        [Description("")]
+        [Description("Head right blower turn off")]
         InBlowerTurnOff = 10000,
 
         /// <summary>
-        /// ()
+        /// (Head left blower turn off)
         /// </summary>
-        [Description("")]
+        [Description("Head left blower turn off")]
         OutBlowerTurnOff = 10001,
 
         /// <summary>
-        /// ()
+        /// (Head right blower turn on)
         /// </summary>
-        [Description("")]
+        [Description("Head right blower turn on")]
         InBlowerTurnOn = 10002,
 
         /// <summary>
-        /// ()
+        /// (Head left blower turn on)
         /// </summary>
-        [Description("")]
+        [Description("Head left blower turn on")]
         OutBlowerTurnOn = 10003,
 
         /// <summary>
-        /// ()
+        /// (Read head right blower fan RPM)
         /// </summary>
-        [Description("")]
+        [Description("Read head right blower fan RPM")]
         InBlowerPressure = 10004,
 
         /// <summary>
-        /// ()
+        /// (Read head left blower fan RPM)
         /// </summary>
-        [Description("")]
+        [Description("Read head left blower fan RPM")]
         OutBlowerPressure = 10005,
 
         /// <summary>
-        /// ()
+        /// (WHS blower function)
         /// </summary>
-        [Description("")]
+        [Description("WHS blower function")]
         WHSBlowerDoesNotBuildPressure = 10006,
 
         /// <summary>
-        /// ()
+        /// (Read WHS dryer flow)
         /// </summary>
-        [Description("")]
+        [Description("Read WHS dryer flow")]
         WHSDryerSensorFailure = 10007,
 
         /// <summary>
-        /// ()
+        /// (Read WHS head flow)
         /// </summary>
-        [Description("")]
+        [Description("Read WHS head flow")]
         WHSHeadSensorFailure = 10008,
 
         /// <summary>
-        /// ()
+        /// (Read WHS others flow)
         /// </summary>
-        [Description("")]
+        [Description("Read WHS others flow")]
         WHSOtherSensorFailure = 10009,
 
         /// <summary>
-        /// ()
+        /// (Black dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp1 = 11000,
+        [Description("Black dispenser pressure build up")]
+        PressureBuildingUpK = 11000,
 
         /// <summary>
-        /// ()
+        /// (Cyan dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp2 = 11001,
+        [Description("Cyan dispenser pressure build up")]
+        PressureBuildingUpC = 11001,
 
         /// <summary>
-        /// ()
+        /// (Magenta dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp3 = 11002,
+        [Description("Magenta dispenser pressure build up")]
+        PressureBuildingUpM = 11002,
 
         /// <summary>
-        /// ()
+        /// (Yellow dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp4 = 11003,
+        [Description("Yellow dispenser pressure build up")]
+        PressureBuildingUpY = 11003,
 
         /// <summary>
-        /// ()
+        /// (Transparent ink dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp5 = 11004,
+        [Description("Transparent ink dispenser pressure build up")]
+        PressureBuildingUpTI = 11004,
 
         /// <summary>
-        /// ()
+        /// (Light cyan dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp6 = 11005,
+        [Description("Light cyan dispenser pressure build up")]
+        PressureBuildingUpLC = 11005,
 
         /// <summary>
-        /// ()
+        /// (Light magenta dispenser pressure up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp7 = 11006,
+        [Description("Light magenta dispenser pressure up")]
+        PressureBuildingUpLM = 11006,
 
         /// <summary>
-        /// ()
+        /// (Light yellow dispenser pressure build up)
         /// </summary>
-        [Description("")]
-        PressureBuildingUp8 = 11007,
+        [Description("Light yellow dispenser pressure build up")]
+        PressureBuildingUpLY = 11007,
 
         /// <summary>
-        /// ()
+        /// (Black dispenser pressure release )
         /// </summary>
-        [Description("")]
-        PressureReleased1 = 11008,
+        [Description("Black dispenser pressure release ")]
+        PressureReleasedK = 11008,
 
         /// <summary>
-        /// ()
+        /// (Cyan dispenser pressure release )
         /// </summary>
-        [Description("")]
-        PressureReleased2 = 11009,
+        [Description("Cyan dispenser pressure release ")]
+        PressureReleasedC = 11009,
 
         /// <summary>
-        /// ()
+        /// (Magenta dispenser pressure release)
         /// </summary>
-        [Description("")]
-        PressureReleased3 = 11010,
+        [Description("Magenta dispenser pressure release")]
+        PressureReleasedM = 11010,
 
         /// <summary>
-        /// ()
+        /// (Yellow dispenser pressure release)
         /// </summary>
-        [Description("")]
-        PressureReleased4 = 11011,
+        [Description("Yellow dispenser pressure release")]
+        PressureReleasedY = 11011,
 
         /// <summary>
-        /// ()
+        /// (Transparent ink dispenser pressure release)
         /// </summary>
-        [Description("")]
-        PressureReleased5 = 11012,
+        [Description("Transparent ink dispenser pressure release")]
+        PressureReleasedTI = 11012,
 
         /// <summary>
-        /// ()
+        /// (Light cyan dispenser pressure release)
         /// </summary>
-        [Description("")]
-        PressureReleased6 = 11013,
+        [Description("Light cyan dispenser pressure release")]
+        PressureReleasedLC = 11013,
 
         /// <summary>
-        /// ()
+        /// (Light magenta dispenser pressure release)
         /// </summary>
-        [Description("")]
-        PressureReleased7 = 11014,
+        [Description("Light magenta dispenser pressure release")]
+        PressureReleasedLM = 11014,
 
         /// <summary>
-        /// ()
+        /// (Light yellow dispenser pressure release)
         /// </summary>
-        [Description("")]
-        PressureReleased8 = 11015,
+        [Description("Light yellow dispenser pressure release")]
+        PressureReleasedLY = 11015,
 
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/FiberShapes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/FiberShapes.cs
index 5580a9aeb..f62e2e4c2 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/FiberShapes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/FiberShapes.cs
@@ -20,46 +20,10 @@ namespace Tango.BL.Enumerations
     {
 
         /// <summary>
-        /// (Trilobal)
-        /// </summary>
-        [Description("Trilobal")]
-        Trilobal = 3,
-
-        /// <summary>
         /// (Triangle)
         /// </summary>
         [Description("Triangle")]
         Triangle = 1,
 
-        /// <summary>
-        /// (Hollow)
-        /// </summary>
-        [Description("Hollow")]
-        Hollow = 4,
-
-        /// <summary>
-        /// (Irregular)
-        /// </summary>
-        [Description("Irregular")]
-        Irregular = 5,
-
-        /// <summary>
-        /// (Pentagona)
-        /// </summary>
-        [Description("Pentagona")]
-        Pentagona = 6,
-
-        /// <summary>
-        /// (Round)
-        /// </summary>
-        [Description("Round")]
-        Round = 2,
-
-        /// <summary>
-        /// (Unknown)
-        /// </summary>
-        [Description("Unknown")]
-        Unknown = 7,
-
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/MediaPurposes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/MediaPurposes.cs
index 1d5ea3533..b76cc6f4e 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/MediaPurposes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/MediaPurposes.cs
@@ -61,5 +61,11 @@ namespace Tango.BL.Enumerations
         [Description("Circular Knitting")]
         CircularKnitting = 5,
 
+        /// <summary>
+        /// (Twine)
+        /// </summary>
+        [Description("Twine")]
+        Twine = 0,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Rmls.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Rmls.cs
index 6e2bfa3e7..4cca09917 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Rmls.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Rmls.cs
@@ -38,6 +38,12 @@ namespace Tango.BL.Enumerations
         RML2 = 0,
 
         /// <summary>
+        /// (vica_test)
+        /// </summary>
+        [Description("vica_test")]
+        vica_test = 3,
+
+        /// <summary>
         /// (RML 1)
         /// </summary>
         [Description("RML 1")]
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs
index 814e7370b..f02de31bb 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs
@@ -20,6 +20,12 @@ namespace Tango.BL.Enumerations
     {
 
         /// <summary>
+        /// (Ha Amma)
+        /// </summary>
+        [Description("Ha Amma")]
+        HaAmma = 1,
+
+        /// <summary>
         /// (Standard Spool)
         /// </summary>
         [Description("Standard Spool")]
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index d6bc73bd0..114c727c7 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -31,6 +31,150 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the ColorProcessData.
+        /// </summary>
+        public DbSet<ColorProcessData> ColorProcessData 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the ColorProcessFactors.
+        /// </summary>
+        public DbSet<ColorProcessFactor> ColorProcessFactors 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the ColorProcessParameters.
+        /// </summary>
+        public DbSet<ColorProcessParameter> ColorProcessParameters 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResults.
+        /// </summary>
+        public DbSet<RmlExtensionTestResult> RmlExtensionTestResults 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlsExtensions.
+        /// </summary>
+        public DbSet<RmlsExtension> RmlsExtensions 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RubbingResults.
+        /// </summary>
+        public DbSet<RubbingResult> RubbingResults 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the TensileResults.
+        /// </summary>
+        public DbSet<TensileResult> TensileResults 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnApplications.
+        /// </summary>
+        public DbSet<YarnApplication> YarnApplications 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnBrands.
+        /// </summary>
+        public DbSet<YarnBrand> YarnBrands 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnFamilies.
+        /// </summary>
+        public DbSet<YarnFamily> YarnFamilies 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnGlossLevels.
+        /// </summary>
+        public DbSet<YarnGlossLevel> YarnGlossLevels 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnGroups.
+        /// </summary>
+        public DbSet<YarnGroup> YarnGroups 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnIndustrysectors.
+        /// </summary>
+        public DbSet<YarnIndustrysector> YarnIndustrysectors 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnManufacturers.
+        /// </summary>
+        public DbSet<YarnManufacturer> YarnManufacturers 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnSubFamilies.
+        /// </summary>
+        public DbSet<YarnSubFamily> YarnSubFamilies 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnTexturings.
+        /// </summary>
+        public DbSet<YarnTexturing> YarnTexturings 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnTypes.
+        /// </summary>
+        public DbSet<YarnType> YarnTypes 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnWhiteShades.
+        /// </summary>
+        public DbSet<YarnWhiteShade> YarnWhiteShades 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the ActionLogs.
         /// </summary>
         public DbSet<ActionLog> ActionLogs 
@@ -159,30 +303,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the ColorProcessData.
-        /// </summary>
-        public DbSet<ColorProcessData> ColorProcessData 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the ColorProcessFactors.
-        /// </summary>
-        public DbSet<ColorProcessFactor> ColorProcessFactors 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the ColorProcessParameters.
-        /// </summary>
-        public DbSet<ColorProcessParameter> ColorProcessParameters 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the ColorSpaces.
         /// </summary>
         public DbSet<ColorSpace> ColorSpaces 
@@ -583,14 +703,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the RmlExtensionTestResults.
-        /// </summary>
-        public DbSet<RmlExtensionTestResult> RmlExtensionTestResults 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the Rmls.
         /// </summary>
         public DbSet<Rml> Rmls 
@@ -599,14 +711,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the RmlsExtensions.
-        /// </summary>
-        public DbSet<RmlsExtension> RmlsExtensions 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the RmlsSpools.
         /// </summary>
         public DbSet<RmlsSpool> RmlsSpools 
@@ -631,14 +735,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the RubbingResults.
-        /// </summary>
-        public DbSet<RubbingResult> RubbingResults 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the Segments.
         /// </summary>
         public DbSet<Segment> Segments 
@@ -671,6 +767,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the SitesSpoolTypes.
+        /// </summary>
+        public DbSet<SitesSpoolType> SitesSpoolTypes 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the SpoolTypes.
         /// </summary>
         public DbSet<SpoolType> SpoolTypes 
@@ -759,14 +863,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the TensileResults.
-        /// </summary>
-        public DbSet<TensileResult> TensileResults 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the Users.
         /// </summary>
         public DbSet<User> Users 
@@ -790,93 +886,5 @@ namespace Tango.BL
             get; set; 
         }
 
-        /// <summary>
-        /// Gets or sets the YarnApplications.
-        /// </summary>
-        public DbSet<YarnApplication> YarnApplications 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnBrands.
-        /// </summary>
-        public DbSet<YarnBrand> YarnBrands 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnFamilies.
-        /// </summary>
-        public DbSet<YarnFamily> YarnFamilies 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnGlossLevels.
-        /// </summary>
-        public DbSet<YarnGlossLevel> YarnGlossLevels 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnGroups.
-        /// </summary>
-        public DbSet<YarnGroup> YarnGroups 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnIndustrysectors.
-        /// </summary>
-        public DbSet<YarnIndustrysector> YarnIndustrysectors 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnManufacturers.
-        /// </summary>
-        public DbSet<YarnManufacturer> YarnManufacturers 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnSubFamilies.
-        /// </summary>
-        public DbSet<YarnSubFamily> YarnSubFamilies 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnTexturings.
-        /// </summary>
-        public DbSet<YarnTexturing> YarnTexturings 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnTypes.
-        /// </summary>
-        public DbSet<YarnType> YarnTypes 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// Gets or sets the YarnWhiteShades.
-        /// </summary>
-        public DbSet<YarnWhiteShade> YarnWhiteShades 
-        {
-            get; set; 
-        }
-
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index ac276916f..4b74c3c13 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -53,6 +53,654 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<ColorProcessData> _colorprocessdata;
+        /// <summary>
+        /// Gets or sets the ColorProcessData.
+        /// </summary>
+        public ObservableCollection<ColorProcessData> ColorProcessData
+        {
+            get 
+            {
+                return _colorprocessdata; 
+            }
+
+            set 
+            {
+                _colorprocessdata = value; RaisePropertyChanged(nameof(ColorProcessData)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessdataViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessData View Source.
+        ///</summary>
+        public ICollectionView ColorProcessDataViewSource
+        {
+            get 
+            {
+                return _colorprocessdataViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessdataViewSource = value; RaisePropertyChanged(nameof(ColorProcessDataViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<ColorProcessFactor> _colorprocessfactors;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactors.
+        /// </summary>
+        public ObservableCollection<ColorProcessFactor> ColorProcessFactors
+        {
+            get 
+            {
+                return _colorprocessfactors; 
+            }
+
+            set 
+            {
+                _colorprocessfactors = value; RaisePropertyChanged(nameof(ColorProcessFactors)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessfactorsViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactors View Source.
+        ///</summary>
+        public ICollectionView ColorProcessFactorsViewSource
+        {
+            get 
+            {
+                return _colorprocessfactorsViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessfactorsViewSource = value; RaisePropertyChanged(nameof(ColorProcessFactorsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<ColorProcessParameter> _colorprocessparameters;
+        /// <summary>
+        /// Gets or sets the ColorProcessParameters.
+        /// </summary>
+        public ObservableCollection<ColorProcessParameter> ColorProcessParameters
+        {
+            get 
+            {
+                return _colorprocessparameters; 
+            }
+
+            set 
+            {
+                _colorprocessparameters = value; RaisePropertyChanged(nameof(ColorProcessParameters)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessparametersViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessParameters View Source.
+        ///</summary>
+        public ICollectionView ColorProcessParametersViewSource
+        {
+            get 
+            {
+                return _colorprocessparametersViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessparametersViewSource = value; RaisePropertyChanged(nameof(ColorProcessParametersViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResults.
+        /// </summary>
+        public ObservableCollection<RmlExtensionTestResult> RmlExtensionTestResults
+        {
+            get 
+            {
+                return _rmlextensiontestresults; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresults = value; RaisePropertyChanged(nameof(RmlExtensionTestResults)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensiontestresultsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResults View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionTestResultsViewSource
+        {
+            get 
+            {
+                return _rmlextensiontestresultsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlsExtension> _rmlsextensions;
+        /// <summary>
+        /// Gets or sets the RmlsExtensions.
+        /// </summary>
+        public ObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                _rmlsextensions = value; RaisePropertyChanged(nameof(RmlsExtensions)); 
+            }
+
+        }
+
+        private ICollectionView _rmlsextensionsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlsExtensions View Source.
+        ///</summary>
+        public ICollectionView RmlsExtensionsViewSource
+        {
+            get 
+            {
+                return _rmlsextensionsViewSource; 
+            }
+
+            set 
+            {
+                _rmlsextensionsViewSource = value; RaisePropertyChanged(nameof(RmlsExtensionsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RubbingResult> _rubbingresults;
+        /// <summary>
+        /// Gets or sets the RubbingResults.
+        /// </summary>
+        public ObservableCollection<RubbingResult> RubbingResults
+        {
+            get 
+            {
+                return _rubbingresults; 
+            }
+
+            set 
+            {
+                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
+            }
+
+        }
+
+        private ICollectionView _rubbingresultsViewSource;
+        /// <summary>
+        /// Gets or sets the RubbingResults View Source.
+        ///</summary>
+        public ICollectionView RubbingResultsViewSource
+        {
+            get 
+            {
+                return _rubbingresultsViewSource; 
+            }
+
+            set 
+            {
+                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<TensileResult> _tensileresults;
+        /// <summary>
+        /// Gets or sets the TensileResults.
+        /// </summary>
+        public ObservableCollection<TensileResult> TensileResults
+        {
+            get 
+            {
+                return _tensileresults; 
+            }
+
+            set 
+            {
+                _tensileresults = value; RaisePropertyChanged(nameof(TensileResults)); 
+            }
+
+        }
+
+        private ICollectionView _tensileresultsViewSource;
+        /// <summary>
+        /// Gets or sets the TensileResults View Source.
+        ///</summary>
+        public ICollectionView TensileResultsViewSource
+        {
+            get 
+            {
+                return _tensileresultsViewSource; 
+            }
+
+            set 
+            {
+                _tensileresultsViewSource = value; RaisePropertyChanged(nameof(TensileResultsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnApplication> _yarnapplications;
+        /// <summary>
+        /// Gets or sets the YarnApplications.
+        /// </summary>
+        public ObservableCollection<YarnApplication> YarnApplications
+        {
+            get 
+            {
+                return _yarnapplications; 
+            }
+
+            set 
+            {
+                _yarnapplications = value; RaisePropertyChanged(nameof(YarnApplications)); 
+            }
+
+        }
+
+        private ICollectionView _yarnapplicationsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnApplications View Source.
+        ///</summary>
+        public ICollectionView YarnApplicationsViewSource
+        {
+            get 
+            {
+                return _yarnapplicationsViewSource; 
+            }
+
+            set 
+            {
+                _yarnapplicationsViewSource = value; RaisePropertyChanged(nameof(YarnApplicationsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnBrand> _yarnbrands;
+        /// <summary>
+        /// Gets or sets the YarnBrands.
+        /// </summary>
+        public ObservableCollection<YarnBrand> YarnBrands
+        {
+            get 
+            {
+                return _yarnbrands; 
+            }
+
+            set 
+            {
+                _yarnbrands = value; RaisePropertyChanged(nameof(YarnBrands)); 
+            }
+
+        }
+
+        private ICollectionView _yarnbrandsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnBrands View Source.
+        ///</summary>
+        public ICollectionView YarnBrandsViewSource
+        {
+            get 
+            {
+                return _yarnbrandsViewSource; 
+            }
+
+            set 
+            {
+                _yarnbrandsViewSource = value; RaisePropertyChanged(nameof(YarnBrandsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnFamily> _yarnfamilies;
+        /// <summary>
+        /// Gets or sets the YarnFamilies.
+        /// </summary>
+        public ObservableCollection<YarnFamily> YarnFamilies
+        {
+            get 
+            {
+                return _yarnfamilies; 
+            }
+
+            set 
+            {
+                _yarnfamilies = value; RaisePropertyChanged(nameof(YarnFamilies)); 
+            }
+
+        }
+
+        private ICollectionView _yarnfamiliesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnFamilies View Source.
+        ///</summary>
+        public ICollectionView YarnFamiliesViewSource
+        {
+            get 
+            {
+                return _yarnfamiliesViewSource; 
+            }
+
+            set 
+            {
+                _yarnfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnFamiliesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGlossLevel> _yarnglosslevels;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevels.
+        /// </summary>
+        public ObservableCollection<YarnGlossLevel> YarnGlossLevels
+        {
+            get 
+            {
+                return _yarnglosslevels; 
+            }
+
+            set 
+            {
+                _yarnglosslevels = value; RaisePropertyChanged(nameof(YarnGlossLevels)); 
+            }
+
+        }
+
+        private ICollectionView _yarnglosslevelsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevels View Source.
+        ///</summary>
+        public ICollectionView YarnGlossLevelsViewSource
+        {
+            get 
+            {
+                return _yarnglosslevelsViewSource; 
+            }
+
+            set 
+            {
+                _yarnglosslevelsViewSource = value; RaisePropertyChanged(nameof(YarnGlossLevelsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGroup> _yarngroups;
+        /// <summary>
+        /// Gets or sets the YarnGroups.
+        /// </summary>
+        public ObservableCollection<YarnGroup> YarnGroups
+        {
+            get 
+            {
+                return _yarngroups; 
+            }
+
+            set 
+            {
+                _yarngroups = value; RaisePropertyChanged(nameof(YarnGroups)); 
+            }
+
+        }
+
+        private ICollectionView _yarngroupsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGroups View Source.
+        ///</summary>
+        public ICollectionView YarnGroupsViewSource
+        {
+            get 
+            {
+                return _yarngroupsViewSource; 
+            }
+
+            set 
+            {
+                _yarngroupsViewSource = value; RaisePropertyChanged(nameof(YarnGroupsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnIndustrysector> _yarnindustrysectors;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysectors.
+        /// </summary>
+        public ObservableCollection<YarnIndustrysector> YarnIndustrysectors
+        {
+            get 
+            {
+                return _yarnindustrysectors; 
+            }
+
+            set 
+            {
+                _yarnindustrysectors = value; RaisePropertyChanged(nameof(YarnIndustrysectors)); 
+            }
+
+        }
+
+        private ICollectionView _yarnindustrysectorsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysectors View Source.
+        ///</summary>
+        public ICollectionView YarnIndustrysectorsViewSource
+        {
+            get 
+            {
+                return _yarnindustrysectorsViewSource; 
+            }
+
+            set 
+            {
+                _yarnindustrysectorsViewSource = value; RaisePropertyChanged(nameof(YarnIndustrysectorsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnManufacturer> _yarnmanufacturers;
+        /// <summary>
+        /// Gets or sets the YarnManufacturers.
+        /// </summary>
+        public ObservableCollection<YarnManufacturer> YarnManufacturers
+        {
+            get 
+            {
+                return _yarnmanufacturers; 
+            }
+
+            set 
+            {
+                _yarnmanufacturers = value; RaisePropertyChanged(nameof(YarnManufacturers)); 
+            }
+
+        }
+
+        private ICollectionView _yarnmanufacturersViewSource;
+        /// <summary>
+        /// Gets or sets the YarnManufacturers View Source.
+        ///</summary>
+        public ICollectionView YarnManufacturersViewSource
+        {
+            get 
+            {
+                return _yarnmanufacturersViewSource; 
+            }
+
+            set 
+            {
+                _yarnmanufacturersViewSource = value; RaisePropertyChanged(nameof(YarnManufacturersViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnSubFamily> _yarnsubfamilies;
+        /// <summary>
+        /// Gets or sets the YarnSubFamilies.
+        /// </summary>
+        public ObservableCollection<YarnSubFamily> YarnSubFamilies
+        {
+            get 
+            {
+                return _yarnsubfamilies; 
+            }
+
+            set 
+            {
+                _yarnsubfamilies = value; RaisePropertyChanged(nameof(YarnSubFamilies)); 
+            }
+
+        }
+
+        private ICollectionView _yarnsubfamiliesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnSubFamilies View Source.
+        ///</summary>
+        public ICollectionView YarnSubFamiliesViewSource
+        {
+            get 
+            {
+                return _yarnsubfamiliesViewSource; 
+            }
+
+            set 
+            {
+                _yarnsubfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnSubFamiliesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnTexturing> _yarntexturings;
+        /// <summary>
+        /// Gets or sets the YarnTexturings.
+        /// </summary>
+        public ObservableCollection<YarnTexturing> YarnTexturings
+        {
+            get 
+            {
+                return _yarntexturings; 
+            }
+
+            set 
+            {
+                _yarntexturings = value; RaisePropertyChanged(nameof(YarnTexturings)); 
+            }
+
+        }
+
+        private ICollectionView _yarntexturingsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnTexturings View Source.
+        ///</summary>
+        public ICollectionView YarnTexturingsViewSource
+        {
+            get 
+            {
+                return _yarntexturingsViewSource; 
+            }
+
+            set 
+            {
+                _yarntexturingsViewSource = value; RaisePropertyChanged(nameof(YarnTexturingsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnType> _yarntypes;
+        /// <summary>
+        /// Gets or sets the YarnTypes.
+        /// </summary>
+        public ObservableCollection<YarnType> YarnTypes
+        {
+            get 
+            {
+                return _yarntypes; 
+            }
+
+            set 
+            {
+                _yarntypes = value; RaisePropertyChanged(nameof(YarnTypes)); 
+            }
+
+        }
+
+        private ICollectionView _yarntypesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnTypes View Source.
+        ///</summary>
+        public ICollectionView YarnTypesViewSource
+        {
+            get 
+            {
+                return _yarntypesViewSource; 
+            }
+
+            set 
+            {
+                _yarntypesViewSource = value; RaisePropertyChanged(nameof(YarnTypesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnWhiteShade> _yarnwhiteshades;
+        /// <summary>
+        /// Gets or sets the YarnWhiteShades.
+        /// </summary>
+        public ObservableCollection<YarnWhiteShade> YarnWhiteShades
+        {
+            get 
+            {
+                return _yarnwhiteshades; 
+            }
+
+            set 
+            {
+                _yarnwhiteshades = value; RaisePropertyChanged(nameof(YarnWhiteShades)); 
+            }
+
+        }
+
+        private ICollectionView _yarnwhiteshadesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnWhiteShades View Source.
+        ///</summary>
+        public ICollectionView YarnWhiteShadesViewSource
+        {
+            get 
+            {
+                return _yarnwhiteshadesViewSource; 
+            }
+
+            set 
+            {
+                _yarnwhiteshadesViewSource = value; RaisePropertyChanged(nameof(YarnWhiteShadesViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<ActionLog> _actionlogs;
         /// <summary>
         /// Gets or sets the ActionLogs.
@@ -629,114 +1277,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<ColorProcessData> _colorprocessdata;
-        /// <summary>
-        /// Gets or sets the ColorProcessData.
-        /// </summary>
-        public ObservableCollection<ColorProcessData> ColorProcessData
-        {
-            get 
-            {
-                return _colorprocessdata; 
-            }
-
-            set 
-            {
-                _colorprocessdata = value; RaisePropertyChanged(nameof(ColorProcessData)); 
-            }
-
-        }
-
-        private ICollectionView _colorprocessdataViewSource;
-        /// <summary>
-        /// Gets or sets the ColorProcessData View Source.
-        ///</summary>
-        public ICollectionView ColorProcessDataViewSource
-        {
-            get 
-            {
-                return _colorprocessdataViewSource; 
-            }
-
-            set 
-            {
-                _colorprocessdataViewSource = value; RaisePropertyChanged(nameof(ColorProcessDataViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<ColorProcessFactor> _colorprocessfactors;
-        /// <summary>
-        /// Gets or sets the ColorProcessFactors.
-        /// </summary>
-        public ObservableCollection<ColorProcessFactor> ColorProcessFactors
-        {
-            get 
-            {
-                return _colorprocessfactors; 
-            }
-
-            set 
-            {
-                _colorprocessfactors = value; RaisePropertyChanged(nameof(ColorProcessFactors)); 
-            }
-
-        }
-
-        private ICollectionView _colorprocessfactorsViewSource;
-        /// <summary>
-        /// Gets or sets the ColorProcessFactors View Source.
-        ///</summary>
-        public ICollectionView ColorProcessFactorsViewSource
-        {
-            get 
-            {
-                return _colorprocessfactorsViewSource; 
-            }
-
-            set 
-            {
-                _colorprocessfactorsViewSource = value; RaisePropertyChanged(nameof(ColorProcessFactorsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<ColorProcessParameter> _colorprocessparameters;
-        /// <summary>
-        /// Gets or sets the ColorProcessParameters.
-        /// </summary>
-        public ObservableCollection<ColorProcessParameter> ColorProcessParameters
-        {
-            get 
-            {
-                return _colorprocessparameters; 
-            }
-
-            set 
-            {
-                _colorprocessparameters = value; RaisePropertyChanged(nameof(ColorProcessParameters)); 
-            }
-
-        }
-
-        private ICollectionView _colorprocessparametersViewSource;
-        /// <summary>
-        /// Gets or sets the ColorProcessParameters View Source.
-        ///</summary>
-        public ICollectionView ColorProcessParametersViewSource
-        {
-            get 
-            {
-                return _colorprocessparametersViewSource; 
-            }
-
-            set 
-            {
-                _colorprocessparametersViewSource = value; RaisePropertyChanged(nameof(ColorProcessParametersViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<ColorSpace> _colorspaces;
         /// <summary>
         /// Gets or sets the ColorSpaces.
@@ -2537,42 +3077,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
-        /// <summary>
-        /// Gets or sets the RmlExtensionTestResults.
-        /// </summary>
-        public ObservableCollection<RmlExtensionTestResult> RmlExtensionTestResults
-        {
-            get 
-            {
-                return _rmlextensiontestresults; 
-            }
-
-            set 
-            {
-                _rmlextensiontestresults = value; RaisePropertyChanged(nameof(RmlExtensionTestResults)); 
-            }
-
-        }
-
-        private ICollectionView _rmlextensiontestresultsViewSource;
-        /// <summary>
-        /// Gets or sets the RmlExtensionTestResults View Source.
-        ///</summary>
-        public ICollectionView RmlExtensionTestResultsViewSource
-        {
-            get 
-            {
-                return _rmlextensiontestresultsViewSource; 
-            }
-
-            set 
-            {
-                _rmlextensiontestresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<Rml> _rmls;
         /// <summary>
         /// Gets or sets the Rmls.
@@ -2609,42 +3113,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RmlsExtension> _rmlsextensions;
-        /// <summary>
-        /// Gets or sets the RmlsExtensions.
-        /// </summary>
-        public ObservableCollection<RmlsExtension> RmlsExtensions
-        {
-            get 
-            {
-                return _rmlsextensions; 
-            }
-
-            set 
-            {
-                _rmlsextensions = value; RaisePropertyChanged(nameof(RmlsExtensions)); 
-            }
-
-        }
-
-        private ICollectionView _rmlsextensionsViewSource;
-        /// <summary>
-        /// Gets or sets the RmlsExtensions View Source.
-        ///</summary>
-        public ICollectionView RmlsExtensionsViewSource
-        {
-            get 
-            {
-                return _rmlsextensionsViewSource; 
-            }
-
-            set 
-            {
-                _rmlsextensionsViewSource = value; RaisePropertyChanged(nameof(RmlsExtensionsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<RmlsSpool> _rmlsspools;
         /// <summary>
         /// Gets or sets the RmlsSpools.
@@ -2753,42 +3221,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RubbingResult> _rubbingresults;
-        /// <summary>
-        /// Gets or sets the RubbingResults.
-        /// </summary>
-        public ObservableCollection<RubbingResult> RubbingResults
-        {
-            get 
-            {
-                return _rubbingresults; 
-            }
-
-            set 
-            {
-                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
-            }
-
-        }
-
-        private ICollectionView _rubbingresultsViewSource;
-        /// <summary>
-        /// Gets or sets the RubbingResults View Source.
-        ///</summary>
-        public ICollectionView RubbingResultsViewSource
-        {
-            get 
-            {
-                return _rubbingresultsViewSource; 
-            }
-
-            set 
-            {
-                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<Segment> _segments;
         /// <summary>
         /// Gets or sets the Segments.
@@ -2933,6 +3365,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<SitesSpoolType> _sitesspooltypes;
+        /// <summary>
+        /// Gets or sets the SitesSpoolTypes.
+        /// </summary>
+        public ObservableCollection<SitesSpoolType> SitesSpoolTypes
+        {
+            get 
+            {
+                return _sitesspooltypes; 
+            }
+
+            set 
+            {
+                _sitesspooltypes = value; RaisePropertyChanged(nameof(SitesSpoolTypes)); 
+            }
+
+        }
+
+        private ICollectionView _sitesspooltypesViewSource;
+        /// <summary>
+        /// Gets or sets the SitesSpoolTypes View Source.
+        ///</summary>
+        public ICollectionView SitesSpoolTypesViewSource
+        {
+            get 
+            {
+                return _sitesspooltypesViewSource; 
+            }
+
+            set 
+            {
+                _sitesspooltypesViewSource = value; RaisePropertyChanged(nameof(SitesSpoolTypesViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<SpoolType> _spooltypes;
         /// <summary>
         /// Gets or sets the SpoolTypes.
@@ -3329,42 +3797,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<TensileResult> _tensileresults;
-        /// <summary>
-        /// Gets or sets the TensileResults.
-        /// </summary>
-        public ObservableCollection<TensileResult> TensileResults
-        {
-            get 
-            {
-                return _tensileresults; 
-            }
-
-            set 
-            {
-                _tensileresults = value; RaisePropertyChanged(nameof(TensileResults)); 
-            }
-
-        }
-
-        private ICollectionView _tensileresultsViewSource;
-        /// <summary>
-        /// Gets or sets the TensileResults View Source.
-        ///</summary>
-        public ICollectionView TensileResultsViewSource
-        {
-            get 
-            {
-                return _tensileresultsViewSource; 
-            }
-
-            set 
-            {
-                _tensileresultsViewSource = value; RaisePropertyChanged(nameof(TensileResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<User> _users;
         /// <summary>
         /// Gets or sets the Users.
@@ -3473,409 +3905,49 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<YarnApplication> _yarnapplications;
-        /// <summary>
-        /// Gets or sets the YarnApplications.
-        /// </summary>
-        public ObservableCollection<YarnApplication> YarnApplications
-        {
-            get 
-            {
-                return _yarnapplications; 
-            }
-
-            set 
-            {
-                _yarnapplications = value; RaisePropertyChanged(nameof(YarnApplications)); 
-            }
-
-        }
-
-        private ICollectionView _yarnapplicationsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnApplications View Source.
-        ///</summary>
-        public ICollectionView YarnApplicationsViewSource
-        {
-            get 
-            {
-                return _yarnapplicationsViewSource; 
-            }
-
-            set 
-            {
-                _yarnapplicationsViewSource = value; RaisePropertyChanged(nameof(YarnApplicationsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnBrand> _yarnbrands;
-        /// <summary>
-        /// Gets or sets the YarnBrands.
-        /// </summary>
-        public ObservableCollection<YarnBrand> YarnBrands
-        {
-            get 
-            {
-                return _yarnbrands; 
-            }
-
-            set 
-            {
-                _yarnbrands = value; RaisePropertyChanged(nameof(YarnBrands)); 
-            }
-
-        }
-
-        private ICollectionView _yarnbrandsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnBrands View Source.
-        ///</summary>
-        public ICollectionView YarnBrandsViewSource
-        {
-            get 
-            {
-                return _yarnbrandsViewSource; 
-            }
-
-            set 
-            {
-                _yarnbrandsViewSource = value; RaisePropertyChanged(nameof(YarnBrandsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnFamily> _yarnfamilies;
-        /// <summary>
-        /// Gets or sets the YarnFamilies.
-        /// </summary>
-        public ObservableCollection<YarnFamily> YarnFamilies
-        {
-            get 
-            {
-                return _yarnfamilies; 
-            }
-
-            set 
-            {
-                _yarnfamilies = value; RaisePropertyChanged(nameof(YarnFamilies)); 
-            }
-
-        }
-
-        private ICollectionView _yarnfamiliesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnFamilies View Source.
-        ///</summary>
-        public ICollectionView YarnFamiliesViewSource
-        {
-            get 
-            {
-                return _yarnfamiliesViewSource; 
-            }
-
-            set 
-            {
-                _yarnfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnFamiliesViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnGlossLevel> _yarnglosslevels;
-        /// <summary>
-        /// Gets or sets the YarnGlossLevels.
-        /// </summary>
-        public ObservableCollection<YarnGlossLevel> YarnGlossLevels
-        {
-            get 
-            {
-                return _yarnglosslevels; 
-            }
-
-            set 
-            {
-                _yarnglosslevels = value; RaisePropertyChanged(nameof(YarnGlossLevels)); 
-            }
-
-        }
-
-        private ICollectionView _yarnglosslevelsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnGlossLevels View Source.
-        ///</summary>
-        public ICollectionView YarnGlossLevelsViewSource
-        {
-            get 
-            {
-                return _yarnglosslevelsViewSource; 
-            }
-
-            set 
-            {
-                _yarnglosslevelsViewSource = value; RaisePropertyChanged(nameof(YarnGlossLevelsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnGroup> _yarngroups;
-        /// <summary>
-        /// Gets or sets the YarnGroups.
-        /// </summary>
-        public ObservableCollection<YarnGroup> YarnGroups
-        {
-            get 
-            {
-                return _yarngroups; 
-            }
-
-            set 
-            {
-                _yarngroups = value; RaisePropertyChanged(nameof(YarnGroups)); 
-            }
-
-        }
-
-        private ICollectionView _yarngroupsViewSource;
         /// <summary>
-        /// Gets or sets the YarnGroups View Source.
-        ///</summary>
-        public ICollectionView YarnGroupsViewSource
-        {
-            get 
-            {
-                return _yarngroupsViewSource; 
-            }
-
-            set 
-            {
-                _yarngroupsViewSource = value; RaisePropertyChanged(nameof(YarnGroupsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnIndustrysector> _yarnindustrysectors;
-        /// <summary>
-        /// Gets or sets the YarnIndustrysectors.
-        /// </summary>
-        public ObservableCollection<YarnIndustrysector> YarnIndustrysectors
-        {
-            get 
-            {
-                return _yarnindustrysectors; 
-            }
-
-            set 
-            {
-                _yarnindustrysectors = value; RaisePropertyChanged(nameof(YarnIndustrysectors)); 
-            }
-
-        }
-
-        private ICollectionView _yarnindustrysectorsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnIndustrysectors View Source.
-        ///</summary>
-        public ICollectionView YarnIndustrysectorsViewSource
-        {
-            get 
-            {
-                return _yarnindustrysectorsViewSource; 
-            }
-
-            set 
-            {
-                _yarnindustrysectorsViewSource = value; RaisePropertyChanged(nameof(YarnIndustrysectorsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnManufacturer> _yarnmanufacturers;
-        /// <summary>
-        /// Gets or sets the YarnManufacturers.
-        /// </summary>
-        public ObservableCollection<YarnManufacturer> YarnManufacturers
-        {
-            get 
-            {
-                return _yarnmanufacturers; 
-            }
-
-            set 
-            {
-                _yarnmanufacturers = value; RaisePropertyChanged(nameof(YarnManufacturers)); 
-            }
-
-        }
-
-        private ICollectionView _yarnmanufacturersViewSource;
-        /// <summary>
-        /// Gets or sets the YarnManufacturers View Source.
-        ///</summary>
-        public ICollectionView YarnManufacturersViewSource
-        {
-            get 
-            {
-                return _yarnmanufacturersViewSource; 
-            }
-
-            set 
-            {
-                _yarnmanufacturersViewSource = value; RaisePropertyChanged(nameof(YarnManufacturersViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnSubFamily> _yarnsubfamilies;
-        /// <summary>
-        /// Gets or sets the YarnSubFamilies.
-        /// </summary>
-        public ObservableCollection<YarnSubFamily> YarnSubFamilies
-        {
-            get 
-            {
-                return _yarnsubfamilies; 
-            }
-
-            set 
-            {
-                _yarnsubfamilies = value; RaisePropertyChanged(nameof(YarnSubFamilies)); 
-            }
-
-        }
-
-        private ICollectionView _yarnsubfamiliesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnSubFamilies View Source.
-        ///</summary>
-        public ICollectionView YarnSubFamiliesViewSource
-        {
-            get 
-            {
-                return _yarnsubfamiliesViewSource; 
-            }
-
-            set 
-            {
-                _yarnsubfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnSubFamiliesViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnTexturing> _yarntexturings;
-        /// <summary>
-        /// Gets or sets the YarnTexturings.
+        /// Initialize collection sources.
         /// </summary>
-        public ObservableCollection<YarnTexturing> YarnTexturings
+        private void InitCollectionSources()
         {
-            get 
-            {
-                return _yarntexturings; 
-            }
 
-            set 
-            {
-                _yarntexturings = value; RaisePropertyChanged(nameof(YarnTexturings)); 
-            }
+            SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations);
 
-        }
+            ColorProcessDataViewSource = CreateCollectionView(ColorProcessData);
 
-        private ICollectionView _yarntexturingsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnTexturings View Source.
-        ///</summary>
-        public ICollectionView YarnTexturingsViewSource
-        {
-            get 
-            {
-                return _yarntexturingsViewSource; 
-            }
+            ColorProcessFactorsViewSource = CreateCollectionView(ColorProcessFactors);
 
-            set 
-            {
-                _yarntexturingsViewSource = value; RaisePropertyChanged(nameof(YarnTexturingsViewSource)); 
-            }
+            ColorProcessParametersViewSource = CreateCollectionView(ColorProcessParameters);
 
-        }
+            RmlExtensionTestResultsViewSource = CreateCollectionView(RmlExtensionTestResults);
 
-        private ObservableCollection<YarnType> _yarntypes;
-        /// <summary>
-        /// Gets or sets the YarnTypes.
-        /// </summary>
-        public ObservableCollection<YarnType> YarnTypes
-        {
-            get 
-            {
-                return _yarntypes; 
-            }
+            RmlsExtensionsViewSource = CreateCollectionView(RmlsExtensions);
 
-            set 
-            {
-                _yarntypes = value; RaisePropertyChanged(nameof(YarnTypes)); 
-            }
+            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
 
-        }
+            TensileResultsViewSource = CreateCollectionView(TensileResults);
 
-        private ICollectionView _yarntypesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnTypes View Source.
-        ///</summary>
-        public ICollectionView YarnTypesViewSource
-        {
-            get 
-            {
-                return _yarntypesViewSource; 
-            }
+            YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
 
-            set 
-            {
-                _yarntypesViewSource = value; RaisePropertyChanged(nameof(YarnTypesViewSource)); 
-            }
+            YarnBrandsViewSource = CreateCollectionView(YarnBrands);
 
-        }
+            YarnFamiliesViewSource = CreateCollectionView(YarnFamilies);
 
-        private ObservableCollection<YarnWhiteShade> _yarnwhiteshades;
-        /// <summary>
-        /// Gets or sets the YarnWhiteShades.
-        /// </summary>
-        public ObservableCollection<YarnWhiteShade> YarnWhiteShades
-        {
-            get 
-            {
-                return _yarnwhiteshades; 
-            }
+            YarnGlossLevelsViewSource = CreateCollectionView(YarnGlossLevels);
 
-            set 
-            {
-                _yarnwhiteshades = value; RaisePropertyChanged(nameof(YarnWhiteShades)); 
-            }
+            YarnGroupsViewSource = CreateCollectionView(YarnGroups);
 
-        }
+            YarnIndustrysectorsViewSource = CreateCollectionView(YarnIndustrysectors);
 
-        private ICollectionView _yarnwhiteshadesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnWhiteShades View Source.
-        ///</summary>
-        public ICollectionView YarnWhiteShadesViewSource
-        {
-            get 
-            {
-                return _yarnwhiteshadesViewSource; 
-            }
+            YarnManufacturersViewSource = CreateCollectionView(YarnManufacturers);
 
-            set 
-            {
-                _yarnwhiteshadesViewSource = value; RaisePropertyChanged(nameof(YarnWhiteShadesViewSource)); 
-            }
+            YarnSubFamiliesViewSource = CreateCollectionView(YarnSubFamilies);
 
-        }
+            YarnTexturingsViewSource = CreateCollectionView(YarnTexturings);
 
-        /// <summary>
-        /// Initialize collection sources.
-        /// </summary>
-        private void InitCollectionSources()
-        {
+            YarnTypesViewSource = CreateCollectionView(YarnTypes);
 
-            SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations);
+            YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades);
 
             ActionLogsViewSource = CreateCollectionView(ActionLogs);
 
@@ -3909,12 +3981,6 @@ namespace Tango.BL
 
             ColorCatalogsItemsRecipesViewSource = CreateCollectionView(ColorCatalogsItemsRecipes);
 
-            ColorProcessDataViewSource = CreateCollectionView(ColorProcessData);
-
-            ColorProcessFactorsViewSource = CreateCollectionView(ColorProcessFactors);
-
-            ColorProcessParametersViewSource = CreateCollectionView(ColorProcessParameters);
-
             ColorSpacesViewSource = CreateCollectionView(ColorSpaces);
 
             ConfigurationsViewSource = CreateCollectionView(Configurations);
@@ -4015,20 +4081,14 @@ namespace Tango.BL
 
             PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions);
 
-            RmlExtensionTestResultsViewSource = CreateCollectionView(RmlExtensionTestResults);
-
             RmlsViewSource = CreateCollectionView(Rmls);
 
-            RmlsExtensionsViewSource = CreateCollectionView(RmlsExtensions);
-
             RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools);
 
             RolesViewSource = CreateCollectionView(Roles);
 
             RolesPermissionsViewSource = CreateCollectionView(RolesPermissions);
 
-            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
-
             SegmentsViewSource = CreateCollectionView(Segments);
 
             SitesViewSource = CreateCollectionView(Sites);
@@ -4037,6 +4097,8 @@ namespace Tango.BL
 
             SitesRmlsViewSource = CreateCollectionView(SitesRmls);
 
+            SitesSpoolTypesViewSource = CreateCollectionView(SitesSpoolTypes);
+
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
 
             SpoolsViewSource = CreateCollectionView(Spools);
@@ -4059,36 +4121,12 @@ namespace Tango.BL
 
             TechValvesViewSource = CreateCollectionView(TechValves);
 
-            TensileResultsViewSource = CreateCollectionView(TensileResults);
-
             UsersViewSource = CreateCollectionView(Users);
 
             UsersRolesViewSource = CreateCollectionView(UsersRoles);
 
             WindingMethodsViewSource = CreateCollectionView(WindingMethods);
 
-            YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
-
-            YarnBrandsViewSource = CreateCollectionView(YarnBrands);
-
-            YarnFamiliesViewSource = CreateCollectionView(YarnFamilies);
-
-            YarnGlossLevelsViewSource = CreateCollectionView(YarnGlossLevels);
-
-            YarnGroupsViewSource = CreateCollectionView(YarnGroups);
-
-            YarnIndustrysectorsViewSource = CreateCollectionView(YarnIndustrysectors);
-
-            YarnManufacturersViewSource = CreateCollectionView(YarnManufacturers);
-
-            YarnSubFamiliesViewSource = CreateCollectionView(YarnSubFamilies);
-
-            YarnTexturingsViewSource = CreateCollectionView(YarnTexturings);
-
-            YarnTypesViewSource = CreateCollectionView(YarnTypes);
-
-            YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades);
-
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index 080a6fa92..640434416 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -53,6 +53,654 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<ColorProcessData> _colorprocessdata;
+        /// <summary>
+        /// Gets or sets the ColorProcessData.
+        /// </summary>
+        public ObservableCollection<ColorProcessData> ColorProcessData
+        {
+            get 
+            {
+                return _colorprocessdata; 
+            }
+
+            set 
+            {
+                _colorprocessdata = value; RaisePropertyChanged(nameof(ColorProcessData)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessdataViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessData View Source.
+        ///</summary>
+        public ICollectionView ColorProcessDataViewSource
+        {
+            get 
+            {
+                return _colorprocessdataViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessdataViewSource = value; RaisePropertyChanged(nameof(ColorProcessDataViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<ColorProcessFactor> _colorprocessfactors;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactors.
+        /// </summary>
+        public ObservableCollection<ColorProcessFactor> ColorProcessFactors
+        {
+            get 
+            {
+                return _colorprocessfactors; 
+            }
+
+            set 
+            {
+                _colorprocessfactors = value; RaisePropertyChanged(nameof(ColorProcessFactors)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessfactorsViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactors View Source.
+        ///</summary>
+        public ICollectionView ColorProcessFactorsViewSource
+        {
+            get 
+            {
+                return _colorprocessfactorsViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessfactorsViewSource = value; RaisePropertyChanged(nameof(ColorProcessFactorsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<ColorProcessParameter> _colorprocessparameters;
+        /// <summary>
+        /// Gets or sets the ColorProcessParameters.
+        /// </summary>
+        public ObservableCollection<ColorProcessParameter> ColorProcessParameters
+        {
+            get 
+            {
+                return _colorprocessparameters; 
+            }
+
+            set 
+            {
+                _colorprocessparameters = value; RaisePropertyChanged(nameof(ColorProcessParameters)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessparametersViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessParameters View Source.
+        ///</summary>
+        public ICollectionView ColorProcessParametersViewSource
+        {
+            get 
+            {
+                return _colorprocessparametersViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessparametersViewSource = value; RaisePropertyChanged(nameof(ColorProcessParametersViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResults.
+        /// </summary>
+        public ObservableCollection<RmlExtensionTestResult> RmlExtensionTestResults
+        {
+            get 
+            {
+                return _rmlextensiontestresults; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresults = value; RaisePropertyChanged(nameof(RmlExtensionTestResults)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensiontestresultsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionTestResults View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionTestResultsViewSource
+        {
+            get 
+            {
+                return _rmlextensiontestresultsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensiontestresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlsExtension> _rmlsextensions;
+        /// <summary>
+        /// Gets or sets the RmlsExtensions.
+        /// </summary>
+        public ObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                _rmlsextensions = value; RaisePropertyChanged(nameof(RmlsExtensions)); 
+            }
+
+        }
+
+        private ICollectionView _rmlsextensionsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlsExtensions View Source.
+        ///</summary>
+        public ICollectionView RmlsExtensionsViewSource
+        {
+            get 
+            {
+                return _rmlsextensionsViewSource; 
+            }
+
+            set 
+            {
+                _rmlsextensionsViewSource = value; RaisePropertyChanged(nameof(RmlsExtensionsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RubbingResult> _rubbingresults;
+        /// <summary>
+        /// Gets or sets the RubbingResults.
+        /// </summary>
+        public ObservableCollection<RubbingResult> RubbingResults
+        {
+            get 
+            {
+                return _rubbingresults; 
+            }
+
+            set 
+            {
+                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
+            }
+
+        }
+
+        private ICollectionView _rubbingresultsViewSource;
+        /// <summary>
+        /// Gets or sets the RubbingResults View Source.
+        ///</summary>
+        public ICollectionView RubbingResultsViewSource
+        {
+            get 
+            {
+                return _rubbingresultsViewSource; 
+            }
+
+            set 
+            {
+                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<TensileResult> _tensileresults;
+        /// <summary>
+        /// Gets or sets the TensileResults.
+        /// </summary>
+        public ObservableCollection<TensileResult> TensileResults
+        {
+            get 
+            {
+                return _tensileresults; 
+            }
+
+            set 
+            {
+                _tensileresults = value; RaisePropertyChanged(nameof(TensileResults)); 
+            }
+
+        }
+
+        private ICollectionView _tensileresultsViewSource;
+        /// <summary>
+        /// Gets or sets the TensileResults View Source.
+        ///</summary>
+        public ICollectionView TensileResultsViewSource
+        {
+            get 
+            {
+                return _tensileresultsViewSource; 
+            }
+
+            set 
+            {
+                _tensileresultsViewSource = value; RaisePropertyChanged(nameof(TensileResultsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnApplication> _yarnapplications;
+        /// <summary>
+        /// Gets or sets the YarnApplications.
+        /// </summary>
+        public ObservableCollection<YarnApplication> YarnApplications
+        {
+            get 
+            {
+                return _yarnapplications; 
+            }
+
+            set 
+            {
+                _yarnapplications = value; RaisePropertyChanged(nameof(YarnApplications)); 
+            }
+
+        }
+
+        private ICollectionView _yarnapplicationsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnApplications View Source.
+        ///</summary>
+        public ICollectionView YarnApplicationsViewSource
+        {
+            get 
+            {
+                return _yarnapplicationsViewSource; 
+            }
+
+            set 
+            {
+                _yarnapplicationsViewSource = value; RaisePropertyChanged(nameof(YarnApplicationsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnBrand> _yarnbrands;
+        /// <summary>
+        /// Gets or sets the YarnBrands.
+        /// </summary>
+        public ObservableCollection<YarnBrand> YarnBrands
+        {
+            get 
+            {
+                return _yarnbrands; 
+            }
+
+            set 
+            {
+                _yarnbrands = value; RaisePropertyChanged(nameof(YarnBrands)); 
+            }
+
+        }
+
+        private ICollectionView _yarnbrandsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnBrands View Source.
+        ///</summary>
+        public ICollectionView YarnBrandsViewSource
+        {
+            get 
+            {
+                return _yarnbrandsViewSource; 
+            }
+
+            set 
+            {
+                _yarnbrandsViewSource = value; RaisePropertyChanged(nameof(YarnBrandsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnFamily> _yarnfamilies;
+        /// <summary>
+        /// Gets or sets the YarnFamilies.
+        /// </summary>
+        public ObservableCollection<YarnFamily> YarnFamilies
+        {
+            get 
+            {
+                return _yarnfamilies; 
+            }
+
+            set 
+            {
+                _yarnfamilies = value; RaisePropertyChanged(nameof(YarnFamilies)); 
+            }
+
+        }
+
+        private ICollectionView _yarnfamiliesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnFamilies View Source.
+        ///</summary>
+        public ICollectionView YarnFamiliesViewSource
+        {
+            get 
+            {
+                return _yarnfamiliesViewSource; 
+            }
+
+            set 
+            {
+                _yarnfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnFamiliesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGlossLevel> _yarnglosslevels;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevels.
+        /// </summary>
+        public ObservableCollection<YarnGlossLevel> YarnGlossLevels
+        {
+            get 
+            {
+                return _yarnglosslevels; 
+            }
+
+            set 
+            {
+                _yarnglosslevels = value; RaisePropertyChanged(nameof(YarnGlossLevels)); 
+            }
+
+        }
+
+        private ICollectionView _yarnglosslevelsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevels View Source.
+        ///</summary>
+        public ICollectionView YarnGlossLevelsViewSource
+        {
+            get 
+            {
+                return _yarnglosslevelsViewSource; 
+            }
+
+            set 
+            {
+                _yarnglosslevelsViewSource = value; RaisePropertyChanged(nameof(YarnGlossLevelsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGroup> _yarngroups;
+        /// <summary>
+        /// Gets or sets the YarnGroups.
+        /// </summary>
+        public ObservableCollection<YarnGroup> YarnGroups
+        {
+            get 
+            {
+                return _yarngroups; 
+            }
+
+            set 
+            {
+                _yarngroups = value; RaisePropertyChanged(nameof(YarnGroups)); 
+            }
+
+        }
+
+        private ICollectionView _yarngroupsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGroups View Source.
+        ///</summary>
+        public ICollectionView YarnGroupsViewSource
+        {
+            get 
+            {
+                return _yarngroupsViewSource; 
+            }
+
+            set 
+            {
+                _yarngroupsViewSource = value; RaisePropertyChanged(nameof(YarnGroupsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnIndustrysector> _yarnindustrysectors;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysectors.
+        /// </summary>
+        public ObservableCollection<YarnIndustrysector> YarnIndustrysectors
+        {
+            get 
+            {
+                return _yarnindustrysectors; 
+            }
+
+            set 
+            {
+                _yarnindustrysectors = value; RaisePropertyChanged(nameof(YarnIndustrysectors)); 
+            }
+
+        }
+
+        private ICollectionView _yarnindustrysectorsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysectors View Source.
+        ///</summary>
+        public ICollectionView YarnIndustrysectorsViewSource
+        {
+            get 
+            {
+                return _yarnindustrysectorsViewSource; 
+            }
+
+            set 
+            {
+                _yarnindustrysectorsViewSource = value; RaisePropertyChanged(nameof(YarnIndustrysectorsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnManufacturer> _yarnmanufacturers;
+        /// <summary>
+        /// Gets or sets the YarnManufacturers.
+        /// </summary>
+        public ObservableCollection<YarnManufacturer> YarnManufacturers
+        {
+            get 
+            {
+                return _yarnmanufacturers; 
+            }
+
+            set 
+            {
+                _yarnmanufacturers = value; RaisePropertyChanged(nameof(YarnManufacturers)); 
+            }
+
+        }
+
+        private ICollectionView _yarnmanufacturersViewSource;
+        /// <summary>
+        /// Gets or sets the YarnManufacturers View Source.
+        ///</summary>
+        public ICollectionView YarnManufacturersViewSource
+        {
+            get 
+            {
+                return _yarnmanufacturersViewSource; 
+            }
+
+            set 
+            {
+                _yarnmanufacturersViewSource = value; RaisePropertyChanged(nameof(YarnManufacturersViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnSubFamily> _yarnsubfamilies;
+        /// <summary>
+        /// Gets or sets the YarnSubFamilies.
+        /// </summary>
+        public ObservableCollection<YarnSubFamily> YarnSubFamilies
+        {
+            get 
+            {
+                return _yarnsubfamilies; 
+            }
+
+            set 
+            {
+                _yarnsubfamilies = value; RaisePropertyChanged(nameof(YarnSubFamilies)); 
+            }
+
+        }
+
+        private ICollectionView _yarnsubfamiliesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnSubFamilies View Source.
+        ///</summary>
+        public ICollectionView YarnSubFamiliesViewSource
+        {
+            get 
+            {
+                return _yarnsubfamiliesViewSource; 
+            }
+
+            set 
+            {
+                _yarnsubfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnSubFamiliesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnTexturing> _yarntexturings;
+        /// <summary>
+        /// Gets or sets the YarnTexturings.
+        /// </summary>
+        public ObservableCollection<YarnTexturing> YarnTexturings
+        {
+            get 
+            {
+                return _yarntexturings; 
+            }
+
+            set 
+            {
+                _yarntexturings = value; RaisePropertyChanged(nameof(YarnTexturings)); 
+            }
+
+        }
+
+        private ICollectionView _yarntexturingsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnTexturings View Source.
+        ///</summary>
+        public ICollectionView YarnTexturingsViewSource
+        {
+            get 
+            {
+                return _yarntexturingsViewSource; 
+            }
+
+            set 
+            {
+                _yarntexturingsViewSource = value; RaisePropertyChanged(nameof(YarnTexturingsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnType> _yarntypes;
+        /// <summary>
+        /// Gets or sets the YarnTypes.
+        /// </summary>
+        public ObservableCollection<YarnType> YarnTypes
+        {
+            get 
+            {
+                return _yarntypes; 
+            }
+
+            set 
+            {
+                _yarntypes = value; RaisePropertyChanged(nameof(YarnTypes)); 
+            }
+
+        }
+
+        private ICollectionView _yarntypesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnTypes View Source.
+        ///</summary>
+        public ICollectionView YarnTypesViewSource
+        {
+            get 
+            {
+                return _yarntypesViewSource; 
+            }
+
+            set 
+            {
+                _yarntypesViewSource = value; RaisePropertyChanged(nameof(YarnTypesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnWhiteShade> _yarnwhiteshades;
+        /// <summary>
+        /// Gets or sets the YarnWhiteShades.
+        /// </summary>
+        public ObservableCollection<YarnWhiteShade> YarnWhiteShades
+        {
+            get 
+            {
+                return _yarnwhiteshades; 
+            }
+
+            set 
+            {
+                _yarnwhiteshades = value; RaisePropertyChanged(nameof(YarnWhiteShades)); 
+            }
+
+        }
+
+        private ICollectionView _yarnwhiteshadesViewSource;
+        /// <summary>
+        /// Gets or sets the YarnWhiteShades View Source.
+        ///</summary>
+        public ICollectionView YarnWhiteShadesViewSource
+        {
+            get 
+            {
+                return _yarnwhiteshadesViewSource; 
+            }
+
+            set 
+            {
+                _yarnwhiteshadesViewSource = value; RaisePropertyChanged(nameof(YarnWhiteShadesViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<ActionLog> _actionlogs;
         /// <summary>
         /// Gets or sets the ActionLogs.
@@ -629,114 +1277,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<ColorProcessData> _colorprocessdata;
-        /// <summary>
-        /// Gets or sets the ColorProcessData.
-        /// </summary>
-        public ObservableCollection<ColorProcessData> ColorProcessData
-        {
-            get 
-            {
-                return _colorprocessdata; 
-            }
-
-            set 
-            {
-                _colorprocessdata = value; RaisePropertyChanged(nameof(ColorProcessData)); 
-            }
-
-        }
-
-        private ICollectionView _colorprocessdataViewSource;
-        /// <summary>
-        /// Gets or sets the ColorProcessData View Source.
-        ///</summary>
-        public ICollectionView ColorProcessDataViewSource
-        {
-            get 
-            {
-                return _colorprocessdataViewSource; 
-            }
-
-            set 
-            {
-                _colorprocessdataViewSource = value; RaisePropertyChanged(nameof(ColorProcessDataViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<ColorProcessFactor> _colorprocessfactors;
-        /// <summary>
-        /// Gets or sets the ColorProcessFactors.
-        /// </summary>
-        public ObservableCollection<ColorProcessFactor> ColorProcessFactors
-        {
-            get 
-            {
-                return _colorprocessfactors; 
-            }
-
-            set 
-            {
-                _colorprocessfactors = value; RaisePropertyChanged(nameof(ColorProcessFactors)); 
-            }
-
-        }
-
-        private ICollectionView _colorprocessfactorsViewSource;
-        /// <summary>
-        /// Gets or sets the ColorProcessFactors View Source.
-        ///</summary>
-        public ICollectionView ColorProcessFactorsViewSource
-        {
-            get 
-            {
-                return _colorprocessfactorsViewSource; 
-            }
-
-            set 
-            {
-                _colorprocessfactorsViewSource = value; RaisePropertyChanged(nameof(ColorProcessFactorsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<ColorProcessParameter> _colorprocessparameters;
-        /// <summary>
-        /// Gets or sets the ColorProcessParameters.
-        /// </summary>
-        public ObservableCollection<ColorProcessParameter> ColorProcessParameters
-        {
-            get 
-            {
-                return _colorprocessparameters; 
-            }
-
-            set 
-            {
-                _colorprocessparameters = value; RaisePropertyChanged(nameof(ColorProcessParameters)); 
-            }
-
-        }
-
-        private ICollectionView _colorprocessparametersViewSource;
-        /// <summary>
-        /// Gets or sets the ColorProcessParameters View Source.
-        ///</summary>
-        public ICollectionView ColorProcessParametersViewSource
-        {
-            get 
-            {
-                return _colorprocessparametersViewSource; 
-            }
-
-            set 
-            {
-                _colorprocessparametersViewSource = value; RaisePropertyChanged(nameof(ColorProcessParametersViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<ColorSpace> _colorspaces;
         /// <summary>
         /// Gets or sets the ColorSpaces.
@@ -2537,42 +3077,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
-        /// <summary>
-        /// Gets or sets the RmlExtensionTestResults.
-        /// </summary>
-        public ObservableCollection<RmlExtensionTestResult> RmlExtensionTestResults
-        {
-            get 
-            {
-                return _rmlextensiontestresults; 
-            }
-
-            set 
-            {
-                _rmlextensiontestresults = value; RaisePropertyChanged(nameof(RmlExtensionTestResults)); 
-            }
-
-        }
-
-        private ICollectionView _rmlextensiontestresultsViewSource;
-        /// <summary>
-        /// Gets or sets the RmlExtensionTestResults View Source.
-        ///</summary>
-        public ICollectionView RmlExtensionTestResultsViewSource
-        {
-            get 
-            {
-                return _rmlextensiontestresultsViewSource; 
-            }
-
-            set 
-            {
-                _rmlextensiontestresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<Rml> _rmls;
         /// <summary>
         /// Gets or sets the Rmls.
@@ -2609,42 +3113,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RmlsExtension> _rmlsextensions;
-        /// <summary>
-        /// Gets or sets the RmlsExtensions.
-        /// </summary>
-        public ObservableCollection<RmlsExtension> RmlsExtensions
-        {
-            get 
-            {
-                return _rmlsextensions; 
-            }
-
-            set 
-            {
-                _rmlsextensions = value; RaisePropertyChanged(nameof(RmlsExtensions)); 
-            }
-
-        }
-
-        private ICollectionView _rmlsextensionsViewSource;
-        /// <summary>
-        /// Gets or sets the RmlsExtensions View Source.
-        ///</summary>
-        public ICollectionView RmlsExtensionsViewSource
-        {
-            get 
-            {
-                return _rmlsextensionsViewSource; 
-            }
-
-            set 
-            {
-                _rmlsextensionsViewSource = value; RaisePropertyChanged(nameof(RmlsExtensionsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<RmlsSpool> _rmlsspools;
         /// <summary>
         /// Gets or sets the RmlsSpools.
@@ -2753,42 +3221,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RubbingResult> _rubbingresults;
-        /// <summary>
-        /// Gets or sets the RubbingResults.
-        /// </summary>
-        public ObservableCollection<RubbingResult> RubbingResults
-        {
-            get 
-            {
-                return _rubbingresults; 
-            }
-
-            set 
-            {
-                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
-            }
-
-        }
-
-        private ICollectionView _rubbingresultsViewSource;
-        /// <summary>
-        /// Gets or sets the RubbingResults View Source.
-        ///</summary>
-        public ICollectionView RubbingResultsViewSource
-        {
-            get 
-            {
-                return _rubbingresultsViewSource; 
-            }
-
-            set 
-            {
-                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<Segment> _segments;
         /// <summary>
         /// Gets or sets the Segments.
@@ -2933,6 +3365,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<SitesSpoolType> _sitesspooltypes;
+        /// <summary>
+        /// Gets or sets the SitesSpoolTypes.
+        /// </summary>
+        public ObservableCollection<SitesSpoolType> SitesSpoolTypes
+        {
+            get 
+            {
+                return _sitesspooltypes; 
+            }
+
+            set 
+            {
+                _sitesspooltypes = value; RaisePropertyChanged(nameof(SitesSpoolTypes)); 
+            }
+
+        }
+
+        private ICollectionView _sitesspooltypesViewSource;
+        /// <summary>
+        /// Gets or sets the SitesSpoolTypes View Source.
+        ///</summary>
+        public ICollectionView SitesSpoolTypesViewSource
+        {
+            get 
+            {
+                return _sitesspooltypesViewSource; 
+            }
+
+            set 
+            {
+                _sitesspooltypesViewSource = value; RaisePropertyChanged(nameof(SitesSpoolTypesViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<SpoolType> _spooltypes;
         /// <summary>
         /// Gets or sets the SpoolTypes.
@@ -3329,42 +3797,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<TensileResult> _tensileresults;
-        /// <summary>
-        /// Gets or sets the TensileResults.
-        /// </summary>
-        public ObservableCollection<TensileResult> TensileResults
-        {
-            get 
-            {
-                return _tensileresults; 
-            }
-
-            set 
-            {
-                _tensileresults = value; RaisePropertyChanged(nameof(TensileResults)); 
-            }
-
-        }
-
-        private ICollectionView _tensileresultsViewSource;
-        /// <summary>
-        /// Gets or sets the TensileResults View Source.
-        ///</summary>
-        public ICollectionView TensileResultsViewSource
-        {
-            get 
-            {
-                return _tensileresultsViewSource; 
-            }
-
-            set 
-            {
-                _tensileresultsViewSource = value; RaisePropertyChanged(nameof(TensileResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<User> _users;
         /// <summary>
         /// Gets or sets the Users.
@@ -3473,409 +3905,49 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<YarnApplication> _yarnapplications;
-        /// <summary>
-        /// Gets or sets the YarnApplications.
-        /// </summary>
-        public ObservableCollection<YarnApplication> YarnApplications
-        {
-            get 
-            {
-                return _yarnapplications; 
-            }
-
-            set 
-            {
-                _yarnapplications = value; RaisePropertyChanged(nameof(YarnApplications)); 
-            }
-
-        }
-
-        private ICollectionView _yarnapplicationsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnApplications View Source.
-        ///</summary>
-        public ICollectionView YarnApplicationsViewSource
-        {
-            get 
-            {
-                return _yarnapplicationsViewSource; 
-            }
-
-            set 
-            {
-                _yarnapplicationsViewSource = value; RaisePropertyChanged(nameof(YarnApplicationsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnBrand> _yarnbrands;
-        /// <summary>
-        /// Gets or sets the YarnBrands.
-        /// </summary>
-        public ObservableCollection<YarnBrand> YarnBrands
-        {
-            get 
-            {
-                return _yarnbrands; 
-            }
-
-            set 
-            {
-                _yarnbrands = value; RaisePropertyChanged(nameof(YarnBrands)); 
-            }
-
-        }
-
-        private ICollectionView _yarnbrandsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnBrands View Source.
-        ///</summary>
-        public ICollectionView YarnBrandsViewSource
-        {
-            get 
-            {
-                return _yarnbrandsViewSource; 
-            }
-
-            set 
-            {
-                _yarnbrandsViewSource = value; RaisePropertyChanged(nameof(YarnBrandsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnFamily> _yarnfamilies;
-        /// <summary>
-        /// Gets or sets the YarnFamilies.
-        /// </summary>
-        public ObservableCollection<YarnFamily> YarnFamilies
-        {
-            get 
-            {
-                return _yarnfamilies; 
-            }
-
-            set 
-            {
-                _yarnfamilies = value; RaisePropertyChanged(nameof(YarnFamilies)); 
-            }
-
-        }
-
-        private ICollectionView _yarnfamiliesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnFamilies View Source.
-        ///</summary>
-        public ICollectionView YarnFamiliesViewSource
-        {
-            get 
-            {
-                return _yarnfamiliesViewSource; 
-            }
-
-            set 
-            {
-                _yarnfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnFamiliesViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnGlossLevel> _yarnglosslevels;
-        /// <summary>
-        /// Gets or sets the YarnGlossLevels.
-        /// </summary>
-        public ObservableCollection<YarnGlossLevel> YarnGlossLevels
-        {
-            get 
-            {
-                return _yarnglosslevels; 
-            }
-
-            set 
-            {
-                _yarnglosslevels = value; RaisePropertyChanged(nameof(YarnGlossLevels)); 
-            }
-
-        }
-
-        private ICollectionView _yarnglosslevelsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnGlossLevels View Source.
-        ///</summary>
-        public ICollectionView YarnGlossLevelsViewSource
-        {
-            get 
-            {
-                return _yarnglosslevelsViewSource; 
-            }
-
-            set 
-            {
-                _yarnglosslevelsViewSource = value; RaisePropertyChanged(nameof(YarnGlossLevelsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnGroup> _yarngroups;
-        /// <summary>
-        /// Gets or sets the YarnGroups.
-        /// </summary>
-        public ObservableCollection<YarnGroup> YarnGroups
-        {
-            get 
-            {
-                return _yarngroups; 
-            }
-
-            set 
-            {
-                _yarngroups = value; RaisePropertyChanged(nameof(YarnGroups)); 
-            }
-
-        }
-
-        private ICollectionView _yarngroupsViewSource;
         /// <summary>
-        /// Gets or sets the YarnGroups View Source.
-        ///</summary>
-        public ICollectionView YarnGroupsViewSource
-        {
-            get 
-            {
-                return _yarngroupsViewSource; 
-            }
-
-            set 
-            {
-                _yarngroupsViewSource = value; RaisePropertyChanged(nameof(YarnGroupsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnIndustrysector> _yarnindustrysectors;
-        /// <summary>
-        /// Gets or sets the YarnIndustrysectors.
-        /// </summary>
-        public ObservableCollection<YarnIndustrysector> YarnIndustrysectors
-        {
-            get 
-            {
-                return _yarnindustrysectors; 
-            }
-
-            set 
-            {
-                _yarnindustrysectors = value; RaisePropertyChanged(nameof(YarnIndustrysectors)); 
-            }
-
-        }
-
-        private ICollectionView _yarnindustrysectorsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnIndustrysectors View Source.
-        ///</summary>
-        public ICollectionView YarnIndustrysectorsViewSource
-        {
-            get 
-            {
-                return _yarnindustrysectorsViewSource; 
-            }
-
-            set 
-            {
-                _yarnindustrysectorsViewSource = value; RaisePropertyChanged(nameof(YarnIndustrysectorsViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnManufacturer> _yarnmanufacturers;
-        /// <summary>
-        /// Gets or sets the YarnManufacturers.
-        /// </summary>
-        public ObservableCollection<YarnManufacturer> YarnManufacturers
-        {
-            get 
-            {
-                return _yarnmanufacturers; 
-            }
-
-            set 
-            {
-                _yarnmanufacturers = value; RaisePropertyChanged(nameof(YarnManufacturers)); 
-            }
-
-        }
-
-        private ICollectionView _yarnmanufacturersViewSource;
-        /// <summary>
-        /// Gets or sets the YarnManufacturers View Source.
-        ///</summary>
-        public ICollectionView YarnManufacturersViewSource
-        {
-            get 
-            {
-                return _yarnmanufacturersViewSource; 
-            }
-
-            set 
-            {
-                _yarnmanufacturersViewSource = value; RaisePropertyChanged(nameof(YarnManufacturersViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnSubFamily> _yarnsubfamilies;
-        /// <summary>
-        /// Gets or sets the YarnSubFamilies.
-        /// </summary>
-        public ObservableCollection<YarnSubFamily> YarnSubFamilies
-        {
-            get 
-            {
-                return _yarnsubfamilies; 
-            }
-
-            set 
-            {
-                _yarnsubfamilies = value; RaisePropertyChanged(nameof(YarnSubFamilies)); 
-            }
-
-        }
-
-        private ICollectionView _yarnsubfamiliesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnSubFamilies View Source.
-        ///</summary>
-        public ICollectionView YarnSubFamiliesViewSource
-        {
-            get 
-            {
-                return _yarnsubfamiliesViewSource; 
-            }
-
-            set 
-            {
-                _yarnsubfamiliesViewSource = value; RaisePropertyChanged(nameof(YarnSubFamiliesViewSource)); 
-            }
-
-        }
-
-        private ObservableCollection<YarnTexturing> _yarntexturings;
-        /// <summary>
-        /// Gets or sets the YarnTexturings.
+        /// Initialize collection sources.
         /// </summary>
-        public ObservableCollection<YarnTexturing> YarnTexturings
+        public void InitCollectionSources()
         {
-            get 
-            {
-                return _yarntexturings; 
-            }
 
-            set 
-            {
-                _yarntexturings = value; RaisePropertyChanged(nameof(YarnTexturings)); 
-            }
+            SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations);
 
-        }
+            ColorProcessDataViewSource = CreateCollectionView(ColorProcessData);
 
-        private ICollectionView _yarntexturingsViewSource;
-        /// <summary>
-        /// Gets or sets the YarnTexturings View Source.
-        ///</summary>
-        public ICollectionView YarnTexturingsViewSource
-        {
-            get 
-            {
-                return _yarntexturingsViewSource; 
-            }
+            ColorProcessFactorsViewSource = CreateCollectionView(ColorProcessFactors);
 
-            set 
-            {
-                _yarntexturingsViewSource = value; RaisePropertyChanged(nameof(YarnTexturingsViewSource)); 
-            }
+            ColorProcessParametersViewSource = CreateCollectionView(ColorProcessParameters);
 
-        }
+            RmlExtensionTestResultsViewSource = CreateCollectionView(RmlExtensionTestResults);
 
-        private ObservableCollection<YarnType> _yarntypes;
-        /// <summary>
-        /// Gets or sets the YarnTypes.
-        /// </summary>
-        public ObservableCollection<YarnType> YarnTypes
-        {
-            get 
-            {
-                return _yarntypes; 
-            }
+            RmlsExtensionsViewSource = CreateCollectionView(RmlsExtensions);
 
-            set 
-            {
-                _yarntypes = value; RaisePropertyChanged(nameof(YarnTypes)); 
-            }
+            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
 
-        }
+            TensileResultsViewSource = CreateCollectionView(TensileResults);
 
-        private ICollectionView _yarntypesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnTypes View Source.
-        ///</summary>
-        public ICollectionView YarnTypesViewSource
-        {
-            get 
-            {
-                return _yarntypesViewSource; 
-            }
+            YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
 
-            set 
-            {
-                _yarntypesViewSource = value; RaisePropertyChanged(nameof(YarnTypesViewSource)); 
-            }
+            YarnBrandsViewSource = CreateCollectionView(YarnBrands);
 
-        }
+            YarnFamiliesViewSource = CreateCollectionView(YarnFamilies);
 
-        private ObservableCollection<YarnWhiteShade> _yarnwhiteshades;
-        /// <summary>
-        /// Gets or sets the YarnWhiteShades.
-        /// </summary>
-        public ObservableCollection<YarnWhiteShade> YarnWhiteShades
-        {
-            get 
-            {
-                return _yarnwhiteshades; 
-            }
+            YarnGlossLevelsViewSource = CreateCollectionView(YarnGlossLevels);
 
-            set 
-            {
-                _yarnwhiteshades = value; RaisePropertyChanged(nameof(YarnWhiteShades)); 
-            }
+            YarnGroupsViewSource = CreateCollectionView(YarnGroups);
 
-        }
+            YarnIndustrysectorsViewSource = CreateCollectionView(YarnIndustrysectors);
 
-        private ICollectionView _yarnwhiteshadesViewSource;
-        /// <summary>
-        /// Gets or sets the YarnWhiteShades View Source.
-        ///</summary>
-        public ICollectionView YarnWhiteShadesViewSource
-        {
-            get 
-            {
-                return _yarnwhiteshadesViewSource; 
-            }
+            YarnManufacturersViewSource = CreateCollectionView(YarnManufacturers);
 
-            set 
-            {
-                _yarnwhiteshadesViewSource = value; RaisePropertyChanged(nameof(YarnWhiteShadesViewSource)); 
-            }
+            YarnSubFamiliesViewSource = CreateCollectionView(YarnSubFamilies);
 
-        }
+            YarnTexturingsViewSource = CreateCollectionView(YarnTexturings);
 
-        /// <summary>
-        /// Initialize collection sources.
-        /// </summary>
-        public void InitCollectionSources()
-        {
+            YarnTypesViewSource = CreateCollectionView(YarnTypes);
 
-            SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations);
+            YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades);
 
             ActionLogsViewSource = CreateCollectionView(ActionLogs);
 
@@ -3909,12 +3981,6 @@ namespace Tango.BL
 
             ColorCatalogsItemsRecipesViewSource = CreateCollectionView(ColorCatalogsItemsRecipes);
 
-            ColorProcessDataViewSource = CreateCollectionView(ColorProcessData);
-
-            ColorProcessFactorsViewSource = CreateCollectionView(ColorProcessFactors);
-
-            ColorProcessParametersViewSource = CreateCollectionView(ColorProcessParameters);
-
             ColorSpacesViewSource = CreateCollectionView(ColorSpaces);
 
             ConfigurationsViewSource = CreateCollectionView(Configurations);
@@ -4015,20 +4081,14 @@ namespace Tango.BL
 
             PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions);
 
-            RmlExtensionTestResultsViewSource = CreateCollectionView(RmlExtensionTestResults);
-
             RmlsViewSource = CreateCollectionView(Rmls);
 
-            RmlsExtensionsViewSource = CreateCollectionView(RmlsExtensions);
-
             RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools);
 
             RolesViewSource = CreateCollectionView(Roles);
 
             RolesPermissionsViewSource = CreateCollectionView(RolesPermissions);
 
-            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
-
             SegmentsViewSource = CreateCollectionView(Segments);
 
             SitesViewSource = CreateCollectionView(Sites);
@@ -4037,6 +4097,8 @@ namespace Tango.BL
 
             SitesRmlsViewSource = CreateCollectionView(SitesRmls);
 
+            SitesSpoolTypesViewSource = CreateCollectionView(SitesSpoolTypes);
+
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
 
             SpoolsViewSource = CreateCollectionView(Spools);
@@ -4059,36 +4121,12 @@ namespace Tango.BL
 
             TechValvesViewSource = CreateCollectionView(TechValves);
 
-            TensileResultsViewSource = CreateCollectionView(TensileResults);
-
             UsersViewSource = CreateCollectionView(Users);
 
             UsersRolesViewSource = CreateCollectionView(UsersRoles);
 
             WindingMethodsViewSource = CreateCollectionView(WindingMethods);
 
-            YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
-
-            YarnBrandsViewSource = CreateCollectionView(YarnBrands);
-
-            YarnFamiliesViewSource = CreateCollectionView(YarnFamilies);
-
-            YarnGlossLevelsViewSource = CreateCollectionView(YarnGlossLevels);
-
-            YarnGroupsViewSource = CreateCollectionView(YarnGroups);
-
-            YarnIndustrysectorsViewSource = CreateCollectionView(YarnIndustrysectors);
-
-            YarnManufacturersViewSource = CreateCollectionView(YarnManufacturers);
-
-            YarnSubFamiliesViewSource = CreateCollectionView(YarnSubFamilies);
-
-            YarnTexturingsViewSource = CreateCollectionView(YarnTexturings);
-
-            YarnTypesViewSource = CreateCollectionView(YarnTypes);
-
-            YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades);
-
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 35fd930f9..eb9932c1e 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -305,6 +305,8 @@
     <Compile Include="DTO\SitesCatalogDTOBase.cs" />
     <Compile Include="DTO\SitesRmlDTO.cs" />
     <Compile Include="DTO\SitesRmlDTOBase.cs" />
+    <Compile Include="DTO\SitesSpoolTypeDTO.cs" />
+    <Compile Include="DTO\SitesSpoolTypeDTOBase.cs" />
     <Compile Include="DTO\SpoolDTO.cs" />
     <Compile Include="DTO\SpoolDTOBase.cs" />
     <Compile Include="DTO\SpoolTypeDTO.cs" />
@@ -468,6 +470,8 @@
     <Compile Include="Entities\SitesCatalogBase.cs" />
     <Compile Include="Entities\SitesRml.cs" />
     <Compile Include="Entities\SitesRmlBase.cs" />
+    <Compile Include="Entities\SitesSpoolType.cs" />
+    <Compile Include="Entities\SitesSpoolTypeBase.cs" />
     <Compile Include="Entities\Spool.cs" />
     <Compile Include="Entities\SpoolBase.cs" />
     <Compile Include="Entities\SpoolTypeBase.cs" />
@@ -762,7 +766,7 @@
   </Target>
   <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/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 702ce780c..0810b88c8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -118,6 +118,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<SITE> SITES { get; set; }
         public virtual DbSet<SITES_CATALOGS> SITES_CATALOGS { get; set; }
         public virtual DbSet<SITES_RMLS> SITES_RMLS { get; set; }
+        public virtual DbSet<SITES_SPOOL_TYPES> SITES_SPOOL_TYPES { get; set; }
         public virtual DbSet<SPOOL_TYPES> SPOOL_TYPES { get; set; }
         public virtual DbSet<SPOOL> SPOOLS { get; set; }
         public virtual DbSet<sysdiagram> sysdiagrams { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
index b9a889afd..d26e67908 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'C:\TFS\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
+// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 78b7b3fdf..a53e6dffb 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1305,6 +1305,16 @@
           <Property Name="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <EntityType Name="SITES_SPOOL_TYPES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="SPOOL_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2934,6 +2944,34 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SITES">
+          <End Role="SITES" Type="Self.SITES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="SITES_SPOOL_TYPES" Type="Self.SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SITES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SITE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+          <End Role="SPOOL_TYPES" Type="Self.SPOOL_TYPES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="SITES_SPOOL_TYPES" Type="Self.SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SPOOL_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SPOOL_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_SPOOLS_MACHINES">
           <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3145,6 +3183,7 @@
           <EntitySet Name="SITES" EntityType="Self.SITES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SITES_CATALOGS" EntityType="Self.SITES_CATALOGS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SITES_RMLS" EntityType="Self.SITES_RMLS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="SITES_SPOOL_TYPES" EntityType="Self.SITES_SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOL_TYPES" EntityType="Self.SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOLS" EntityType="Self.SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
@@ -3572,6 +3611,14 @@
             <End Role="SITES" EntitySet="SITES" />
             <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SITES" Association="Self.FK_SITES_SPOOL_TYPES_SITES">
+            <End Role="SITES" EntitySet="SITES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES" Association="Self.FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_MACHINES" Association="Self.FK_SPOOLS_MACHINES">
             <End Role="MACHINES" EntitySet="MACHINES" />
             <End Role="SPOOLS" EntitySet="SPOOLS" />
@@ -3775,6 +3822,7 @@
           <EntitySet Name="SITES" EntityType="RemoteModel.SITE" />
           <EntitySet Name="SITES_CATALOGS" EntityType="RemoteModel.SITES_CATALOGS" />
           <EntitySet Name="SITES_RMLS" EntityType="RemoteModel.SITES_RMLS" />
+          <EntitySet Name="SITES_SPOOL_TYPES" EntityType="RemoteModel.SITES_SPOOL_TYPES" />
           <EntitySet Name="SPOOL_TYPES" EntityType="RemoteModel.SPOOL_TYPES" />
           <EntitySet Name="SPOOLS" EntityType="RemoteModel.SPOOL" />
           <EntitySet Name="sysdiagrams" EntityType="RemoteModel.sysdiagram" />
@@ -4153,6 +4201,14 @@
             <End Role="SITE" EntitySet="SITES" />
             <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SITES" Association="RemoteModel.FK_SITES_SPOOL_TYPES_SITES">
+            <End Role="SITE" EntitySet="SITES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES" Association="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_SPOOL_TYPES" Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES">
             <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
             <End Role="SPOOL" EntitySet="SPOOLS" />
@@ -5969,6 +6025,7 @@
           <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_SITES_ORGANIZATIONS" FromRole="SITE" ToRole="ORGANIZATION" />
           <NavigationProperty Name="SITES_CATALOGS" Relationship="RemoteModel.FK_SITES_CATALOGS_SITES" FromRole="SITE" ToRole="SITES_CATALOGS" />
           <NavigationProperty Name="SITES_RMLS" Relationship="RemoteModel.FK_SITES_RMLS_SITES" FromRole="SITE" ToRole="SITES_RMLS" />
+          <NavigationProperty Name="SITES_SPOOL_TYPES" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SITES" FromRole="SITE" ToRole="SITES_SPOOL_TYPES" />
         </EntityType>
         <EntityType Name="SITES_CATALOGS">
           <Key>
@@ -5994,6 +6051,18 @@
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_SITES_RMLS_RMLS" FromRole="SITES_RMLS" ToRole="RML" />
           <NavigationProperty Name="SITE" Relationship="RemoteModel.FK_SITES_RMLS_SITES" FromRole="SITES_RMLS" ToRole="SITE" />
         </EntityType>
+        <EntityType Name="SITES_SPOOL_TYPES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="SITE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="SPOOL_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="SITE" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SITES" FromRole="SITES_SPOOL_TYPES" ToRole="SITE" />
+          <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES" FromRole="SITES_SPOOL_TYPES" ToRole="SPOOL_TYPES" />
+        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6015,6 +6084,7 @@
           <Property Name="BTSR_SPOOL_TENSION" Type="Int32" Nullable="false" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="JOB" />
           <NavigationProperty Name="RMLS_SPOOLS" Relationship="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="RMLS_SPOOLS" />
+          <NavigationProperty Name="SITES_SPOOL_TYPES" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="SITES_SPOOL_TYPES" />
           <NavigationProperty Name="SPOOLS" Relationship="RemoteModel.FK_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="SPOOL" />
         </EntityType>
         <EntityType Name="SPOOL">
@@ -7405,6 +7475,34 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SITES">
+          <End Type="RemoteModel.SITE" Role="SITE" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.SITES_SPOOL_TYPES" Role="SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SITE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SITE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+          <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.SITES_SPOOL_TYPES" Role="SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SPOOL_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SPOOL_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_SPOOLS_SPOOL_TYPES">
           <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -8968,6 +9066,17 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="SITES_SPOOL_TYPES">
+            <EntityTypeMapping TypeName="RemoteModel.SITES_SPOOL_TYPES">
+              <MappingFragment StoreEntitySet="SITES_SPOOL_TYPES">
+                <ScalarProperty Name="SPOOL_TYPE_GUID" ColumnName="SPOOL_TYPE_GUID" />
+                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="SPOOL_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.SPOOL_TYPES">
               <MappingFragment StoreEntitySet="SPOOL_TYPES">
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 10bd85a35..be198cefc 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,94 +5,95 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="40.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="70" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="64.125" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="5" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="51.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="62.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="70.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="60" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="0.75" />
         <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="32.75" />
         <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="55" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="49.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="48.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="27.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="62.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="44.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="67" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="31.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="27.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="24.5" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="5.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="10.5" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12.75" PointY="50.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="44.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="57.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="76.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="55.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="10.5" PointY="77.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12.75" PointY="54.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="13.5" PointY="46.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15.75" PointY="55.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="43.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9.75" PointY="51.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.5" PointY="81.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="11.75" PointY="64.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="40" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="24.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="62.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="73.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="77.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="77" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="57" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="72.25" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="11.5" PointY="81.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="13.75" PointY="73" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="73.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="68.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="77.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="65.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="77.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="63" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.5" PointY="57.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="14.75" PointY="55.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="46.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="58.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="65.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.5" PointY="57.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="11.75" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="43.25" />
         <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="9" PointY="37.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="0.75" />
         <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="16.125" />
         <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="2.75" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="72.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="30.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="29.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="3.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="85.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="4.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="28.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="73" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="39.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="27" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="24.125" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="35.75" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="44.875" />
         <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.875" />
         <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="2.75" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="5" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="13.125" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="72.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="69.5" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="1.875" />
         <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="42.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="29" />
         <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="37" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="17.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="39.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="14.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="7.5" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="8.875" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="27.75" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -181,6 +182,8 @@
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_ROLES" />
         <AssociationConnector Association="RemoteModel.FK_SITES_CATALOGS_SITES" />
         <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_SITES" />
+        <AssociationConnector Association="RemoteModel.FK_SITES_SPOOL_TYPES_SITES" />
+        <AssociationConnector Association="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_TANGO_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_USERS" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
index c0aa38e97..7086ccbce 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         {
             this.SITES_CATALOGS = new HashSet<SITES_CATALOGS>();
             this.SITES_RMLS = new HashSet<SITES_RMLS>();
+            this.SITES_SPOOL_TYPES = new HashSet<SITES_SPOOL_TYPES>();
         }
     
         public int ID { get; set; }
@@ -33,5 +34,7 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<SITES_CATALOGS> SITES_CATALOGS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SITES_RMLS> SITES_RMLS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<SITES_SPOOL_TYPES> SITES_SPOOL_TYPES { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_SPOOL_TYPES.cs
new file mode 100644
index 000000000..f5d93132a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_SPOOL_TYPES.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class SITES_SPOOL_TYPES
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string SITE_GUID { get; set; }
+        public string SPOOL_TYPE_GUID { get; set; }
+    
+        public virtual SITE SITE { get; set; }
+        public virtual SPOOL_TYPES SPOOL_TYPES { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
index 836112ec7..732f56b68 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         {
             this.JOBS = new HashSet<JOB>();
             this.RMLS_SPOOLS = new HashSet<RMLS_SPOOLS>();
+            this.SITES_SPOOL_TYPES = new HashSet<SITES_SPOOL_TYPES>();
             this.SPOOLS = new HashSet<SPOOL>();
         }
     
@@ -43,6 +44,8 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<SITES_SPOOL_TYPES> SITES_SPOOL_TYPES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SPOOL> SPOOLS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 424b9585f..f299d1c52 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -321,6 +321,9 @@
     <Compile Include="DB\SITES_RMLS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\SITES_SPOOL_TYPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\SPOOL.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -452,7 +455,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.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index fb43b55b3..957c53a89 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -2755,7 +2755,7 @@ namespace Tango.Integration.Operation
 
                 //Spool parameters
                 ticket.Spool = new JobSpool();
-                job.SpoolType.MapPrimitivesTo(ticket.Spool);
+                job.SpoolType.MapPropertiesTo(ticket.Spool);
                 ticket.Spool.JobSpoolType = (JobSpoolType)job.SpoolType.Code;
 
                 //Override spool parameters from RML Spool calibration
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs
index 1af8dad60..0da337cdc 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs
@@ -406,7 +406,7 @@ namespace Tango.PMR.Diagnostics {
     /// </summary>
     [pbr::OriginalName("JOB_COMPLETED")] JobCompleted = 1013,
     /// <summary>
-    ///Could not complete power-up. Cannot execute job                            (Group = GeneralHardware, Category = Critical)
+    ///Could not complete power-up. Cannot execute job                            (Group = GeneralHardware, Category = Warning)
     /// </summary>
     [pbr::OriginalName("POWER_UP_BIT_FAILURE")] PowerUpBitFailure = 2000,
     /// <summary>
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs
index 59490212b..4a677ab0c 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs
@@ -22,9 +22,9 @@ namespace Tango.PMR.Printing {
     static JobSpoolTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChJKb2JTcG9vbFR5cGUucHJvdG8SElRhbmdvLlBNUi5QcmludGluZyohCgxK",
-            "b2JTcG9vbFR5cGUSEQoNU3RhbmRhcmRTcG9vbBAAQh4KHGNvbS50d2luZS50",
-            "YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw=="));
+            "ChJKb2JTcG9vbFR5cGUucHJvdG8SElRhbmdvLlBNUi5QcmludGluZyotCgxK",
+            "b2JTcG9vbFR5cGUSEQoNU3RhbmRhcmRTcG9vbBAAEgoKBkhhQW1tYRABQh4K",
+            "HGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.JobSpoolType), }, null));
@@ -35,6 +35,7 @@ namespace Tango.PMR.Printing {
   #region Enums
   public enum JobSpoolType {
     [pbr::OriginalName("StandardSpool")] StandardSpool = 0,
+    [pbr::OriginalName("HaAmma")] HaAmma = 1,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/Action.cs b/Software/Visual_Studio/Tango.SQLExaminer/Action.cs
index 5f7be7751..fd1b95113 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/Action.cs
+++ b/Software/Visual_Studio/Tango.SQLExaminer/Action.cs
@@ -7,7 +7,7 @@ using System.Xml.Serialization;
 
 namespace Tango.SQLExaminer
 {
-    public class Action
+    public class Action 
     {
         [XmlAttribute("type")]
         public String Type { get; set; }
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
index 7b477f6bb..7b9e124cd 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
index fde5211de..2007a1767 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
diff --git a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
index d85777292..322f43a4c 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
@@ -17,6 +17,18 @@ namespace Tango.SharedUI.Components
             get { return _isSelected; }
             set { _isSelected = value; RaisePropertyChangedAuto(); IsSelectedChanged?.Invoke(this, new EventArgs()); }
         }
+
+        private bool _isEnabled;
+        public bool IsEnabled
+        {
+            get { return _isEnabled; }
+            set { _isEnabled = value; RaisePropertyChangedAuto(); }
+        }
+
+        public SelectedObject()
+        {
+            IsEnabled = true;
+        }
     }
 
     public class SelectedObject<T> : SelectedObject
@@ -29,7 +41,7 @@ namespace Tango.SharedUI.Components
             set { _data = value; RaisePropertyChangedAuto(); }
         }
 
-        public SelectedObject()
+        public SelectedObject() : base()
         {
 
         }