Created a new project Tango.MachineStudio.ThreadExtentions. Changes in Database.

129 files changed, 12538 insertions, 135 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/App.xaml
new file mode 100644
index 000000000..6925f5a1b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/App.xaml
@@ -0,0 +1,12 @@
+<Application x:Class="Tango.MachineStudio.ThreadExtensions.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Contracts/IMainView.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Contracts/IMainView.cs
new file mode 100644
index 000000000..0f432eefb
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Contracts/IMainView.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.ThreadExtensions.Contracts
+{
+    public enum ThreadExtensionNavigationView
+    {
+        ThreadExtentionView,
+        ThreadExtensionsView,
+    }
+
+    public interface IMainView : IView
+    {
+        void NavigateTo(ThreadExtensionNavigationView view);
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Converters/ColorNameToBrushConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Converters/ColorNameToBrushConverter.cs
new file mode 100644
index 000000000..c9e246bb8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Converters/ColorNameToBrushConverter.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Tango.MachineStudio.ThreadExtensions.Converters
+{
+    public class ColorNameToBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                string colorName = value as string;
+                if(String.IsNullOrEmpty(colorName))
+                    return new SolidColorBrush(Colors.Transparent);
+
+                Color color = (Color)TypeDescriptor.GetConverter(typeof(Color)).ConvertFromString(colorName);
+               
+                SolidColorBrush brush = new SolidColorBrush(color);
+                brush.Opacity = 0.5;
+                
+                return brush;
+            }
+            catch
+            {
+                return  new SolidColorBrush(Colors.Transparent);
+            }
+        }
+        
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+        
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Images/threads.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Images/threads.png
new file mode 100644
index 000000000..86eb0b335
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Images/threads.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs
new file mode 100644
index 000000000..da7471e16
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Documents;
+
+namespace Tango.MachineStudio.ThreadExtensions.Models
+{
+    public class ColorDataExcelModel
+    {
+        public int NlCm { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+
+        public ColorDataExcelModel()
+        {
+            NlCm = 0;
+            L = A = B = 0.0;
+        }
+
+        public static void GetDataFromFile(string fileName, out List<ColorDataExcelModel> items, ref string errors)
+        {
+            items = null;
+            try
+            {
+                using (ExcelReader reader = new ExcelReader(fileName))
+                {
+                    items = reader.GetDataByIndex<ColorDataExcelModel>("Sheet1", 1);
+                }
+            }
+            catch (Exception ex)
+            {
+                errors = ex.Message;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs
new file mode 100644
index 000000000..32f568f5f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.ThreadExtensions.Models
+{
+    public static class FactorTarget
+    {
+        public static Dictionary<string, double> FACTOR100 = new Dictionary<string, double>() {
+            { "CYAN", 51.95}, {"MAGENTA", 47.47}, { "YELLOW", 94.05}, {"BLACK", 26.58}};
+
+        public static Dictionary<string, double> FACTOR200 = new Dictionary<string, double>() {
+            { "CYAN", 46.3}, {"MAGENTA", 41.04}, { "YELLOW", 97.78}, {"BLACK", 21.01}};
+
+        public static double GetFactor100(string color)
+        {
+            double result;
+
+            if (FACTOR100.TryGetValue(color, out result))
+            {
+                return result;
+            }
+            return 0.0;
+        }
+        public static double GetFactor200(string color)
+        {
+            double result;
+
+            if (FACTOR200.TryGetValue(color, out result))
+            {
+                return result;
+            }
+            return 0.0;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs
new file mode 100644
index 000000000..47632d3aa
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs
@@ -0,0 +1,169 @@
+using OxyPlot;
+using OxyPlot.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Tango.BL.Entities;
+using Tango.Core;
+using Tango.MachineStudio.ThreadExtensions.ViewModels;
+
+namespace Tango.MachineStudio.ThreadExtensions.Models
+{
+    public class PlotProperties : ExtendedObject
+    {
+        public Plot PlotControl { get; set; }
+        private IList<DataPoint> _points;
+
+        private string _colorName;
+
+        public string ColorName
+        {
+            get { return _colorName; }
+            set { _colorName = value; }
+        }
+
+        /// <summary>
+        /// Binding to ItemsSource  of line chart.
+        /// </summary>
+        public IList<DataPoint> Points
+        {
+            get { return _points; }
+            set
+            {
+                _points = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+        private IList<DataPoint> _target100Points;
+        /// <summary>
+        /// Binding to ItemsSource  of line chart.
+        /// </summary>
+        public IList<DataPoint> Target100Points
+        {
+            get { return _target100Points; }
+            set
+            {
+                _target100Points = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+        private IList<DataPoint> _target200Points;
+        /// <summary>
+        /// Binding to ItemsSource  of line chart.
+        /// </summary>
+        public IList<DataPoint> Target200Points
+        {
+            get { return _target200Points; }
+            set
+            {
+                _target200Points = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+        private int _step;
+        public int XStep
+        {
+            get { return _step; }
+            set { _step = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _from;
+        /// <summary>
+        /// From use to binding to bottom axis min value
+        /// </summary>
+        public double From
+        {
+            get { return _from; }
+            set
+            {
+                _from = value; RaisePropertyChangedAuto();
+            }
+        }
+
+        private double _to;
+        /// <summary>
+        /// To use to binding to bottom axis max value
+        /// </summary>
+        public double To
+        {
+            get { return _to; }
+            set
+            {
+                _to = value; RaisePropertyChangedAuto();
+            }
+        }
+
+        public PlotProperties(string colorName)
+        {
+            this.Points = new List<DataPoint>();
+            Target100Points = new List<DataPoint>();
+            Target200Points = new List<DataPoint>();
+            ColorName = colorName;
+
+        }
+
+        public void ClearResults()
+        {
+            Points.Clear();
+            Target100Points.Clear();
+            Target200Points.Clear();
+        }
+
+        public void CreateGraph(List<ColorProcessData> points, bool isLtype)
+        {
+            if (PlotControl == null)
+            {
+                Debug.WriteLine("ERROR!!!   CreateGraph. Plot Control is NULL.");
+                return;
+            }   
+
+            ClearResults();
+            PlotControl.InvalidatePlot(true);
+
+            double target100Y = FactorTarget.GetFactor100(ColorName);
+            double target200Y = FactorTarget.GetFactor200(ColorName);
+
+            _to = target100Y > target200Y? target100Y + 10: target200Y + 10;
+            _from = target100Y < target200Y ? target100Y - 10 : target200Y - 10;
+
+            foreach ( var x in points)
+            {
+                var point = new DataPoint(x.InkNlCm, isLtype ? x.L : x.B);
+                Points.Add(point);
+
+                _to = _to > point.Y ? _to : point.Y;
+                _from = ( _from == 0 || _from > point.Y )  ?  point.Y : _from;
+               
+            }
+            if (points.Count > 1)
+            {
+                var minInkNlCm = points.Min(n => n.InkNlCm);
+                var maxInkNlCm = points.Max(n => n.InkNlCm);
+                if(! Target100Points.Any(x => x.X == minInkNlCm))
+                {
+                    Target100Points.Add(new DataPoint(minInkNlCm, target100Y));
+                    Target200Points.Add(new DataPoint(minInkNlCm, target200Y));
+                }
+                if (!Target100Points.Any(x => x.X == maxInkNlCm))
+                {
+                    Target100Points.Add(new DataPoint(maxInkNlCm, target100Y));
+                    Target200Points.Add(new DataPoint(maxInkNlCm, target200Y));
+                }
+            }
+            Debug.WriteLine($"CreateGraph. Count Points {points.Count}");
+
+            if (_to == 0)
+                _to = isLtype ? 100 : 128;
+            if (_from == 0)
+                _from = isLtype ? 0 : -127;
+
+            RaisePropertyChanged("To");
+            RaisePropertyChanged("From");
+            XStep = (int)(Points.Count / 6);
+            
+            PlotControl.InvalidatePlot(true);
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj
index ca27b9a48..6b7204aac 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj
@@ -32,6 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
     <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
@@ -47,8 +53,17 @@
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\OxyPlot.Core.2.0.0\lib\net45\OxyPlot.dll</HintPath>
+    </Reference>
+    <Reference Include="OxyPlot.Wpf, Version=2.0.0.0, Culture=neutral, PublicKeyToken=75e952ba404cdbb0, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\OxyPlot.Wpf.2.0.0\lib\net45\OxyPlot.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="ReachFramework" />
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Printing" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -69,16 +84,54 @@
     <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Contracts\IMainView.cs" />
+    <Compile Include="Converters\ColorNameToBrushConverter.cs" />
+    <Compile Include="Models\ColorDataExcelModel.cs" />
+    <Compile Include="Models\FactorTarget.cs" />
+    <Compile Include="Models\PlotProperties.cs" />
     <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\ColorParametersVewVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="Views\ColorParametersView.xaml.cs">
+      <DependentUpon>ColorParametersView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ThreadExtensionsModule.cs" />
+    <Compile Include="Views\ThreadCharacteristicsView.xaml.cs">
+      <DependentUpon>ThreadCharacteristicsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ThreadExtensionView.xaml.cs">
+      <DependentUpon>ThreadExtensionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ThreadExtensionsView.xaml.cs">
+      <DependentUpon>ThreadExtensionsView.xaml</DependentUpon>
+    </Compile>
+    <Page Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\ColorParametersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ThreadCharacteristicsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ThreadExtensionView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ThreadExtensionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -105,8 +158,14 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
+    <Resource Include="Images\threads.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
+      <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
+      <Name>Tango.AutoComplete</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
@@ -115,6 +174,10 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Documents\Tango.Documents.csproj">
+      <Project>{ca87a608-7b17-4c98-88f2-42abee10f4c1}</Project>
+      <Name>Tango.Documents</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
       <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
       <Name>Tango.Logging</Name>
@@ -139,5 +202,6 @@
   <ItemGroup>
     <Resource Include="Images\Fabric.jpg" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs
new file mode 100644
index 000000000..b2e677339
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs
@@ -0,0 +1,788 @@
+using OxyPlot;
+using OxyPlot.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.ActionLogs;
+using Tango.BL.Builders;
+using Tango.BL.DTO;
+using Tango.BL.Entities;
+using Tango.Core;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.SharedUI;
+using Tango.AutoComplete.Editors;
+using Tango.MachineStudio.ThreadExtensions.Models;
+using Tango.Core.Commands;
+using Microsoft.Win32;
+using System.Diagnostics;
+
+namespace Tango.MachineStudio.ThreadExtensions.ViewModels
+{
+    public class ColorParametersVewVM : ViewModel
+    {
+        private INotificationProvider _notification;
+        private IActionLogManager _actionLogManager;
+        
+        private ObservablesContext _active_context;
+        private ObservablesContext _machineDbContext;
+       // private ColorProcessParameterDTO _hwBeforeSave;
+
+        #region Properties
+
+        private ColorProcessParameter _selectedColorProcessparameter;
+        /// <summary>
+        /// Gets or sets the selected RML.
+        /// </summary>
+        public ColorProcessParameter SelectedColorProcessParameter
+        {
+            get { return _selectedColorProcessparameter; }
+            set
+            {
+                _selectedColorProcessparameter = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+        
+        private ObservableCollection<ColorProcessData> _magentaProcessData;
+        public ObservableCollection<ColorProcessData> MagentaProcessData
+        {
+            get
+            {
+                return _magentaProcessData;
+            }
+            set
+            {
+                _magentaProcessData = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<ColorProcessData> _cyanProcessData;
+        public ObservableCollection<ColorProcessData> CyanProcessData
+        {
+            get
+            {
+                return _cyanProcessData;
+            }
+            set
+            {
+                _cyanProcessData = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+        
+        private ObservableCollection<ColorProcessData> _yellowProcessData;
+        public ObservableCollection<ColorProcessData> YellowProcessData
+        {
+            get
+            {
+                return _yellowProcessData;
+            }
+            set
+            {
+                _yellowProcessData = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<ColorProcessData> _blackProcessData;
+        public ObservableCollection<ColorProcessData> BlackProcessData
+        {
+            get
+            {
+                return _blackProcessData;
+            }
+            set
+            {
+                _blackProcessData = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<ColorProcessFactor> _factor100ProcessData;
+        public ObservableCollection<ColorProcessFactor> Factor100ProcessData
+        {
+            get
+            {
+                return _factor100ProcessData;
+            }
+            set
+            {
+                _factor100ProcessData = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<ColorProcessFactor> _factor200ProcessData;
+        public ObservableCollection<ColorProcessFactor> Factor200ProcessData
+        {
+            get
+            {
+                return _factor200ProcessData;
+            }
+            set
+            {
+                _factor200ProcessData = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<ColorProcessFactor> _minInkUptake;
+        public ObservableCollection<ColorProcessFactor> MinInkUptake
+        {
+            get
+            {
+                return _minInkUptake;
+            }
+            set
+            {
+                _minInkUptake = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<ColorProcessFactor> _maxInkUptake;
+        public ObservableCollection<ColorProcessFactor> MaxInkUptake
+        {
+            get
+            {
+                return _maxInkUptake;
+            }
+            set
+            {
+                _maxInkUptake = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+
+        private PlotProperties _cyanPlot;
+
+        public PlotProperties CyanPlot
+        {
+            get { return _cyanPlot; }
+            set {
+                _cyanPlot = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private PlotProperties _magentaPlot;
+
+        public PlotProperties MagentaPlot
+        {
+            get { return _magentaPlot; }
+            set { _magentaPlot = value; }
+        }
+
+        private PlotProperties _yellowPlot;
+
+        public PlotProperties YellowPlot
+        {
+            get { return _yellowPlot; }
+            set { _yellowPlot = value; }
+        }
+
+        private PlotProperties _blackPlot;
+
+        public PlotProperties BlackPlot
+        {
+            get { return _blackPlot; }
+            set { _blackPlot = value; }
+        }
+        /// <summary>
+        /// Gets or sets the machines providers.
+        /// </summary>
+        public ISuggestionProvider MachinesProvider { get; set; }
+
+        protected Machine _selectedMachine;
+        /// <summary>
+        /// Gets or sets the selected machine.
+        /// </summary>
+        public Machine SelectedMachine
+        {
+            get { return _selectedMachine; }
+            set
+            {
+                if (value != null && _selectedMachine != value)
+                {
+                    _selectedMachine = value;
+                    RaisePropertyChangedAuto();
+                    InvalidateRelayCommands();
+                }
+            }
+        }
+
+        private bool _isViewLoaded;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is view loaded. Used to update charts.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this instance is view loaded; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsViewLoaded
+        {
+            get { return _isViewLoaded; }
+            set {
+                if(_isViewLoaded != value)
+                {
+                    _isViewLoaded = value;
+                }
+            }
+        }
+
+        private Dictionary<string, ColorProcessData> _removedColorProcessDataBeforeSave;
+
+        public Dictionary<string, ColorProcessData> RemovedColorProcessDataBeforeSave
+        {
+            get { return _removedColorProcessDataBeforeSave; }
+            set { _removedColorProcessDataBeforeSave = value; }
+        }
+
+        #endregion
+        #region commands
+
+        public RelayCommand ImportCyanDataCommand { get; set; }
+        public RelayCommand ImportMagentaDataCommand { get; set; }
+        public RelayCommand ImportYellowDataCommand { get; set; }
+        public RelayCommand ImportBlackDataCommand { get; set; }
+
+        private void ImportMagentaData(object obj)
+        {
+            List<ColorDataExcelModel> items;
+            if (LoadColorDataFromExcel(out items) && items != null)
+            {
+                MagentaProcessData.Clear();
+                items.ForEach(x => MagentaProcessData.Add(new ColorProcessData() { InkNlCm = x.NlCm, L = x.L, A = x.A, B = x.B, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid}));
+                MagentaPlot.CreateGraph(MagentaProcessData.ToList(), true);
+                UpdateFactorsOnChangeProcessData("MAGENTA");
+            }
+        }
+
+        private void ImportYellowData(object obj)
+        {
+            List<ColorDataExcelModel> items;
+            if (LoadColorDataFromExcel(out items) && items != null)
+            {
+                YellowProcessData.Clear();
+                items.ForEach(x => YellowProcessData.Add(new ColorProcessData() { InkNlCm = x.NlCm, L = x.L, A = x.A, B = x.B, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid}));
+                YellowPlot.CreateGraph(YellowProcessData.ToList(), false);
+                UpdateFactorsOnChangeProcessData("YELLOW");
+            }
+        }
+
+        private void ImportCyanData(object obj)
+        {
+            List<ColorDataExcelModel> items;
+            if (LoadColorDataFromExcel(out items) && items != null)
+            {
+                CyanProcessData.Clear();
+                items.ForEach(x => CyanProcessData.Add(new ColorProcessData() { InkNlCm = x.NlCm, L = x.L, A = x.A, B = x.B, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }));
+                CyanPlot.CreateGraph(CyanProcessData.ToList(), true);
+                UpdateFactorsOnChangeProcessData("CYAN");
+            }
+        }
+
+        private void ImportBlackData(object obj)
+        {
+            List<ColorDataExcelModel> items;
+            if (LoadColorDataFromExcel(out items) && items != null)
+            {
+                BlackProcessData.Clear();
+                items.ForEach(x => BlackProcessData.Add(new ColorProcessData() { InkNlCm = x.NlCm, L = x.L, A = x.A, B = x.B, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }));
+                BlackPlot.CreateGraph(BlackProcessData.ToList(), true);
+                UpdateFactorsOnChangeProcessData("BLACK");
+            }
+        }
+
+        private bool LoadColorDataFromExcel(out List<ColorDataExcelModel> items)
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            items = null;
+            try
+            {
+                dlg.Title = $"Import excel file with data";
+                dlg.Filter = "Excel Files|*.xlsx";
+                if (dlg.ShowDialog().Value)
+                {
+                    string error = "";
+                    ColorDataExcelModel.GetDataFromFile(dlg.FileName, out items, ref error);
+                    if (false == String.IsNullOrEmpty(error) || items == null || items.Count == 0)
+                    {
+                        _notification.ShowError("An error occurred while trying to import data form the selected excel file. Please check the file format if valid and is available to read.");
+                        return false;
+                    }
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error importing excel file " + dlg.FileName);
+                _notification.ShowError("An error occurred while trying to import the selected excel file. Please check the file format if valid and is available to read.");
+            }
+            return false;
+        }
+
+        #endregion
+
+        public ColorParametersVewVM(INotificationProvider notification, IActionLogManager actionLogManager)
+        {
+            _notification = notification;
+            _actionLogManager = actionLogManager;
+            _isViewLoaded = false;
+            RemovedColorProcessDataBeforeSave = new Dictionary<string, ColorProcessData>();
+
+            MachinesProvider = new SuggestionProvider((filter) =>
+            {
+                try
+                {
+                    return _machineDbContext.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList();
+                }
+                catch
+                {
+                    return null;
+                }
+            });
+
+            CyanProcessData = new ObservableCollection<ColorProcessData>();
+            CyanProcessData.CollectionChanged += OnCyanCollectionChanged;
+
+            MagentaProcessData = new ObservableCollection<ColorProcessData>();
+            MagentaProcessData.CollectionChanged += OnMagentaCollectionChanged;
+
+            YellowProcessData = new ObservableCollection<ColorProcessData>();
+            YellowProcessData.CollectionChanged += OnYellowCollectionChanged;
+
+            BlackProcessData = new ObservableCollection<ColorProcessData>();
+            BlackProcessData.CollectionChanged += OnBlackCollectionChanged;
+
+            CyanPlot = new PlotProperties("CYAN");
+            YellowPlot = new PlotProperties("YELLOW");
+            MagentaPlot = new PlotProperties("MAGENTA");
+            BlackPlot = new PlotProperties("BLACK");
+            
+            ImportCyanDataCommand = new RelayCommand(ImportCyanData);
+            ImportMagentaDataCommand = new RelayCommand(ImportMagentaData);
+            ImportYellowDataCommand = new RelayCommand(ImportYellowData);
+            ImportBlackDataCommand = new RelayCommand(ImportBlackData);
+        }
+
+        #region Loading
+
+        public async void LoadColorParameters(string RMLExtemtionGUID)
+        {
+            IsFree = false;
+            if (_active_context != null)
+            {
+                _active_context.Dispose();
+            }
+            if (_machineDbContext != null)
+            {
+                _machineDbContext.Dispose();
+            }
+
+
+            LogManager.Log("Initializing machine Db context...");
+            
+            _machineDbContext = ObservablesContext.CreateDefault();
+
+           
+            _active_context = ObservablesContext.CreateDefault();
+
+            await Task.Factory.StartNew(() =>
+            {
+                using (_notification.PushTaskItem("Loading Color Process Parameters ..."))
+                {
+                    
+                    var currentcolorProcessParameter =  _active_context.ColorProcessParameters.Where(x => x.RmlsExtensionsGuid == RMLExtemtionGUID).FirstOrDefault();
+                    if(currentcolorProcessParameter != null)
+                    {
+                        SelectedColorProcessParameter = new ColorProcessParametersBuilder(_active_context).Set(currentcolorProcessParameter.Guid).WithColorProcessData().WithColorProcessFactor(). Build();
+                    }
+                    
+                    if (SelectedColorProcessParameter == null)
+                    {
+                        SelectedColorProcessParameter = new ColorProcessParameter() { RmlsExtensionsGuid = RMLExtemtionGUID };
+                        SelectedColorProcessParameter.WhitePointL = 0.0;
+                        SelectedColorProcessParameter.WhitePointA = 0.0;
+                        SelectedColorProcessParameter.WhitePointB = 0.0;
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "CYAN", FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "MAGENTA", FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "YELLOW", FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "BLACK", FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "CYAN", FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "MAGENTA", FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "YELLOW", FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "BLACK", FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "CYAN", FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "MAGENTA", FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "YELLOW", FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "BLACK", FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "CYAN", FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "MAGENTA", FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "YELLOW", FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessFactor.Add(new ColorProcessFactor() { ColorName = "BLACK", FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        _active_context.ColorProcessParameters.Add(SelectedColorProcessParameter);
+                        _active_context.SaveChangesAsync();
+                    }
+ 
+                }
+            });
+            
+            LoadParameters();
+            IsFree = true;
+        }
+
+        private void LoadParameters()
+        {
+            Factor100ProcessData = SelectedColorProcessParameter.ColorProcessFactor.Where(x => x.FactorPercent == 100).ToObservableCollection();
+
+            Factor200ProcessData = SelectedColorProcessParameter.ColorProcessFactor.Where(x => x.FactorPercent == 200).ToObservableCollection();
+
+            MinInkUptake = SelectedColorProcessParameter.ColorProcessFactor.Where(x => x.FactorPercent == 1).ToObservableCollection();
+
+            MaxInkUptake = SelectedColorProcessParameter.ColorProcessFactor.Where(x => x.FactorPercent == 1111).ToObservableCollection();
+
+            RemovedColorProcessDataBeforeSave.Clear();
+
+            var cyanDataList = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "CYAN").ToList().OrderBy(x => x.InkNlCm ).ToList(); 
+            CyanProcessData.Clear();
+            cyanDataList.ForEach( y => CyanProcessData.Add(y));
+
+            var magentaDatalist = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "MAGENTA").ToList().OrderBy(x => x.InkNlCm).ToList(); ;
+            MagentaProcessData.Clear();
+            magentaDatalist.ForEach(y => MagentaProcessData.Add(y));
+
+            var yellowDatalist = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "YELLOW").ToList().OrderBy(x => x.InkNlCm).ToList(); ;
+            YellowProcessData.Clear();
+            yellowDatalist.ForEach(y => YellowProcessData.Add(y));
+
+            var blackDatalist = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "BLACK").ToList().OrderBy(x => x.InkNlCm).ToList(); ;
+            BlackProcessData.Clear();
+            blackDatalist.ForEach(y => BlackProcessData.Add(y));
+            
+            UpdatePlots();
+            SelectedColorProcessParameter.ColorProcessFactor.ToList().ForEach(x => UpdateFactorsOnChangeProcessData(x.ColorName));
+        }
+
+        #endregion
+
+        #region Update Plot
+
+        public void UpdatePlots()
+        {
+            if (IsViewLoaded)
+            {
+                CyanPlot.CreateGraph(CyanProcessData.ToList(), true);
+                MagentaPlot.CreateGraph(MagentaProcessData.ToList(), true);
+                YellowPlot.CreateGraph(YellowProcessData.ToList(), false);
+                BlackPlot.CreateGraph(BlackProcessData.ToList(), true);
+            }
+        }
+
+        private void OnCyanCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+               var cyanProcessData = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "CYAN").ToObservableCollection();
+                foreach (ColorProcessData item in cyanProcessData)
+                {
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                    item.PropertyChanged -= CyanMeasurementModelPropertyChanged;
+                }
+               // UpdateFactorsOnChangeProcessData("Cyan");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (ColorProcessData item in e.OldItems)
+                {
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                    item.PropertyChanged -= CyanMeasurementModelPropertyChanged;
+                }
+                UpdateFactorsOnChangeProcessData("CYAN");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (ColorProcessData item in e.NewItems)
+                {
+                    item.ColorName = "CYAN";
+                    item.ColorProcessParametersGuid = SelectedColorProcessParameter.Guid;
+                    SelectedColorProcessParameter.ColorProcessData.Add(item);
+                    RemovedColorProcessDataBeforeSave.Remove(item.Guid);
+                    item.PropertyChanged += CyanMeasurementModelPropertyChanged;
+                }
+            }
+        }
+
+        private void CyanMeasurementModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if(IsFree)
+            {
+                CyanPlot.CreateGraph(CyanProcessData.ToList(), true);
+                UpdateFactorsOnChangeProcessData("CYAN");
+            }
+        }
+        
+        private void OnMagentaCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                var magentaProcessData = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "MAGENTA").ToObservableCollection();
+                foreach (ColorProcessData item in magentaProcessData)
+                {
+                    item.PropertyChanged -= MagentaMeasurementModelPropertyChanged;
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                }
+               // UpdateFactorsOnChangeProcessData("Magenta");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (ColorProcessData item in e.OldItems)
+                {
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                    item.PropertyChanged -= MagentaMeasurementModelPropertyChanged;
+                }
+                UpdateFactorsOnChangeProcessData("MAGENTA");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (ColorProcessData item in e.NewItems)
+                {
+                    item.ColorName = "MAGENTA";
+                    item.ColorProcessParametersGuid = SelectedColorProcessParameter.Guid;
+                    SelectedColorProcessParameter.ColorProcessData.Add(item);
+                    RemovedColorProcessDataBeforeSave.Remove(item.Guid);
+                    item.PropertyChanged += MagentaMeasurementModelPropertyChanged;
+                }
+            }
+        }
+
+        private void MagentaMeasurementModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (IsFree)
+            {
+                MagentaPlot.CreateGraph(MagentaProcessData.ToList(), true);
+                UpdateFactorsOnChangeProcessData("MAGENTA");
+            }
+        }
+
+        private void OnYellowCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                var yellowProcessData = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "YELLOW").ToObservableCollection();
+                foreach (ColorProcessData item in yellowProcessData)
+                {
+                    item.PropertyChanged -= YellowMeasurementModelPropertyChanged;
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                }
+                //UpdateFactorsOnChangeProcessData("Yellow");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (ColorProcessData item in e.OldItems)
+                {
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                    item.PropertyChanged -= YellowMeasurementModelPropertyChanged;
+                }
+                UpdateFactorsOnChangeProcessData("YELLOW");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (ColorProcessData item in e.NewItems)
+                {
+                    item.ColorName = "YELLOW";
+                    item.ColorProcessParametersGuid = SelectedColorProcessParameter.Guid;
+                    SelectedColorProcessParameter.ColorProcessData.Add(item);
+                    RemovedColorProcessDataBeforeSave.Remove(item.Guid);
+                    item.PropertyChanged += YellowMeasurementModelPropertyChanged;
+                }
+            }
+        }
+
+        private void YellowMeasurementModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (IsFree)
+            {
+                YellowPlot.CreateGraph(YellowProcessData.ToList(), false);
+                UpdateFactorsOnChangeProcessData("YELLOW");
+            }
+        }
+        
+        private void OnBlackCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if(e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                var blackProcessData = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName == "BLACK").ToObservableCollection();
+                foreach (ColorProcessData item in blackProcessData)
+                {
+                    item.PropertyChanged -= BlackMeasurementModelPropertyChanged;
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                }
+                //UpdateFactorsOnChangeProcessData("Black");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (ColorProcessData item in e.OldItems)
+                {
+                    SelectedColorProcessParameter.ColorProcessData.Remove(item);
+                    RemovedColorProcessDataBeforeSave[item.Guid] = item;
+                    item.PropertyChanged -= BlackMeasurementModelPropertyChanged;
+                }
+                UpdateFactorsOnChangeProcessData("BLACK");
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (ColorProcessData item in e.NewItems)
+                {
+                    item.ColorName = "BLACK";
+                    item.ColorProcessParametersGuid = SelectedColorProcessParameter.Guid;
+                    SelectedColorProcessParameter.ColorProcessData.Add(item);
+                    RemovedColorProcessDataBeforeSave.Remove(item.Guid);
+                    item.PropertyChanged += BlackMeasurementModelPropertyChanged;
+                }
+                
+            }
+        }
+
+        private void BlackMeasurementModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (IsFree)
+            {
+                BlackPlot.CreateGraph(BlackProcessData.ToList(), true);
+                UpdateFactorsOnChangeProcessData("BLACK");
+            }
+        }
+
+        #endregion
+
+        #region update factors
+
+        /// <summary>
+        /// Updates the ColorProcessFactor from ColorProcessData item.
+        /// </summary>
+        /// <param name="factor">The factor.</param>
+        /// <param name="item">The item.</param>
+        private void UpdateFactor(ColorProcessFactor factor, ColorProcessData item)
+        {
+            if (factor == null)
+                return;
+            if (item == null)
+            {
+                factor.InkNlCm = 0;
+                factor.L = factor.A = factor.B = 0.0;
+                return;
+            }
+            factor.InkNlCm = item.InkNlCm;
+            factor.L = item.L;
+            factor.A = item.A;
+            factor.B = item.B;
+        }
+
+        /// <summary>
+        /// Calculate and Update the factors on change process data.
+        /// </summary>
+        /// <param name="color">The color.</param>
+        private void UpdateFactorsOnChangeProcessData(string color)
+        {
+            bool isLtype = color.ToLower() == "yellow" ? false : true;
+            var processData = SelectedColorProcessParameter.ColorProcessData.Where(x => x.ColorName.ToLower() == color.ToLower()).ToObservableCollection();
+            double target100 = FactorTarget.GetFactor100(color);
+            double target200 = FactorTarget.GetFactor200(color);
+            ColorProcessData closest100 = null;
+            ColorProcessData closest200 = null;
+            ColorProcessData minInk = null;
+            ColorProcessData maxInk = null;
+
+            var minDifference100 = double.MaxValue;
+            var minDifference200 = double.MaxValue;
+
+            if (processData.Count == 0)
+                return;
+
+            foreach (var item in processData)
+            {
+                var colorvalue = isLtype ? item.L : item.B;
+                var difference100 = Math.Abs(colorvalue - target100);
+                if (minDifference100 > difference100)
+                {
+                    minDifference100 = (int)difference100;
+                    closest100 = item;
+                }
+                var difference200 = Math.Abs(colorvalue - target200);
+                if (minDifference200 > difference200)
+                {
+                    minDifference200 = (int)difference200;
+                    closest200 = item;
+                }
+                if (minInk == null ||  minInk.InkNlCm > item.InkNlCm)
+                {
+                    minInk = item;
+                }
+                if (maxInk == null ||  maxInk.InkNlCm < item.InkNlCm)
+                {
+                    maxInk = item;
+                }
+            }
+            UpdateFactor(Factor100ProcessData.FirstOrDefault(x => x.ColorName == color), closest100);
+            UpdateFactor(Factor200ProcessData.FirstOrDefault(x => x.ColorName == color), closest200);
+            UpdateFactor(MinInkUptake.FirstOrDefault(x => x.ColorName == color), minInk);
+            UpdateFactor(MaxInkUptake.FirstOrDefault(x => x.ColorName == color), maxInk);
+        }
+
+        #endregion
+
+        #region save
+
+        public async void Save()
+        {
+            try
+            {
+                IsFree = false;
+                await Task.Factory.StartNew(() =>
+                {
+                    SelectedColorProcessParameter.LastUpdated = DateTime.UtcNow;
+
+                    var colorProcessParameterAfterChange = ColorProcessParameterDTO.FromObservable(SelectedColorProcessParameter);
+
+                    foreach (KeyValuePair<string, ColorProcessData> item in RemovedColorProcessDataBeforeSave)
+                    {
+                        var existingColorProcessData = _active_context.ColorProcessData.FirstOrDefault(y => y.Guid == item.Value.Guid);
+                        if (existingColorProcessData != null)
+                        {
+                            _active_context.ColorProcessData.Remove(existingColorProcessData);
+                        }
+                    }
+                    _active_context.SaveChanges();
+                    
+                });
+                LoadColorParameters(SelectedColorProcessParameter.RmlsExtensionsGuid);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Could not update color parameters.");
+                _notification.ShowError($"An error occurred while trying to save color parameters.\n{ex.Message}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+        
+        #endregion
+    }
+}
+
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 607670461..3fde7abbe 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -1,18 +1,542 @@
-
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.BL;
+using Tango.BL.Builders;
+using Tango.BL.Calibration;
+using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Common.Notifications;
+
+
+using System.Data.Entity;
+using Tango.Core.ExtensionMethods;
+using Tango.MachineStudio.Common.Authentication;
+using Tango.BL.ActionLogs;
+using Tango.BL.DTO;
+using Tango.BL.Enumerations;
+using Tango.MachineStudio.ThreadExtensions.Contracts;
+using Tango.MachineStudio.ThreadExtensions.Views;
 
 namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 {
-    public class MainViewVM : StudioViewModel
+    public class MainViewVM : StudioViewModel<IMainView>
     {
+        private INotificationProvider _notification;
+        private IAuthenticationProvider _authentication;
+        private IActionLogManager _actionLogManager;
+        private RmlsExtensionDTO _rmlExtensionBeforeSave;
+
+        private ObservablesContext _rmlExtentions_context;
+        private ObservablesContext _active_context;
+
+        #region properties
+        private ObservableCollection<RmlsExtension> _rmlsExtension;
+        public ObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get { return _rmlsExtension; }
+            set { _rmlsExtension = value;
+                RaisePropertyChangedAuto(); }
+        }
+
+
+        private RmlsExtension _activeRMLExtention;
+        public RmlsExtension ActiveRMLExtention
+        {
+            get { return _activeRMLExtention; }
+            set { _activeRMLExtention = value;
+                RaisePropertyChangedAuto(); }
+        }
+
+        private RmlsExtension _selectedRMLExtension;
+        public RmlsExtension SelectedRMLExtension
+        {
+            get { return _selectedRMLExtension; }
+            set { _selectedRMLExtension = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private ICollectionView _rmlExtCollectionView;
+        /// <summary>
+        /// Gets or sets the RML collection view.
+        /// </summary>
+        public ICollectionView RmlExtCollectionView
+        {
+            get { return _rmlExtCollectionView; }
+            set
+            {
+                _rmlExtCollectionView = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private ObservableCollection<YarnApplication> _applications;
+        public ObservableCollection<YarnApplication> Applications
+        {
+            get { return _applications; }
+            set { _applications = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnBrand> _brands;
+        public ObservableCollection<YarnBrand> Brands
+        {
+            get { return _brands; }
+            set { _brands = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnColor> _yarnColor;
+        public ObservableCollection<YarnColor> YarnColor
+        {
+            get { return _yarnColor; }
+            set { _yarnColor = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnEndUse> _enduse;
+        public ObservableCollection<YarnEndUse> EndUse
+        {
+            get { return _enduse; }
+            set { _enduse = value; RaisePropertyChangedAuto(); }
+        }
+        
+        private ObservableCollection<YarnFamily> _family;
+        public ObservableCollection<YarnFamily> Family
+        {
+            get { return _family; }
+            set { _family = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnGeometry> _geometry;
+        public ObservableCollection<YarnGeometry> Geometry
+        {
+            get { return _geometry; }
+            set { _geometry = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnGlossLevel> _glosslevel;
+        public ObservableCollection<YarnGlossLevel> GlossLevel
+        {
+            get { return _glosslevel; }
+            set { _glosslevel = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnGroup> _group;
+        public ObservableCollection<YarnGroup> Group
+        {
+            get { return _group; }
+            set { _group = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnManufacturer> _manufacturer;
+        public ObservableCollection<YarnManufacturer> Manufacturer
+        {
+            get { return _manufacturer; }
+            set { _manufacturer = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnMaterial> _materials;
+        public ObservableCollection<YarnMaterial> Materials
+        {
+            get { return _materials; }
+            set { _materials = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnSubFamily> _subFamilies;
+        public ObservableCollection<YarnSubFamily> SubFamilies
+        {
+            get { return _subFamilies; }
+            set { _subFamilies = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnTexturing> _texturing;
+        public ObservableCollection<YarnTexturing> Texturing
+        {
+            get { return _texturing; }
+            set { _texturing = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnType> _yarnTypes;
+        public ObservableCollection<YarnType> YarnTypes
+        {
+            get { return _yarnTypes; }
+            set { _yarnTypes = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<YarnIndustrysector> _industrySector;
+        public ObservableCollection<YarnIndustrysector> IndustrySector
+        {
+            get { return _industrySector; }
+            set { _industrySector = value; RaisePropertyChangedAuto(); }
+        }
+        
+        private String _Filter;
+        /// <summary>
+        /// Gets or sets the search filter.
+        /// </summary>
+        public String Filter
+        {
+            get { return _Filter; }
+            set { _Filter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        private void OnFilterChanged()
+        {
+            RmlExtCollectionView.Refresh();
+        }
+
+        private ColorParametersVewVM _colorParametersVewVM;
+        public ColorParametersVewVM ColorParametersVewVM
+        {
+            get { return _colorParametersVewVM; }
+            set { _colorParametersVewVM = value; RaisePropertyChangedAuto(); }
+        }
+        #endregion
+
+        #region commands
+
+        public RelayCommand SaveCommand { get; set; }
+
+        public RelayCommand ManageRmlExtensionCommand { get; set; }
+        
+        public RelayCommand AddRmlExtCommand { get; set; }
+        
+        public RelayCommand RemoveRmlExtensionCommand { get; set; }
+
+        public RelayCommand CloneRmlExtensionCommand { get; set; }
+
+        public RelayCommand BackToThreadExtensionViewsCommand { get; set; }
+
+       
+        private void BackToThreadExtensionViews(object obj)
+        {
+            View.NavigateTo(ThreadExtensionNavigationView.ThreadExtensionsView);
+            LoadRmlExtentions();
+        }
+
+        private async void CloneSelectedRmlExtension(object obj)
+        {
+            using (_notification.PushTaskItem("Cloning thread..."))
+            {
+                try
+                {
+                    IsFree = false;
+
+                    using (var context = ObservablesContext.CreateDefault())
+                    {
+                        RmlsExtension rml_extention = await new RmlExtensionsBuilder(_rmlExtentions_context).Set(SelectedRMLExtension.Guid).WithUser().BuildAsync();
+
+                        RmlsExtension cloned = new RmlsExtension();
+                        rml_extention.MapPropertiesTo(cloned, MappingFlags.NoReferenceTypes);
+                        
+                        cloned.Guid = Guid.NewGuid().ToString();
+                        cloned.ID = 0;
+                        
+
+                        context.RmlsExtensions.Add(cloned);
+                        await context.SaveChangesAsync();
+
+                        //_actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlCreated, _authentication.CurrentUser, cloned.Name, cloned, "RML cloned from Machine Studio.");
+                    }
+
+                    LoadRmlExtentions();
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error cloning thread.");
+                    _notification.ShowError($"An error occurred while trying to clone the selected thread\n{ex.Message}");
+                }
+                finally
+                {
+                    IsFree = true;
+                }
+            }
+        }
+
+        private async void RemoveRmlExtension(object obj)
+        {
+            if (_notification.ShowQuestion(" Are you sure you want to delete the selected RML Extension?"))
+            {
+                using (_notification.PushTaskItem("Removing RML Extension..."))
+                {
+                    try
+                    {
+                        IsFree = false;
+                        
+                        await SelectedRMLExtension.DeleteCascadeAsync(_rmlExtentions_context);
+                        //_actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlDeleted, _authentication.CurrentUser, SelectedRML.Name, SelectedRML, "RML deleted from Machine Studio.");
+
+                        LoadRmlExtentions();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error removing selected RML {SelectedRMLExtension?.Name}.");
+                        _notification.ShowError($"An error occurred while trying to remove the selected RML Extension.\n{ex.FlattenMessage()}");
+                        LoadRmlExtentions();
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
+                }
+            }
+        }
+        #endregion
+        
+        public MainViewVM(INotificationProvider notificationProvider, IAuthenticationProvider authentication, IActionLogManager actionLogManager)
+        {
+            _notification = notificationProvider;
+            _authentication = authentication;
+            _actionLogManager = actionLogManager;
+            
+            BackToThreadExtensionViewsCommand = new RelayCommand(BackToThreadExtensionViews, () => IsFree);
+            SaveCommand = new RelayCommand(Save, () => IsFree);
+            ManageRmlExtensionCommand = new RelayCommand(() => LoadActiveRMLExtention(SelectedRMLExtension.Guid), () => SelectedRMLExtension != null);
+            RemoveRmlExtensionCommand = new RelayCommand(RemoveRmlExtension, () => SelectedRMLExtension != null);
+            CloneRmlExtensionCommand = new RelayCommand(CloneSelectedRmlExtension, () => SelectedRMLExtension != null);
+            AddRmlExtCommand = new RelayCommand(AddNewRmlExtention);
+        }
+        
         public override void OnApplicationReady()
         {
+            LoadRmlExtentions();
+        }
+
+        #region Loading
+
+        private async void LoadRmlExtentions()
+        {
+            try
+            {
+                IsFree = false;
+
+                using (_notification.PushTaskItem("Loading RmlExtentions..."))
+                {
+                    if (_rmlExtentions_context != null) _rmlExtentions_context.Dispose();
+
+                    _rmlExtentions_context = ObservablesContext.CreateDefault();
+                    RmlsExtensions = await new RMLExtentionsCollectionBuilder(_rmlExtentions_context).SetAll().WithUser().WithYarnProperties().BuildAsync();
+
+
+                    RmlExtCollectionView = CollectionViewSource.GetDefaultView(RmlsExtensions);
+                    RmlExtCollectionView.SortDescriptions.Add(new SortDescription(nameof(Rml.LastUpdated), ListSortDirection.Descending));
+
+                    RmlExtCollectionView.Filter = (rml) =>
+                    {
+                        RmlsExtension r = rml as RmlsExtension;
+                        return String.IsNullOrWhiteSpace(Filter)
+                        || r.Name.ToLower().Contains(Filter.ToLower());
+                    };
+
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error loading RMLExtensions.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+
+        private void LoadRmlProperties()
+        {
+            Applications = _active_context.YarnApplications.ToObservableCollection();
+            Brands = _active_context.YarnBrand.ToObservableCollection();
+            YarnColor = _active_context.YarnColor.ToObservableCollection();
+            EndUse = _active_context.YarnEndUse.ToObservableCollection();
+            Family = _active_context.YarnFamily.ToObservableCollection();
+            Geometry = _active_context.YarnGeometry.ToObservableCollection();
+            GlossLevel = _active_context.YarnGlossLevel.ToObservableCollection();
+            Group = _active_context.YarnGroup.ToObservableCollection();
+            Manufacturer = _active_context.YarnManufacturer.ToObservableCollection();
+
+            Materials = _active_context.YarnMaterials.ToObservableCollection();
+            SubFamilies = _active_context.YarnSubFamily.ToObservableCollection();
+            Texturing = _active_context.YarnTexturing.ToObservableCollection();
+            YarnTypes = _active_context.YarnType.ToObservableCollection();
+            IndustrySector = _active_context.YarnIndustrysector.ToObservableCollection();
+        }
+
+        private async void AddNewRmlExtention(object obj)
+        {
+            using (_notification.PushTaskItem("Creating new RML Extension..."))
+            {
+                IsFree = false;
+
+                if (_active_context != null)
+                {
+                    _active_context.Dispose();
+                }
+
+                _active_context = ObservablesContext.CreateDefault();
+
+                LoadRmlProperties();
+
+                RmlsExtension rml_extention = new RmlsExtension();
+                rml_extention.Created = DateTime.UtcNow;
+                rml_extention.UserGuid = _authentication.CurrentUser.Guid;
+                rml_extention.YarnManufacturer = Manufacturer.FirstOrDefault();
+                rml_extention.YarnBrand = Brands.FirstOrDefault();
+                rml_extention.Country = null;
+                rml_extention.YarnEndUse = EndUse.FirstOrDefault();
+                rml_extention.YarnApplications = Applications.FirstOrDefault();
+                rml_extention.YarnIndustrysector = IndustrySector.FirstOrDefault();
+
+                rml_extention.YarnMaterial = Materials.FirstOrDefault();
+                rml_extention.YarnType = YarnTypes.FirstOrDefault();
+                rml_extention.YarnSubFamily = SubFamilies.FirstOrDefault();
+                rml_extention.YarnFamily = Family.FirstOrDefault();
+                rml_extention.YarnGroup = Group.FirstOrDefault();
+                rml_extention.YarnTexturing = Texturing.FirstOrDefault();
+                rml_extention.YarnGeometry = Geometry.FirstOrDefault();
+                rml_extention.YarnColor = YarnColor.FirstOrDefault();
+                rml_extention.YarnGlossLevel = GlossLevel.FirstOrDefault();
+                rml_extention.LinearDensity = 0;
+                rml_extention.YarnUnit = YarnUnits.DTEX;
+                rml_extention.YarnPlies = Plies.P1;
+                rml_extention.FilamentCount = 0;
+                rml_extention.TwistTpm = 0;
+                rml_extention.YarnTwistDirections = TwistDirections.S;
+                rml_extention.MinElongation = 0.0;
+                rml_extention.MaxElongation = 100.0;
+                rml_extention.MinMaxForceN = 0.0;
+                rml_extention.MaxMaxForceN = 100.0;
+                rml_extention.MinElasticity = 0.0;
+                rml_extention.MaxElasticity = 100.0;
+                rml_extention.MinTenacity = 0.0;
+                rml_extention.MaxTenacity = 100.0;
+                rml_extention.Finishing = "Lubrication";
+                
+                _active_context.RmlsExtensions.Add(rml_extention);
+                await _active_context.SaveChangesAsync();
+
+                //_actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlCreated, _authentication.CurrentUser, rml.Name, rml, "Rml created using Machine Studio.");
+                ColorParametersVewVM = new ColorParametersVewVM(_notification, _actionLogManager);
+                LoadActiveRMLExtention(rml_extention.Guid);
+
+                IsFree = true;
+            }
+        }
+        
+        private async void LoadActiveRMLExtention(String guid)
+        {
+            using (_notification.PushTaskItem("Loading RML Extension..."))
+            {
+                try
+                {
+                    IsFree = false;
+
+                    if (_active_context != null)
+                    {
+                        _active_context.Dispose();
+                    }
+
+                    _active_context = ObservablesContext.CreateDefault();
+
+                    LoadRmlProperties();
+
+                    ActiveRMLExtention = await new RmlExtensionsBuilder(_active_context)
+                        .Set(guid)
+                        .WithUser()
+                        .BuildAsync();
+
+                    ColorParametersVewVM = new ColorParametersVewVM(_notification, _actionLogManager);
+                    ColorParametersVewVM.LoadColorParameters(guid);
+                    View.NavigateTo(ThreadExtensionNavigationView.ThreadExtentionView);
+
+                    InvalidateRelayCommands();
+
+                    IsFree = true;
+                }
+                catch (Exception ex)
+                {
+                    //LogManager.Log($"Error loading RML '{ActiveRML.Name}'...");
+                    _notification.ShowError($"Error loading the selected thread.\n{ex.FlattenMessage()}");
+                }
+                finally
+                {
+                    IsFree = true;
+                }
+            }
+        }
+
+        private async void RefreshView(String guid)
+        {
+            try
+            {
+                IsFree = false;
+
+                //if (_active_context != null)
+                //{
+                //    _active_context.Dispose();
+                //}
+
+                //_active_context = ObservablesContext.CreateDefault();
+
+                LoadRmlProperties();
+                ActiveRMLExtention = await new RmlExtensionsBuilder(_active_context)
+                    .Set(guid)
+                    .WithUser()
+                    .BuildAsync();
+                
+                InvalidateRelayCommands();
+
+                IsFree = true;
+            }
+            catch (Exception ex)
+            {
+                //LogManager.Log($"Error loading RML '{ActiveRML.Name}'...");
+                _notification.ShowError($"Error refresh the selected thread.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+
+        #endregion
+
+        private async void Save()
+        {
+            IsFree = false;
+
+            try
+            {
+                using (_notification.PushTaskItem("Saving RML Extension..."))
+                {
+
+                    ActiveRMLExtention.LastUpdated = DateTime.UtcNow;
+
+                    ColorParametersVewVM.Save();
+
+                    var rmlExtensionAfter = RmlsExtensionDTO.FromObservable(ActiveRMLExtention);
+
+                    await _active_context.SaveChangesAsync();
+
+                    //ColorParametersVewVM.LoadColorParameters(ActiveRMLExtention.Guid);
+                    // _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlSaved, _authentication.CurrentUser, _rmlBeforeSave.Name, _rmlBeforeSave, rmlAfter, "RML saved using Machine Studio.");
+
+                    _rmlExtensionBeforeSave = rmlExtensionAfter;
 
+                    RefreshView(SelectedRMLExtension.Guid);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error saving RML Extension {ActiveRMLExtention.Name}");
+                _notification.ShowError($"An error occurred while trying to save the current RML Extension.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml
new file mode 100644
index 000000000..1526a49cb
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml
@@ -0,0 +1,474 @@
+<UserControl x:Class="Tango.MachineStudio.ThreadExtensions.Views.ColorParametersView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.ThreadExtensions.Views"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.ThreadExtensions.ViewModels"
+             xmlns:converters="clr-namespace:Tango.MachineStudio.ThreadExtensions.Converters"
+             xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:oxy="http://oxyplot.org/wpf"
+             xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+
+        <converters:ColorNameToBrushConverter x:Key="ColorNameToBrushConverter"/>
+
+        <Style x:Key="CellNumericUpDown" TargetType="{x:Type  mahapps:NumericUpDown}" BasedOn="{StaticResource {x:Type mahapps:NumericUpDown}}">
+            <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsHitTestVisible" Value="false"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="FrameworkElement.VerticalAlignment" Value="Top"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FrameworkElement.MinHeight" Value="0"/>
+            <Setter Property="HideUpDownButtons" Value="true"/>
+            <Setter Property="FontSize" Value="14"/>
+        </Style>
+
+        <Style x:Key="FactorCellNumericUpDown" TargetType="{x:Type  mahapps:NumericUpDown}" BasedOn="{StaticResource {x:Type mahapps:NumericUpDown}}">
+            <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsHitTestVisible" Value="false"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="FrameworkElement.VerticalAlignment" Value="Top"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FrameworkElement.MinHeight" Value="0"/>
+            <Setter Property="HideUpDownButtons" Value="true"/>
+            <Setter Property="Margin" Value=" 10 0 0 0"/>
+            <Setter Property="FontSize" Value="14"/>
+        </Style>
+
+        <Style x:Key="EditableCellNumericUpDown" TargetType="{x:Type  mahapps:NumericUpDown}" BasedOn="{StaticResource {x:Type mahapps:NumericUpDown}}">
+            <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+            <Setter Property="FrameworkElement.VerticalAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FrameworkElement.MinHeight" Value="0"/>
+            <Setter Property="FontSize" Value="14"/>
+        </Style>
+
+        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+        </Style>
+
+    </UserControl.Resources>
+
+    <Grid x:Name="contentGrid" DataContext="{Binding  ColorParametersVewVM}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+        <DockPanel Grid.Column="0">
+            <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
+                <TextBlock Margin="40 20" FontSize="30" FontWeight="SemiBold" FontStyle="Italic">TARGET MACHINE</TextBlock>
+
+            <autoComplete:AutoCompleteTextBox Provider="{Binding MachinesProvider}" LoadingContent="Loading..."  FontSize="20" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number" DisplayMember="SerialNumber">
+                <autoComplete:AutoCompleteTextBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel>
+                            <TextBlock Text="{Binding SerialNumber}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
+                            <TextBlock FontSize="11" Text="{Binding Name}" Foreground="Gray"></TextBlock>
+                        </StackPanel>
+                    </DataTemplate>
+                </autoComplete:AutoCompleteTextBox.ItemTemplate>
+            </autoComplete:AutoCompleteTextBox>
+            </StackPanel>
+            <UniformGrid Columns="2" FirstColumn="0" Name="uniformGrid1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" >
+
+            <DockPanel Grid.Column="0" Grid.Row="0" x:Name="CyanPanel">
+                <Border DockPanel.Dock="Top"  Background="LightCyan" Margin="20 0 0 0 " Padding="5" CornerRadius="5" Height="40" VerticalAlignment="Top">
+                    <Border.Effect>
+                        <DropShadowEffect Opacity="0.4" />
+                    </Border.Effect>
+                    <Grid>
+                            <DockPanel>
+                                <Button DockPanel.Dock="Right" HorizontalAlignment="Left"  Padding="2" Height="26" Width="140" Background="Transparent" Command="{Binding ImportCyanDataCommand}" ToolTip="Import Cyan data " Margin="0 0 10 0" BorderBrush="{StaticResource TransparentBackgroundBrush200}" BorderThickness="1 1 0.8 2">
+                                    <TextBlock FontSize="14"  Foreground="{StaticResource MainWindow.Foreground}">IMPORT DATA</TextBlock>
+                                </Button>
+                                <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 4 0 0" FontSize="16" Padding="0">LIQUID TYPE CYAN</TextBlock>
+                                
+                            </DockPanel>
+                    </Grid>
+                </Border>
+
+                <Grid Margin="10 20 0 10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid   HorizontalAlignment="Left" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Margin="20 30 10 0">
+                        <StackPanel Orientation="Vertical">
+
+                            <DataGrid HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="340"  SelectionMode="Single" SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" ItemsSource="{Binding CyanProcessData}" Margin="0 0 0 50">
+                               
+                                <DataGrid.Columns>
+                                    <mahapps:DataGridNumericUpDownColumn Header="nl/cm" Minimum="0" Maximum="100000"  Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L,Delay=100 ,UpdateSourceTrigger=LostFocus}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A,Delay=100, UpdateSourceTrigger=LostFocus}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B ,Delay=100, UpdateSourceTrigger=LostFocus}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="1" Grid.Row="0" Margin="10 0 0 0">
+                        <Border  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  BorderThickness="0" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="5">
+                            <oxy:Plot Title="Cyan" TitleFontSize="14" x:Name="CyanPlotControl" Margin="0 0 10 0" Background="Transparent" >
+                                <oxy:Plot.Series >
+                                    <oxy:LineSeries ItemsSource="{Binding CyanPlot.Points}"  Color="Cyan" MarkerFill="SteelBlue"  MarkerType="Circle" />
+                                    <oxy:LineSeries ItemsSource="{Binding CyanPlot.Target100Points}"  Color="#C5E14141"   LineStyle="LongDash"  />
+                                    <oxy:LineSeries ItemsSource="{Binding CyanPlot.Target200Points}"  Color="#C5E14141"   LineStyle="Dash"   />
+                                </oxy:Plot.Series>
+                                <oxy:Plot.Axes>
+                                    <oxy:LinearAxis Position="Bottom"  Title = "nl/cm" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" />
+                                    <oxy:LinearAxis Position="Left"  Title = "Lab" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="{Binding CyanPlot.From}" Maximum="{Binding CyanPlot.To}" />
+                                </oxy:Plot.Axes>
+                            </oxy:Plot>
+                        </Border>
+                    </Grid>
+                </Grid>
+            </DockPanel>
+            <DockPanel Grid.Column="1">
+                <Border DockPanel.Dock="Top"  Background="#FC63FC" Margin="20 0 0 0 " Padding="5" CornerRadius="5" Height="40" VerticalAlignment="Top">
+                    <Border.Effect>
+                        <DropShadowEffect Opacity="0.4" />
+                    </Border.Effect>
+                        <Grid>
+                            <DockPanel>
+                                <Button DockPanel.Dock="Right" HorizontalAlignment="Left"  Height="26" Padding="2" Width="140" Background="Transparent" Command="{Binding ImportMagentaDataCommand}" ToolTip="Import Magenta data " Margin="0 0 10 0" BorderBrush="{StaticResource TransparentBackgroundBrush200}" BorderThickness="1 1 0.8 2">
+                                    <TextBlock FontSize="14"  Foreground="{StaticResource MainWindow.Foreground}">IMPORT DATA</TextBlock>
+                                </Button>
+                                <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 4 0 0" FontSize="16" Padding="0">LIQUID TYPE MAGENTA</TextBlock>
+                            </DockPanel>
+                        </Grid>
+                    </Border>
+                <Grid Margin="10 20 0 10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid   HorizontalAlignment="Left" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Margin="20 30 10 0">
+                        <StackPanel Orientation="Vertical">
+
+                            <DataGrid HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="340"   SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" ItemsSource="{Binding MagentaProcessData}" Margin="0 0 0 50">
+
+                                <DataGrid.Columns>
+                                    <mahapps:DataGridNumericUpDownColumn Header="nl/cm" Minimum="0" Maximum="100000"  Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="1" Grid.Row="0" Margin="10 0 0 0">
+                        <Border  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  BorderThickness="0" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="5">
+                            <oxy:Plot Title="Magenta" TitleFontSize="14" x:Name="MagentaPlotControl" Margin="0 0 10 0" Background="Transparent"  >
+                                <oxy:Plot.Series >
+                                    <oxy:LineSeries ItemsSource="{Binding MagentaPlot.Points}"  Color="Magenta" MarkerFill="SteelBlue"  MarkerType="Circle" />
+                                    <oxy:LineSeries ItemsSource="{Binding MagentaPlot.Target100Points}"  Color="#C5E14141"   LineStyle="LongDash"  />
+                                    <oxy:LineSeries ItemsSource="{Binding MagentaPlot.Target200Points}"  Color="#C5E14141"   LineStyle="Dash"   />
+                                </oxy:Plot.Series>
+                                <oxy:Plot.Axes>
+                                    <oxy:LinearAxis Position="Bottom"  Title = "nl/cm" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" />
+                                    <oxy:LinearAxis Position="Left"  Title = "Lab" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="{Binding MagentaPlot.From}" Maximum="{Binding MagentaPlot.To}" />
+                                </oxy:Plot.Axes>
+                            </oxy:Plot>
+                        </Border>
+                    </Grid>
+                </Grid>
+            </DockPanel >
+            <DockPanel Grid.Column="0" Grid.Row="1" x:Name="YellowPanel">
+                <Border DockPanel.Dock="Top"  Background="LightYellow" Margin="20 0 0 0 " Padding="5" CornerRadius="5" Height="40" VerticalAlignment="Top">
+                    <Border.Effect>
+                        <DropShadowEffect Opacity="0.4" />
+                    </Border.Effect>
+                    <Grid>
+                            <DockPanel>
+                                <Button DockPanel.Dock="Right" HorizontalAlignment="Left"  Height="26" Padding="2" Width="140" Background="Transparent" Command="{Binding ImportYellowDataCommand}" ToolTip="Import Yellow data " Margin="0 0 10 0" BorderBrush="{StaticResource TransparentBackgroundBrush200}" BorderThickness="1 1 0.8 2">
+                                    <TextBlock FontSize="14"  Foreground="{StaticResource MainWindow.Foreground}">IMPORT DATA</TextBlock>
+                                </Button>
+                                <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 4 0 0" FontSize="16" Padding="0">LIQUID TYPE YELLOW</TextBlock>
+                                </DockPanel>
+                        </Grid>
+                </Border>
+                <Grid Margin="10 20 0 10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Margin="20 30 10 0">
+                        <StackPanel Orientation="Vertical">
+                            <DataGrid HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="340"   SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" ItemsSource="{Binding YellowProcessData}" Margin="0 0 0 50">
+                                <DataGrid.Columns>
+                                    <mahapps:DataGridNumericUpDownColumn Header="nl/cm" Minimum="0" Maximum="10000"  Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="1" Grid.Row="0" Margin="10 0 0 0">
+                        <Border  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  BorderThickness="0" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="5">
+                            <oxy:Plot Title="Yellow" TitleFontSize="14" x:Name="YellowPlotControl" Margin="0 0 10 0" Background="Transparent"  >
+                                <oxy:Plot.Series >
+                                    <oxy:LineSeries ItemsSource="{Binding YellowPlot.Points}"  Color="Yellow" MarkerFill="SteelBlue"  MarkerType="Circle" />
+                                    <oxy:LineSeries ItemsSource="{Binding YellowPlot.Target100Points}"  Color="#C5E14141"   LineStyle="LongDash"  />
+                                    <oxy:LineSeries ItemsSource="{Binding YellowPlot.Target200Points}"  Color="#C5E14141"   LineStyle="Dash"   />
+                                </oxy:Plot.Series>
+                                <oxy:Plot.Axes>
+                                    <oxy:LinearAxis Position="Bottom"  Title = "nl/cm" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" />
+                                    <oxy:LinearAxis Position="Left"  Title = "Lab" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="{Binding YellowPlot.From}" Maximum="{Binding YellowPlot.To}" />
+                                </oxy:Plot.Axes>
+                            </oxy:Plot>
+                        </Border>
+                    </Grid>
+                </Grid>
+            </DockPanel>
+            <DockPanel  Grid.Column="1" Grid.Row="1">
+                <Border DockPanel.Dock="Top"  Background="DarkGray" Margin="20 0 0 0 " Padding="5" CornerRadius="5" Height="40" VerticalAlignment="Top">
+                    <Border.Effect>
+                        <DropShadowEffect Opacity="0.4" />
+                    </Border.Effect>
+                    <Grid>
+                            <DockPanel>
+                                <Button DockPanel.Dock="Right" HorizontalAlignment="Left"  Height="26" Padding="2" Width="140" Background="Transparent" Command="{Binding ImportBlackDataCommand}" ToolTip="Import Black data " Margin="0 0 10 0" BorderBrush="{StaticResource TransparentBackgroundBrush200}" BorderThickness="1 1 0.8 2" >
+                                    <TextBlock FontSize="14"  Foreground="{StaticResource MainWindow.Foreground}">IMPORT DATA</TextBlock>
+                                </Button>
+                                <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 4 0 0" FontSize="16" Padding="0">LIQUID TYPE BLACK</TextBlock>
+                                </DockPanel>
+                    </Grid>
+
+                </Border>
+                <Grid Margin="10 20 0 10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid   HorizontalAlignment="Left" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Margin="20 30 10 0">
+                        <StackPanel Orientation="Vertical" >
+
+                            <DataGrid HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="340"   SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" ItemsSource="{Binding BlackProcessData}" Margin="0 0 0 50">
+
+                                <DataGrid.Columns>
+                                    <mahapps:DataGridNumericUpDownColumn Header="nl/cm" Minimum="0" Maximum="10000"  Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="1" Grid.Row="0" Margin="10 0 0 0">
+                        <Border  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  BorderThickness="0" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="5">
+                            <oxy:Plot Title=" Black" TitleFontSize="14" x:Name="BlackPlotControl" Margin="0 0 10 0" Background="Transparent"  >
+                                <oxy:Plot.Series >
+                                    <oxy:LineSeries ItemsSource="{Binding BlackPlot.Points}"  Color="Black" MarkerFill="SteelBlue"  MarkerType="Circle" />
+                                    <oxy:LineSeries ItemsSource="{Binding BlackPlot.Target100Points}"  Color="#A1E14141"   LineStyle="LongDash"  />
+                                    <oxy:LineSeries ItemsSource="{Binding BlackPlot.Target200Points}"  Color="#A1E14141"   LineStyle="Dash"   />
+                                </oxy:Plot.Series>
+                                <oxy:Plot.Axes>
+                                    <oxy:LinearAxis Position="Bottom"  Title = "nl/cm" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" />
+                                    <oxy:LinearAxis Position="Left"  Title = "Lab" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="{Binding BlackPlot.From}" Maximum="{Binding BlackPlot.To}" />
+                                </oxy:Plot.Axes>
+                            </oxy:Plot>
+                        </Border>
+                    </Grid>
+                </Grid>
+            </DockPanel>
+        </UniformGrid>
+        </DockPanel>
+        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="40 60 0 0">
+            <Border BorderBrush="{StaticResource Statistics.BorderBrush}" BorderThickness="1">
+                <UniformGrid Rows="2" Columns="4"  x:Name="whitePointsGrid" DataContext="{Binding SelectedColorProcessParameter}">
+                <Border BorderThickness="0 0 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                    <TextBlock></TextBlock>
+                </Border>
+                    <Border BorderThickness="1 0 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <TextBlock FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Foreground="{StaticResource GrayBrush200}">L</TextBlock>
+                </Border>
+                    <Border BorderThickness="1 0 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <TextBlock FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Foreground="{StaticResource GrayBrush200}">A</TextBlock>
+                </Border>
+                    <Border BorderThickness="1 0 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <TextBlock FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Foreground="{StaticResource GrayBrush200}">B</TextBlock>
+                </Border>
+                    <Border BorderThickness="0 1 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <TextBlock FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Foreground="{StaticResource GrayBrush200}">White point</TextBlock>
+                </Border>
+                    <Border BorderThickness="1 1 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <mahapps:NumericUpDown Minimum="-500" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding  WhitePointL, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                </Border>
+                    <Border BorderThickness="1 1 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <mahapps:NumericUpDown Minimum="-500" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding  WhitePointA,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                </Border>
+                    <Border BorderThickness="1 1 0 0" Background="Transparent" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                        <mahapps:NumericUpDown Minimum="-500" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding  WhitePointB,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                </Border>
+            </UniformGrid>
+            </Border>
+            <!--<DataGrid x:Name="whitePointGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" Height="Auto"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding WhitePoints}" Margin="0 0 0 20">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header=""  Width="1*"  Binding="{Binding Name}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                </DataGrid.Columns>
+            </DataGrid>-->
+
+            <DataGrid x:Name="Factor100Grid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="250" RowHeight="26" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Factor100ProcessData}" Margin="0 10 0 20">
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        <Setter Property="Padding" Value="0"></Setter>
+                        <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                    </Style>
+                </DataGrid.CellStyle>
+                <DataGrid.Columns>
+                    <DataGridTemplateColumn Header="Factor 100%"  Width="1*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Border BorderThickness="0" Background="{Binding ColorName, Converter={StaticResource ColorNameToBrushConverter}}">
+                                <mahapps:NumericUpDown Minimum="0" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" VerticalContentAlignment="Top" Margin="0" Padding="0"
+                                                       HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding InkNlCm,Mode=TwoWay}" FontSize="14"></mahapps:NumericUpDown>
+                                    </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+
+                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <DataGrid x:Name="Factor200Grid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="250" RowHeight="26"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Factor200ProcessData}" Margin="0 10 0 20">
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        <Setter Property="Padding" Value="0"></Setter>
+                        <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                        <Setter Property="FontSize" Value="14"/>
+                    </Style>
+                </DataGrid.CellStyle>
+                <DataGrid.Columns>
+                    <DataGridTemplateColumn Header="Factor 200%"  Width="1*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Border BorderThickness="0" Background="{Binding ColorName, Converter={StaticResource ColorNameToBrushConverter}}">
+                                    <mahapps:NumericUpDown Minimum="0" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"
+                                                       HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding InkNlCm,Mode=TwoWay}" FontSize="14"></mahapps:NumericUpDown>
+                                </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <!--<mahapps:DataGridNumericUpDownColumn Header="Factor 200%" Minimum="0" Maximum="100" Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource ColorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"  />-->
+                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <DataGrid x:Name="MinInkUptakeGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="250" RowHeight="26"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MinInkUptake}" Margin="0 10 0 20">
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        <Setter Property="Padding" Value="0"></Setter>
+                        <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                        <Setter Property="FontSize" Value="14"/>
+                    </Style>
+                </DataGrid.CellStyle>
+                <DataGrid.Columns>
+                    <DataGridTemplateColumn Header="Min Ink Uptake"  Width="1*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Border BorderThickness="0" Background="{Binding ColorName, Converter={StaticResource ColorNameToBrushConverter}}">
+                                    <mahapps:NumericUpDown Minimum="0" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"
+                                                       HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding InkNlCm,Mode=TwoWay}" FontSize="14"></mahapps:NumericUpDown>
+                                </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <!--<mahapps:DataGridNumericUpDownColumn Header="Factor 200%" Minimum="0" Maximum="100" Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource ColorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"  />-->
+                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <DataGrid x:Name="MaxInkUptakeGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="250" RowHeight="26"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MaxInkUptake}" Margin="0 10 0 20">
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        <Setter Property="Padding" Value="0"></Setter>
+                        <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                        <Setter Property="FontSize" Value="14"/>
+                    </Style>
+                </DataGrid.CellStyle>
+                <DataGrid.Columns>
+                    <DataGridTemplateColumn Header="Max Ink Uptake"  Width="1*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Border BorderThickness="0" Background="{Binding ColorName, Converter={StaticResource ColorNameToBrushConverter}}">
+                                    <mahapps:NumericUpDown Minimum="0" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"
+                                                       HideUpDownButtons="True" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding InkNlCm,Mode=TwoWay}" FontSize="14"></mahapps:NumericUpDown>
+                                </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <!--<mahapps:DataGridNumericUpDownColumn Header="Factor 200%" Minimum="0" Maximum="100" Binding="{Binding InkNlCm}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource ColorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"  />-->
+                    <mahapps:DataGridNumericUpDownColumn Header="L" Minimum="0" Maximum="100" Binding="{Binding L}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="A" Minimum="-128" Maximum="127" Binding="{Binding A}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                    <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource FactorCellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <!--<DataGrid x:Name="inktGrid" HeadersVisibility="None" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280"   SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding InkUptake}" Margin="0 10 0 20">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header=""  Width="1*"  Binding="{Binding Name}" />
+                    <mahapps:DataGridNumericUpDownColumn  Minimum="0" Maximum="100" Binding="{Binding InkUptakeValue}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                </DataGrid.Columns>
+            </DataGrid>-->
+
+        </StackPanel>
+    </Grid>
+
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml.cs
new file mode 100644
index 000000000..4e6a8c048
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.MachineStudio.ThreadExtensions.ViewModels;
+
+namespace Tango.MachineStudio.ThreadExtensions.Views
+{
+    /// <summary>
+    /// Interaction logic for ColorParametersView.xaml
+    /// </summary>
+    public partial class ColorParametersView : UserControl
+    {
+        public ColorParametersView()
+        {
+            InitializeComponent();
+            this.Loaded += ColorParametersView_Loaded;
+        }
+
+        private void ColorParametersView_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (contentGrid != null && contentGrid.DataContext is ColorParametersVewVM)
+            {
+                ColorParametersVewVM vm = (ColorParametersVewVM)contentGrid.DataContext;
+                vm.CyanPlot.PlotControl = CyanPlotControl;
+                vm.MagentaPlot.PlotControl = MagentaPlotControl;
+                vm.YellowPlot.PlotControl = YellowPlotControl;
+                vm.BlackPlot.PlotControl = BlackPlotControl;
+                vm.IsViewLoaded = true;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
index b446c7cc7..0ef5850c6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
@@ -4,12 +4,16 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.ThreadExtensions.Views"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.ThreadExtensions.ViewModels"
              xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid IsEnabled="{Binding IsFree}">
-        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="70">Thread Extensions</TextBlock>
+        <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
+            <local:ThreadExtensionsView />
+            <local:ThreadExtentionView/>
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml.cs
index 863a96398..251099c8a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml.cs
@@ -12,17 +12,25 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Core.DI;
+using Tango.MachineStudio.ThreadExtensions.Contracts;
 
 namespace Tango.MachineStudio.ThreadExtensions.Views
 {
     /// <summary>
     /// Interaction logic for MainView.xaml
     /// </summary>
-    public partial class MainView : UserControl
+    public partial class MainView : UserControl, IMainView
     {
         public MainView()
         {
             InitializeComponent();
+            TangoIOC.Default.Register<IMainView>(this);
+        }
+
+        public void NavigateTo(ThreadExtensionNavigationView view)
+        {
+            navigationControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadCharacteristicsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadCharacteristicsView.xaml
new file mode 100644
index 000000000..fac8e6af4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadCharacteristicsView.xaml
@@ -0,0 +1,195 @@
+<UserControl x:Class="Tango.MachineStudio.ThreadExtensions.Views.ThreadCharacteristicsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.ThreadExtensions.Views"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.ThreadExtensions.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
+             xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             mc:Ignorable="d" 
+             FontSize="16"
+             d:DesignHeight="450" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+   
+    <UserControl.Resources>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter"/>
+        <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter"/>
+    </UserControl.Resources>
+
+    <Grid>
+        <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch" Padding="40">
+            <UniformGrid Columns="4" >
+
+                <Grid Margin="10">
+                    <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch" >
+                        <Grid Margin="20">
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="20" FontWeight="DemiBold">Yarn Source</TextBlock>
+                                <controls:TableGrid RowHeight="60" Margin="0 20 0 0" MakeFirstColumnVerticalAlignmentBottom="False"  >
+                                    <controls:TableGrid.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                            <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                        </Style>
+                                    </controls:TableGrid.Resources>
+                                    <TextBlock Text="Manufacturer:"  VerticalAlignment="Center" FontSize="16" Margin="0 3 0 0"></TextBlock>
+                                    <ComboBox VerticalAlignment="Center" ItemsSource="{Binding Manufacturer}" SelectedItem="{Binding ActiveRMLExtention.YarnManufacturer,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True" Margin="20 0 20 0"/>
+
+
+                                    <TextBlock Text="Brand:" VerticalAlignment="Center" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Brands}" SelectedItem="{Binding ActiveRMLExtention.YarnBrand,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"  Margin="20 0 20 0"></ComboBox>
+
+                                    <TextBlock Text="Country:" ></TextBlock>
+                                    <TextBox Text="{Binding  ActiveRMLExtention.Country,UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center"></TextBox>
+
+                                    <TextBlock Text="End Use:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding EndUse}" SelectedItem="{Binding ActiveRMLExtention.YarnEndUse,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Applications:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Applications}" SelectedItem="{Binding ActiveRMLExtention.YarnApplications,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Industry Sector:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding IndustrySector}" SelectedItem="{Binding ActiveRMLExtention.YarnIndustrysector,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                </controls:TableGrid>
+                            </DockPanel>
+                        </Grid>
+                    </materialDesign:Card>
+                </Grid>
+
+                <Grid Margin="10">
+                    <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch" >
+                        <Grid Margin="20">
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top"  FontSize="20" FontWeight="DemiBold">Yarn Source</TextBlock>
+                                <controls:TableGrid RowHeight="55" Margin="0 20 0 0" MakeFirstColumnVerticalAlignmentBottom="False" >
+                                    <controls:TableGrid.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                            <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                        </Style>
+                                    </controls:TableGrid.Resources>
+                                    <TextBlock Text="Material:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRMLExtention.YarnMaterial,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Type:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding YarnTypes}" SelectedItem="{Binding ActiveRMLExtention.YarnType,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Sub family:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding SubFamilies}" SelectedItem="{Binding ActiveRMLExtention.YarnSubFamily,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Family:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Family}" SelectedItem="{Binding ActiveRMLExtention.YarnFamily,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Group:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Group}" SelectedItem="{Binding ActiveRMLExtention.YarnGroup,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Texturing:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Texturing}" SelectedItem="{Binding ActiveRMLExtention.YarnTexturing,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Geometry:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Geometry }" SelectedItem="{Binding ActiveRMLExtention.YarnGeometry ,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Color:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding YarnColor}" SelectedItem="{Binding ActiveRMLExtention.YarnColor,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+
+                                    <TextBlock Text="Gloss level:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding GlossLevel }" SelectedItem="{Binding ActiveRMLExtention.YarnGlossLevel ,Mode=TwoWay}" DisplayMemberPath="Name" IsEditable="True"></ComboBox>
+                                </controls:TableGrid>
+                            </DockPanel>
+                        </Grid>
+                    </materialDesign:Card>
+                </Grid>
+                <Grid Margin="10">
+                    <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch" >
+                        <Grid Margin="20">
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top"  FontSize="20" FontWeight="DemiBold">Yarn Data</TextBlock>
+                                <controls:TableGrid RowHeight="55" Margin="0 20 0 0" MakeFirstColumnVerticalAlignmentBottom="False" >
+                                    <controls:TableGrid.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                            <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                        </Style>
+                                    </controls:TableGrid.Resources>
+
+                                    <TextBlock Text="Linear Density:" ></TextBlock>
+                                    <mahapps:NumericUpDown Minimum="0" Maximum="9999" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveRMLExtention.LinearDensity,Mode=TwoWay}" FontSize="16"></mahapps:NumericUpDown>
+
+                                    <TextBlock Text="Unit:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:YarnUnits},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedItem="{Binding ActiveRMLExtention.YarnUnit}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"  Validation.ErrorTemplate="{x:Null}"></ComboBox>
+
+                                    <TextBlock Text="Plies:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:Plies},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedItem="{Binding ActiveRMLExtention.YarnPlies}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" Validation.ErrorTemplate="{x:Null}"></ComboBox>
+
+                                    <TextBlock Text="Filament count per plies:" ></TextBlock>
+                                    <mahapps:NumericUpDown Minimum="0" Maximum="500" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveRMLExtention.FilamentCount,Mode=TwoWay}" FontSize="16"></mahapps:NumericUpDown>
+
+                                    <TextBlock Text="Count (den)" ></TextBlock>
+                                    <TextBlock Text="{Binding ActiveRMLExtention.DencityCount}" Foreground="Blue" ></TextBlock>
+
+                                    <TextBlock Text="Fiber count " ></TextBlock>
+                                    <TextBlock Text="{Binding ActiveRMLExtention.FiberCount}" Foreground="Blue" ></TextBlock>
+
+                                    <TextBlock Text="Twist(tpm):" ></TextBlock>
+                                    <mahapps:NumericUpDown Minimum="0" Maximum="9999" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveRMLExtention.TwistTpm,Mode=TwoWay}" FontSize="16"></mahapps:NumericUpDown>
+
+                                    <TextBlock Text="Twist direction:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding  Source={x:Type enumerations:TwistDirections}, Converter={StaticResource EnumToItemsSourceConverter}}" SelectedItem="{Binding ActiveRMLExtention.YarnTwistDirections }" SelectedValuePath="Value" DisplayMemberPath="DisplayName" Validation.ErrorTemplate="{x:Null}"></ComboBox>
+                                </controls:TableGrid>
+                            </DockPanel>
+                        </Grid>
+                    </materialDesign:Card>
+                </Grid>
+                <Grid Margin="10">
+                    <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch" >
+                        <Grid Margin="20">
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top"  FontSize="20" FontWeight="DemiBold">Yarn Properties from datasheet</TextBlock>
+                                <controls:TableGrid RowHeight="55" Margin="0 20 0 0" MakeFirstColumnVerticalAlignmentBottom="False" >
+                                    <controls:TableGrid.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                            <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                        </Style>
+                                        <Style TargetType="{x:Type mahapps:NumericUpDown}">
+                                            <Setter Property="BorderThickness" Value="0 0 0 0.5"></Setter>
+                                            <Setter Property="FontSize" Value="16"/>
+                                        </Style>
+                                        </controls:TableGrid.Resources>
+                                    <TextBlock Text="Max Force (N):" ></TextBlock>
+                                    <StackPanel Orientation="Horizontal">
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRMLExtention.MinMaxForceN}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRMLExtention.MaxMaxForceN}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}" Margin="10 0 0 0"/>
+                                    </StackPanel>
+                                    
+                                    <TextBlock Text="Elasticity (%)" ></TextBlock>
+                                    <StackPanel Orientation="Horizontal">
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRMLExtention.MinElasticity}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRMLExtention.MaxElasticity}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}" Margin="10 0 0 0"/>
+                                    </StackPanel>
+
+                                    <TextBlock Text="Tenacity (%)" ></TextBlock>
+                                    <StackPanel Orientation="Horizontal">
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRMLExtention.MinTenacity}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRMLExtention.MaxTenacity}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}" Margin="10 0 0 0"/>
+                                    </StackPanel>
+
+                                    <TextBlock Text="Finishing:" ></TextBlock>
+                                    <TextBlock Text="{Binding ActiveRMLExtention.Finishing}" ></TextBlock>
+
+                                </controls:TableGrid>
+                            </DockPanel>
+                        </Grid>
+                    </materialDesign:Card>
+                </Grid>
+
+            </UniformGrid>
+        </materialDesign:Card>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadCharacteristicsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadCharacteristicsView.xaml.cs
new file mode 100644
index 000000000..944cf07f4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadCharacteristicsView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.ThreadExtensions.Views
+{
+    /// <summary>
+    /// Interaction logic for ThreadCharacteristicsView.xaml
+    /// </summary>
+    public partial class ThreadCharacteristicsView : UserControl
+    {
+        public ThreadCharacteristicsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionView.xaml
new file mode 100644
index 000000000..f9d8a2dc3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionView.xaml
@@ -0,0 +1,61 @@
+<UserControl x:Class="Tango.MachineStudio.ThreadExtensions.Views.ThreadExtentionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
+             xmlns:local="clr-namespace:Tango.MachineStudio.ThreadExtensions.Views"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.ThreadExtensions.ViewModels"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid>
+        <DockPanel>
+            <Grid DockPanel.Dock="Top" Panel.ZIndex="200">
+                <StackPanel Orientation="Horizontal">
+                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToThreadExtensionViewsCommand}">
+                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="{StaticResource DarkGrayBrush200}" ToolTip="Back to Thread list" />
+                    </Button>
+                    <TextBlock MaxWidth="350" Text="{Binding ActiveRMLExtention.Name}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="30" TextWrapping="Wrap"></TextBlock>
+                </StackPanel>
+
+                <Button HorizontalAlignment="Right" Width="170" Height="45" Margin="0 0 20 0" VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                    </StackPanel>
+                </Button>
+            </Grid>
+            <Grid DockPanel.Dock="Bottom">
+
+            </Grid>
+
+            <Grid>
+                <Grid   IsEnabled="{Binding IsFree}" Margin="40" >
+                    <TabControl Background="Transparent" Margin="0,-70,0,0" x:Name="processTabControl" Padding="0 25 0 0">
+                        <TabControl.Resources>
+                            <Style TargetType="TabPanel">
+                                <Setter Property="HorizontalAlignment" Value="Center"/>
+                            </Style>
+                            <Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
+                                <Setter Property="Padding" Value="20,2"></Setter>
+                            </Style>
+                        </TabControl.Resources>
+                        <TabItem Header="THREAD CHARACTERISTICS" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
+                            <local:ThreadCharacteristicsView x:Name="threadParametersView" />
+                        </TabItem>
+                        <TabItem Header="COLOR PARAMETERS" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
+                            <local:ColorParametersView/>
+                        </TabItem>
+                        <!--<TabItem Header="COLOR parameters" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
+                            <local:ColorCalibrationView DataContext="{Binding ColorCalibrationVM}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"/>
+                        </TabItem>-->
+                    </TabControl>
+                </Grid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionView.xaml.cs
new file mode 100644
index 000000000..2cce29e57
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionView.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.ThreadExtensions.Views
+{
+    /// <summary>
+    /// Interaction logic for ThreadExtView.xaml
+    /// </summary>
+    public partial class ThreadExtentionView : UserControl
+    {
+        public ThreadExtentionView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionsView.xaml
new file mode 100644
index 000000000..b85222b12
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionsView.xaml
@@ -0,0 +1,103 @@
+<UserControl x:Class="Tango.MachineStudio.ThreadExtensions.Views.ThreadExtensionsView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
+        xmlns:local="clr-namespace:Tango.MachineStudio.ThreadExtensions.Views"
+        xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+        xmlns:vm="clr-namespace:Tango.MachineStudio.ThreadExtensions.ViewModels"
+        xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+        mc:Ignorable="d"
+        d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+    </UserControl.Resources>
+    
+    <Grid IsEnabled="{Binding IsFree}">
+        <DockPanel Margin="100 100 100 50" MaxWidth="1200">
+            <Grid DockPanel.Dock="Top">
+                <Image Source="../Images/threads.png" Width="300" Margin="10" />
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 10 30">
+                    <materialDesign:PackIcon Kind="Magnify" Width="26" Height="26"/>
+                    <TextBox Width="300" materialDesign:HintAssist.Hint="Search by name" Text="{Binding Filter,UpdateSourceTrigger=PropertyChanged,Delay=500}"></TextBox>
+                </StackPanel>
+            </Grid>
+            <Grid DockPanel.Dock="Bottom">
+                <StackPanel>
+                    <Grid>
+                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveRmlExtensionCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                                </StackPanel>
+                            </Button>
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}" Command="{Binding CloneRmlExtensionCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="ContentCopy" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">DUPLICATE</TextBlock>
+                                </StackPanel>
+                            </Button>
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddRmlExtCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">NEW</TextBlock>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageRmlExtensionCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
+                                    <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+
+                    <StackPanel Orientation="Horizontal" Margin="0 40 0 0">
+                        <Button Command="{Binding ImportRMLFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="FileImport" VerticalAlignment="Center" Width="30" Height="30" />
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Thread File</TextBlock>
+                            </StackPanel>
+                        </Button>
+
+                        <Button Margin="30 0 0 0" Command="{Binding ExportRMLFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="FileExport" VerticalAlignment="Center" Width="30" Height="30" />
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Export Thread File</TextBlock>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+            <Grid>
+                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" RowHeight="60" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding RmlsExtensions}" SelectedItem="{Binding SelectedRMLExtension}">
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                            <Setter Property="Padding" Value="4"></Setter>
+                            <Setter Property="Margin" Value="10 5 0 0"></Setter>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="MANUFACTURER" Binding="{Binding YarnManufacturer.Name}" Width="Auto" />
+                        <DataGridTextColumn Header="BRAND" Binding="{Binding YarnBrand.Name}" Width="Auto" />
+                        <DataGridTextColumn Header="LINEAR DENSITY" Binding="{Binding LinearDensity}" Width="140"/>
+                        <DataGridTextColumn Header="CREATED BY" Binding="{Binding User.Contact.FirstName}" Width="Auto"/>
+                        <DataGridTextColumn Header="CREATED" Binding="{Binding Created,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
+                        <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionsView.xaml.cs
new file mode 100644
index 000000000..9afb7a5c8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ThreadExtensionsView.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.ThreadExtensions.Views
+{
+    /// <summary>
+    /// Interaction logic for ThreadExtViews.xaml
+    /// </summary>
+    public partial class ThreadExtensionsView : UserControl
+    {
+        public ThreadExtensionsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/app.config
index 97a204217..7b82e5f7c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/app.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/app.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -72,4 +76,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config
index fd88f4804..5a03cfb57 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/packages.config
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="Google.Protobuf" version="3.4.1" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.5.0" targetFramework="net461" />
   <package id="MaterialDesignColors" version="1.1.2" targetFramework="net461" />
   <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="OxyPlot.Core" version="2.0.0" targetFramework="net461" />
+  <package id="OxyPlot.Wpf" version="2.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs
new file mode 100644
index 000000000..005ca8a53
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using System.Data.Entity;
+using System.Linq.Expressions;
+
+namespace Tango.BL.Builders
+{
+    public class ColorProcessParametersBuilder : EntityBuilderBase<ColorProcessParameter, ColorProcessParametersBuilder>
+    {
+        public ColorProcessParametersBuilder(ObservablesContext context) : base(context)
+        {
+
+        }
+        
+        //protected override IQueryable<ColorProcessParameter> OnSetQuery(IQueryable<ColorProcessParameter> query)
+        //{
+        //    return query.
+        //        Include(x => x.ColorProcessData).
+        //        Include(x => x.ColorProcessFactor);
+        //}
+        public virtual ColorProcessParametersBuilder WithColorProcessData()
+        {
+            return AddQueryStep(1, (query) =>
+            {
+                return query.Include(x => x.ColorProcessData);
+            });
+        }
+
+        public virtual ColorProcessParametersBuilder WithColorProcessFactor()
+        {
+            return AddQueryStep(2, (query) =>
+            {
+                return query.Include(x => x.ColorProcessFactor);
+            });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs
new file mode 100644
index 000000000..370c4273c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using System.Data.Entity;
+using Tango.BL.Enumerations;
+
+namespace Tango.BL.Builders
+{
+    public class RMLExtentionsCollectionBuilder : EntityCollectionBuilderBase<RmlsExtension, RMLExtentionsCollectionBuilder>
+    {
+        public RMLExtentionsCollectionBuilder(ObservablesContext context) : base(context)
+        {
+        }
+        public virtual RMLExtentionsCollectionBuilder WithUser()
+        {
+            //return AddStep(0, () =>
+            //{
+            //    foreach (var rmlExtentions in Entities.ToList())
+            //    {
+            //        new UserBuilder(Context).Set(rmlExtentions.UserGuid).Build();
+            //    }
+            //});
+           
+            return AddQueryStep(0, (query) =>
+            {
+                return query.Include(x => x.User).Include(x => x.User.Contact);
+            });
+        }
+
+        public virtual RMLExtentionsCollectionBuilder WithUsers()
+        {
+            return AddStep(2, () =>
+            {
+                foreach (var rmlExtention in Entities)
+                {
+                    new UsersCollectionBuilder(Context).Set(x => x.Guid == rmlExtention.UserGuid).WithAddress().WithContacts().Build();
+                }
+            });
+        }
+
+        public virtual RMLExtentionsCollectionBuilder WithYarnProperties()
+        {
+            return AddStep(1, () =>
+            {
+                Context.YarnApplications.ToList();
+                Context.YarnBrand.ToList();
+                Context.YarnColor.ToList();
+                Context.YarnEndUse.ToList();
+                Context.YarnGeometry.ToList();
+                Context.YarnFamily.ToList();
+                Context.YarnGlossLevel.ToList();
+                Context.YarnGroup.ToList();
+                Context.YarnIndustrysector.ToList();
+                Context.YarnManufacturer.ToList();
+                Context.YarnMaterials.ToList();
+                Context.YarnSubFamily.ToList();
+                Context.YarnTexturing.ToList();
+                Context.YarnType.ToList();
+            });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs
new file mode 100644
index 000000000..00c251a4e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using System.Data.Entity;
+using System.Linq.Expressions;
+
+namespace Tango.BL.Builders
+{
+    public class RmlExtensionsBuilder : EntityBuilderBase<RmlsExtension, RmlExtensionsBuilder>
+    {
+        public RmlExtensionsBuilder(ObservablesContext context) : base(context)
+        {
+            
+        }
+        protected override IQueryable<RmlsExtension> OnSetQuery(IQueryable<RmlsExtension> query)
+        {
+            return query.
+                Include(x => x.Rml).
+                Include(x => x.YarnApplications).
+                Include(x => x.YarnBrand).
+                Include(x => x.YarnColor).
+                Include(x => x.YarnEndUse).
+                Include(x => x.YarnFamily).
+                Include(x => x.YarnGeometry).
+                Include(x => x.YarnGlossLevel).
+                Include(x => x.YarnGroup).
+                Include(x => x.YarnManufacturer).
+                Include(x => x.YarnMaterial).
+                Include(x => x.YarnSubFamily).
+                Include(x => x.YarnTexturing).
+                Include(x => x.YarnType);
+        }
+        public virtual RmlExtensionsBuilder WithUser()
+        {
+            return AddStep(0, () =>
+            {
+                new UserBuilder(Context).Set(Entity.UserGuid).WithRolesAndPermissions().Build();
+            });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorProcessDataDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessDataDTO.cs
new file mode 100644
index 000000000..b55a7ad27
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessDataDTO.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 ColorProcessDataDTO : ColorProcessDataDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorProcessDataDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessDataDTOBase.cs
new file mode 100644
index 000000000..bb0dadfa6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessDataDTOBase.cs
@@ -0,0 +1,73 @@
+
+//------------------------------------------------------------------------------
+// <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 ColorProcessDataDTOBase : ObservableEntityDTO<ColorProcessDataDTO, ColorProcessData>
+    {
+
+        /// <summary>
+        /// color process parameters guid
+        /// </summary>
+        public String ColorProcessParametersGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// color name
+        /// </summary>
+        public String ColorName 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ink nl cm
+        /// </summary>
+        public Int32 InkNlCm 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// l
+        /// </summary>
+        public Double L 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// a
+        /// </summary>
+        public Double A 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// b
+        /// </summary>
+        public Double B 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorProcessFactorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessFactorDTO.cs
new file mode 100644
index 000000000..780fb4d0f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessFactorDTO.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 ColorProcessFactorDTO : ColorProcessFactorDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorProcessFactorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessFactorDTOBase.cs
new file mode 100644
index 000000000..a6e2a83b2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessFactorDTOBase.cs
@@ -0,0 +1,81 @@
+
+//------------------------------------------------------------------------------
+// <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 ColorProcessFactorDTOBase : ObservableEntityDTO<ColorProcessFactorDTO, ColorProcessFactor>
+    {
+
+        /// <summary>
+        /// color process parameters guid
+        /// </summary>
+        public String ColorProcessParametersGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// color name
+        /// </summary>
+        public String ColorName 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ink nl cm
+        /// </summary>
+        public Int32 InkNlCm 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// l
+        /// </summary>
+        public Double L 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// a
+        /// </summary>
+        public Double A 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// b
+        /// </summary>
+        public Double B 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// factor percent
+        /// </summary>
+        public Int32 FactorPercent 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorProcessParameterDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessParameterDTO.cs
new file mode 100644
index 000000000..2c7fd48aa
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessParameterDTO.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 ColorProcessParameterDTO : ColorProcessParameterDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorProcessParameterDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessParameterDTOBase.cs
new file mode 100644
index 000000000..606c23ca6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorProcessParameterDTOBase.cs
@@ -0,0 +1,57 @@
+
+//------------------------------------------------------------------------------
+// <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 ColorProcessParameterDTOBase : ObservableEntityDTO<ColorProcessParameterDTO, ColorProcessParameter>
+    {
+
+        /// <summary>
+        /// rmls extensions guid
+        /// </summary>
+        public String RmlsExtensionsGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// white point l
+        /// </summary>
+        public Double WhitePointL 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// white point a
+        /// </summary>
+        public Double WhitePointA 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// white point b
+        /// </summary>
+        public Double WhitePointB 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsExtensionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsExtensionDTOBase.cs
index 76f927048..a80e63c75 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlsExtensionDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlsExtensionDTOBase.cs
@@ -22,17 +22,281 @@ namespace Tango.BL.DTO
     {
 
         /// <summary>
-        /// name
+        /// rml guid
         /// </summary>
-        public String Name 
+        public String RmlGuid 
         {
             get; set; 
         }
 
         /// <summary>
-        /// description
+        /// user guid
         /// </summary>
-        public String Description 
+        public String UserGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// created
+        /// </summary>
+        public DateTime Created 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn manufacturer guid
+        /// </summary>
+        public String YarnManufacturerGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn brand guid
+        /// </summary>
+        public String YarnBrandGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// country
+        /// </summary>
+        public String Country 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn end use guid
+        /// </summary>
+        public String YarnEndUseGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn applications guid
+        /// </summary>
+        public String YarnApplicationsGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn industrysector guid
+        /// </summary>
+        public String YarnIndustrysectorGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn material guid
+        /// </summary>
+        public String YarnMaterialGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn type guid
+        /// </summary>
+        public String YarnTypeGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn family guid
+        /// </summary>
+        public String YarnFamilyGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn sub family guid
+        /// </summary>
+        public String YarnSubFamilyGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn group guid
+        /// </summary>
+        public String YarnGroupGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn texturing guid
+        /// </summary>
+        public String YarnTexturingGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn geometry guid
+        /// </summary>
+        public String YarnGeometryGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn color guid
+        /// </summary>
+        public String YarnColorGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yarn gloss level guid
+        /// </summary>
+        public String YarnGlossLevelGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// linear density
+        /// </summary>
+        public Int32 LinearDensity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// unit
+        /// </summary>
+        public Int32 Unit 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// plies
+        /// </summary>
+        public Int32 Plies 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// filament count
+        /// </summary>
+        public Int32 FilamentCount 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// twist tpm
+        /// </summary>
+        public Int32 TwistTpm 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// twist direction
+        /// </summary>
+        public Nullable<Int32> TwistDirection 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// min elongation
+        /// </summary>
+        public Nullable<Double> MinElongation 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// max elongation
+        /// </summary>
+        public Nullable<Double> MaxElongation 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// min max force n
+        /// </summary>
+        public Nullable<Double> MinMaxForceN 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// max max force n
+        /// </summary>
+        public Nullable<Double> MaxMaxForceN 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// min elasticity
+        /// </summary>
+        public Nullable<Double> MinElasticity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// max elasticity
+        /// </summary>
+        public Nullable<Double> MaxElasticity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// min tenacity
+        /// </summary>
+        public Nullable<Double> MinTenacity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// max tenacity
+        /// </summary>
+        public Nullable<Double> MaxTenacity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// finishing
+        /// </summary>
+        public String Finishing 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// file name
+        /// </summary>
+        public String FileName 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// data
+        /// </summary>
+        public Byte[] Data 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnApplicationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnApplicationDTO.cs
new file mode 100644
index 000000000..37be2426f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnApplicationDTO.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 YarnApplicationDTO : YarnApplicationDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnApplicationDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnApplicationDTOBase.cs
new file mode 100644
index 000000000..e37e97e67
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnApplicationDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnApplicationDTOBase : ObservableEntityDTO<YarnApplicationDTO, YarnApplication>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnBrandDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnBrandDTO.cs
new file mode 100644
index 000000000..27c6947b3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnBrandDTO.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 YarnBrandDTO : YarnBrandDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnBrandDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnBrandDTOBase.cs
new file mode 100644
index 000000000..08c0c1b08
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnBrandDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnBrandDTOBase : ObservableEntityDTO<YarnBrandDTO, YarnBrand>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnColorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnColorDTO.cs
new file mode 100644
index 000000000..cebf7e442
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnColorDTO.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 YarnColorDTO : YarnColorDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnColorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnColorDTOBase.cs
new file mode 100644
index 000000000..7ca5264bb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnColorDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnColorDTOBase : ObservableEntityDTO<YarnColorDTO, YarnColor>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnEndUseDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnEndUseDTO.cs
new file mode 100644
index 000000000..a7e1c5593
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnEndUseDTO.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 YarnEndUseDTO : YarnEndUseDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnEndUseDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnEndUseDTOBase.cs
new file mode 100644
index 000000000..c28452a65
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnEndUseDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnEndUseDTOBase : ObservableEntityDTO<YarnEndUseDTO, YarnEndUse>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnFamilyDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnFamilyDTO.cs
new file mode 100644
index 000000000..43e492ec3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnFamilyDTO.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 YarnFamilyDTO : YarnFamilyDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnFamilyDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnFamilyDTOBase.cs
new file mode 100644
index 000000000..1e2712bba
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnFamilyDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnFamilyDTOBase : ObservableEntityDTO<YarnFamilyDTO, YarnFamily>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnGeometryDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnGeometryDTO.cs
new file mode 100644
index 000000000..1d051e713
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnGeometryDTO.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 YarnGeometryDTO : YarnGeometryDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnGeometryDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnGeometryDTOBase.cs
new file mode 100644
index 000000000..a19e5ec37
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnGeometryDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnGeometryDTOBase : ObservableEntityDTO<YarnGeometryDTO, YarnGeometry>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnGlossLevelDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnGlossLevelDTO.cs
new file mode 100644
index 000000000..0d904cd6f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnGlossLevelDTO.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 YarnGlossLevelDTO : YarnGlossLevelDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnGlossLevelDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnGlossLevelDTOBase.cs
new file mode 100644
index 000000000..f8f3bf634
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnGlossLevelDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnGlossLevelDTOBase : ObservableEntityDTO<YarnGlossLevelDTO, YarnGlossLevel>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnGroupDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnGroupDTO.cs
new file mode 100644
index 000000000..0634a6c47
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnGroupDTO.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 YarnGroupDTO : YarnGroupDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnGroupDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnGroupDTOBase.cs
new file mode 100644
index 000000000..fc2dd604e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnGroupDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnGroupDTOBase : ObservableEntityDTO<YarnGroupDTO, YarnGroup>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnIndustrysectorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnIndustrysectorDTO.cs
new file mode 100644
index 000000000..8ffa1bde0
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnIndustrysectorDTO.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 YarnIndustrysectorDTO : YarnIndustrysectorDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnIndustrysectorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnIndustrysectorDTOBase.cs
new file mode 100644
index 000000000..e48393fc3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnIndustrysectorDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnIndustrysectorDTOBase : ObservableEntityDTO<YarnIndustrysectorDTO, YarnIndustrysector>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnManufacturerDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnManufacturerDTO.cs
new file mode 100644
index 000000000..57a2a1b09
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnManufacturerDTO.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 YarnManufacturerDTO : YarnManufacturerDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnManufacturerDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnManufacturerDTOBase.cs
new file mode 100644
index 000000000..5076d754e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnManufacturerDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnManufacturerDTOBase : ObservableEntityDTO<YarnManufacturerDTO, YarnManufacturer>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnMaterialDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnMaterialDTO.cs
new file mode 100644
index 000000000..5b884c13d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnMaterialDTO.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 YarnMaterialDTO : YarnMaterialDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnMaterialDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnMaterialDTOBase.cs
new file mode 100644
index 000000000..77f9f0aca
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnMaterialDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnMaterialDTOBase : ObservableEntityDTO<YarnMaterialDTO, YarnMaterial>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnSubFamilyDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnSubFamilyDTO.cs
new file mode 100644
index 000000000..7c6b78ef9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnSubFamilyDTO.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 YarnSubFamilyDTO : YarnSubFamilyDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnSubFamilyDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnSubFamilyDTOBase.cs
new file mode 100644
index 000000000..5b2149495
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnSubFamilyDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnSubFamilyDTOBase : ObservableEntityDTO<YarnSubFamilyDTO, YarnSubFamily>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnTexturingDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnTexturingDTO.cs
new file mode 100644
index 000000000..c78a3f6fe
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnTexturingDTO.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 YarnTexturingDTO : YarnTexturingDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnTexturingDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnTexturingDTOBase.cs
new file mode 100644
index 000000000..8c3a0cb97
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnTexturingDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnTexturingDTOBase : ObservableEntityDTO<YarnTexturingDTO, YarnTexturing>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnTypeDTO.cs
new file mode 100644
index 000000000..2648a9993
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnTypeDTO.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 YarnTypeDTO : YarnTypeDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/YarnTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/YarnTypeDTOBase.cs
new file mode 100644
index 000000000..401519044
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/YarnTypeDTOBase.cs
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+// <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 YarnTypeDTOBase : ObservableEntityDTO<YarnTypeDTO, YarnType>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorProcessData.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessData.cs
new file mode 100644
index 000000000..cd6781446
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessData.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class ColorProcessData : ColorProcessDataBase
+    {
+        public ColorProcessData() : base()
+        {
+            L = 0;
+            A = 0;
+            B = 0;
+        }
+        public override void Delete(ObservablesContext context)
+        {
+            base.Delete(context);
+
+            context.ColorProcessData.Remove(this);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorProcessDataBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessDataBase.cs
new file mode 100644
index 000000000..e49883712
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessDataBase.cs
@@ -0,0 +1,296 @@
+//------------------------------------------------------------------------------
+// <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("COLOR_PROCESS_DATA")]
+    public abstract class ColorProcessDataBase : ObservableEntity<ColorProcessData>
+    {
+
+        public event EventHandler<String> ColorNameChanged;
+
+        public event EventHandler<Int32> InkNlCmChanged;
+
+        public event EventHandler<Double> LChanged;
+
+        public event EventHandler<Double> AChanged;
+
+        public event EventHandler<Double> BChanged;
+
+        public event EventHandler<ColorProcessParameter> ColorProcessParametersChanged;
+
+        protected String _colorprocessparametersguid;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase color process parameters guid.
+        /// </summary>
+
+        [Column("COLOR_PROCESS_PARAMETERS_GUID")]
+        [ForeignKey("ColorProcessParameters")]
+
+        public  String ColorProcessParametersGuid
+        {
+            get 
+            {
+                return _colorprocessparametersguid; 
+            }
+
+            set 
+            {
+                if (_colorprocessparametersguid != value)
+                {
+                    _colorprocessparametersguid = value;
+
+                }
+            }
+        }
+
+        protected String _colorname;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase color name.
+        /// </summary>
+
+        [Column("COLOR_NAME")]
+
+        public  String ColorName
+        {
+            get 
+            {
+                return _colorname; 
+            }
+
+            set 
+            {
+                if (_colorname != value)
+                {
+                    _colorname = value;
+
+                    OnColorNameChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _inknlcm;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase ink nl cm.
+        /// </summary>
+
+        [Column("INK_NL_CM")]
+
+        public  Int32 InkNlCm
+        {
+            get 
+            {
+                return _inknlcm; 
+            }
+
+            set 
+            {
+                if (_inknlcm != value)
+                {
+                    _inknlcm = value;
+
+                    OnInkNlCmChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _l;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase l.
+        /// </summary>
+
+        [Column("L")]
+
+        public  Double L
+        {
+            get 
+            {
+                return _l; 
+            }
+
+            set 
+            {
+                if (_l != value)
+                {
+                    _l = value;
+
+                    OnLChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _a;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase a.
+        /// </summary>
+
+        [Column("A")]
+
+        public  Double A
+        {
+            get 
+            {
+                return _a; 
+            }
+
+            set 
+            {
+                if (_a != value)
+                {
+                    _a = value;
+
+                    OnAChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _b;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase b.
+        /// </summary>
+
+        [Column("B")]
+
+        public  Double B
+        {
+            get 
+            {
+                return _b; 
+            }
+
+            set 
+            {
+                if (_b != value)
+                {
+                    _b = value;
+
+                    OnBChanged(value);
+
+                }
+            }
+        }
+
+        protected ColorProcessParameter _colorprocessparameters;
+
+        /// <summary>
+        /// Gets or sets the colorprocessdatabase color process parameters.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual ColorProcessParameter ColorProcessParameters
+        {
+            get 
+            {
+                return _colorprocessparameters; 
+            }
+
+            set 
+            {
+                if (_colorprocessparameters != value)
+                {
+                    _colorprocessparameters = value;
+
+                    if (ColorProcessParameters != null)
+                    {
+                        ColorProcessParametersGuid = ColorProcessParameters.Guid;
+                    }
+
+                    OnColorProcessParametersChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the ColorName has changed.
+        /// </summary>
+        protected virtual void OnColorNameChanged(String colorname)
+        {
+            ColorNameChanged?.Invoke(this, colorname);
+            RaisePropertyChanged(nameof(ColorName));
+        }
+
+        /// <summary>
+        /// Called when the InkNlCm has changed.
+        /// </summary>
+        protected virtual void OnInkNlCmChanged(Int32 inknlcm)
+        {
+            InkNlCmChanged?.Invoke(this, inknlcm);
+            RaisePropertyChanged(nameof(InkNlCm));
+        }
+
+        /// <summary>
+        /// Called when the L has changed.
+        /// </summary>
+        protected virtual void OnLChanged(Double l)
+        {
+            LChanged?.Invoke(this, l);
+            RaisePropertyChanged(nameof(L));
+        }
+
+        /// <summary>
+        /// Called when the A has changed.
+        /// </summary>
+        protected virtual void OnAChanged(Double a)
+        {
+            AChanged?.Invoke(this, a);
+            RaisePropertyChanged(nameof(A));
+        }
+
+        /// <summary>
+        /// Called when the B has changed.
+        /// </summary>
+        protected virtual void OnBChanged(Double b)
+        {
+            BChanged?.Invoke(this, b);
+            RaisePropertyChanged(nameof(B));
+        }
+
+        /// <summary>
+        /// Called when the ColorProcessParameters has changed.
+        /// </summary>
+        protected virtual void OnColorProcessParametersChanged(ColorProcessParameter colorprocessparameters)
+        {
+            ColorProcessParametersChanged?.Invoke(this, colorprocessparameters);
+            RaisePropertyChanged(nameof(ColorProcessParameters));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorProcessDataBase" /> class.
+        /// </summary>
+        public ColorProcessDataBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorProcessFactor.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessFactor.cs
new file mode 100644
index 000000000..e20ca528a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessFactor.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class ColorProcessFactor : ColorProcessFactorBase
+    {
+        public override void Delete(ObservablesContext context)
+        {
+            base.Delete(context);
+
+            context.ColorProcessFactor.Remove(this);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorProcessFactorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessFactorBase.cs
new file mode 100644
index 000000000..5749784a5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessFactorBase.cs
@@ -0,0 +1,334 @@
+//------------------------------------------------------------------------------
+// <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("COLOR_PROCESS_FACTOR")]
+    public abstract class ColorProcessFactorBase : ObservableEntity<ColorProcessFactor>
+    {
+
+        public event EventHandler<String> ColorNameChanged;
+
+        public event EventHandler<Int32> InkNlCmChanged;
+
+        public event EventHandler<Double> LChanged;
+
+        public event EventHandler<Double> AChanged;
+
+        public event EventHandler<Double> BChanged;
+
+        public event EventHandler<Int32> FactorPercentChanged;
+
+        public event EventHandler<ColorProcessParameter> ColorProcessParametersChanged;
+
+        protected String _colorprocessparametersguid;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase color process parameters guid.
+        /// </summary>
+
+        [Column("COLOR_PROCESS_PARAMETERS_GUID")]
+        [ForeignKey("ColorProcessParameters")]
+
+        public  String ColorProcessParametersGuid
+        {
+            get 
+            {
+                return _colorprocessparametersguid; 
+            }
+
+            set 
+            {
+                if (_colorprocessparametersguid != value)
+                {
+                    _colorprocessparametersguid = value;
+
+                }
+            }
+        }
+
+        protected String _colorname;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase color name.
+        /// </summary>
+
+        [Column("COLOR_NAME")]
+
+        public  String ColorName
+        {
+            get 
+            {
+                return _colorname; 
+            }
+
+            set 
+            {
+                if (_colorname != value)
+                {
+                    _colorname = value;
+
+                    OnColorNameChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _inknlcm;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase ink nl cm.
+        /// </summary>
+
+        [Column("INK_NL_CM")]
+
+        public  Int32 InkNlCm
+        {
+            get 
+            {
+                return _inknlcm; 
+            }
+
+            set 
+            {
+                if (_inknlcm != value)
+                {
+                    _inknlcm = value;
+
+                    OnInkNlCmChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _l;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase l.
+        /// </summary>
+
+        [Column("L")]
+
+        public  Double L
+        {
+            get 
+            {
+                return _l; 
+            }
+
+            set 
+            {
+                if (_l != value)
+                {
+                    _l = value;
+
+                    OnLChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _a;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase a.
+        /// </summary>
+
+        [Column("A")]
+
+        public  Double A
+        {
+            get 
+            {
+                return _a; 
+            }
+
+            set 
+            {
+                if (_a != value)
+                {
+                    _a = value;
+
+                    OnAChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _b;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase b.
+        /// </summary>
+
+        [Column("B")]
+
+        public  Double B
+        {
+            get 
+            {
+                return _b; 
+            }
+
+            set 
+            {
+                if (_b != value)
+                {
+                    _b = value;
+
+                    OnBChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _factorpercent;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase factor percent.
+        /// </summary>
+
+        [Column("FACTOR_PERCENT")]
+
+        public  Int32 FactorPercent
+        {
+            get 
+            {
+                return _factorpercent; 
+            }
+
+            set 
+            {
+                if (_factorpercent != value)
+                {
+                    _factorpercent = value;
+
+                    OnFactorPercentChanged(value);
+
+                }
+            }
+        }
+
+        protected ColorProcessParameter _colorprocessparameters;
+
+        /// <summary>
+        /// Gets or sets the colorprocessfactorbase color process parameters.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual ColorProcessParameter ColorProcessParameters
+        {
+            get 
+            {
+                return _colorprocessparameters; 
+            }
+
+            set 
+            {
+                if (_colorprocessparameters != value)
+                {
+                    _colorprocessparameters = value;
+
+                    if (ColorProcessParameters != null)
+                    {
+                        ColorProcessParametersGuid = ColorProcessParameters.Guid;
+                    }
+
+                    OnColorProcessParametersChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the ColorName has changed.
+        /// </summary>
+        protected virtual void OnColorNameChanged(String colorname)
+        {
+            ColorNameChanged?.Invoke(this, colorname);
+            RaisePropertyChanged(nameof(ColorName));
+        }
+
+        /// <summary>
+        /// Called when the InkNlCm has changed.
+        /// </summary>
+        protected virtual void OnInkNlCmChanged(Int32 inknlcm)
+        {
+            InkNlCmChanged?.Invoke(this, inknlcm);
+            RaisePropertyChanged(nameof(InkNlCm));
+        }
+
+        /// <summary>
+        /// Called when the L has changed.
+        /// </summary>
+        protected virtual void OnLChanged(Double l)
+        {
+            LChanged?.Invoke(this, l);
+            RaisePropertyChanged(nameof(L));
+        }
+
+        /// <summary>
+        /// Called when the A has changed.
+        /// </summary>
+        protected virtual void OnAChanged(Double a)
+        {
+            AChanged?.Invoke(this, a);
+            RaisePropertyChanged(nameof(A));
+        }
+
+        /// <summary>
+        /// Called when the B has changed.
+        /// </summary>
+        protected virtual void OnBChanged(Double b)
+        {
+            BChanged?.Invoke(this, b);
+            RaisePropertyChanged(nameof(B));
+        }
+
+        /// <summary>
+        /// Called when the FactorPercent has changed.
+        /// </summary>
+        protected virtual void OnFactorPercentChanged(Int32 factorpercent)
+        {
+            FactorPercentChanged?.Invoke(this, factorpercent);
+            RaisePropertyChanged(nameof(FactorPercent));
+        }
+
+        /// <summary>
+        /// Called when the ColorProcessParameters has changed.
+        /// </summary>
+        protected virtual void OnColorProcessParametersChanged(ColorProcessParameter colorprocessparameters)
+        {
+            ColorProcessParametersChanged?.Invoke(this, colorprocessparameters);
+            RaisePropertyChanged(nameof(ColorProcessParameters));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorProcessFactorBase" /> class.
+        /// </summary>
+        public ColorProcessFactorBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorProcessParameter.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessParameter.cs
new file mode 100644
index 000000000..2a679227e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessParameter.cs
@@ -0,0 +1,32 @@
+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;
+using Tango.BL.Enumerations;
+
+namespace Tango.BL.Entities
+{
+    public class ColorProcessParameter: ColorProcessParameterBase
+    {
+        public ColorProcessParameter() : base()
+        {
+            WhitePointL = 92.1815;
+            WhitePointA = 2.2555;
+            WhitePointB = -10.9325;
+        }
+        public override void Delete(ObservablesContext context)
+        {
+            base.Delete(context);
+            
+            context.ColorProcessParameters.Remove(this);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorProcessParameterBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessParameterBase.cs
new file mode 100644
index 000000000..a5271b7da
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorProcessParameterBase.cs
@@ -0,0 +1,297 @@
+//------------------------------------------------------------------------------
+// <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("COLOR_PROCESS_PARAMETERS")]
+    public abstract class ColorProcessParameterBase : ObservableEntity<ColorProcessParameter>
+    {
+
+        public event EventHandler<Double> WhitePointLChanged;
+
+        public event EventHandler<Double> WhitePointAChanged;
+
+        public event EventHandler<Double> WhitePointBChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<ColorProcessData>> ColorProcessDataChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<ColorProcessFactor>> ColorProcessFactorChanged;
+
+        public event EventHandler<RmlsExtension> RmlsExtensionsChanged;
+
+        protected String _rmlsextensionsguid;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase rmls extensions guid.
+        /// </summary>
+
+        [Column("RMLS_EXTENSIONS_GUID")]
+        [ForeignKey("RmlsExtensions")]
+
+        public  String RmlsExtensionsGuid
+        {
+            get 
+            {
+                return _rmlsextensionsguid; 
+            }
+
+            set 
+            {
+                if (_rmlsextensionsguid != value)
+                {
+                    _rmlsextensionsguid = value;
+
+                }
+            }
+        }
+
+        protected Double _whitepointl;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase white point l.
+        /// </summary>
+
+        [Column("WHITE_POINT_L")]
+
+        public  Double WhitePointL
+        {
+            get 
+            {
+                return _whitepointl; 
+            }
+
+            set 
+            {
+                if (_whitepointl != value)
+                {
+                    _whitepointl = value;
+
+                    OnWhitePointLChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _whitepointa;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase white point a.
+        /// </summary>
+
+        [Column("WHITE_POINT_A")]
+
+        public  Double WhitePointA
+        {
+            get 
+            {
+                return _whitepointa; 
+            }
+
+            set 
+            {
+                if (_whitepointa != value)
+                {
+                    _whitepointa = value;
+
+                    OnWhitePointAChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _whitepointb;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase white point b.
+        /// </summary>
+
+        [Column("WHITE_POINT_B")]
+
+        public  Double WhitePointB
+        {
+            get 
+            {
+                return _whitepointb; 
+            }
+
+            set 
+            {
+                if (_whitepointb != value)
+                {
+                    _whitepointb = value;
+
+                    OnWhitePointBChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<ColorProcessData> _colorprocessdata;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase color process data.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<ColorProcessData> ColorProcessData
+        {
+            get 
+            {
+                return _colorprocessdata; 
+            }
+
+            set 
+            {
+                if (_colorprocessdata != value)
+                {
+                    _colorprocessdata = value;
+
+                    OnColorProcessDataChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<ColorProcessFactor> _colorprocessfactor;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase color process factor.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<ColorProcessFactor> ColorProcessFactor
+        {
+            get 
+            {
+                return _colorprocessfactor; 
+            }
+
+            set 
+            {
+                if (_colorprocessfactor != value)
+                {
+                    _colorprocessfactor = value;
+
+                    OnColorProcessFactorChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlsExtension _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the colorprocessparameterbase rmls extensions.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlsExtension RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    if (RmlsExtensions != null)
+                    {
+                        RmlsExtensionsGuid = RmlsExtensions.Guid;
+                    }
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the WhitePointL has changed.
+        /// </summary>
+        protected virtual void OnWhitePointLChanged(Double whitepointl)
+        {
+            WhitePointLChanged?.Invoke(this, whitepointl);
+            RaisePropertyChanged(nameof(WhitePointL));
+        }
+
+        /// <summary>
+        /// Called when the WhitePointA has changed.
+        /// </summary>
+        protected virtual void OnWhitePointAChanged(Double whitepointa)
+        {
+            WhitePointAChanged?.Invoke(this, whitepointa);
+            RaisePropertyChanged(nameof(WhitePointA));
+        }
+
+        /// <summary>
+        /// Called when the WhitePointB has changed.
+        /// </summary>
+        protected virtual void OnWhitePointBChanged(Double whitepointb)
+        {
+            WhitePointBChanged?.Invoke(this, whitepointb);
+            RaisePropertyChanged(nameof(WhitePointB));
+        }
+
+        /// <summary>
+        /// Called when the ColorProcessData has changed.
+        /// </summary>
+        protected virtual void OnColorProcessDataChanged(SynchronizedObservableCollection<ColorProcessData> colorprocessdata)
+        {
+            ColorProcessDataChanged?.Invoke(this, colorprocessdata);
+            RaisePropertyChanged(nameof(ColorProcessData));
+        }
+
+        /// <summary>
+        /// Called when the ColorProcessFactor has changed.
+        /// </summary>
+        protected virtual void OnColorProcessFactorChanged(SynchronizedObservableCollection<ColorProcessFactor> colorprocessfactor)
+        {
+            ColorProcessFactorChanged?.Invoke(this, colorprocessfactor);
+            RaisePropertyChanged(nameof(ColorProcessFactor));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(RmlsExtension rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorProcessParameterBase" /> class.
+        /// </summary>
+        public ColorProcessParameterBase() : base()
+        {
+
+            ColorProcessData = new SynchronizedObservableCollection<ColorProcessData>();
+
+            ColorProcessFactor = new SynchronizedObservableCollection<ColorProcessFactor>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index 8e07bcd8c..c922c5d1e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -135,6 +135,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<SynchronizedObservableCollection<ProcessParametersTablesGroup>> ProcessParametersTablesGroupsChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
         public event EventHandler<SynchronizedObservableCollection<RmlsSpool>> RmlsSpoolsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<SitesRml>> SitesRmlsChanged;
@@ -1866,6 +1868,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the rmlbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<RmlsSpool> _rmlsspools;
 
         /// <summary>
@@ -2403,6 +2430,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
         /// Called when the RmlsSpools has changed.
         /// </summary>
         protected virtual void OnRmlsSpoolsChanged(SynchronizedObservableCollection<RmlsSpool> rmlsspools)
@@ -2436,6 +2472,8 @@ namespace Tango.BL.Entities
 
             ProcessParametersTablesGroups = new SynchronizedObservableCollection<ProcessParametersTablesGroup>();
 
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
             RmlsSpools = new SynchronizedObservableCollection<RmlsSpool>();
 
             SitesRmls = new SynchronizedObservableCollection<SitesRml>();
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsExtension.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsExtension.cs
index bf326ad3a..9436ab48e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlsExtension.cs
@@ -1,13 +1,154 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Data.Entity;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
+using Tango.BL.Builders;
+using Tango.BL.Enumerations;
+using Tango.BL.Serialization;
 
 namespace Tango.BL.Entities
 {
     public class RmlsExtension : RmlsExtensionBase
     {
+        #region Name
+        protected override void OnYarnMaterialChanged(YarnMaterial yarnmaterial)
+        {
+            base.OnYarnMaterialChanged(yarnmaterial);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        protected override void OnYarnBrandChanged(YarnBrand yarnbrand)
+        {
+            base.OnYarnBrandChanged(yarnbrand);
+            RaisePropertyChanged(nameof(Name));
+        }
+        
+
+        [NotMapped]
+        [JsonIgnore]
+        public string Name
+        {
+            get
+            {
+                if (YarnManufacturer == null)
+                    return "";
+                StringBuilder sb = new StringBuilder(YarnManufacturer.Name);
+                if (YarnBrand != null && !String.IsNullOrEmpty(YarnBrand.Name))
+                    sb.Append("-" + YarnBrand.Name);
+                sb.Append("-" + LinearDensity.ToString());
+                return sb.ToString();
+            }
+
+        }
+        #endregion
+
+        #region Density count and Fiber count
+        protected override void OnUnitChanged(int unit)
+        {
+            base.OnUnitChanged(unit);
+            UpdateDencityCount();
+            UpdateFiberCount();
+        }
+
+        protected override void OnLinearDensityChanged(int lineardensity)
+        {
+            base.OnLinearDensityChanged(lineardensity);
+            UpdateDencityCount();
+            UpdateFiberCount();
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        protected override void OnFilamentCountChanged(int filamentcount)
+        {
+            base.OnFilamentCountChanged(filamentcount);
+            UpdateFiberCount();
+        }
+
+        private void UpdateDencityCount()
+        {
+            RaisePropertyChanged(nameof(DencityCount));
+        }
+
+        private void UpdateFiberCount()
+        {
+            RaisePropertyChanged(nameof(FiberCount));
+        }
+
+        [NotMapped]
+        [JsonIgnore]
+        public int DencityCount
+        {
+            get
+            {
+                if (YarnUnit.ToDescription() == "Tex")
+                    return Convert.ToInt32(LinearDensity) * 9;
+                if (YarnUnit.ToDescription() == "DTEX")
+                    return (int)(Convert.ToInt32(LinearDensity) * 0.9);
+                if (YarnUnit.ToDescription() == "Ne")
+                    return (int) (5315 / Convert.ToInt32(LinearDensity));
+                if (YarnUnit.ToDescription() == "Nm")
+                    return (int)(9000 / Convert.ToInt32(LinearDensity));
+                return 0;
+            }
+        }
+
+        [NotMapped]
+        [JsonIgnore]
+        public string FiberCount 
+        {
+            get
+            {
+                if (DencityCount == 0)
+                    return "";
+
+                var number = FilamentCount / DencityCount;
+                if (number < 1.0 && number >= 0.3)
+                    return "Micro";
+                if (number < 2.4 && number >= 1.0)
+                    return "Fine";
+                if (number <= 7.0 && number >= 2.4)
+                    return "Medium";
+                if ( number > 7.0)
+                    return "Coarse";
+                return "";
+            }
+        }
+        #endregion
+
+        #region value to enum conversion
+
+        [NotMapped]
+        [JsonIgnore]
+        public YarnUnits YarnUnit
+        {
+            get { return (YarnUnits)Unit; }
+            set { Unit = (int)value;
+                RaisePropertyChangedAuto();  }
+        }
+
+        [NotMapped]
+        [JsonIgnore]
+        public TwistDirections YarnTwistDirections
+        {
+            get { return (TwistDirections)TwistDirection; }
+            set { base.TwistDirection = (int?)value;
+                RaisePropertyChangedAuto(); }
+        }
+
+        [NotMapped]
+        [JsonIgnore]
+        public Plies YarnPlies
+        {
+            get { return (Plies)Plies; }
+            set { base.Plies = (int)value;
+                RaisePropertyChangedAuto(); }
+        }
+        #endregion
 
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs
index a87812638..54157c644 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs
@@ -27,80 +27,1866 @@ namespace Tango.BL.Entities
     public abstract class RmlsExtensionBase : ObservableEntity<RmlsExtension>
     {
 
-        public event EventHandler<String> NameChanged;
+        public event EventHandler<DateTime> CreatedChanged;
 
-        public event EventHandler<String> DescriptionChanged;
+        public event EventHandler<String> CountryChanged;
 
-        protected String _name;
+        public event EventHandler<Int32> LinearDensityChanged;
+
+        public event EventHandler<Int32> UnitChanged;
+
+        public event EventHandler<Int32> PliesChanged;
+
+        public event EventHandler<Int32> FilamentCountChanged;
+
+        public event EventHandler<Int32> TwistTpmChanged;
+
+        public event EventHandler<Nullable<Int32>> TwistDirectionChanged;
+
+        public event EventHandler<Nullable<Double>> MinElongationChanged;
+
+        public event EventHandler<Nullable<Double>> MaxElongationChanged;
+
+        public event EventHandler<Nullable<Double>> MinMaxForceNChanged;
+
+        public event EventHandler<Nullable<Double>> MaxMaxForceNChanged;
+
+        public event EventHandler<Nullable<Double>> MinElasticityChanged;
+
+        public event EventHandler<Nullable<Double>> MaxElasticityChanged;
+
+        public event EventHandler<Nullable<Double>> MinTenacityChanged;
+
+        public event EventHandler<Nullable<Double>> MaxTenacityChanged;
+
+        public event EventHandler<String> FinishingChanged;
+
+        public event EventHandler<String> FileNameChanged;
+
+        public event EventHandler<Byte[]> DataChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<ColorProcessParameter>> ColorProcessParametersChanged;
+
+        public event EventHandler<Rml> RmlChanged;
+
+        public event EventHandler<User> UserChanged;
+
+        public event EventHandler<YarnApplication> YarnApplicationsChanged;
+
+        public event EventHandler<YarnBrand> YarnBrandChanged;
+
+        public event EventHandler<YarnColor> YarnColorChanged;
+
+        public event EventHandler<YarnEndUse> YarnEndUseChanged;
+
+        public event EventHandler<YarnFamily> YarnFamilyChanged;
+
+        public event EventHandler<YarnGeometry> YarnGeometryChanged;
+
+        public event EventHandler<YarnGlossLevel> YarnGlossLevelChanged;
+
+        public event EventHandler<YarnGroup> YarnGroupChanged;
+
+        public event EventHandler<YarnIndustrysector> YarnIndustrysectorChanged;
+
+        public event EventHandler<YarnManufacturer> YarnManufacturerChanged;
+
+        public event EventHandler<YarnMaterial> YarnMaterialChanged;
+
+        public event EventHandler<YarnSubFamily> YarnSubFamilyChanged;
+
+        public event EventHandler<YarnTexturing> YarnTexturingChanged;
+
+        public event EventHandler<YarnType> YarnTypeChanged;
+
+        protected String _rmlguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase rml guid.
+        /// </summary>
+
+        [Column("RML_GUID")]
+        [ForeignKey("Rml")]
+
+        public  String RmlGuid
+        {
+            get 
+            {
+                return _rmlguid; 
+            }
+
+            set 
+            {
+                if (_rmlguid != value)
+                {
+                    _rmlguid = value;
+
+                }
+            }
+        }
+
+        protected String _userguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase user guid.
+        /// </summary>
+
+        [Column("USER_GUID")]
+        [ForeignKey("User")]
+
+        public  String UserGuid
+        {
+            get 
+            {
+                return _userguid; 
+            }
+
+            set 
+            {
+                if (_userguid != value)
+                {
+                    _userguid = value;
+
+                }
+            }
+        }
+
+        protected DateTime _created;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase created.
+        /// </summary>
+
+        [Column("CREATED")]
+
+        public  DateTime Created
+        {
+            get 
+            {
+                return _created; 
+            }
+
+            set 
+            {
+                if (_created != value)
+                {
+                    _created = value;
+
+                    OnCreatedChanged(value);
+
+                }
+            }
+        }
+
+        protected String _yarnmanufacturerguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn manufacturer guid.
+        /// </summary>
+
+        [Column("YARN_MANUFACTURER_GUID")]
+        [ForeignKey("YarnManufacturer")]
+
+        public  String YarnManufacturerGuid
+        {
+            get 
+            {
+                return _yarnmanufacturerguid; 
+            }
+
+            set 
+            {
+                if (_yarnmanufacturerguid != value)
+                {
+                    _yarnmanufacturerguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnbrandguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn brand guid.
+        /// </summary>
+
+        [Column("YARN_BRAND_GUID")]
+        [ForeignKey("YarnBrand")]
+
+        public  String YarnBrandGuid
+        {
+            get 
+            {
+                return _yarnbrandguid; 
+            }
+
+            set 
+            {
+                if (_yarnbrandguid != value)
+                {
+                    _yarnbrandguid = value;
+
+                }
+            }
+        }
+
+        protected String _country;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase country.
+        /// </summary>
+
+        [Column("COUNTRY")]
+
+        public  String Country
+        {
+            get 
+            {
+                return _country; 
+            }
+
+            set 
+            {
+                if (_country != value)
+                {
+                    _country = value;
+
+                    OnCountryChanged(value);
+
+                }
+            }
+        }
+
+        protected String _yarnenduseguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn end use guid.
+        /// </summary>
+
+        [Column("YARN_END_USE_GUID")]
+        [ForeignKey("YarnEndUse")]
+
+        public  String YarnEndUseGuid
+        {
+            get 
+            {
+                return _yarnenduseguid; 
+            }
+
+            set 
+            {
+                if (_yarnenduseguid != value)
+                {
+                    _yarnenduseguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnapplicationsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn applications guid.
+        /// </summary>
+
+        [Column("YARN_APPLICATIONS_GUID")]
+        [ForeignKey("YarnApplications")]
+
+        public  String YarnApplicationsGuid
+        {
+            get 
+            {
+                return _yarnapplicationsguid; 
+            }
+
+            set 
+            {
+                if (_yarnapplicationsguid != value)
+                {
+                    _yarnapplicationsguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnindustrysectorguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn industrysector guid.
+        /// </summary>
+
+        [Column("YARN_INDUSTRYSECTOR_GUID")]
+        [ForeignKey("YarnIndustrysector")]
+
+        public  String YarnIndustrysectorGuid
+        {
+            get 
+            {
+                return _yarnindustrysectorguid; 
+            }
+
+            set 
+            {
+                if (_yarnindustrysectorguid != value)
+                {
+                    _yarnindustrysectorguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnmaterialguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn material guid.
+        /// </summary>
+
+        [Column("YARN_MATERIAL_GUID")]
+        [ForeignKey("YarnMaterial")]
+
+        public  String YarnMaterialGuid
+        {
+            get 
+            {
+                return _yarnmaterialguid; 
+            }
+
+            set 
+            {
+                if (_yarnmaterialguid != value)
+                {
+                    _yarnmaterialguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarntypeguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn type guid.
+        /// </summary>
+
+        [Column("YARN_TYPE_GUID")]
+        [ForeignKey("YarnType")]
+
+        public  String YarnTypeGuid
+        {
+            get 
+            {
+                return _yarntypeguid; 
+            }
+
+            set 
+            {
+                if (_yarntypeguid != value)
+                {
+                    _yarntypeguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnfamilyguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn family guid.
+        /// </summary>
+
+        [Column("YARN_FAMILY_GUID")]
+        [ForeignKey("YarnFamily")]
+
+        public  String YarnFamilyGuid
+        {
+            get 
+            {
+                return _yarnfamilyguid; 
+            }
+
+            set 
+            {
+                if (_yarnfamilyguid != value)
+                {
+                    _yarnfamilyguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnsubfamilyguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn sub family guid.
+        /// </summary>
+
+        [Column("YARN_SUB_FAMILY_GUID")]
+        [ForeignKey("YarnSubFamily")]
+
+        public  String YarnSubFamilyGuid
+        {
+            get 
+            {
+                return _yarnsubfamilyguid; 
+            }
+
+            set 
+            {
+                if (_yarnsubfamilyguid != value)
+                {
+                    _yarnsubfamilyguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarngroupguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn group guid.
+        /// </summary>
+
+        [Column("YARN_GROUP_GUID")]
+        [ForeignKey("YarnGroup")]
+
+        public  String YarnGroupGuid
+        {
+            get 
+            {
+                return _yarngroupguid; 
+            }
+
+            set 
+            {
+                if (_yarngroupguid != value)
+                {
+                    _yarngroupguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarntexturingguid;
 
         /// <summary>
-        /// Gets or sets the rmlsextensionbase name.
+        /// Gets or sets the rmlsextensionbase yarn texturing guid.
         /// </summary>
 
-        [Column("NAME")]
+        [Column("YARN_TEXTURING_GUID")]
+        [ForeignKey("YarnTexturing")]
 
-        public  String Name
+        public  String YarnTexturingGuid
         {
             get 
             {
-                return _name; 
+                return _yarntexturingguid; 
             }
 
             set 
             {
-                if (_name != value)
+                if (_yarntexturingguid != value)
                 {
-                    _name = value;
+                    _yarntexturingguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarngeometryguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn geometry guid.
+        /// </summary>
+
+        [Column("YARN_GEOMETRY_GUID")]
+        [ForeignKey("YarnGeometry")]
 
-                    OnNameChanged(value);
+        public  String YarnGeometryGuid
+        {
+            get 
+            {
+                return _yarngeometryguid; 
+            }
+
+            set 
+            {
+                if (_yarngeometryguid != value)
+                {
+                    _yarngeometryguid = value;
 
                 }
             }
         }
 
-        protected String _description;
+        protected String _yarncolorguid;
 
         /// <summary>
-        /// Gets or sets the rmlsextensionbase description.
+        /// Gets or sets the rmlsextensionbase yarn color guid.
         /// </summary>
 
-        [Column("DESCRIPTION")]
+        [Column("YARN_COLOR_GUID")]
+        [ForeignKey("YarnColor")]
 
-        public  String Description
+        public  String YarnColorGuid
         {
             get 
             {
-                return _description; 
+                return _yarncolorguid; 
             }
 
             set 
             {
-                if (_description != value)
+                if (_yarncolorguid != value)
                 {
-                    _description = value;
+                    _yarncolorguid = value;
+
+                }
+            }
+        }
+
+        protected String _yarnglosslevelguid;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn gloss level guid.
+        /// </summary>
+
+        [Column("YARN_GLOSS_LEVEL_GUID")]
+        [ForeignKey("YarnGlossLevel")]
 
-                    OnDescriptionChanged(value);
+        public  String YarnGlossLevelGuid
+        {
+            get 
+            {
+                return _yarnglosslevelguid; 
+            }
+
+            set 
+            {
+                if (_yarnglosslevelguid != value)
+                {
+                    _yarnglosslevelguid = value;
 
                 }
             }
         }
 
+        protected Int32 _lineardensity;
+
         /// <summary>
-        /// Called when the Name has changed.
+        /// Gets or sets the rmlsextensionbase linear density.
         /// </summary>
-        protected virtual void OnNameChanged(String name)
+
+        [Column("LINEAR_DENSITY")]
+
+        public  Int32 LinearDensity
         {
-            NameChanged?.Invoke(this, name);
-            RaisePropertyChanged(nameof(Name));
+            get 
+            {
+                return _lineardensity; 
+            }
+
+            set 
+            {
+                if (_lineardensity != value)
+                {
+                    _lineardensity = value;
+
+                    OnLinearDensityChanged(value);
+
+                }
+            }
         }
 
+        protected Int32 _unit;
+
         /// <summary>
-        /// Called when the Description has changed.
+        /// Gets or sets the rmlsextensionbase unit.
         /// </summary>
-        protected virtual void OnDescriptionChanged(String description)
+
+        [Column("UNIT")]
+
+        public  Int32 Unit
         {
-            DescriptionChanged?.Invoke(this, description);
-            RaisePropertyChanged(nameof(Description));
+            get 
+            {
+                return _unit; 
+            }
+
+            set 
+            {
+                if (_unit != value)
+                {
+                    _unit = value;
+
+                    OnUnitChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _plies;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase plies.
+        /// </summary>
+
+        [Column("PLIES")]
+
+        public  Int32 Plies
+        {
+            get 
+            {
+                return _plies; 
+            }
+
+            set 
+            {
+                if (_plies != value)
+                {
+                    _plies = value;
+
+                    OnPliesChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _filamentcount;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase filament count.
+        /// </summary>
+
+        [Column("FILAMENT_COUNT")]
+
+        public  Int32 FilamentCount
+        {
+            get 
+            {
+                return _filamentcount; 
+            }
+
+            set 
+            {
+                if (_filamentcount != value)
+                {
+                    _filamentcount = value;
+
+                    OnFilamentCountChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _twisttpm;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase twist tpm.
+        /// </summary>
+
+        [Column("TWIST_TPM")]
+
+        public  Int32 TwistTpm
+        {
+            get 
+            {
+                return _twisttpm; 
+            }
+
+            set 
+            {
+                if (_twisttpm != value)
+                {
+                    _twisttpm = value;
+
+                    OnTwistTpmChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Int32> _twistdirection;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase twist direction.
+        /// </summary>
+
+        [Column("TWIST_DIRECTION")]
+
+        public  Nullable<Int32> TwistDirection
+        {
+            get 
+            {
+                return _twistdirection; 
+            }
+
+            set 
+            {
+                if (_twistdirection != value)
+                {
+                    _twistdirection = value;
+
+                    OnTwistDirectionChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _minelongation;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase min elongation.
+        /// </summary>
+
+        [Column("MIN_ELONGATION")]
+
+        public  Nullable<Double> MinElongation
+        {
+            get 
+            {
+                return _minelongation; 
+            }
+
+            set 
+            {
+                if (_minelongation != value)
+                {
+                    _minelongation = value;
+
+                    OnMinElongationChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _maxelongation;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase max elongation.
+        /// </summary>
+
+        [Column("MAX_ELONGATION")]
+
+        public  Nullable<Double> MaxElongation
+        {
+            get 
+            {
+                return _maxelongation; 
+            }
+
+            set 
+            {
+                if (_maxelongation != value)
+                {
+                    _maxelongation = value;
+
+                    OnMaxElongationChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _minmaxforcen;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase min max force n.
+        /// </summary>
+
+        [Column("MIN_MAX_FORCE_N")]
+
+        public  Nullable<Double> MinMaxForceN
+        {
+            get 
+            {
+                return _minmaxforcen; 
+            }
+
+            set 
+            {
+                if (_minmaxforcen != value)
+                {
+                    _minmaxforcen = value;
+
+                    OnMinMaxForceNChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _maxmaxforcen;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase max max force n.
+        /// </summary>
+
+        [Column("MAX_MAX_FORCE_N")]
+
+        public  Nullable<Double> MaxMaxForceN
+        {
+            get 
+            {
+                return _maxmaxforcen; 
+            }
+
+            set 
+            {
+                if (_maxmaxforcen != value)
+                {
+                    _maxmaxforcen = value;
+
+                    OnMaxMaxForceNChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _minelasticity;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase min elasticity.
+        /// </summary>
+
+        [Column("MIN_ELASTICITY")]
+
+        public  Nullable<Double> MinElasticity
+        {
+            get 
+            {
+                return _minelasticity; 
+            }
+
+            set 
+            {
+                if (_minelasticity != value)
+                {
+                    _minelasticity = value;
+
+                    OnMinElasticityChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _maxelasticity;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase max elasticity.
+        /// </summary>
+
+        [Column("MAX_ELASTICITY")]
+
+        public  Nullable<Double> MaxElasticity
+        {
+            get 
+            {
+                return _maxelasticity; 
+            }
+
+            set 
+            {
+                if (_maxelasticity != value)
+                {
+                    _maxelasticity = value;
+
+                    OnMaxElasticityChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _mintenacity;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase min tenacity.
+        /// </summary>
+
+        [Column("MIN_TENACITY")]
+
+        public  Nullable<Double> MinTenacity
+        {
+            get 
+            {
+                return _mintenacity; 
+            }
+
+            set 
+            {
+                if (_mintenacity != value)
+                {
+                    _mintenacity = value;
+
+                    OnMinTenacityChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _maxtenacity;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase max tenacity.
+        /// </summary>
+
+        [Column("MAX_TENACITY")]
+
+        public  Nullable<Double> MaxTenacity
+        {
+            get 
+            {
+                return _maxtenacity; 
+            }
+
+            set 
+            {
+                if (_maxtenacity != value)
+                {
+                    _maxtenacity = value;
+
+                    OnMaxTenacityChanged(value);
+
+                }
+            }
+        }
+
+        protected String _finishing;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase finishing.
+        /// </summary>
+
+        [Column("FINISHING")]
+
+        public  String Finishing
+        {
+            get 
+            {
+                return _finishing; 
+            }
+
+            set 
+            {
+                if (_finishing != value)
+                {
+                    _finishing = value;
+
+                    OnFinishingChanged(value);
+
+                }
+            }
+        }
+
+        protected String _filename;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase file name.
+        /// </summary>
+
+        [Column("FILE_NAME")]
+
+        public  String FileName
+        {
+            get 
+            {
+                return _filename; 
+            }
+
+            set 
+            {
+                if (_filename != value)
+                {
+                    _filename = value;
+
+                    OnFileNameChanged(value);
+
+                }
+            }
+        }
+
+        protected Byte[] _data;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase data.
+        /// </summary>
+
+        [Column("DATA")]
+
+        public  Byte[] Data
+        {
+            get 
+            {
+                return _data; 
+            }
+
+            set 
+            {
+                if (_data != value)
+                {
+                    _data = value;
+
+                    OnDataChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<ColorProcessParameter> _colorprocessparameters;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase color process parameters.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<ColorProcessParameter> ColorProcessParameters
+        {
+            get 
+            {
+                return _colorprocessparameters; 
+            }
+
+            set 
+            {
+                if (_colorprocessparameters != value)
+                {
+                    _colorprocessparameters = value;
+
+                    OnColorProcessParametersChanged(value);
+
+                }
+            }
+        }
+
+        protected Rml _rml;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase rml.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Rml Rml
+        {
+            get 
+            {
+                return _rml; 
+            }
+
+            set 
+            {
+                if (_rml != value)
+                {
+                    _rml = value;
+
+                    if (Rml != null)
+                    {
+                        RmlGuid = Rml.Guid;
+                    }
+
+                    OnRmlChanged(value);
+
+                }
+            }
+        }
+
+        protected User _user;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase user.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual User User
+        {
+            get 
+            {
+                return _user; 
+            }
+
+            set 
+            {
+                if (_user != value)
+                {
+                    _user = value;
+
+                    if (User != null)
+                    {
+                        UserGuid = User.Guid;
+                    }
+
+                    OnUserChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnApplication _yarnapplications;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn applications.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnApplication YarnApplications
+        {
+            get 
+            {
+                return _yarnapplications; 
+            }
+
+            set 
+            {
+                if (_yarnapplications != value)
+                {
+                    _yarnapplications = value;
+
+                    if (YarnApplications != null)
+                    {
+                        YarnApplicationsGuid = YarnApplications.Guid;
+                    }
+
+                    OnYarnApplicationsChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnBrand _yarnbrand;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn brand.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnBrand YarnBrand
+        {
+            get 
+            {
+                return _yarnbrand; 
+            }
+
+            set 
+            {
+                if (_yarnbrand != value)
+                {
+                    _yarnbrand = value;
+
+                    if (YarnBrand != null)
+                    {
+                        YarnBrandGuid = YarnBrand.Guid;
+                    }
+
+                    OnYarnBrandChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnColor _yarncolor;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn color.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnColor YarnColor
+        {
+            get 
+            {
+                return _yarncolor; 
+            }
+
+            set 
+            {
+                if (_yarncolor != value)
+                {
+                    _yarncolor = value;
+
+                    if (YarnColor != null)
+                    {
+                        YarnColorGuid = YarnColor.Guid;
+                    }
+
+                    OnYarnColorChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnEndUse _yarnenduse;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn end use.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnEndUse YarnEndUse
+        {
+            get 
+            {
+                return _yarnenduse; 
+            }
+
+            set 
+            {
+                if (_yarnenduse != value)
+                {
+                    _yarnenduse = value;
+
+                    if (YarnEndUse != null)
+                    {
+                        YarnEndUseGuid = YarnEndUse.Guid;
+                    }
+
+                    OnYarnEndUseChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnFamily _yarnfamily;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn family.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnFamily YarnFamily
+        {
+            get 
+            {
+                return _yarnfamily; 
+            }
+
+            set 
+            {
+                if (_yarnfamily != value)
+                {
+                    _yarnfamily = value;
+
+                    if (YarnFamily != null)
+                    {
+                        YarnFamilyGuid = YarnFamily.Guid;
+                    }
+
+                    OnYarnFamilyChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnGeometry _yarngeometry;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn geometry.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnGeometry YarnGeometry
+        {
+            get 
+            {
+                return _yarngeometry; 
+            }
+
+            set 
+            {
+                if (_yarngeometry != value)
+                {
+                    _yarngeometry = value;
+
+                    if (YarnGeometry != null)
+                    {
+                        YarnGeometryGuid = YarnGeometry.Guid;
+                    }
+
+                    OnYarnGeometryChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnGlossLevel _yarnglosslevel;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn gloss level.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnGlossLevel YarnGlossLevel
+        {
+            get 
+            {
+                return _yarnglosslevel; 
+            }
+
+            set 
+            {
+                if (_yarnglosslevel != value)
+                {
+                    _yarnglosslevel = value;
+
+                    if (YarnGlossLevel != null)
+                    {
+                        YarnGlossLevelGuid = YarnGlossLevel.Guid;
+                    }
+
+                    OnYarnGlossLevelChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnGroup _yarngroup;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn group.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnGroup YarnGroup
+        {
+            get 
+            {
+                return _yarngroup; 
+            }
+
+            set 
+            {
+                if (_yarngroup != value)
+                {
+                    _yarngroup = value;
+
+                    if (YarnGroup != null)
+                    {
+                        YarnGroupGuid = YarnGroup.Guid;
+                    }
+
+                    OnYarnGroupChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnIndustrysector _yarnindustrysector;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn industrysector.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnIndustrysector YarnIndustrysector
+        {
+            get 
+            {
+                return _yarnindustrysector; 
+            }
+
+            set 
+            {
+                if (_yarnindustrysector != value)
+                {
+                    _yarnindustrysector = value;
+
+                    if (YarnIndustrysector != null)
+                    {
+                        YarnIndustrysectorGuid = YarnIndustrysector.Guid;
+                    }
+
+                    OnYarnIndustrysectorChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnManufacturer _yarnmanufacturer;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn manufacturer.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnManufacturer YarnManufacturer
+        {
+            get 
+            {
+                return _yarnmanufacturer; 
+            }
+
+            set 
+            {
+                if (_yarnmanufacturer != value)
+                {
+                    _yarnmanufacturer = value;
+
+                    if (YarnManufacturer != null)
+                    {
+                        YarnManufacturerGuid = YarnManufacturer.Guid;
+                    }
+
+                    OnYarnManufacturerChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnMaterial _yarnmaterial;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn materials.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnMaterial YarnMaterial
+        {
+            get 
+            {
+                return _yarnmaterial; 
+            }
+
+            set 
+            {
+                if (_yarnmaterial != value)
+                {
+                    _yarnmaterial = value;
+
+                    if (YarnMaterial != null)
+                    {
+                        YarnMaterialGuid = YarnMaterial.Guid;
+                    }
+
+                    OnYarnMaterialChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnSubFamily _yarnsubfamily;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn sub family.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnSubFamily YarnSubFamily
+        {
+            get 
+            {
+                return _yarnsubfamily; 
+            }
+
+            set 
+            {
+                if (_yarnsubfamily != value)
+                {
+                    _yarnsubfamily = value;
+
+                    if (YarnSubFamily != null)
+                    {
+                        YarnSubFamilyGuid = YarnSubFamily.Guid;
+                    }
+
+                    OnYarnSubFamilyChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnTexturing _yarntexturing;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn texturing.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnTexturing YarnTexturing
+        {
+            get 
+            {
+                return _yarntexturing; 
+            }
+
+            set 
+            {
+                if (_yarntexturing != value)
+                {
+                    _yarntexturing = value;
+
+                    if (YarnTexturing != null)
+                    {
+                        YarnTexturingGuid = YarnTexturing.Guid;
+                    }
+
+                    OnYarnTexturingChanged(value);
+
+                }
+            }
+        }
+
+        protected YarnType _yarntype;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase yarn type.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual YarnType YarnType
+        {
+            get 
+            {
+                return _yarntype; 
+            }
+
+            set 
+            {
+                if (_yarntype != value)
+                {
+                    _yarntype = value;
+
+                    if (YarnType != null)
+                    {
+                        YarnTypeGuid = YarnType.Guid;
+                    }
+
+                    OnYarnTypeChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Created has changed.
+        /// </summary>
+        protected virtual void OnCreatedChanged(DateTime created)
+        {
+            CreatedChanged?.Invoke(this, created);
+            RaisePropertyChanged(nameof(Created));
+        }
+
+        /// <summary>
+        /// Called when the Country has changed.
+        /// </summary>
+        protected virtual void OnCountryChanged(String country)
+        {
+            CountryChanged?.Invoke(this, country);
+            RaisePropertyChanged(nameof(Country));
+        }
+
+        /// <summary>
+        /// Called when the LinearDensity has changed.
+        /// </summary>
+        protected virtual void OnLinearDensityChanged(Int32 lineardensity)
+        {
+            LinearDensityChanged?.Invoke(this, lineardensity);
+            RaisePropertyChanged(nameof(LinearDensity));
+        }
+
+        /// <summary>
+        /// Called when the Unit has changed.
+        /// </summary>
+        protected virtual void OnUnitChanged(Int32 unit)
+        {
+            UnitChanged?.Invoke(this, unit);
+            RaisePropertyChanged(nameof(Unit));
+        }
+
+        /// <summary>
+        /// Called when the Plies has changed.
+        /// </summary>
+        protected virtual void OnPliesChanged(Int32 plies)
+        {
+            PliesChanged?.Invoke(this, plies);
+            RaisePropertyChanged(nameof(Plies));
+        }
+
+        /// <summary>
+        /// Called when the FilamentCount has changed.
+        /// </summary>
+        protected virtual void OnFilamentCountChanged(Int32 filamentcount)
+        {
+            FilamentCountChanged?.Invoke(this, filamentcount);
+            RaisePropertyChanged(nameof(FilamentCount));
+        }
+
+        /// <summary>
+        /// Called when the TwistTpm has changed.
+        /// </summary>
+        protected virtual void OnTwistTpmChanged(Int32 twisttpm)
+        {
+            TwistTpmChanged?.Invoke(this, twisttpm);
+            RaisePropertyChanged(nameof(TwistTpm));
+        }
+
+        /// <summary>
+        /// Called when the TwistDirection has changed.
+        /// </summary>
+        protected virtual void OnTwistDirectionChanged(Nullable<Int32> twistdirection)
+        {
+            TwistDirectionChanged?.Invoke(this, twistdirection);
+            RaisePropertyChanged(nameof(TwistDirection));
+        }
+
+        /// <summary>
+        /// Called when the MinElongation has changed.
+        /// </summary>
+        protected virtual void OnMinElongationChanged(Nullable<Double> minelongation)
+        {
+            MinElongationChanged?.Invoke(this, minelongation);
+            RaisePropertyChanged(nameof(MinElongation));
+        }
+
+        /// <summary>
+        /// Called when the MaxElongation has changed.
+        /// </summary>
+        protected virtual void OnMaxElongationChanged(Nullable<Double> maxelongation)
+        {
+            MaxElongationChanged?.Invoke(this, maxelongation);
+            RaisePropertyChanged(nameof(MaxElongation));
+        }
+
+        /// <summary>
+        /// Called when the MinMaxForceN has changed.
+        /// </summary>
+        protected virtual void OnMinMaxForceNChanged(Nullable<Double> minmaxforcen)
+        {
+            MinMaxForceNChanged?.Invoke(this, minmaxforcen);
+            RaisePropertyChanged(nameof(MinMaxForceN));
+        }
+
+        /// <summary>
+        /// Called when the MaxMaxForceN has changed.
+        /// </summary>
+        protected virtual void OnMaxMaxForceNChanged(Nullable<Double> maxmaxforcen)
+        {
+            MaxMaxForceNChanged?.Invoke(this, maxmaxforcen);
+            RaisePropertyChanged(nameof(MaxMaxForceN));
+        }
+
+        /// <summary>
+        /// Called when the MinElasticity has changed.
+        /// </summary>
+        protected virtual void OnMinElasticityChanged(Nullable<Double> minelasticity)
+        {
+            MinElasticityChanged?.Invoke(this, minelasticity);
+            RaisePropertyChanged(nameof(MinElasticity));
+        }
+
+        /// <summary>
+        /// Called when the MaxElasticity has changed.
+        /// </summary>
+        protected virtual void OnMaxElasticityChanged(Nullable<Double> maxelasticity)
+        {
+            MaxElasticityChanged?.Invoke(this, maxelasticity);
+            RaisePropertyChanged(nameof(MaxElasticity));
+        }
+
+        /// <summary>
+        /// Called when the MinTenacity has changed.
+        /// </summary>
+        protected virtual void OnMinTenacityChanged(Nullable<Double> mintenacity)
+        {
+            MinTenacityChanged?.Invoke(this, mintenacity);
+            RaisePropertyChanged(nameof(MinTenacity));
+        }
+
+        /// <summary>
+        /// Called when the MaxTenacity has changed.
+        /// </summary>
+        protected virtual void OnMaxTenacityChanged(Nullable<Double> maxtenacity)
+        {
+            MaxTenacityChanged?.Invoke(this, maxtenacity);
+            RaisePropertyChanged(nameof(MaxTenacity));
+        }
+
+        /// <summary>
+        /// Called when the Finishing has changed.
+        /// </summary>
+        protected virtual void OnFinishingChanged(String finishing)
+        {
+            FinishingChanged?.Invoke(this, finishing);
+            RaisePropertyChanged(nameof(Finishing));
+        }
+
+        /// <summary>
+        /// Called when the FileName has changed.
+        /// </summary>
+        protected virtual void OnFileNameChanged(String filename)
+        {
+            FileNameChanged?.Invoke(this, filename);
+            RaisePropertyChanged(nameof(FileName));
+        }
+
+        /// <summary>
+        /// Called when the Data has changed.
+        /// </summary>
+        protected virtual void OnDataChanged(Byte[] data)
+        {
+            DataChanged?.Invoke(this, data);
+            RaisePropertyChanged(nameof(Data));
+        }
+
+        /// <summary>
+        /// Called when the ColorProcessParameters has changed.
+        /// </summary>
+        protected virtual void OnColorProcessParametersChanged(SynchronizedObservableCollection<ColorProcessParameter> colorprocessparameters)
+        {
+            ColorProcessParametersChanged?.Invoke(this, colorprocessparameters);
+            RaisePropertyChanged(nameof(ColorProcessParameters));
+        }
+
+        /// <summary>
+        /// Called when the Rml has changed.
+        /// </summary>
+        protected virtual void OnRmlChanged(Rml rml)
+        {
+            RmlChanged?.Invoke(this, rml);
+            RaisePropertyChanged(nameof(Rml));
+        }
+
+        /// <summary>
+        /// Called when the User has changed.
+        /// </summary>
+        protected virtual void OnUserChanged(User user)
+        {
+            UserChanged?.Invoke(this, user);
+            RaisePropertyChanged(nameof(User));
+        }
+
+        /// <summary>
+        /// Called when the YarnApplications has changed.
+        /// </summary>
+        protected virtual void OnYarnApplicationsChanged(YarnApplication yarnapplications)
+        {
+            YarnApplicationsChanged?.Invoke(this, yarnapplications);
+            RaisePropertyChanged(nameof(YarnApplications));
+        }
+
+        /// <summary>
+        /// Called when the YarnBrand has changed.
+        /// </summary>
+        protected virtual void OnYarnBrandChanged(YarnBrand yarnbrand)
+        {
+            YarnBrandChanged?.Invoke(this, yarnbrand);
+            RaisePropertyChanged(nameof(YarnBrand));
+        }
+
+        /// <summary>
+        /// Called when the YarnColor has changed.
+        /// </summary>
+        protected virtual void OnYarnColorChanged(YarnColor yarncolor)
+        {
+            YarnColorChanged?.Invoke(this, yarncolor);
+            RaisePropertyChanged(nameof(YarnColor));
+        }
+
+        /// <summary>
+        /// Called when the YarnEndUse has changed.
+        /// </summary>
+        protected virtual void OnYarnEndUseChanged(YarnEndUse yarnenduse)
+        {
+            YarnEndUseChanged?.Invoke(this, yarnenduse);
+            RaisePropertyChanged(nameof(YarnEndUse));
+        }
+
+        /// <summary>
+        /// Called when the YarnFamily has changed.
+        /// </summary>
+        protected virtual void OnYarnFamilyChanged(YarnFamily yarnfamily)
+        {
+            YarnFamilyChanged?.Invoke(this, yarnfamily);
+            RaisePropertyChanged(nameof(YarnFamily));
+        }
+
+        /// <summary>
+        /// Called when the YarnGeometry has changed.
+        /// </summary>
+        protected virtual void OnYarnGeometryChanged(YarnGeometry yarngeometry)
+        {
+            YarnGeometryChanged?.Invoke(this, yarngeometry);
+            RaisePropertyChanged(nameof(YarnGeometry));
+        }
+
+        /// <summary>
+        /// Called when the YarnGlossLevel has changed.
+        /// </summary>
+        protected virtual void OnYarnGlossLevelChanged(YarnGlossLevel yarnglosslevel)
+        {
+            YarnGlossLevelChanged?.Invoke(this, yarnglosslevel);
+            RaisePropertyChanged(nameof(YarnGlossLevel));
+        }
+
+        /// <summary>
+        /// Called when the YarnGroup has changed.
+        /// </summary>
+        protected virtual void OnYarnGroupChanged(YarnGroup yarngroup)
+        {
+            YarnGroupChanged?.Invoke(this, yarngroup);
+            RaisePropertyChanged(nameof(YarnGroup));
+        }
+
+        /// <summary>
+        /// Called when the YarnIndustrysector has changed.
+        /// </summary>
+        protected virtual void OnYarnIndustrysectorChanged(YarnIndustrysector yarnindustrysector)
+        {
+            YarnIndustrysectorChanged?.Invoke(this, yarnindustrysector);
+            RaisePropertyChanged(nameof(YarnIndustrysector));
+        }
+
+        /// <summary>
+        /// Called when the YarnManufacturer has changed.
+        /// </summary>
+        protected virtual void OnYarnManufacturerChanged(YarnManufacturer yarnmanufacturer)
+        {
+            YarnManufacturerChanged?.Invoke(this, yarnmanufacturer);
+            RaisePropertyChanged(nameof(YarnManufacturer));
+        }
+
+        /// <summary>
+        /// Called when the YarnMaterial has changed.
+        /// </summary>
+        protected virtual void OnYarnMaterialChanged(YarnMaterial yarnmaterial)
+        {
+            YarnMaterialChanged?.Invoke(this, yarnmaterial);
+            RaisePropertyChanged(nameof(YarnMaterial));
+        }
+
+        /// <summary>
+        /// Called when the YarnSubFamily has changed.
+        /// </summary>
+        protected virtual void OnYarnSubFamilyChanged(YarnSubFamily yarnsubfamily)
+        {
+            YarnSubFamilyChanged?.Invoke(this, yarnsubfamily);
+            RaisePropertyChanged(nameof(YarnSubFamily));
+        }
+
+        /// <summary>
+        /// Called when the YarnTexturing has changed.
+        /// </summary>
+        protected virtual void OnYarnTexturingChanged(YarnTexturing yarntexturing)
+        {
+            YarnTexturingChanged?.Invoke(this, yarntexturing);
+            RaisePropertyChanged(nameof(YarnTexturing));
+        }
+
+        /// <summary>
+        /// Called when the YarnType has changed.
+        /// </summary>
+        protected virtual void OnYarnTypeChanged(YarnType yarntype)
+        {
+            YarnTypeChanged?.Invoke(this, yarntype);
+            RaisePropertyChanged(nameof(YarnType));
         }
 
         /// <summary>
@@ -108,6 +1894,9 @@ namespace Tango.BL.Entities
         /// </summary>
         public RmlsExtensionBase() : base()
         {
+
+            ColorProcessParameters = new SynchronizedObservableCollection<ColorProcessParameter>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs
index eb6eae4f7..29981fd75 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs
@@ -53,6 +53,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Organization> OrganizationChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
         public event EventHandler<SynchronizedObservableCollection<TangoVersion>> TangoVersionsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<UsersRole>> UsersRolesChanged;
@@ -491,6 +493,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the userbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<TangoVersion> _tangoversions;
 
         /// <summary>
@@ -659,6 +686,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
         /// Called when the TangoVersions has changed.
         /// </summary>
         protected virtual void OnTangoVersionsChanged(SynchronizedObservableCollection<TangoVersion> tangoversions)
@@ -692,6 +728,8 @@ namespace Tango.BL.Entities
 
             MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>();
 
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
             TangoVersions = new SynchronizedObservableCollection<TangoVersion>();
 
             UsersRoles = new SynchronizedObservableCollection<UsersRole>();
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnApplication.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnApplication.cs
new file mode 100644
index 000000000..86bc38932
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnApplication.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnApplication: YarnApplicationBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnApplicationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnApplicationBase.cs
new file mode 100644
index 000000000..ec74bfbbb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnApplicationBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_APPLICATIONS")]
+    public abstract class YarnApplicationBase : ObservableEntity<YarnApplication>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnapplicationbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnapplicationbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnApplicationBase" /> class.
+        /// </summary>
+        public YarnApplicationBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnBrand.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnBrand.cs
new file mode 100644
index 000000000..dbf5b5e95
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnBrand.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnBrand: YarnBrandBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnBrandBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnBrandBase.cs
new file mode 100644
index 000000000..5f743da43
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnBrandBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_BRAND")]
+    public abstract class YarnBrandBase : ObservableEntity<YarnBrand>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnbrandbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnbrandbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnBrandBase" /> class.
+        /// </summary>
+        public YarnBrandBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnColor.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnColor.cs
new file mode 100644
index 000000000..eb35a37fc
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnColor.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnColor : YarnColorBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnColorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnColorBase.cs
new file mode 100644
index 000000000..e92628012
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnColorBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_COLOR")]
+    public abstract class YarnColorBase : ObservableEntity<YarnColor>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarncolorbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarncolorbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnColorBase" /> class.
+        /// </summary>
+        public YarnColorBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnEndUse.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnEndUse.cs
new file mode 100644
index 000000000..a01f95fd5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnEndUse.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnEndUse : YarnEndUseBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnEndUseBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnEndUseBase.cs
new file mode 100644
index 000000000..25c51eacd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnEndUseBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_END_USE")]
+    public abstract class YarnEndUseBase : ObservableEntity<YarnEndUse>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnendusebase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnendusebase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnEndUseBase" /> class.
+        /// </summary>
+        public YarnEndUseBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnFamily.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnFamily.cs
new file mode 100644
index 000000000..f3b9383fd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnFamily.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnFamily : YarnFamilyBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnFamilyBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnFamilyBase.cs
new file mode 100644
index 000000000..7dd46677e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnFamilyBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_FAMILY")]
+    public abstract class YarnFamilyBase : ObservableEntity<YarnFamily>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnfamilybase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnfamilybase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnFamilyBase" /> class.
+        /// </summary>
+        public YarnFamilyBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnGeometry.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnGeometry.cs
new file mode 100644
index 000000000..3028558a6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnGeometry.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnGeometry : YarnGeometryBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnGeometryBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnGeometryBase.cs
new file mode 100644
index 000000000..7ee00b957
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnGeometryBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_GEOMETRY")]
+    public abstract class YarnGeometryBase : ObservableEntity<YarnGeometry>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarngeometrybase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarngeometrybase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnGeometryBase" /> class.
+        /// </summary>
+        public YarnGeometryBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnGlossLevel.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnGlossLevel.cs
new file mode 100644
index 000000000..9d368c2e4
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnGlossLevel.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnGlossLevel : YarnGlossLevelBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnGlossLevelBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnGlossLevelBase.cs
new file mode 100644
index 000000000..ed87750e7
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnGlossLevelBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_GLOSS_LEVEL")]
+    public abstract class YarnGlossLevelBase : ObservableEntity<YarnGlossLevel>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnglosslevelbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnglosslevelbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnGlossLevelBase" /> class.
+        /// </summary>
+        public YarnGlossLevelBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnGroup.cs
new file mode 100644
index 000000000..bd021a09b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnGroup.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnGroup : YarnGroupBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnGroupBase.cs
new file mode 100644
index 000000000..bc07ba6b2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnGroupBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_GROUP")]
+    public abstract class YarnGroupBase : ObservableEntity<YarnGroup>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarngroupbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarngroupbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnGroupBase" /> class.
+        /// </summary>
+        public YarnGroupBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnIndustrysector.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnIndustrysector.cs
new file mode 100644
index 000000000..00e9e6401
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnIndustrysector.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class YarnIndustrysector : YarnIndustrysectorBase
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnIndustrysectorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnIndustrysectorBase.cs
new file mode 100644
index 000000000..f807ae88e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnIndustrysectorBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_INDUSTRYSECTOR")]
+    public abstract class YarnIndustrysectorBase : ObservableEntity<YarnIndustrysector>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnindustrysectorbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnindustrysectorbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnIndustrysectorBase" /> class.
+        /// </summary>
+        public YarnIndustrysectorBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnManufacturer.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnManufacturer.cs
new file mode 100644
index 000000000..3c0b4384e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnManufacturer.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnManufacturer : YarnManufacturerBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnManufacturerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnManufacturerBase.cs
new file mode 100644
index 000000000..d119e54b2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnManufacturerBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_MANUFACTURER")]
+    public abstract class YarnManufacturerBase : ObservableEntity<YarnManufacturer>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnmanufacturerbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnmanufacturerbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnManufacturerBase" /> class.
+        /// </summary>
+        public YarnManufacturerBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnMaterial.cs
new file mode 100644
index 000000000..508dda1f2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnMaterial.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnMaterial : YarnMaterialBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnMaterialBase.cs
new file mode 100644
index 000000000..8c4de2cca
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnMaterialBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_MATERIALS")]
+    public abstract class YarnMaterialBase : ObservableEntity<YarnMaterial>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnmaterialbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnmaterialbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnMaterialBase" /> class.
+        /// </summary>
+        public YarnMaterialBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnSubFamily.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnSubFamily.cs
new file mode 100644
index 000000000..e19b3008c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnSubFamily.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnSubFamily : YarnSubFamilyBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnSubFamilyBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnSubFamilyBase.cs
new file mode 100644
index 000000000..baf467257
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnSubFamilyBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_SUB_FAMILY")]
+    public abstract class YarnSubFamilyBase : ObservableEntity<YarnSubFamily>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarnsubfamilybase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarnsubfamilybase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnSubFamilyBase" /> class.
+        /// </summary>
+        public YarnSubFamilyBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnTexturing.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnTexturing.cs
new file mode 100644
index 000000000..f61b40f67
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnTexturing.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnTexturing : YarnTexturingBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnTexturingBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnTexturingBase.cs
new file mode 100644
index 000000000..0d736df59
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnTexturingBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_TEXTURING")]
+    public abstract class YarnTexturingBase : ObservableEntity<YarnTexturing>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarntexturingbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarntexturingbase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnTexturingBase" /> class.
+        /// </summary>
+        public YarnTexturingBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnType.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnType.cs
new file mode 100644
index 000000000..97ddd1ffc
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnType.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+namespace Tango.BL.Entities
+{
+    public class YarnType : YarnTypeBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/YarnTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/YarnTypeBase.cs
new file mode 100644
index 000000000..b3ae3ba20
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/YarnTypeBase.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <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("YARN_TYPE")]
+    public abstract class YarnTypeBase : ObservableEntity<YarnType>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlsExtension>> RmlsExtensionsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the yarntypebase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlsExtension> _rmlsextensions;
+
+        /// <summary>
+        /// Gets or sets the yarntypebase rmls extensions.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlsExtension> RmlsExtensions
+        {
+            get 
+            {
+                return _rmlsextensions; 
+            }
+
+            set 
+            {
+                if (_rmlsextensions != value)
+                {
+                    _rmlsextensions = value;
+
+                    OnRmlsExtensionsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtensions has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionsChanged(SynchronizedObservableCollection<RmlsExtension> rmlsextensions)
+        {
+            RmlsExtensionsChanged?.Invoke(this, rmlsextensions);
+            RaisePropertyChanged(nameof(RmlsExtensions));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="YarnTypeBase" /> class.
+        /// </summary>
+        public YarnTypeBase() : base()
+        {
+
+            RmlsExtensions = new SynchronizedObservableCollection<RmlsExtension>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Plies.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Plies.cs
new file mode 100644
index 000000000..d099bee5d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Plies.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.ComponentModel;
+
+namespace Tango.BL.Enumerations
+{
+    public enum Plies
+    {
+        [Description("1")]
+        P1 = 1,
+        [Description("2")]
+        P2 = 2,
+        [Description("3")]
+        P3 = 3,
+        [Description("4")]
+        P4 = 4,
+        [Description("5")]
+        P5 = 5,
+        [Description("6")]
+        P6 = 6
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TwistDirections.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TwistDirections.cs
new file mode 100644
index 000000000..8c6017f6a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TwistDirections.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.ComponentModel;
+
+namespace Tango.BL.Enumerations
+{
+    public enum TwistDirections
+    {
+        S = 0,
+        Z = 1
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/YarnUnits.cs b/Software/Visual_Studio/Tango.BL/Enumerations/YarnUnits.cs
new file mode 100644
index 000000000..91ab3bbd1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/YarnUnits.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Enumerations
+{
+    public enum YarnUnits
+    {
+        [Description("DTEX")]
+        DTEX = 0,
+        [Description("Tex")]
+        Tex = 1,
+        [Description("Ne")]
+        Ne = 2,
+        [Description("Nm")]
+        Nm = 3,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index 0f4bbb311..10f4575d4 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -159,6 +159,30 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the ColorProcessData.
+        /// </summary>
+        public DbSet<ColorProcessData> ColorProcessData 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the ColorProcessFactor.
+        /// </summary>
+        public DbSet<ColorProcessFactor> ColorProcessFactor 
+        {
+            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 
@@ -742,5 +766,117 @@ namespace Tango.BL
             get; set; 
         }
 
+        /// <summary>
+        /// Gets or sets the YarnApplications.
+        /// </summary>
+        public DbSet<YarnApplication> YarnApplications 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnBrand.
+        /// </summary>
+        public DbSet<YarnBrand> YarnBrand 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnColor.
+        /// </summary>
+        public DbSet<YarnColor> YarnColor 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnEndUse.
+        /// </summary>
+        public DbSet<YarnEndUse> YarnEndUse 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnFamily.
+        /// </summary>
+        public DbSet<YarnFamily> YarnFamily 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnGeometry.
+        /// </summary>
+        public DbSet<YarnGeometry> YarnGeometry 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnGlossLevel.
+        /// </summary>
+        public DbSet<YarnGlossLevel> YarnGlossLevel 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnGroup.
+        /// </summary>
+        public DbSet<YarnGroup> YarnGroup 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnIndustrysector.
+        /// </summary>
+        public DbSet<YarnIndustrysector> YarnIndustrysector 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnManufacturer.
+        /// </summary>
+        public DbSet<YarnManufacturer> YarnManufacturer 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnMaterials.
+        /// </summary>
+        public DbSet<YarnMaterial> YarnMaterials 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnSubFamily.
+        /// </summary>
+        public DbSet<YarnSubFamily> YarnSubFamily 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnTexturing.
+        /// </summary>
+        public DbSet<YarnTexturing> YarnTexturing 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the YarnType.
+        /// </summary>
+        public DbSet<YarnType> YarnType 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index 3bb4c6d83..35d256267 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -629,6 +629,114 @@ 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> _colorprocessfactor;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactor.
+        /// </summary>
+        public ObservableCollection<ColorProcessFactor> ColorProcessFactor
+        {
+            get 
+            {
+                return _colorprocessfactor; 
+            }
+
+            set 
+            {
+                _colorprocessfactor = value; RaisePropertyChanged(nameof(ColorProcessFactor)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessfactorViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactor View Source.
+        ///</summary>
+        public ICollectionView ColorProcessFactorViewSource
+        {
+            get 
+            {
+                return _colorprocessfactorViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessfactorViewSource = value; RaisePropertyChanged(nameof(ColorProcessFactorViewSource)); 
+            }
+
+        }
+
+        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.
@@ -3257,6 +3365,510 @@ 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> _yarnbrand;
+        /// <summary>
+        /// Gets or sets the YarnBrand.
+        /// </summary>
+        public ObservableCollection<YarnBrand> YarnBrand
+        {
+            get 
+            {
+                return _yarnbrand; 
+            }
+
+            set 
+            {
+                _yarnbrand = value; RaisePropertyChanged(nameof(YarnBrand)); 
+            }
+
+        }
+
+        private ICollectionView _yarnbrandViewSource;
+        /// <summary>
+        /// Gets or sets the YarnBrand View Source.
+        ///</summary>
+        public ICollectionView YarnBrandViewSource
+        {
+            get 
+            {
+                return _yarnbrandViewSource; 
+            }
+
+            set 
+            {
+                _yarnbrandViewSource = value; RaisePropertyChanged(nameof(YarnBrandViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnColor> _yarncolor;
+        /// <summary>
+        /// Gets or sets the YarnColor.
+        /// </summary>
+        public ObservableCollection<YarnColor> YarnColor
+        {
+            get 
+            {
+                return _yarncolor; 
+            }
+
+            set 
+            {
+                _yarncolor = value; RaisePropertyChanged(nameof(YarnColor)); 
+            }
+
+        }
+
+        private ICollectionView _yarncolorViewSource;
+        /// <summary>
+        /// Gets or sets the YarnColor View Source.
+        ///</summary>
+        public ICollectionView YarnColorViewSource
+        {
+            get 
+            {
+                return _yarncolorViewSource; 
+            }
+
+            set 
+            {
+                _yarncolorViewSource = value; RaisePropertyChanged(nameof(YarnColorViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnEndUse> _yarnenduse;
+        /// <summary>
+        /// Gets or sets the YarnEndUse.
+        /// </summary>
+        public ObservableCollection<YarnEndUse> YarnEndUse
+        {
+            get 
+            {
+                return _yarnenduse; 
+            }
+
+            set 
+            {
+                _yarnenduse = value; RaisePropertyChanged(nameof(YarnEndUse)); 
+            }
+
+        }
+
+        private ICollectionView _yarnenduseViewSource;
+        /// <summary>
+        /// Gets or sets the YarnEndUse View Source.
+        ///</summary>
+        public ICollectionView YarnEndUseViewSource
+        {
+            get 
+            {
+                return _yarnenduseViewSource; 
+            }
+
+            set 
+            {
+                _yarnenduseViewSource = value; RaisePropertyChanged(nameof(YarnEndUseViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnFamily> _yarnfamily;
+        /// <summary>
+        /// Gets or sets the YarnFamily.
+        /// </summary>
+        public ObservableCollection<YarnFamily> YarnFamily
+        {
+            get 
+            {
+                return _yarnfamily; 
+            }
+
+            set 
+            {
+                _yarnfamily = value; RaisePropertyChanged(nameof(YarnFamily)); 
+            }
+
+        }
+
+        private ICollectionView _yarnfamilyViewSource;
+        /// <summary>
+        /// Gets or sets the YarnFamily View Source.
+        ///</summary>
+        public ICollectionView YarnFamilyViewSource
+        {
+            get 
+            {
+                return _yarnfamilyViewSource; 
+            }
+
+            set 
+            {
+                _yarnfamilyViewSource = value; RaisePropertyChanged(nameof(YarnFamilyViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGeometry> _yarngeometry;
+        /// <summary>
+        /// Gets or sets the YarnGeometry.
+        /// </summary>
+        public ObservableCollection<YarnGeometry> YarnGeometry
+        {
+            get 
+            {
+                return _yarngeometry; 
+            }
+
+            set 
+            {
+                _yarngeometry = value; RaisePropertyChanged(nameof(YarnGeometry)); 
+            }
+
+        }
+
+        private ICollectionView _yarngeometryViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGeometry View Source.
+        ///</summary>
+        public ICollectionView YarnGeometryViewSource
+        {
+            get 
+            {
+                return _yarngeometryViewSource; 
+            }
+
+            set 
+            {
+                _yarngeometryViewSource = value; RaisePropertyChanged(nameof(YarnGeometryViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGlossLevel> _yarnglosslevel;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevel.
+        /// </summary>
+        public ObservableCollection<YarnGlossLevel> YarnGlossLevel
+        {
+            get 
+            {
+                return _yarnglosslevel; 
+            }
+
+            set 
+            {
+                _yarnglosslevel = value; RaisePropertyChanged(nameof(YarnGlossLevel)); 
+            }
+
+        }
+
+        private ICollectionView _yarnglosslevelViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevel View Source.
+        ///</summary>
+        public ICollectionView YarnGlossLevelViewSource
+        {
+            get 
+            {
+                return _yarnglosslevelViewSource; 
+            }
+
+            set 
+            {
+                _yarnglosslevelViewSource = value; RaisePropertyChanged(nameof(YarnGlossLevelViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGroup> _yarngroup;
+        /// <summary>
+        /// Gets or sets the YarnGroup.
+        /// </summary>
+        public ObservableCollection<YarnGroup> YarnGroup
+        {
+            get 
+            {
+                return _yarngroup; 
+            }
+
+            set 
+            {
+                _yarngroup = value; RaisePropertyChanged(nameof(YarnGroup)); 
+            }
+
+        }
+
+        private ICollectionView _yarngroupViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGroup View Source.
+        ///</summary>
+        public ICollectionView YarnGroupViewSource
+        {
+            get 
+            {
+                return _yarngroupViewSource; 
+            }
+
+            set 
+            {
+                _yarngroupViewSource = value; RaisePropertyChanged(nameof(YarnGroupViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnIndustrysector> _yarnindustrysector;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysector.
+        /// </summary>
+        public ObservableCollection<YarnIndustrysector> YarnIndustrysector
+        {
+            get 
+            {
+                return _yarnindustrysector; 
+            }
+
+            set 
+            {
+                _yarnindustrysector = value; RaisePropertyChanged(nameof(YarnIndustrysector)); 
+            }
+
+        }
+
+        private ICollectionView _yarnindustrysectorViewSource;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysector View Source.
+        ///</summary>
+        public ICollectionView YarnIndustrysectorViewSource
+        {
+            get 
+            {
+                return _yarnindustrysectorViewSource; 
+            }
+
+            set 
+            {
+                _yarnindustrysectorViewSource = value; RaisePropertyChanged(nameof(YarnIndustrysectorViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnManufacturer> _yarnmanufacturer;
+        /// <summary>
+        /// Gets or sets the YarnManufacturer.
+        /// </summary>
+        public ObservableCollection<YarnManufacturer> YarnManufacturer
+        {
+            get 
+            {
+                return _yarnmanufacturer; 
+            }
+
+            set 
+            {
+                _yarnmanufacturer = value; RaisePropertyChanged(nameof(YarnManufacturer)); 
+            }
+
+        }
+
+        private ICollectionView _yarnmanufacturerViewSource;
+        /// <summary>
+        /// Gets or sets the YarnManufacturer View Source.
+        ///</summary>
+        public ICollectionView YarnManufacturerViewSource
+        {
+            get 
+            {
+                return _yarnmanufacturerViewSource; 
+            }
+
+            set 
+            {
+                _yarnmanufacturerViewSource = value; RaisePropertyChanged(nameof(YarnManufacturerViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnMaterial> _yarnmaterials;
+        /// <summary>
+        /// Gets or sets the YarnMaterials.
+        /// </summary>
+        public ObservableCollection<YarnMaterial> YarnMaterials
+        {
+            get 
+            {
+                return _yarnmaterials; 
+            }
+
+            set 
+            {
+                _yarnmaterials = value; RaisePropertyChanged(nameof(YarnMaterials)); 
+            }
+
+        }
+
+        private ICollectionView _yarnmaterialsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnMaterials View Source.
+        ///</summary>
+        public ICollectionView YarnMaterialsViewSource
+        {
+            get 
+            {
+                return _yarnmaterialsViewSource; 
+            }
+
+            set 
+            {
+                _yarnmaterialsViewSource = value; RaisePropertyChanged(nameof(YarnMaterialsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnSubFamily> _yarnsubfamily;
+        /// <summary>
+        /// Gets or sets the YarnSubFamily.
+        /// </summary>
+        public ObservableCollection<YarnSubFamily> YarnSubFamily
+        {
+            get 
+            {
+                return _yarnsubfamily; 
+            }
+
+            set 
+            {
+                _yarnsubfamily = value; RaisePropertyChanged(nameof(YarnSubFamily)); 
+            }
+
+        }
+
+        private ICollectionView _yarnsubfamilyViewSource;
+        /// <summary>
+        /// Gets or sets the YarnSubFamily View Source.
+        ///</summary>
+        public ICollectionView YarnSubFamilyViewSource
+        {
+            get 
+            {
+                return _yarnsubfamilyViewSource; 
+            }
+
+            set 
+            {
+                _yarnsubfamilyViewSource = value; RaisePropertyChanged(nameof(YarnSubFamilyViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnTexturing> _yarntexturing;
+        /// <summary>
+        /// Gets or sets the YarnTexturing.
+        /// </summary>
+        public ObservableCollection<YarnTexturing> YarnTexturing
+        {
+            get 
+            {
+                return _yarntexturing; 
+            }
+
+            set 
+            {
+                _yarntexturing = value; RaisePropertyChanged(nameof(YarnTexturing)); 
+            }
+
+        }
+
+        private ICollectionView _yarntexturingViewSource;
+        /// <summary>
+        /// Gets or sets the YarnTexturing View Source.
+        ///</summary>
+        public ICollectionView YarnTexturingViewSource
+        {
+            get 
+            {
+                return _yarntexturingViewSource; 
+            }
+
+            set 
+            {
+                _yarntexturingViewSource = value; RaisePropertyChanged(nameof(YarnTexturingViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnType> _yarntype;
+        /// <summary>
+        /// Gets or sets the YarnType.
+        /// </summary>
+        public ObservableCollection<YarnType> YarnType
+        {
+            get 
+            {
+                return _yarntype; 
+            }
+
+            set 
+            {
+                _yarntype = value; RaisePropertyChanged(nameof(YarnType)); 
+            }
+
+        }
+
+        private ICollectionView _yarntypeViewSource;
+        /// <summary>
+        /// Gets or sets the YarnType View Source.
+        ///</summary>
+        public ICollectionView YarnTypeViewSource
+        {
+            get 
+            {
+                return _yarntypeViewSource; 
+            }
+
+            set 
+            {
+                _yarntypeViewSource = value; RaisePropertyChanged(nameof(YarnTypeViewSource)); 
+            }
+
+        }
+
         /// <summary>
         /// Initialize collection sources.
         /// </summary>
@@ -3297,6 +3909,12 @@ namespace Tango.BL
 
             ColorCatalogsItemsRecipesViewSource = CreateCollectionView(ColorCatalogsItemsRecipes);
 
+            ColorProcessDataViewSource = CreateCollectionView(ColorProcessData);
+
+            ColorProcessFactorViewSource = CreateCollectionView(ColorProcessFactor);
+
+            ColorProcessParametersViewSource = CreateCollectionView(ColorProcessParameters);
+
             ColorSpacesViewSource = CreateCollectionView(ColorSpaces);
 
             ConfigurationsViewSource = CreateCollectionView(Configurations);
@@ -3443,6 +4061,34 @@ namespace Tango.BL
 
             WindingMethodsViewSource = CreateCollectionView(WindingMethods);
 
+            YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
+
+            YarnBrandViewSource = CreateCollectionView(YarnBrand);
+
+            YarnColorViewSource = CreateCollectionView(YarnColor);
+
+            YarnEndUseViewSource = CreateCollectionView(YarnEndUse);
+
+            YarnFamilyViewSource = CreateCollectionView(YarnFamily);
+
+            YarnGeometryViewSource = CreateCollectionView(YarnGeometry);
+
+            YarnGlossLevelViewSource = CreateCollectionView(YarnGlossLevel);
+
+            YarnGroupViewSource = CreateCollectionView(YarnGroup);
+
+            YarnIndustrysectorViewSource = CreateCollectionView(YarnIndustrysector);
+
+            YarnManufacturerViewSource = CreateCollectionView(YarnManufacturer);
+
+            YarnMaterialsViewSource = CreateCollectionView(YarnMaterials);
+
+            YarnSubFamilyViewSource = CreateCollectionView(YarnSubFamily);
+
+            YarnTexturingViewSource = CreateCollectionView(YarnTexturing);
+
+            YarnTypeViewSource = CreateCollectionView(YarnType);
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index c113de4a6..daaf341a2 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -629,6 +629,114 @@ 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> _colorprocessfactor;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactor.
+        /// </summary>
+        public ObservableCollection<ColorProcessFactor> ColorProcessFactor
+        {
+            get 
+            {
+                return _colorprocessfactor; 
+            }
+
+            set 
+            {
+                _colorprocessfactor = value; RaisePropertyChanged(nameof(ColorProcessFactor)); 
+            }
+
+        }
+
+        private ICollectionView _colorprocessfactorViewSource;
+        /// <summary>
+        /// Gets or sets the ColorProcessFactor View Source.
+        ///</summary>
+        public ICollectionView ColorProcessFactorViewSource
+        {
+            get 
+            {
+                return _colorprocessfactorViewSource; 
+            }
+
+            set 
+            {
+                _colorprocessfactorViewSource = value; RaisePropertyChanged(nameof(ColorProcessFactorViewSource)); 
+            }
+
+        }
+
+        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.
@@ -3257,6 +3365,510 @@ 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> _yarnbrand;
+        /// <summary>
+        /// Gets or sets the YarnBrand.
+        /// </summary>
+        public ObservableCollection<YarnBrand> YarnBrand
+        {
+            get 
+            {
+                return _yarnbrand; 
+            }
+
+            set 
+            {
+                _yarnbrand = value; RaisePropertyChanged(nameof(YarnBrand)); 
+            }
+
+        }
+
+        private ICollectionView _yarnbrandViewSource;
+        /// <summary>
+        /// Gets or sets the YarnBrand View Source.
+        ///</summary>
+        public ICollectionView YarnBrandViewSource
+        {
+            get 
+            {
+                return _yarnbrandViewSource; 
+            }
+
+            set 
+            {
+                _yarnbrandViewSource = value; RaisePropertyChanged(nameof(YarnBrandViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnColor> _yarncolor;
+        /// <summary>
+        /// Gets or sets the YarnColor.
+        /// </summary>
+        public ObservableCollection<YarnColor> YarnColor
+        {
+            get 
+            {
+                return _yarncolor; 
+            }
+
+            set 
+            {
+                _yarncolor = value; RaisePropertyChanged(nameof(YarnColor)); 
+            }
+
+        }
+
+        private ICollectionView _yarncolorViewSource;
+        /// <summary>
+        /// Gets or sets the YarnColor View Source.
+        ///</summary>
+        public ICollectionView YarnColorViewSource
+        {
+            get 
+            {
+                return _yarncolorViewSource; 
+            }
+
+            set 
+            {
+                _yarncolorViewSource = value; RaisePropertyChanged(nameof(YarnColorViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnEndUse> _yarnenduse;
+        /// <summary>
+        /// Gets or sets the YarnEndUse.
+        /// </summary>
+        public ObservableCollection<YarnEndUse> YarnEndUse
+        {
+            get 
+            {
+                return _yarnenduse; 
+            }
+
+            set 
+            {
+                _yarnenduse = value; RaisePropertyChanged(nameof(YarnEndUse)); 
+            }
+
+        }
+
+        private ICollectionView _yarnenduseViewSource;
+        /// <summary>
+        /// Gets or sets the YarnEndUse View Source.
+        ///</summary>
+        public ICollectionView YarnEndUseViewSource
+        {
+            get 
+            {
+                return _yarnenduseViewSource; 
+            }
+
+            set 
+            {
+                _yarnenduseViewSource = value; RaisePropertyChanged(nameof(YarnEndUseViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnFamily> _yarnfamily;
+        /// <summary>
+        /// Gets or sets the YarnFamily.
+        /// </summary>
+        public ObservableCollection<YarnFamily> YarnFamily
+        {
+            get 
+            {
+                return _yarnfamily; 
+            }
+
+            set 
+            {
+                _yarnfamily = value; RaisePropertyChanged(nameof(YarnFamily)); 
+            }
+
+        }
+
+        private ICollectionView _yarnfamilyViewSource;
+        /// <summary>
+        /// Gets or sets the YarnFamily View Source.
+        ///</summary>
+        public ICollectionView YarnFamilyViewSource
+        {
+            get 
+            {
+                return _yarnfamilyViewSource; 
+            }
+
+            set 
+            {
+                _yarnfamilyViewSource = value; RaisePropertyChanged(nameof(YarnFamilyViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGeometry> _yarngeometry;
+        /// <summary>
+        /// Gets or sets the YarnGeometry.
+        /// </summary>
+        public ObservableCollection<YarnGeometry> YarnGeometry
+        {
+            get 
+            {
+                return _yarngeometry; 
+            }
+
+            set 
+            {
+                _yarngeometry = value; RaisePropertyChanged(nameof(YarnGeometry)); 
+            }
+
+        }
+
+        private ICollectionView _yarngeometryViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGeometry View Source.
+        ///</summary>
+        public ICollectionView YarnGeometryViewSource
+        {
+            get 
+            {
+                return _yarngeometryViewSource; 
+            }
+
+            set 
+            {
+                _yarngeometryViewSource = value; RaisePropertyChanged(nameof(YarnGeometryViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGlossLevel> _yarnglosslevel;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevel.
+        /// </summary>
+        public ObservableCollection<YarnGlossLevel> YarnGlossLevel
+        {
+            get 
+            {
+                return _yarnglosslevel; 
+            }
+
+            set 
+            {
+                _yarnglosslevel = value; RaisePropertyChanged(nameof(YarnGlossLevel)); 
+            }
+
+        }
+
+        private ICollectionView _yarnglosslevelViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGlossLevel View Source.
+        ///</summary>
+        public ICollectionView YarnGlossLevelViewSource
+        {
+            get 
+            {
+                return _yarnglosslevelViewSource; 
+            }
+
+            set 
+            {
+                _yarnglosslevelViewSource = value; RaisePropertyChanged(nameof(YarnGlossLevelViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnGroup> _yarngroup;
+        /// <summary>
+        /// Gets or sets the YarnGroup.
+        /// </summary>
+        public ObservableCollection<YarnGroup> YarnGroup
+        {
+            get 
+            {
+                return _yarngroup; 
+            }
+
+            set 
+            {
+                _yarngroup = value; RaisePropertyChanged(nameof(YarnGroup)); 
+            }
+
+        }
+
+        private ICollectionView _yarngroupViewSource;
+        /// <summary>
+        /// Gets or sets the YarnGroup View Source.
+        ///</summary>
+        public ICollectionView YarnGroupViewSource
+        {
+            get 
+            {
+                return _yarngroupViewSource; 
+            }
+
+            set 
+            {
+                _yarngroupViewSource = value; RaisePropertyChanged(nameof(YarnGroupViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnIndustrysector> _yarnindustrysector;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysector.
+        /// </summary>
+        public ObservableCollection<YarnIndustrysector> YarnIndustrysector
+        {
+            get 
+            {
+                return _yarnindustrysector; 
+            }
+
+            set 
+            {
+                _yarnindustrysector = value; RaisePropertyChanged(nameof(YarnIndustrysector)); 
+            }
+
+        }
+
+        private ICollectionView _yarnindustrysectorViewSource;
+        /// <summary>
+        /// Gets or sets the YarnIndustrysector View Source.
+        ///</summary>
+        public ICollectionView YarnIndustrysectorViewSource
+        {
+            get 
+            {
+                return _yarnindustrysectorViewSource; 
+            }
+
+            set 
+            {
+                _yarnindustrysectorViewSource = value; RaisePropertyChanged(nameof(YarnIndustrysectorViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnManufacturer> _yarnmanufacturer;
+        /// <summary>
+        /// Gets or sets the YarnManufacturer.
+        /// </summary>
+        public ObservableCollection<YarnManufacturer> YarnManufacturer
+        {
+            get 
+            {
+                return _yarnmanufacturer; 
+            }
+
+            set 
+            {
+                _yarnmanufacturer = value; RaisePropertyChanged(nameof(YarnManufacturer)); 
+            }
+
+        }
+
+        private ICollectionView _yarnmanufacturerViewSource;
+        /// <summary>
+        /// Gets or sets the YarnManufacturer View Source.
+        ///</summary>
+        public ICollectionView YarnManufacturerViewSource
+        {
+            get 
+            {
+                return _yarnmanufacturerViewSource; 
+            }
+
+            set 
+            {
+                _yarnmanufacturerViewSource = value; RaisePropertyChanged(nameof(YarnManufacturerViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnMaterial> _yarnmaterials;
+        /// <summary>
+        /// Gets or sets the YarnMaterials.
+        /// </summary>
+        public ObservableCollection<YarnMaterial> YarnMaterials
+        {
+            get 
+            {
+                return _yarnmaterials; 
+            }
+
+            set 
+            {
+                _yarnmaterials = value; RaisePropertyChanged(nameof(YarnMaterials)); 
+            }
+
+        }
+
+        private ICollectionView _yarnmaterialsViewSource;
+        /// <summary>
+        /// Gets or sets the YarnMaterials View Source.
+        ///</summary>
+        public ICollectionView YarnMaterialsViewSource
+        {
+            get 
+            {
+                return _yarnmaterialsViewSource; 
+            }
+
+            set 
+            {
+                _yarnmaterialsViewSource = value; RaisePropertyChanged(nameof(YarnMaterialsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnSubFamily> _yarnsubfamily;
+        /// <summary>
+        /// Gets or sets the YarnSubFamily.
+        /// </summary>
+        public ObservableCollection<YarnSubFamily> YarnSubFamily
+        {
+            get 
+            {
+                return _yarnsubfamily; 
+            }
+
+            set 
+            {
+                _yarnsubfamily = value; RaisePropertyChanged(nameof(YarnSubFamily)); 
+            }
+
+        }
+
+        private ICollectionView _yarnsubfamilyViewSource;
+        /// <summary>
+        /// Gets or sets the YarnSubFamily View Source.
+        ///</summary>
+        public ICollectionView YarnSubFamilyViewSource
+        {
+            get 
+            {
+                return _yarnsubfamilyViewSource; 
+            }
+
+            set 
+            {
+                _yarnsubfamilyViewSource = value; RaisePropertyChanged(nameof(YarnSubFamilyViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnTexturing> _yarntexturing;
+        /// <summary>
+        /// Gets or sets the YarnTexturing.
+        /// </summary>
+        public ObservableCollection<YarnTexturing> YarnTexturing
+        {
+            get 
+            {
+                return _yarntexturing; 
+            }
+
+            set 
+            {
+                _yarntexturing = value; RaisePropertyChanged(nameof(YarnTexturing)); 
+            }
+
+        }
+
+        private ICollectionView _yarntexturingViewSource;
+        /// <summary>
+        /// Gets or sets the YarnTexturing View Source.
+        ///</summary>
+        public ICollectionView YarnTexturingViewSource
+        {
+            get 
+            {
+                return _yarntexturingViewSource; 
+            }
+
+            set 
+            {
+                _yarntexturingViewSource = value; RaisePropertyChanged(nameof(YarnTexturingViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<YarnType> _yarntype;
+        /// <summary>
+        /// Gets or sets the YarnType.
+        /// </summary>
+        public ObservableCollection<YarnType> YarnType
+        {
+            get 
+            {
+                return _yarntype; 
+            }
+
+            set 
+            {
+                _yarntype = value; RaisePropertyChanged(nameof(YarnType)); 
+            }
+
+        }
+
+        private ICollectionView _yarntypeViewSource;
+        /// <summary>
+        /// Gets or sets the YarnType View Source.
+        ///</summary>
+        public ICollectionView YarnTypeViewSource
+        {
+            get 
+            {
+                return _yarntypeViewSource; 
+            }
+
+            set 
+            {
+                _yarntypeViewSource = value; RaisePropertyChanged(nameof(YarnTypeViewSource)); 
+            }
+
+        }
+
         /// <summary>
         /// Initialize collection sources.
         /// </summary>
@@ -3297,6 +3909,12 @@ namespace Tango.BL
 
             ColorCatalogsItemsRecipesViewSource = CreateCollectionView(ColorCatalogsItemsRecipes);
 
+            ColorProcessDataViewSource = CreateCollectionView(ColorProcessData);
+
+            ColorProcessFactorViewSource = CreateCollectionView(ColorProcessFactor);
+
+            ColorProcessParametersViewSource = CreateCollectionView(ColorProcessParameters);
+
             ColorSpacesViewSource = CreateCollectionView(ColorSpaces);
 
             ConfigurationsViewSource = CreateCollectionView(Configurations);
@@ -3443,6 +4061,34 @@ namespace Tango.BL
 
             WindingMethodsViewSource = CreateCollectionView(WindingMethods);
 
+            YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
+
+            YarnBrandViewSource = CreateCollectionView(YarnBrand);
+
+            YarnColorViewSource = CreateCollectionView(YarnColor);
+
+            YarnEndUseViewSource = CreateCollectionView(YarnEndUse);
+
+            YarnFamilyViewSource = CreateCollectionView(YarnFamily);
+
+            YarnGeometryViewSource = CreateCollectionView(YarnGeometry);
+
+            YarnGlossLevelViewSource = CreateCollectionView(YarnGlossLevel);
+
+            YarnGroupViewSource = CreateCollectionView(YarnGroup);
+
+            YarnIndustrysectorViewSource = CreateCollectionView(YarnIndustrysector);
+
+            YarnManufacturerViewSource = CreateCollectionView(YarnManufacturer);
+
+            YarnMaterialsViewSource = CreateCollectionView(YarnMaterials);
+
+            YarnSubFamilyViewSource = CreateCollectionView(YarnSubFamily);
+
+            YarnTexturingViewSource = CreateCollectionView(YarnTexturing);
+
+            YarnTypeViewSource = CreateCollectionView(YarnType);
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index bdc5b4c23..a0f33ac59 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -106,6 +106,7 @@
     <Compile Include="ActionLogs\IActionLogManager.cs" />
     <Compile Include="Builders\ActionLogsCollectionBuilder.cs" />
     <Compile Include="Builders\CatalogBuilder.cs" />
+    <Compile Include="Builders\ColorProcessParametersBuilder.cs" />
     <Compile Include="Builders\ConfigurationBuilder.cs" />
     <Compile Include="Builders\EntityBuilderBase.cs" />
     <Compile Include="Builders\EntityCollectionBuilderBase.cs" />
@@ -115,6 +116,8 @@
     <Compile Include="Builders\JobBuilder.cs" />
     <Compile Include="Builders\JobRunsCollectionBuilder.cs" />
     <Compile Include="Builders\CatalogsCollectionBuilder.cs" />
+    <Compile Include="Builders\RmlExtensionsBuilder.cs" />
+    <Compile Include="Builders\RMLExtentionsCollectionBuilder.cs" />
     <Compile Include="Builders\SiteBuilder.cs" />
     <Compile Include="Builders\SitesCollectionBuilder.cs" />
     <Compile Include="Builders\TangoUpdatesCollectionBuilder.cs" />
@@ -173,6 +176,12 @@
     <Compile Include="DTO\ColorCatalogsItemDTOBase.cs" />
     <Compile Include="DTO\ColorCatalogsItemsRecipeDTO.cs" />
     <Compile Include="DTO\ColorCatalogsItemsRecipeDTOBase.cs" />
+    <Compile Include="DTO\ColorProcessDataDTO.cs" />
+    <Compile Include="DTO\ColorProcessDataDTOBase.cs" />
+    <Compile Include="DTO\ColorProcessFactorDTO.cs" />
+    <Compile Include="DTO\ColorProcessFactorDTOBase.cs" />
+    <Compile Include="DTO\ColorProcessParameterDTO.cs" />
+    <Compile Include="DTO\ColorProcessParameterDTOBase.cs" />
     <Compile Include="DTO\ColorSpaceDTO.cs" />
     <Compile Include="DTO\ColorSpaceDTOBase.cs" />
     <Compile Include="DTO\ConfigurationDTO.cs" />
@@ -319,6 +328,34 @@
     <Compile Include="DTO\UsersRoleDTOBase.cs" />
     <Compile Include="DTO\WindingMethodDTO.cs" />
     <Compile Include="DTO\WindingMethodDTOBase.cs" />
+    <Compile Include="DTO\YarnApplicationDTO.cs" />
+    <Compile Include="DTO\YarnApplicationDTOBase.cs" />
+    <Compile Include="DTO\YarnBrandDTO.cs" />
+    <Compile Include="DTO\YarnBrandDTOBase.cs" />
+    <Compile Include="DTO\YarnColorDTO.cs" />
+    <Compile Include="DTO\YarnColorDTOBase.cs" />
+    <Compile Include="DTO\YarnEndUseDTO.cs" />
+    <Compile Include="DTO\YarnEndUseDTOBase.cs" />
+    <Compile Include="DTO\YarnFamilyDTO.cs" />
+    <Compile Include="DTO\YarnFamilyDTOBase.cs" />
+    <Compile Include="DTO\YarnGeometryDTO.cs" />
+    <Compile Include="DTO\YarnGeometryDTOBase.cs" />
+    <Compile Include="DTO\YarnGlossLevelDTO.cs" />
+    <Compile Include="DTO\YarnGlossLevelDTOBase.cs" />
+    <Compile Include="DTO\YarnGroupDTO.cs" />
+    <Compile Include="DTO\YarnGroupDTOBase.cs" />
+    <Compile Include="DTO\YarnIndustrysectorDTO.cs" />
+    <Compile Include="DTO\YarnIndustrysectorDTOBase.cs" />
+    <Compile Include="DTO\YarnManufacturerDTO.cs" />
+    <Compile Include="DTO\YarnManufacturerDTOBase.cs" />
+    <Compile Include="DTO\YarnMaterialDTO.cs" />
+    <Compile Include="DTO\YarnMaterialDTOBase.cs" />
+    <Compile Include="DTO\YarnSubFamilyDTO.cs" />
+    <Compile Include="DTO\YarnSubFamilyDTOBase.cs" />
+    <Compile Include="DTO\YarnTexturingDTO.cs" />
+    <Compile Include="DTO\YarnTexturingDTOBase.cs" />
+    <Compile Include="DTO\YarnTypeDTO.cs" />
+    <Compile Include="DTO\YarnTypeDTOBase.cs" />
     <Compile Include="Entities\ActionLog.cs" />
     <Compile Include="Entities\ActionLogBase.cs" />
     <Compile Include="Entities\AddressBase.cs" />
@@ -342,6 +379,12 @@
     <Compile Include="Entities\ColorCatalogsItemBase.cs" />
     <Compile Include="Entities\ColorCatalogsItemsRecipe.cs" />
     <Compile Include="Entities\ColorCatalogsItemsRecipeBase.cs" />
+    <Compile Include="Entities\ColorProcessData.cs" />
+    <Compile Include="Entities\ColorProcessDataBase.cs" />
+    <Compile Include="Entities\ColorProcessFactor.cs" />
+    <Compile Include="Entities\ColorProcessFactorBase.cs" />
+    <Compile Include="Entities\ColorProcessParameter.cs" />
+    <Compile Include="Entities\ColorProcessParameterBase.cs" />
     <Compile Include="Entities\ColorSpaceBase.cs" />
     <Compile Include="Entities\ConfigurationBase.cs" />
     <Compile Include="Entities\ContactBase.cs" />
@@ -442,6 +485,34 @@
     <Compile Include="Entities\UserBase.cs" />
     <Compile Include="Entities\UsersRoleBase.cs" />
     <Compile Include="Entities\WindingMethodBase.cs" />
+    <Compile Include="Entities\YarnApplication.cs" />
+    <Compile Include="Entities\YarnApplicationBase.cs" />
+    <Compile Include="Entities\YarnBrand.cs" />
+    <Compile Include="Entities\YarnBrandBase.cs" />
+    <Compile Include="Entities\YarnColor.cs" />
+    <Compile Include="Entities\YarnColorBase.cs" />
+    <Compile Include="Entities\YarnEndUse.cs" />
+    <Compile Include="Entities\YarnEndUseBase.cs" />
+    <Compile Include="Entities\YarnFamily.cs" />
+    <Compile Include="Entities\YarnFamilyBase.cs" />
+    <Compile Include="Entities\YarnGeometry.cs" />
+    <Compile Include="Entities\YarnGeometryBase.cs" />
+    <Compile Include="Entities\YarnGlossLevel.cs" />
+    <Compile Include="Entities\YarnGlossLevelBase.cs" />
+    <Compile Include="Entities\YarnGroup.cs" />
+    <Compile Include="Entities\YarnGroupBase.cs" />
+    <Compile Include="Entities\YarnIndustrysector.cs" />
+    <Compile Include="Entities\YarnIndustrysectorBase.cs" />
+    <Compile Include="Entities\YarnManufacturer.cs" />
+    <Compile Include="Entities\YarnManufacturerBase.cs" />
+    <Compile Include="Entities\YarnMaterial.cs" />
+    <Compile Include="Entities\YarnMaterialBase.cs" />
+    <Compile Include="Entities\YarnSubFamily.cs" />
+    <Compile Include="Entities\YarnSubFamilyBase.cs" />
+    <Compile Include="Entities\YarnTexturing.cs" />
+    <Compile Include="Entities\YarnTexturingBase.cs" />
+    <Compile Include="Entities\YarnType.cs" />
+    <Compile Include="Entities\YarnTypeBase.cs" />
     <Compile Include="Enumerations\ActionLogType.cs" />
     <Compile Include="Enumerations\BitTypes.cs" />
     <Compile Include="Enumerations\BtsrApplicationTypes.cs" />
@@ -450,9 +521,12 @@
     <Compile Include="Enumerations\ColorCatalogsItems.cs" />
     <Compile Include="Enumerations\HeadTypes.cs" />
     <Compile Include="Enumerations\JobSource.cs" />
+    <Compile Include="Enumerations\Plies.cs" />
     <Compile Include="Enumerations\PublishedProcedureProjectVisibilities.cs" />
     <Compile Include="Enumerations\TangoUpdateStatuses.cs" />
     <Compile Include="Enumerations\RmlQualifications.cs" />
+    <Compile Include="Enumerations\TwistDirections.cs" />
+    <Compile Include="Enumerations\YarnUnits.cs" />
     <Compile Include="ExtensionMethods\ColorCatalogItemsExtensions.cs" />
     <Compile Include="Helpers\EventTypeTextConverter.cs" />
     <Compile Include="Helpers\SegmentsCsvHelper.cs" />
@@ -678,7 +752,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.DAL.Remote/DB/COLOR_PROCESS_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_DATA.cs
new file mode 100644
index 000000000..711e6597c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_DATA.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <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 COLOR_PROCESS_DATA
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string COLOR_PROCESS_PARAMETERS_GUID { get; set; }
+        public string COLOR_NAME { get; set; }
+        public int INK_NL_CM { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+    
+        public virtual COLOR_PROCESS_PARAMETERS COLOR_PROCESS_PARAMETERS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_FACTOR.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_FACTOR.cs
new file mode 100644
index 000000000..ad5eadb0a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_FACTOR.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <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 COLOR_PROCESS_FACTOR
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string COLOR_PROCESS_PARAMETERS_GUID { get; set; }
+        public string COLOR_NAME { get; set; }
+        public int INK_NL_CM { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+        public int FACTOR_PERCENT { get; set; }
+    
+        public virtual COLOR_PROCESS_PARAMETERS COLOR_PROCESS_PARAMETERS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs
new file mode 100644
index 000000000..3e620912e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs
@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <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 COLOR_PROCESS_PARAMETERS
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public COLOR_PROCESS_PARAMETERS()
+        {
+            this.COLOR_PROCESS_DATA = new HashSet<COLOR_PROCESS_DATA>();
+            this.COLOR_PROCESS_FACTOR = new HashSet<COLOR_PROCESS_FACTOR>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RMLS_EXTENSIONS_GUID { get; set; }
+        public double WHITE_POINT_L { get; set; }
+        public double WHITE_POINT_A { get; set; }
+        public double WHITE_POINT_B { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<COLOR_PROCESS_DATA> COLOR_PROCESS_DATA { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<COLOR_PROCESS_FACTOR> COLOR_PROCESS_FACTOR { get; set; }
+        public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index 4a9908912..f4c6880bc 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -22,6 +22,7 @@ namespace Tango.DAL.Remote.DB
             this.JOBS = new HashSet<JOB>();
             this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>();
             this.PROCESS_PARAMETERS_TABLES_GROUPS = new HashSet<PROCESS_PARAMETERS_TABLES_GROUPS>();
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
             this.RMLS_SPOOLS = new HashSet<RMLS_SPOOLS>();
             this.SITES_RMLS = new HashSet<SITES_RMLS>();
         }
@@ -99,6 +100,8 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<PROCESS_PARAMETERS_TABLES_GROUPS> PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+        [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_RMLS> SITES_RMLS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
index c8f452bc4..a65820556 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
@@ -14,10 +14,68 @@ namespace Tango.DAL.Remote.DB
     
     public partial class RMLS_EXTENSIONS
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public RMLS_EXTENSIONS()
+        {
+            this.COLOR_PROCESS_PARAMETERS = new HashSet<COLOR_PROCESS_PARAMETERS>();
+        }
+    
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
-        public string NAME { get; set; }
-        public string DESCRIPTION { get; set; }
+        public string RML_GUID { get; set; }
+        public string USER_GUID { get; set; }
+        public System.DateTime CREATED { get; set; }
+        public string YARN_MANUFACTURER_GUID { get; set; }
+        public string YARN_BRAND_GUID { get; set; }
+        public string COUNTRY { get; set; }
+        public string YARN_END_USE_GUID { get; set; }
+        public string YARN_APPLICATIONS_GUID { get; set; }
+        public string YARN_INDUSTRYSECTOR_GUID { get; set; }
+        public string YARN_MATERIAL_GUID { get; set; }
+        public string YARN_TYPE_GUID { get; set; }
+        public string YARN_FAMILY_GUID { get; set; }
+        public string YARN_SUB_FAMILY_GUID { get; set; }
+        public string YARN_GROUP_GUID { get; set; }
+        public string YARN_TEXTURING_GUID { get; set; }
+        public string YARN_GEOMETRY_GUID { get; set; }
+        public string YARN_COLOR_GUID { get; set; }
+        public string YARN_GLOSS_LEVEL_GUID { get; set; }
+        public int LINEAR_DENSITY { get; set; }
+        public int UNIT { get; set; }
+        public int PLIES { get; set; }
+        public int FILAMENT_COUNT { get; set; }
+        public int TWIST_TPM { get; set; }
+        public Nullable<int> TWIST_DIRECTION { get; set; }
+        public Nullable<double> MIN_ELONGATION { get; set; }
+        public Nullable<double> MAX_ELONGATION { get; set; }
+        public Nullable<double> MIN_MAX_FORCE_N { get; set; }
+        public Nullable<double> MAX_MAX_FORCE_N { get; set; }
+        public Nullable<double> MIN_ELASTICITY { get; set; }
+        public Nullable<double> MAX_ELASTICITY { get; set; }
+        public Nullable<double> MIN_TENACITY { get; set; }
+        public Nullable<double> MAX_TENACITY { get; set; }
+        public string FINISHING { get; set; }
+        public string FILE_NAME { get; set; }
+        public byte[] DATA { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<COLOR_PROCESS_PARAMETERS> COLOR_PROCESS_PARAMETERS { get; set; }
+        public virtual RML RML { get; set; }
+        public virtual USER USER { get; set; }
+        public virtual YARN_APPLICATIONS YARN_APPLICATIONS { get; set; }
+        public virtual YARN_BRAND YARN_BRAND { get; set; }
+        public virtual YARN_COLOR YARN_COLOR { get; set; }
+        public virtual YARN_END_USE YARN_END_USE { get; set; }
+        public virtual YARN_FAMILY YARN_FAMILY { get; set; }
+        public virtual YARN_GEOMETRY YARN_GEOMETRY { get; set; }
+        public virtual YARN_GLOSS_LEVEL YARN_GLOSS_LEVEL { get; set; }
+        public virtual YARN_GROUP YARN_GROUP { get; set; }
+        public virtual YARN_INDUSTRYSECTOR YARN_INDUSTRYSECTOR { get; set; }
+        public virtual YARN_MANUFACTURER YARN_MANUFACTURER { get; set; }
+        public virtual YARN_MATERIALS YARN_MATERIALS { get; set; }
+        public virtual YARN_SUB_FAMILY YARN_SUB_FAMILY { get; set; }
+        public virtual YARN_TEXTURING YARN_TEXTURING { get; set; }
+        public virtual YARN_TYPE YARN_TYPE { get; set; }
     }
 }
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 d86ec98ae..a37de51db 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -42,6 +42,9 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<COLOR_CATALOGS_GROUPS> COLOR_CATALOGS_GROUPS { get; set; }
         public virtual DbSet<COLOR_CATALOGS_ITEMS> COLOR_CATALOGS_ITEMS { get; set; }
         public virtual DbSet<COLOR_CATALOGS_ITEMS_RECIPES> COLOR_CATALOGS_ITEMS_RECIPES { get; set; }
+        public virtual DbSet<COLOR_PROCESS_DATA> COLOR_PROCESS_DATA { get; set; }
+        public virtual DbSet<COLOR_PROCESS_FACTOR> COLOR_PROCESS_FACTOR { get; set; }
+        public virtual DbSet<COLOR_PROCESS_PARAMETERS> COLOR_PROCESS_PARAMETERS { get; set; }
         public virtual DbSet<COLOR_SPACES> COLOR_SPACES { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
@@ -115,5 +118,19 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<USER> USERS { get; set; }
         public virtual DbSet<USERS_ROLES> USERS_ROLES { get; set; }
         public virtual DbSet<WINDING_METHODS> WINDING_METHODS { get; set; }
+        public virtual DbSet<YARN_APPLICATIONS> YARN_APPLICATIONS { get; set; }
+        public virtual DbSet<YARN_BRAND> YARN_BRAND { get; set; }
+        public virtual DbSet<YARN_COLOR> YARN_COLOR { get; set; }
+        public virtual DbSet<YARN_END_USE> YARN_END_USE { get; set; }
+        public virtual DbSet<YARN_FAMILY> YARN_FAMILY { get; set; }
+        public virtual DbSet<YARN_GEOMETRY> YARN_GEOMETRY { get; set; }
+        public virtual DbSet<YARN_GLOSS_LEVEL> YARN_GLOSS_LEVEL { get; set; }
+        public virtual DbSet<YARN_GROUP> YARN_GROUP { get; set; }
+        public virtual DbSet<YARN_INDUSTRYSECTOR> YARN_INDUSTRYSECTOR { get; set; }
+        public virtual DbSet<YARN_MANUFACTURER> YARN_MANUFACTURER { get; set; }
+        public virtual DbSet<YARN_MATERIALS> YARN_MATERIALS { get; set; }
+        public virtual DbSet<YARN_SUB_FAMILY> YARN_SUB_FAMILY { get; set; }
+        public virtual DbSet<YARN_TEXTURING> YARN_TEXTURING { get; set; }
+        public virtual DbSet<YARN_TYPE> YARN_TYPE { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 8ce8f6e02..79403a182 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -243,6 +243,47 @@
           <Property Name="BLACK" Type="float" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLE_INDEX" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="COLOR_PROCESS_DATA">
+          <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="COLOR_PROCESS_PARAMETERS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="COLOR_NAME" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="INK_NL_CM" Type="int" Nullable="false" />
+          <Property Name="L" Type="float" Nullable="false" />
+          <Property Name="A" Type="float" Nullable="false" />
+          <Property Name="B" Type="float" Nullable="false" />
+        </EntityType>
+        <EntityType Name="COLOR_PROCESS_FACTOR">
+          <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="COLOR_PROCESS_PARAMETERS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="COLOR_NAME" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="INK_NL_CM" Type="int" Nullable="false" />
+          <Property Name="L" Type="float" Nullable="false" />
+          <Property Name="A" Type="float" Nullable="false" />
+          <Property Name="B" Type="float" Nullable="false" />
+          <Property Name="FACTOR_PERCENT" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="COLOR_PROCESS_PARAMETERS">
+          <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="RMLS_EXTENSIONS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="WHITE_POINT_L" Type="float" Nullable="false" />
+          <Property Name="WHITE_POINT_A" Type="float" Nullable="false" />
+          <Property Name="WHITE_POINT_B" Type="float" Nullable="false" />
+        </EntityType>
         <EntityType Name="COLOR_SPACES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1098,8 +1139,41 @@
           <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="NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
+          <Property Name="RML_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="USER_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="CREATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="YARN_MANUFACTURER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_BRAND_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="COUNTRY" Type="varchar" MaxLength="60" />
+          <Property Name="YARN_END_USE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_APPLICATIONS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_INDUSTRYSECTOR_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="YARN_MATERIAL_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_FAMILY_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_SUB_FAMILY_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_TEXTURING_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="YARN_GEOMETRY_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="YARN_COLOR_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="YARN_GLOSS_LEVEL_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="LINEAR_DENSITY" Type="int" Nullable="false" />
+          <Property Name="UNIT" Type="int" Nullable="false" />
+          <Property Name="PLIES" Type="int" Nullable="false" />
+          <Property Name="FILAMENT_COUNT" Type="int" Nullable="false" />
+          <Property Name="TWIST_TPM" Type="int" Nullable="false" />
+          <Property Name="TWIST_DIRECTION" Type="int" />
+          <Property Name="MIN_ELONGATION" Type="float" />
+          <Property Name="MAX_ELONGATION" Type="float" />
+          <Property Name="MIN_MAX_FORCE_N" Type="float" />
+          <Property Name="MAX_MAX_FORCE_N" Type="float" />
+          <Property Name="MIN_ELASTICITY" Type="float" />
+          <Property Name="MAX_ELASTICITY" Type="float" />
+          <Property Name="MIN_TENACITY" Type="float" />
+          <Property Name="MAX_TENACITY" Type="float" />
+          <Property Name="FINISHING" Type="varchar" MaxLength="36" />
+          <Property Name="FILE_NAME" Type="nvarchar" MaxLength="100" />
+          <Property Name="DATA" Type="image" />
         </EntityType>
         <EntityType Name="RMLS_SPOOLS">
           <Key>
@@ -1389,6 +1463,132 @@
           <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" />
           <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
         </EntityType>
+        <EntityType Name="YARN_APPLICATIONS">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_BRAND">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_COLOR">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_END_USE">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_FAMILY">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_GEOMETRY">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_GLOSS_LEVEL">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_GROUP">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_INDUSTRYSECTOR">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_MANUFACTURER">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_MATERIALS">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_SUB_FAMILY">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_TEXTURING">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="YARN_TYPE">
+          <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="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+        </EntityType>
         <Association Name="FK_ACTION_LOGS_USERS">
           <End Role="USERS" Type="Self.USERS" Multiplicity="0..1" />
           <End Role="ACTION_LOGS" Type="Self.ACTION_LOGS" Multiplicity="*" />
@@ -1549,6 +1749,48 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS">
+          <End Role="COLOR_PROCESS_PARAMETERS" Type="Self.COLOR_PROCESS_PARAMETERS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="COLOR_PROCESS_DATA" Type="Self.COLOR_PROCESS_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_DATA">
+              <PropertyRef Name="COLOR_PROCESS_PARAMETERS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS">
+          <End Role="COLOR_PROCESS_PARAMETERS" Type="Self.COLOR_PROCESS_PARAMETERS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="COLOR_PROCESS_FACTOR" Type="Self.COLOR_PROCESS_FACTOR" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_FACTOR">
+              <PropertyRef Name="COLOR_PROCESS_PARAMETERS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS">
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="COLOR_PROCESS_PARAMETERS" Type="Self.COLOR_PROCESS_PARAMETERS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="RMLS_EXTENSIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS">
           <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" Type="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Multiplicity="1" />
           <End Role="CONFIGURATIONS" Type="Self.CONFIGURATIONS" Multiplicity="*" />
@@ -2323,6 +2565,200 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_RMLS">
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="RML_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_USERS">
+          <End Role="USERS" Type="Self.USERS" Multiplicity="0..1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="USERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="USER_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_APPLICATIONS">
+          <End Role="YARN_APPLICATIONS" Type="Self.YARN_APPLICATIONS" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_APPLICATIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_APPLICATIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_BRAND">
+          <End Role="YARN_BRAND" Type="Self.YARN_BRAND" Multiplicity="0..1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_BRAND">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_BRAND_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_COLOR">
+          <End Role="YARN_COLOR" Type="Self.YARN_COLOR" Multiplicity="0..1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_COLOR">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_COLOR_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_END_USE">
+          <End Role="YARN_END_USE" Type="Self.YARN_END_USE" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_END_USE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_END_USE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_FAMILY">
+          <End Role="YARN_FAMILY" Type="Self.YARN_FAMILY" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_FAMILY">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_FAMILY_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_GEOMETRY">
+          <End Role="YARN_GEOMETRY" Type="Self.YARN_GEOMETRY" Multiplicity="0..1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_GEOMETRY">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_GEOMETRY_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL">
+          <End Role="YARN_GLOSS_LEVEL" Type="Self.YARN_GLOSS_LEVEL" Multiplicity="0..1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_GLOSS_LEVEL">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_GLOSS_LEVEL_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_GROUP">
+          <End Role="YARN_GROUP" Type="Self.YARN_GROUP" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_GROUP">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_GROUP_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR">
+          <End Role="YARN_INDUSTRYSECTOR" Type="Self.YARN_INDUSTRYSECTOR" Multiplicity="0..1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_INDUSTRYSECTOR">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_INDUSTRYSECTOR_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURER">
+          <End Role="YARN_MANUFACTURER" Type="Self.YARN_MANUFACTURER" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_MANUFACTURER">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_MANUFACTURER_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_MATERIALS">
+          <End Role="YARN_MATERIALS" Type="Self.YARN_MATERIALS" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_MATERIALS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_MATERIAL_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY">
+          <End Role="YARN_SUB_FAMILY" Type="Self.YARN_SUB_FAMILY" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_SUB_FAMILY">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_SUB_FAMILY_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_TEXTURING">
+          <End Role="YARN_TEXTURING" Type="Self.YARN_TEXTURING" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_TEXTURING">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_TEXTURING_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_TYPE">
+          <End Role="YARN_TYPE" Type="Self.YARN_TYPE" Multiplicity="1" />
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_TYPE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_SPOOLS_RMLS">
           <End Role="RMLS" Type="Self.RMLS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2594,6 +3030,9 @@
           <EntitySet Name="COLOR_CATALOGS_GROUPS" EntityType="Self.COLOR_CATALOGS_GROUPS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_CATALOGS_ITEMS" EntityType="Self.COLOR_CATALOGS_ITEMS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_CATALOGS_ITEMS_RECIPES" EntityType="Self.COLOR_CATALOGS_ITEMS_RECIPES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="COLOR_PROCESS_DATA" EntityType="Self.COLOR_PROCESS_DATA" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="COLOR_PROCESS_FACTOR" EntityType="Self.COLOR_PROCESS_FACTOR" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="COLOR_PROCESS_PARAMETERS" EntityType="Self.COLOR_PROCESS_PARAMETERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_SPACES" EntityType="Self.COLOR_SPACES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" />
@@ -2668,6 +3107,20 @@
           <EntitySet Name="USERS" EntityType="Self.USERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="WINDING_METHODS" EntityType="Self.WINDING_METHODS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_APPLICATIONS" EntityType="Self.YARN_APPLICATIONS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_BRAND" EntityType="Self.YARN_BRAND" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_COLOR" EntityType="Self.YARN_COLOR" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_END_USE" EntityType="Self.YARN_END_USE" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_FAMILY" EntityType="Self.YARN_FAMILY" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_GEOMETRY" EntityType="Self.YARN_GEOMETRY" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_GLOSS_LEVEL" EntityType="Self.YARN_GLOSS_LEVEL" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_GROUP" EntityType="Self.YARN_GROUP" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_INDUSTRYSECTOR" EntityType="Self.YARN_INDUSTRYSECTOR" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_MANUFACTURER" EntityType="Self.YARN_MANUFACTURER" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_MATERIALS" EntityType="Self.YARN_MATERIALS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_SUB_FAMILY" EntityType="Self.YARN_SUB_FAMILY" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_TEXTURING" EntityType="Self.YARN_TEXTURING" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="YARN_TYPE" EntityType="Self.YARN_TYPE" Schema="dbo" store:Type="Tables" />
           <AssociationSet Name="FK_ACTION_LOGS_USERS" Association="Self.FK_ACTION_LOGS_USERS">
             <End Role="USERS" EntitySet="USERS" />
             <End Role="ACTION_LOGS" EntitySet="ACTION_LOGS" />
@@ -2716,6 +3169,18 @@
             <End Role="RMLS" EntitySet="RMLS" />
             <End Role="COLOR_CATALOGS_ITEMS_RECIPES" EntitySet="COLOR_CATALOGS_ITEMS_RECIPES" />
           </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS" Association="Self.FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS">
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+            <End Role="COLOR_PROCESS_DATA" EntitySet="COLOR_PROCESS_DATA" />
+          </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS" Association="Self.FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS">
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+            <End Role="COLOR_PROCESS_FACTOR" EntitySet="COLOR_PROCESS_FACTOR" />
+          </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" Association="Self.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS">
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+          </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" Association="Self.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS">
             <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" EntitySet="APPLICATION_DISPLAY_PANEL_VERSIONS" />
             <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" />
@@ -2956,6 +3421,70 @@
             <End Role="CCTS" EntitySet="CCTS" />
             <End Role="RMLS" EntitySet="RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_RMLS" Association="Self.FK_RMLS_EXTENSIONS_RMLS">
+            <End Role="RMLS" EntitySet="RMLS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_USERS" Association="Self.FK_RMLS_EXTENSIONS_USERS">
+            <End Role="USERS" EntitySet="USERS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_APPLICATIONS" Association="Self.FK_RMLS_EXTENSIONS_YARN_APPLICATIONS">
+            <End Role="YARN_APPLICATIONS" EntitySet="YARN_APPLICATIONS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_BRAND" Association="Self.FK_RMLS_EXTENSIONS_YARN_BRAND">
+            <End Role="YARN_BRAND" EntitySet="YARN_BRAND" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_COLOR" Association="Self.FK_RMLS_EXTENSIONS_YARN_COLOR">
+            <End Role="YARN_COLOR" EntitySet="YARN_COLOR" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_END_USE" Association="Self.FK_RMLS_EXTENSIONS_YARN_END_USE">
+            <End Role="YARN_END_USE" EntitySet="YARN_END_USE" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_FAMILY" Association="Self.FK_RMLS_EXTENSIONS_YARN_FAMILY">
+            <End Role="YARN_FAMILY" EntitySet="YARN_FAMILY" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_GEOMETRY" Association="Self.FK_RMLS_EXTENSIONS_YARN_GEOMETRY">
+            <End Role="YARN_GEOMETRY" EntitySet="YARN_GEOMETRY" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL" Association="Self.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL">
+            <End Role="YARN_GLOSS_LEVEL" EntitySet="YARN_GLOSS_LEVEL" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_GROUP" Association="Self.FK_RMLS_EXTENSIONS_YARN_GROUP">
+            <End Role="YARN_GROUP" EntitySet="YARN_GROUP" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR" Association="Self.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR">
+            <End Role="YARN_INDUSTRYSECTOR" EntitySet="YARN_INDUSTRYSECTOR" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURER" Association="Self.FK_RMLS_EXTENSIONS_YARN_MANUFACTURER">
+            <End Role="YARN_MANUFACTURER" EntitySet="YARN_MANUFACTURER" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_MATERIALS" Association="Self.FK_RMLS_EXTENSIONS_YARN_MATERIALS">
+            <End Role="YARN_MATERIALS" EntitySet="YARN_MATERIALS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY" Association="Self.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY">
+            <End Role="YARN_SUB_FAMILY" EntitySet="YARN_SUB_FAMILY" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_TEXTURING" Association="Self.FK_RMLS_EXTENSIONS_YARN_TEXTURING">
+            <End Role="YARN_TEXTURING" EntitySet="YARN_TEXTURING" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_TYPE" Association="Self.FK_RMLS_EXTENSIONS_YARN_TYPE">
+            <End Role="YARN_TYPE" EntitySet="YARN_TYPE" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RMLS_SPOOLS_RMLS" Association="Self.FK_RMLS_SPOOLS_RMLS">
             <End Role="RMLS" EntitySet="RMLS" />
             <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
@@ -3055,6 +3584,9 @@
           <EntitySet Name="COLOR_CATALOGS_GROUPS" EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" />
           <EntitySet Name="COLOR_CATALOGS_ITEMS" EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" />
           <EntitySet Name="COLOR_CATALOGS_ITEMS_RECIPES" EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" />
+          <EntitySet Name="COLOR_PROCESS_DATA" EntityType="RemoteModel.COLOR_PROCESS_DATA" />
+          <EntitySet Name="COLOR_PROCESS_FACTOR" EntityType="RemoteModel.COLOR_PROCESS_FACTOR" />
+          <EntitySet Name="COLOR_PROCESS_PARAMETERS" EntityType="RemoteModel.COLOR_PROCESS_PARAMETERS" />
           <EntitySet Name="COLOR_SPACES" EntityType="RemoteModel.COLOR_SPACES" />
           <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" />
           <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" />
@@ -3128,6 +3660,20 @@
           <EntitySet Name="USERS" EntityType="RemoteModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="RemoteModel.USERS_ROLES" />
           <EntitySet Name="WINDING_METHODS" EntityType="RemoteModel.WINDING_METHODS" />
+          <EntitySet Name="YARN_APPLICATIONS" EntityType="RemoteModel.YARN_APPLICATIONS" />
+          <EntitySet Name="YARN_BRAND" EntityType="RemoteModel.YARN_BRAND" />
+          <EntitySet Name="YARN_COLOR" EntityType="RemoteModel.YARN_COLOR" />
+          <EntitySet Name="YARN_END_USE" EntityType="RemoteModel.YARN_END_USE" />
+          <EntitySet Name="YARN_FAMILY" EntityType="RemoteModel.YARN_FAMILY" />
+          <EntitySet Name="YARN_GEOMETRY" EntityType="RemoteModel.YARN_GEOMETRY" />
+          <EntitySet Name="YARN_GLOSS_LEVEL" EntityType="RemoteModel.YARN_GLOSS_LEVEL" />
+          <EntitySet Name="YARN_GROUP" EntityType="RemoteModel.YARN_GROUP" />
+          <EntitySet Name="YARN_INDUSTRYSECTOR" EntityType="RemoteModel.YARN_INDUSTRYSECTOR" />
+          <EntitySet Name="YARN_MANUFACTURER" EntityType="RemoteModel.YARN_MANUFACTURER" />
+          <EntitySet Name="YARN_MATERIALS" EntityType="RemoteModel.YARN_MATERIALS" />
+          <EntitySet Name="YARN_SUB_FAMILY" EntityType="RemoteModel.YARN_SUB_FAMILY" />
+          <EntitySet Name="YARN_TEXTURING" EntityType="RemoteModel.YARN_TEXTURING" />
+          <EntitySet Name="YARN_TYPE" EntityType="RemoteModel.YARN_TYPE" />
           <AssociationSet Name="FK_ACTION_LOGS_USERS" Association="RemoteModel.FK_ACTION_LOGS_USERS">
             <End Role="USER" EntitySet="USERS" />
             <End Role="ACTION_LOGS" EntitySet="ACTION_LOGS" />
@@ -3220,6 +3766,18 @@
             <End Role="RML" EntitySet="RMLS" />
             <End Role="COLOR_CATALOGS_ITEMS_RECIPES" EntitySet="COLOR_CATALOGS_ITEMS_RECIPES" />
           </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS" Association="RemoteModel.FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS">
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+            <End Role="COLOR_PROCESS_DATA" EntitySet="COLOR_PROCESS_DATA" />
+          </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS" Association="RemoteModel.FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS">
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+            <End Role="COLOR_PROCESS_FACTOR" EntitySet="COLOR_PROCESS_FACTOR" />
+          </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" Association="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS">
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+          </AssociationSet>
           <AssociationSet Name="FK_JOBS_COLOR_SPACES" Association="RemoteModel.FK_JOBS_COLOR_SPACES">
             <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" />
             <End Role="JOB" EntitySet="JOBS" />
@@ -3452,6 +4010,10 @@
             <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
             <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_RMLS" Association="RemoteModel.FK_RMLS_EXTENSIONS_RMLS">
+            <End Role="RML" EntitySet="RMLS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RMLS_SPOOLS_RMLS" Association="RemoteModel.FK_RMLS_SPOOLS_RMLS">
             <End Role="RML" EntitySet="RMLS" />
             <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
@@ -3460,6 +4022,66 @@
             <End Role="RML" EntitySet="RMLS" />
             <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_USERS" Association="RemoteModel.FK_RMLS_EXTENSIONS_USERS">
+            <End Role="USER" EntitySet="USERS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_APPLICATIONS" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_APPLICATIONS">
+            <End Role="YARN_APPLICATIONS" EntitySet="YARN_APPLICATIONS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_BRAND" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_BRAND">
+            <End Role="YARN_BRAND" EntitySet="YARN_BRAND" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_COLOR" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_COLOR">
+            <End Role="YARN_COLOR" EntitySet="YARN_COLOR" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_END_USE" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_END_USE">
+            <End Role="YARN_END_USE" EntitySet="YARN_END_USE" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_FAMILY" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_FAMILY">
+            <End Role="YARN_FAMILY" EntitySet="YARN_FAMILY" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_GEOMETRY" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GEOMETRY">
+            <End Role="YARN_GEOMETRY" EntitySet="YARN_GEOMETRY" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL">
+            <End Role="YARN_GLOSS_LEVEL" EntitySet="YARN_GLOSS_LEVEL" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_GROUP" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GROUP">
+            <End Role="YARN_GROUP" EntitySet="YARN_GROUP" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR">
+            <End Role="YARN_INDUSTRYSECTOR" EntitySet="YARN_INDUSTRYSECTOR" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURER" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURER">
+            <End Role="YARN_MANUFACTURER" EntitySet="YARN_MANUFACTURER" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_MATERIALS" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MATERIALS">
+            <End Role="YARN_MATERIALS" EntitySet="YARN_MATERIALS" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY">
+            <End Role="YARN_SUB_FAMILY" EntitySet="YARN_SUB_FAMILY" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_TEXTURING" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TEXTURING">
+            <End Role="YARN_TEXTURING" EntitySet="YARN_TEXTURING" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_TYPE" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPE">
+            <End Role="YARN_TYPE" EntitySet="YARN_TYPE" />
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RMLS_SPOOLS_SPOOL_TYPES" Association="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES">
             <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
             <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
@@ -3767,6 +4389,52 @@
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" FromRole="COLOR_CATALOGS_ITEMS_RECIPES" ToRole="COLOR_CATALOGS_ITEMS" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="COLOR_CATALOGS_ITEMS_RECIPES" ToRole="RML" />
         </EntityType>
+        <EntityType Name="COLOR_PROCESS_DATA">
+          <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="COLOR_PROCESS_PARAMETERS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="COLOR_NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="INK_NL_CM" Type="Int32" Nullable="false" />
+          <Property Name="L" Type="Double" Nullable="false" />
+          <Property Name="A" Type="Double" Nullable="false" />
+          <Property Name="B" Type="Double" Nullable="false" />
+          <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_DATA" ToRole="COLOR_PROCESS_PARAMETERS" />
+        </EntityType>
+        <EntityType Name="COLOR_PROCESS_FACTOR">
+          <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="COLOR_PROCESS_PARAMETERS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="COLOR_NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="INK_NL_CM" Type="Int32" Nullable="false" />
+          <Property Name="L" Type="Double" Nullable="false" />
+          <Property Name="A" Type="Double" Nullable="false" />
+          <Property Name="B" Type="Double" Nullable="false" />
+          <Property Name="FACTOR_PERCENT" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_FACTOR" ToRole="COLOR_PROCESS_PARAMETERS" />
+        </EntityType>
+        <EntityType Name="COLOR_PROCESS_PARAMETERS">
+          <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="RMLS_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="WHITE_POINT_L" Type="Double" Nullable="false" />
+          <Property Name="WHITE_POINT_A" Type="Double" Nullable="false" />
+          <Property Name="WHITE_POINT_B" Type="Double" Nullable="false" />
+          <NavigationProperty Name="COLOR_PROCESS_DATA" Relationship="RemoteModel.FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="COLOR_PROCESS_DATA" />
+          <NavigationProperty Name="COLOR_PROCESS_FACTOR" Relationship="RemoteModel.FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="COLOR_PROCESS_FACTOR" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
         <EntityType Name="COLOR_SPACES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4731,6 +5399,7 @@
           <NavigationProperty Name="MEDIA_MATERIALS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="RML" ToRole="MEDIA_MATERIALS" />
           <NavigationProperty Name="MEDIA_PURPOSES" Relationship="RemoteModel.FK_RML_MEDIA_PURPOSES" FromRole="RML" ToRole="MEDIA_PURPOSES" />
           <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" FromRole="RML" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_RMLS" FromRole="RML" ToRole="RMLS_EXTENSIONS" />
           <NavigationProperty Name="RMLS_SPOOLS" Relationship="RemoteModel.FK_RMLS_SPOOLS_RMLS" FromRole="RML" ToRole="RMLS_SPOOLS" />
           <NavigationProperty Name="SITES_RMLS" Relationship="RemoteModel.FK_SITES_RMLS_RMLS" FromRole="RML" ToRole="SITES_RMLS" />
         </EntityType>
@@ -4741,8 +5410,58 @@
           <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="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
+          <Property Name="RML_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="USER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="CREATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="YARN_MANUFACTURER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_BRAND_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="COUNTRY" Type="String" MaxLength="60" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_END_USE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_APPLICATIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_INDUSTRYSECTOR_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_MATERIAL_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_FAMILY_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_SUB_FAMILY_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_TEXTURING_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_GEOMETRY_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_COLOR_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="YARN_GLOSS_LEVEL_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LINEAR_DENSITY" Type="Int32" Nullable="false" />
+          <Property Name="UNIT" Type="Int32" Nullable="false" />
+          <Property Name="PLIES" Type="Int32" Nullable="false" />
+          <Property Name="FILAMENT_COUNT" Type="Int32" Nullable="false" />
+          <Property Name="TWIST_TPM" Type="Int32" Nullable="false" />
+          <Property Name="TWIST_DIRECTION" Type="Int32" />
+          <Property Name="MIN_ELONGATION" Type="Double" />
+          <Property Name="MAX_ELONGATION" Type="Double" />
+          <Property Name="MIN_MAX_FORCE_N" Type="Double" />
+          <Property Name="MAX_MAX_FORCE_N" Type="Double" />
+          <Property Name="MIN_ELASTICITY" Type="Double" />
+          <Property Name="MAX_ELASTICITY" Type="Double" />
+          <Property Name="MIN_TENACITY" Type="Double" />
+          <Property Name="MAX_TENACITY" Type="Double" />
+          <Property Name="FINISHING" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" FromRole="RMLS_EXTENSIONS" ToRole="COLOR_PROCESS_PARAMETERS" />
+          <NavigationProperty Name="RML" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_RMLS" FromRole="RMLS_EXTENSIONS" ToRole="RML" />
+          <NavigationProperty Name="USER" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_USERS" FromRole="RMLS_EXTENSIONS" ToRole="USER" />
+          <NavigationProperty Name="YARN_APPLICATIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_APPLICATIONS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_APPLICATIONS" />
+          <NavigationProperty Name="YARN_BRAND" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_BRAND" FromRole="RMLS_EXTENSIONS" ToRole="YARN_BRAND" />
+          <NavigationProperty Name="YARN_COLOR" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_COLOR" FromRole="RMLS_EXTENSIONS" ToRole="YARN_COLOR" />
+          <NavigationProperty Name="YARN_END_USE" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_END_USE" FromRole="RMLS_EXTENSIONS" ToRole="YARN_END_USE" />
+          <NavigationProperty Name="YARN_FAMILY" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_FAMILY" FromRole="RMLS_EXTENSIONS" ToRole="YARN_FAMILY" />
+          <NavigationProperty Name="YARN_GEOMETRY" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GEOMETRY" FromRole="RMLS_EXTENSIONS" ToRole="YARN_GEOMETRY" />
+          <NavigationProperty Name="YARN_GLOSS_LEVEL" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL" FromRole="RMLS_EXTENSIONS" ToRole="YARN_GLOSS_LEVEL" />
+          <NavigationProperty Name="YARN_GROUP" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GROUP" FromRole="RMLS_EXTENSIONS" ToRole="YARN_GROUP" />
+          <NavigationProperty Name="YARN_INDUSTRYSECTOR" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR" FromRole="RMLS_EXTENSIONS" ToRole="YARN_INDUSTRYSECTOR" />
+          <NavigationProperty Name="YARN_MANUFACTURER" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURER" FromRole="RMLS_EXTENSIONS" ToRole="YARN_MANUFACTURER" />
+          <NavigationProperty Name="YARN_MATERIALS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MATERIALS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_MATERIALS" />
+          <NavigationProperty Name="YARN_SUB_FAMILY" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY" FromRole="RMLS_EXTENSIONS" ToRole="YARN_SUB_FAMILY" />
+          <NavigationProperty Name="YARN_TEXTURING" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TEXTURING" FromRole="RMLS_EXTENSIONS" ToRole="YARN_TEXTURING" />
+          <NavigationProperty Name="YARN_TYPE" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPE" FromRole="RMLS_EXTENSIONS" ToRole="YARN_TYPE" />
         </EntityType>
         <EntityType Name="RMLS_SPOOLS">
           <Key>
@@ -5032,6 +5751,7 @@
           <NavigationProperty Name="MACHINE_STUDIO_VERSIONS" Relationship="RemoteModel.FK_MACHINE_STUDIO_VERSIONS_USERS" FromRole="USER" ToRole="MACHINE_STUDIO_VERSIONS" />
           <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_USERS" FromRole="USER" ToRole="MACHINES_EVENTS" />
           <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_USERS_ORGANIZATIONS" FromRole="USER" ToRole="ORGANIZATION" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_USERS" FromRole="USER" ToRole="RMLS_EXTENSIONS" />
           <NavigationProperty Name="TANGO_VERSIONS" Relationship="RemoteModel.FK_TANGO_VERSIONS_USERS" FromRole="USER" ToRole="TANGO_VERSIONS" />
           <NavigationProperty Name="USERS_ROLES" Relationship="RemoteModel.FK_USERS_ROLES_USERS" FromRole="USER" ToRole="USERS_ROLES" />
         </EntityType>
@@ -5059,6 +5779,146 @@
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_WINDING_METHODS" FromRole="WINDING_METHODS" ToRole="JOB" />
         </EntityType>
+        <EntityType Name="YARN_APPLICATIONS">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_APPLICATIONS" FromRole="YARN_APPLICATIONS" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_BRAND">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_BRAND" FromRole="YARN_BRAND" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_COLOR">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_COLOR" FromRole="YARN_COLOR" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_END_USE">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_END_USE" FromRole="YARN_END_USE" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_FAMILY">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_FAMILY" FromRole="YARN_FAMILY" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_GEOMETRY">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GEOMETRY" FromRole="YARN_GEOMETRY" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_GLOSS_LEVEL">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL" FromRole="YARN_GLOSS_LEVEL" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_GROUP">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GROUP" FromRole="YARN_GROUP" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_INDUSTRYSECTOR">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR" FromRole="YARN_INDUSTRYSECTOR" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_MANUFACTURER">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURER" FromRole="YARN_MANUFACTURER" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_MATERIALS">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MATERIALS" FromRole="YARN_MATERIALS" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_SUB_FAMILY">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY" FromRole="YARN_SUB_FAMILY" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_TEXTURING">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TEXTURING" FromRole="YARN_TEXTURING" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
+        <EntityType Name="YARN_TYPE">
+          <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPE" FromRole="YARN_TYPE" ToRole="RMLS_EXTENSIONS" />
+        </EntityType>
         <Association Name="FK_ACTION_LOGS_USERS">
           <End Type="RemoteModel.USER" Role="USER" Multiplicity="0..1" />
           <End Type="RemoteModel.ACTION_LOGS" Role="ACTION_LOGS" Multiplicity="*" />
@@ -5355,6 +6215,48 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS">
+          <End Type="RemoteModel.COLOR_PROCESS_PARAMETERS" Role="COLOR_PROCESS_PARAMETERS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.COLOR_PROCESS_DATA" Role="COLOR_PROCESS_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_DATA">
+              <PropertyRef Name="COLOR_PROCESS_PARAMETERS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS">
+          <End Type="RemoteModel.COLOR_PROCESS_PARAMETERS" Role="COLOR_PROCESS_PARAMETERS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.COLOR_PROCESS_FACTOR" Role="COLOR_PROCESS_FACTOR" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_FACTOR">
+              <PropertyRef Name="COLOR_PROCESS_PARAMETERS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS">
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.COLOR_PROCESS_PARAMETERS" Role="COLOR_PROCESS_PARAMETERS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="RMLS_EXTENSIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_JOBS_COLOR_SPACES">
           <End Type="RemoteModel.COLOR_SPACES" Role="COLOR_SPACES" Multiplicity="0..1" />
           <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="*" />
@@ -6109,6 +7011,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_RMLS">
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="RML_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_SPOOLS_RMLS">
           <End Type="RemoteModel.RML" Role="RML" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -6137,6 +7053,186 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_USERS">
+          <End Type="RemoteModel.USER" Role="USER" Multiplicity="0..1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="USER">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="USER_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_APPLICATIONS">
+          <End Type="RemoteModel.YARN_APPLICATIONS" Role="YARN_APPLICATIONS" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_APPLICATIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_APPLICATIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_BRAND">
+          <End Type="RemoteModel.YARN_BRAND" Role="YARN_BRAND" Multiplicity="0..1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_BRAND">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_BRAND_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_COLOR">
+          <End Type="RemoteModel.YARN_COLOR" Role="YARN_COLOR" Multiplicity="0..1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_COLOR">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_COLOR_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_END_USE">
+          <End Type="RemoteModel.YARN_END_USE" Role="YARN_END_USE" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_END_USE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_END_USE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_FAMILY">
+          <End Type="RemoteModel.YARN_FAMILY" Role="YARN_FAMILY" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_FAMILY">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_FAMILY_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_GEOMETRY">
+          <End Type="RemoteModel.YARN_GEOMETRY" Role="YARN_GEOMETRY" Multiplicity="0..1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_GEOMETRY">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_GEOMETRY_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL">
+          <End Type="RemoteModel.YARN_GLOSS_LEVEL" Role="YARN_GLOSS_LEVEL" Multiplicity="0..1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_GLOSS_LEVEL">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_GLOSS_LEVEL_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_GROUP">
+          <End Type="RemoteModel.YARN_GROUP" Role="YARN_GROUP" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_GROUP">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_GROUP_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR">
+          <End Type="RemoteModel.YARN_INDUSTRYSECTOR" Role="YARN_INDUSTRYSECTOR" Multiplicity="0..1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_INDUSTRYSECTOR">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_INDUSTRYSECTOR_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURER">
+          <End Type="RemoteModel.YARN_MANUFACTURER" Role="YARN_MANUFACTURER" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_MANUFACTURER">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_MANUFACTURER_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_MATERIALS">
+          <End Type="RemoteModel.YARN_MATERIALS" Role="YARN_MATERIALS" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_MATERIALS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_MATERIAL_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY">
+          <End Type="RemoteModel.YARN_SUB_FAMILY" Role="YARN_SUB_FAMILY" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_SUB_FAMILY">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_SUB_FAMILY_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_TEXTURING">
+          <End Type="RemoteModel.YARN_TEXTURING" Role="YARN_TEXTURING" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_TEXTURING">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_TEXTURING_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_EXTENSIONS_YARN_TYPE">
+          <End Type="RemoteModel.YARN_TYPE" Role="YARN_TYPE" Multiplicity="1" />
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="YARN_TYPE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="YARN_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_SPOOLS_SPOOL_TYPES">
           <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -6516,6 +7612,50 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="COLOR_PROCESS_DATA">
+            <EntityTypeMapping TypeName="RemoteModel.COLOR_PROCESS_DATA">
+              <MappingFragment StoreEntitySet="COLOR_PROCESS_DATA">
+                <ScalarProperty Name="B" ColumnName="B" />
+                <ScalarProperty Name="A" ColumnName="A" />
+                <ScalarProperty Name="L" ColumnName="L" />
+                <ScalarProperty Name="INK_NL_CM" ColumnName="INK_NL_CM" />
+                <ScalarProperty Name="COLOR_NAME" ColumnName="COLOR_NAME" />
+                <ScalarProperty Name="COLOR_PROCESS_PARAMETERS_GUID" ColumnName="COLOR_PROCESS_PARAMETERS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="COLOR_PROCESS_FACTOR">
+            <EntityTypeMapping TypeName="RemoteModel.COLOR_PROCESS_FACTOR">
+              <MappingFragment StoreEntitySet="COLOR_PROCESS_FACTOR">
+                <ScalarProperty Name="FACTOR_PERCENT" ColumnName="FACTOR_PERCENT" />
+                <ScalarProperty Name="B" ColumnName="B" />
+                <ScalarProperty Name="A" ColumnName="A" />
+                <ScalarProperty Name="L" ColumnName="L" />
+                <ScalarProperty Name="INK_NL_CM" ColumnName="INK_NL_CM" />
+                <ScalarProperty Name="COLOR_NAME" ColumnName="COLOR_NAME" />
+                <ScalarProperty Name="COLOR_PROCESS_PARAMETERS_GUID" ColumnName="COLOR_PROCESS_PARAMETERS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="COLOR_PROCESS_PARAMETERS">
+            <EntityTypeMapping TypeName="RemoteModel.COLOR_PROCESS_PARAMETERS">
+              <MappingFragment StoreEntitySet="COLOR_PROCESS_PARAMETERS">
+                <ScalarProperty Name="WHITE_POINT_B" ColumnName="WHITE_POINT_B" />
+                <ScalarProperty Name="WHITE_POINT_A" ColumnName="WHITE_POINT_A" />
+                <ScalarProperty Name="WHITE_POINT_L" ColumnName="WHITE_POINT_L" />
+                <ScalarProperty Name="RMLS_EXTENSIONS_GUID" ColumnName="RMLS_EXTENSIONS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="COLOR_SPACES">
             <EntityTypeMapping TypeName="RemoteModel.COLOR_SPACES">
               <MappingFragment StoreEntitySet="COLOR_SPACES">
@@ -7418,8 +8558,41 @@
           <EntitySetMapping Name="RMLS_EXTENSIONS">
             <EntityTypeMapping TypeName="RemoteModel.RMLS_EXTENSIONS">
               <MappingFragment StoreEntitySet="RMLS_EXTENSIONS">
-                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
-                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" />
+                <ScalarProperty Name="FINISHING" ColumnName="FINISHING" />
+                <ScalarProperty Name="MAX_TENACITY" ColumnName="MAX_TENACITY" />
+                <ScalarProperty Name="MIN_TENACITY" ColumnName="MIN_TENACITY" />
+                <ScalarProperty Name="MAX_ELASTICITY" ColumnName="MAX_ELASTICITY" />
+                <ScalarProperty Name="MIN_ELASTICITY" ColumnName="MIN_ELASTICITY" />
+                <ScalarProperty Name="MAX_MAX_FORCE_N" ColumnName="MAX_MAX_FORCE_N" />
+                <ScalarProperty Name="MIN_MAX_FORCE_N" ColumnName="MIN_MAX_FORCE_N" />
+                <ScalarProperty Name="MAX_ELONGATION" ColumnName="MAX_ELONGATION" />
+                <ScalarProperty Name="MIN_ELONGATION" ColumnName="MIN_ELONGATION" />
+                <ScalarProperty Name="TWIST_DIRECTION" ColumnName="TWIST_DIRECTION" />
+                <ScalarProperty Name="TWIST_TPM" ColumnName="TWIST_TPM" />
+                <ScalarProperty Name="FILAMENT_COUNT" ColumnName="FILAMENT_COUNT" />
+                <ScalarProperty Name="PLIES" ColumnName="PLIES" />
+                <ScalarProperty Name="UNIT" ColumnName="UNIT" />
+                <ScalarProperty Name="LINEAR_DENSITY" ColumnName="LINEAR_DENSITY" />
+                <ScalarProperty Name="YARN_GLOSS_LEVEL_GUID" ColumnName="YARN_GLOSS_LEVEL_GUID" />
+                <ScalarProperty Name="YARN_COLOR_GUID" ColumnName="YARN_COLOR_GUID" />
+                <ScalarProperty Name="YARN_GEOMETRY_GUID" ColumnName="YARN_GEOMETRY_GUID" />
+                <ScalarProperty Name="YARN_TEXTURING_GUID" ColumnName="YARN_TEXTURING_GUID" />
+                <ScalarProperty Name="YARN_GROUP_GUID" ColumnName="YARN_GROUP_GUID" />
+                <ScalarProperty Name="YARN_SUB_FAMILY_GUID" ColumnName="YARN_SUB_FAMILY_GUID" />
+                <ScalarProperty Name="YARN_FAMILY_GUID" ColumnName="YARN_FAMILY_GUID" />
+                <ScalarProperty Name="YARN_TYPE_GUID" ColumnName="YARN_TYPE_GUID" />
+                <ScalarProperty Name="YARN_MATERIAL_GUID" ColumnName="YARN_MATERIAL_GUID" />
+                <ScalarProperty Name="YARN_INDUSTRYSECTOR_GUID" ColumnName="YARN_INDUSTRYSECTOR_GUID" />
+                <ScalarProperty Name="YARN_APPLICATIONS_GUID" ColumnName="YARN_APPLICATIONS_GUID" />
+                <ScalarProperty Name="YARN_END_USE_GUID" ColumnName="YARN_END_USE_GUID" />
+                <ScalarProperty Name="COUNTRY" ColumnName="COUNTRY" />
+                <ScalarProperty Name="YARN_BRAND_GUID" ColumnName="YARN_BRAND_GUID" />
+                <ScalarProperty Name="YARN_MANUFACTURER_GUID" ColumnName="YARN_MANUFACTURER_GUID" />
+                <ScalarProperty Name="CREATED" ColumnName="CREATED" />
+                <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
+                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
@@ -7727,6 +8900,146 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="YARN_APPLICATIONS">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_APPLICATIONS">
+              <MappingFragment StoreEntitySet="YARN_APPLICATIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_BRAND">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_BRAND">
+              <MappingFragment StoreEntitySet="YARN_BRAND">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_COLOR">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_COLOR">
+              <MappingFragment StoreEntitySet="YARN_COLOR">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_END_USE">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_END_USE">
+              <MappingFragment StoreEntitySet="YARN_END_USE">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_FAMILY">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_FAMILY">
+              <MappingFragment StoreEntitySet="YARN_FAMILY">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_GEOMETRY">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_GEOMETRY">
+              <MappingFragment StoreEntitySet="YARN_GEOMETRY">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_GLOSS_LEVEL">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_GLOSS_LEVEL">
+              <MappingFragment StoreEntitySet="YARN_GLOSS_LEVEL">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_GROUP">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_GROUP">
+              <MappingFragment StoreEntitySet="YARN_GROUP">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_INDUSTRYSECTOR">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_INDUSTRYSECTOR">
+              <MappingFragment StoreEntitySet="YARN_INDUSTRYSECTOR">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_MANUFACTURER">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_MANUFACTURER">
+              <MappingFragment StoreEntitySet="YARN_MANUFACTURER">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_MATERIALS">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_MATERIALS">
+              <MappingFragment StoreEntitySet="YARN_MATERIALS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_SUB_FAMILY">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_SUB_FAMILY">
+              <MappingFragment StoreEntitySet="YARN_SUB_FAMILY">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_TEXTURING">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_TEXTURING">
+              <MappingFragment StoreEntitySet="YARN_TEXTURING">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="YARN_TYPE">
+            <EntityTypeMapping TypeName="RemoteModel.YARN_TYPE">
+              <MappingFragment StoreEntitySet="YARN_TYPE">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>
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 b47d276c4..017f43c06 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,95 +5,112 @@
     <!-- 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.5" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="60.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="78.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="75.625" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17.625" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="30.375" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3.75" PointY="37.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="36.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="6.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="74" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="64.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.5" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="77.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="1.5" PointY="85.875" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3.75" PointY="85.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="81.5" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="40.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="24.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="27.375" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="54" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="61.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="68.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="82" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="68" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="81.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="65.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.5" PointY="86" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11.75" PointY="74.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="10.5" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12.75" PointY="63.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="68.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="7.5" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9.75" PointY="61.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3.75" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="6" PointY="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="4.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="65.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="41.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="13.625" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3.75" PointY="44" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="62.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.5" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="16.75" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="19" PointY="1.75" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.375" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_EXTENSIONS" Width="1.5" PointX="6.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="13.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="25.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="48.625" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="8.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="17.75" PointY="14.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="8.75" PointY="4.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="19.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="10.5" PointY="54.625" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="30.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="52.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="39.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="46.375" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="46.25" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="6" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="6" PointY="23" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="13.25" PointY="96.625" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="7.5" PointY="48.25" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="6" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="28.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="13.5" PointY="62.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="15.75" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="22" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_DATA" Width="1.5" PointX="18" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_FACTOR" Width="1.5" PointX="18" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_PARAMETERS" Width="1.5" PointX="15.75" PointY="31.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="8.25" PointY="56.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="44.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="5.25" PointY="57.5" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="7.5" PointY="44.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="11" PointY="86.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="13.25" PointY="85.75" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="49.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="50.25" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="6" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="6" PointY="64.5" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="10.5" PointY="58.25" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="15.75" PointY="67.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="18" PointY="57.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="67.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3" PointY="59.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="0.75" PointY="59.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3" PointY="49.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="0.75" PointY="26.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3" PointY="23.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="16.75" PointY="25.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="19" PointY="38.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="63.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="55.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="0.75" PointY="55.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3" PointY="40.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="13.25" PointY="93.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="15.5" PointY="56.125" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="0.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="43" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="6" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="5.25" PointY="48" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="13.5" PointY="24" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="4.75" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="61.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="8.25" PointY="29.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="41.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="6" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="6" PointY="52.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="6" PointY="67.375" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="13.25" PointY="90" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="34.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="17.25" PointY="21.625" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="10.5" PointY="3.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="0.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="3" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="8.25" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_EXTENSIONS" Width="1.5" PointX="13.5" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="20.5" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14.25" PointY="27.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="19.5" PointY="25.625" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="5.25" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="7.5" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="10.5" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="13.25" PointY="55.625" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="15.5" PointY="46.125" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="7.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="10.5" PointY="37.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="2.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="10.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="14.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="36.25" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.5" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="53.125" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_APPLICATIONS" Width="1.5" PointX="11.25" PointY="79.875" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_BRAND" Width="1.5" PointX="11.25" PointY="17" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_COLOR" Width="1.5" PointX="11.25" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_END_USE" Width="1.5" PointX="11.25" PointY="69" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_FAMILY" Width="1.5" PointX="11.25" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_GEOMETRY" Width="1.5" PointX="11.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_GLOSS_LEVEL" Width="1.5" PointX="11.25" PointY="10.5" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_GROUP" Width="1.5" PointX="11.25" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_INDUSTRYSECTOR" Width="1.5" PointX="11.25" PointY="28.25" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_MANUFACTURER" Width="1.5" PointX="11.25" PointY="74.375" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_MATERIALS" Width="1.5" PointX="11.25" PointY="71.625" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_SUB_FAMILY" Width="1.5" PointX="11.25" PointY="77.125" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_TEXTURING" Width="1.5" PointX="11.25" PointY="82.625" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_TYPE" Width="1.5" PointX="11.25" PointY="25.625" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -117,6 +134,9 @@
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" />
+        <AssociationConnector Association="RemoteModel.FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS" />
+        <AssociationConnector Association="RemoteModel.FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS" />
+        <AssociationConnector Association="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_COLOR_SPACES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" />
@@ -175,8 +195,24 @@
         <AssociationConnector Association="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" />
         <AssociationConnector Association="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_RMLS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_USERS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_APPLICATIONS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_BRAND" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_COLOR" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_END_USE" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_FAMILY" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GEOMETRY" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVEL" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GROUP" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTOR" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURER" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MATERIALS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILY" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TEXTURING" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPE" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_ROLES_PERMISSIONS_ROLES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_ROLES" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
index 75cc4e444..375008753 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
@@ -22,6 +22,7 @@ namespace Tango.DAL.Remote.DB
             this.JOBS = new HashSet<JOB>();
             this.MACHINE_STUDIO_VERSIONS = new HashSet<MACHINE_STUDIO_VERSIONS>();
             this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>();
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
             this.TANGO_VERSIONS = new HashSet<TANGO_VERSIONS>();
             this.USERS_ROLES = new HashSet<USERS_ROLES>();
         }
@@ -52,6 +53,8 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
         public virtual ORGANIZATION ORGANIZATION { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<TANGO_VERSIONS> TANGO_VERSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<USERS_ROLES> USERS_ROLES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_APPLICATIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_APPLICATIONS.cs
new file mode 100644
index 000000000..771e3ccaa
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_APPLICATIONS.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_APPLICATIONS
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_APPLICATIONS()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_BRAND.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_BRAND.cs
new file mode 100644
index 000000000..2ba5f08cd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_BRAND.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_BRAND
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_BRAND()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_COLOR.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_COLOR.cs
new file mode 100644
index 000000000..b863f937c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_COLOR.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_COLOR
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_COLOR()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_END_USE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_END_USE.cs
new file mode 100644
index 000000000..4008c4f0e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_END_USE.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_END_USE
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_END_USE()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_FAMILY.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_FAMILY.cs
new file mode 100644
index 000000000..4e29b0ab1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_FAMILY.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_FAMILY
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_FAMILY()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GEOMETRY.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GEOMETRY.cs
new file mode 100644
index 000000000..87f07131e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GEOMETRY.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_GEOMETRY
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_GEOMETRY()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GLOSS_LEVEL.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GLOSS_LEVEL.cs
new file mode 100644
index 000000000..75f4dd0b4
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GLOSS_LEVEL.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_GLOSS_LEVEL
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_GLOSS_LEVEL()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GROUP.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GROUP.cs
new file mode 100644
index 000000000..1442fa1e1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_GROUP.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_GROUP
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_GROUP()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_INDUSTRYSECTOR.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_INDUSTRYSECTOR.cs
new file mode 100644
index 000000000..3ca6eeb67
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_INDUSTRYSECTOR.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_INDUSTRYSECTOR
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_INDUSTRYSECTOR()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURER.cs
new file mode 100644
index 000000000..b2fec3ac4
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURER.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_MANUFACTURER
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_MANUFACTURER()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MATERIALS.cs
new file mode 100644
index 000000000..8e14102bc
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MATERIALS.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_MATERIALS
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_MATERIALS()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_SUB_FAMILY.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_SUB_FAMILY.cs
new file mode 100644
index 000000000..5172bfb8e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_SUB_FAMILY.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_SUB_FAMILY
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_SUB_FAMILY()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_TEXTURING.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_TEXTURING.cs
new file mode 100644
index 000000000..7107eba01
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_TEXTURING.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_TEXTURING
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_TEXTURING()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_TYPE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_TYPE.cs
new file mode 100644
index 000000000..0070c5da6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_TYPE.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <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 YARN_TYPE
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public YARN_TYPE()
+        {
+            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { 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 13d896eb2..32add4378 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -114,6 +114,15 @@
     <Compile Include="DB\COLOR_CATALOGS_ITEMS_RECIPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\COLOR_PROCESS_DATA.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\COLOR_PROCESS_FACTOR.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\COLOR_PROCESS_PARAMETERS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\COLOR_SPACES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -351,6 +360,48 @@
     <Compile Include="DB\WINDING_METHODS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\YARN_APPLICATIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_BRAND.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_COLOR.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_END_USE.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_FAMILY.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_GEOMETRY.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_GLOSS_LEVEL.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_GROUP.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_INDUSTRYSECTOR.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_MANUFACTURER.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_MATERIALS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_SUB_FAMILY.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_TEXTURING.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\YARN_TYPE.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="Partials\RemoteDB.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -401,7 +452,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