#5821 , #5831 RML extension . Created new tables in database and corresponding classes in Tango.BL.

51 files changed, 4334 insertions, 98 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationDTO.cs
new file mode 100644
index 000000000..08cedb31a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationDTO.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 RmlExtensionColorCalibrationDTO : RmlExtensionColorCalibrationDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationDTOBase.cs
new file mode 100644
index 000000000..fab576f25
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class RmlExtensionColorCalibrationDTOBase : ObservableEntityDTO<RmlExtensionColorCalibrationDTO, RmlExtensionColorCalibration>
+    {
+
+        /// <summary>
+        /// rml extensions guid
+        /// </summary>
+        public String RmlExtensionsGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// machine guid
+        /// </summary>
+        public String MachineGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestDTO.cs
new file mode 100644
index 000000000..43472dd24
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestDTO.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 RmlExtensionColorCalibrationsTestDTO : RmlExtensionColorCalibrationsTestDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestDTOBase.cs
new file mode 100644
index 000000000..878b4d40f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class RmlExtensionColorCalibrationsTestDTOBase : ObservableEntityDTO<RmlExtensionColorCalibrationsTestDTO, RmlExtensionColorCalibrationsTest>
+    {
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// rml extension color calibration guid
+        /// </summary>
+        public String RmlExtensionColorCalibrationGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataDTO.cs
new file mode 100644
index 000000000..171898b33
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataDTO.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 RmlExtensionColorCalibrationsTestsLiquidDataDTO : RmlExtensionColorCalibrationsTestsLiquidDataDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataDTOBase.cs
new file mode 100644
index 000000000..eb0cb5d7e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class RmlExtensionColorCalibrationsTestsLiquidDataDTOBase : ObservableEntityDTO<RmlExtensionColorCalibrationsTestsLiquidDataDTO, RmlExtensionColorCalibrationsTestsLiquidData>
+    {
+
+        /// <summary>
+        /// rml extension color calibrations test guid
+        /// </summary>
+        public String RmlExtensionColorCalibrationsTestGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// liquid type guid
+        /// </summary>
+        public String LiquidTypeGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataPointDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataPointDTO.cs
new file mode 100644
index 000000000..42e85ef1e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataPointDTO.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 RmlExtensionColorCalibrationsTestsLiquidDataPointDTO : RmlExtensionColorCalibrationsTestsLiquidDataPointDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataPointDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataPointDTOBase.cs
new file mode 100644
index 000000000..0b1b45da5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorCalibrationsTestsLiquidDataPointDTOBase.cs
@@ -0,0 +1,65 @@
+
+//------------------------------------------------------------------------------
+// <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 RmlExtensionColorCalibrationsTestsLiquidDataPointDTOBase : ObservableEntityDTO<RmlExtensionColorCalibrationsTestsLiquidDataPointDTO, RmlExtensionColorCalibrationsTestsLiquidDataPoint>
+    {
+
+        /// <summary>
+        /// rml extension color calibrations tests liquid data guid
+        /// </summary>
+        public String RmlExtensionColorCalibrationsTestsLiquidDataGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ink
+        /// </summary>
+        public Double Ink 
+        {
+            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/RmlExtensionColorShadeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadeDTO.cs
new file mode 100644
index 000000000..3c80db6c8
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadeDTO.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 RmlExtensionColorShadeDTO : RmlExtensionColorShadeDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadeDTOBase.cs
new file mode 100644
index 000000000..f7fb8344a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadeDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class RmlExtensionColorShadeDTOBase : ObservableEntityDTO<RmlExtensionColorShadeDTO, RmlExtensionColorShade>
+    {
+
+        /// <summary>
+        /// rml extensions guid
+        /// </summary>
+        public String RmlExtensionsGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// machine guid
+        /// </summary>
+        public String MachineGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestDTO.cs
new file mode 100644
index 000000000..68dcb4646
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestDTO.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 RmlExtensionColorShadesTestDTO : RmlExtensionColorShadesTestDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestDTOBase.cs
new file mode 100644
index 000000000..9937a3788
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class RmlExtensionColorShadesTestDTOBase : ObservableEntityDTO<RmlExtensionColorShadesTestDTO, RmlExtensionColorShadesTest>
+    {
+
+        /// <summary>
+        /// rml extension color shades guid
+        /// </summary>
+        public String RmlExtensionColorShadesGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// name
+        /// </summary>
+        public String Name 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestsDataDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestsDataDTO.cs
new file mode 100644
index 000000000..d8d558804
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestsDataDTO.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 RmlExtensionColorShadesTestsDataDTO : RmlExtensionColorShadesTestsDataDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestsDataDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestsDataDTOBase.cs
new file mode 100644
index 000000000..d9d263c92
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionColorShadesTestsDataDTOBase.cs
@@ -0,0 +1,137 @@
+
+//------------------------------------------------------------------------------
+// <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 RmlExtensionColorShadesTestsDataDTOBase : ObservableEntityDTO<RmlExtensionColorShadesTestsDataDTO, RmlExtensionColorShadesTestsData>
+    {
+
+        /// <summary>
+        /// rml extension color shades tests guid
+        /// </summary>
+        public String RmlExtensionColorShadesTestsGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// color num
+        /// </summary>
+        public Int32 ColorNum 
+        {
+            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>
+        /// c
+        /// </summary>
+        public Nullable<Double> C 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// m
+        /// </summary>
+        public Nullable<Double> M 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// y
+        /// </summary>
+        public Nullable<Double> Y 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// k
+        /// </summary>
+        public Nullable<Double> K 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ti
+        /// </summary>
+        public Nullable<Double> Ti 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// l res
+        /// </summary>
+        public Double LRes 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// a res
+        /// </summary>
+        public Double ARes 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// b res
+        /// </summary>
+        public Double BRes 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// delta e
+        /// </summary>
+        public Double DeltaE 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
index 1a75d4516..ea4d18f9b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
@@ -49,6 +49,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<SynchronizedObservableCollection<LiquidTypesRml>> LiquidTypesRmlsChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData>> RmlExtensionColorCalibrationsTestsLiquidDataChanged;
+
         protected Int32 _code;
 
         /// <summary>
@@ -340,6 +342,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata;
+
+        /// <summary>
+        /// Gets or sets the liquidtypebase rml extension color calibrations tests liquid data.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddata; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstestsliquiddata != value)
+                {
+                    _rmlextensioncolorcalibrationstestsliquiddata = value;
+
+                    OnRmlExtensionColorCalibrationsTestsLiquidDataChanged(value);
+
+                }
+            }
+        }
+
         /// <summary>
         /// Called when the Code has changed.
         /// </summary>
@@ -440,6 +467,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionColorCalibrationsTestsLiquidData has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsTestsLiquidDataChanged(SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> rmlextensioncolorcalibrationstestsliquiddata)
+        {
+            RmlExtensionColorCalibrationsTestsLiquidDataChanged?.Invoke(this, rmlextensioncolorcalibrationstestsliquiddata);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="LiquidTypeBase" /> class.
         /// </summary>
         public LiquidTypeBase() : base()
@@ -451,6 +487,8 @@ namespace Tango.BL.Entities
 
             LiquidTypesRmls = new SynchronizedObservableCollection<LiquidTypesRml>();
 
+            RmlExtensionColorCalibrationsTestsLiquidData = new SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
index f17f39c18..ad32b8fdf 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
@@ -95,6 +95,10 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Organization> OrganizationChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibration>> RmlExtensionColorCalibrationsChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorShade>> RmlExtensionColorShadesChanged;
+
         public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResult>> RmlExtensionTestResultsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<Spool>> SpoolsChanged;
@@ -1225,6 +1229,56 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations;
+
+        /// <summary>
+        /// Gets or sets the machinebase rml extension color calibrations.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrations; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrations != value)
+                {
+                    _rmlextensioncolorcalibrations = value;
+
+                    OnRmlExtensionColorCalibrationsChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades;
+
+        /// <summary>
+        /// Gets or sets the machinebase rml extension color shades.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades
+        {
+            get 
+            {
+                return _rmlextensioncolorshades; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshades != value)
+                {
+                    _rmlextensioncolorshades = value;
+
+                    OnRmlExtensionColorShadesChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
 
         /// <summary>
@@ -1582,6 +1636,24 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionColorCalibrations has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsChanged(SynchronizedObservableCollection<RmlExtensionColorCalibration> rmlextensioncolorcalibrations)
+        {
+            RmlExtensionColorCalibrationsChanged?.Invoke(this, rmlextensioncolorcalibrations);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrations));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorShades has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorShadesChanged(SynchronizedObservableCollection<RmlExtensionColorShade> rmlextensioncolorshades)
+        {
+            RmlExtensionColorShadesChanged?.Invoke(this, rmlextensioncolorshades);
+            RaisePropertyChanged(nameof(RmlExtensionColorShades));
+        }
+
+        /// <summary>
         /// Called when the RmlExtensionTestResults has changed.
         /// </summary>
         protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection<RmlExtensionTestResult> rmlextensiontestresults)
@@ -1615,6 +1687,10 @@ namespace Tango.BL.Entities
 
             MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>();
 
+            RmlExtensionColorCalibrations = new SynchronizedObservableCollection<RmlExtensionColorCalibration>();
+
+            RmlExtensionColorShades = new SynchronizedObservableCollection<RmlExtensionColorShade>();
+
             RmlExtensionTestResults = new SynchronizedObservableCollection<RmlExtensionTestResult>();
 
             Spools = new SynchronizedObservableCollection<Spool>();
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibration.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibration.cs
new file mode 100644
index 000000000..470f4ce33
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibration.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 RmlExtensionColorCalibration: RmlExtensionColorCalibrationBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs
new file mode 100644
index 000000000..beb87f784
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs
@@ -0,0 +1,214 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_CALIBRATIONS")]
+    public abstract class RmlExtensionColorCalibrationBase : ObservableEntity<RmlExtensionColorCalibration>
+    {
+
+        public event EventHandler<Machine> MachineChanged;
+
+        public event EventHandler<RmlsExtension> RmlsExtensionChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibrationsTest>> RmlExtensionColorCalibrationsTestsChanged;
+
+        protected String _rmlextensionsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationbase rml extensions guid.
+        /// </summary>
+
+        [Column("RML_EXTENSIONS_GUID")]
+        [ForeignKey("RmlExtensions")]
+
+        public  String RmlExtensionsGuid
+        {
+            get 
+            {
+                return _rmlextensionsguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensionsguid != value)
+                {
+                    _rmlextensionsguid = value;
+
+                }
+            }
+        }
+
+        protected String _machineguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationbase machine guid.
+        /// </summary>
+
+        [Column("MACHINE_GUID")]
+        [ForeignKey("Machine")]
+
+        public  String MachineGuid
+        {
+            get 
+            {
+                return _machineguid; 
+            }
+
+            set 
+            {
+                if (_machineguid != value)
+                {
+                    _machineguid = value;
+
+                }
+            }
+        }
+
+        protected Machine _machine;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationbase machine.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Machine Machine
+        {
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                if (_machine != value)
+                {
+                    _machine = value;
+
+                    if (Machine != null)
+                    {
+                        MachineGuid = Machine.Guid;
+                    }
+
+                    OnMachineChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlsExtension _rmlsextension;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationbase rmls extensions.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlsExtension RmlsExtension
+        {
+            get 
+            {
+                return _rmlsextension; 
+            }
+
+            set 
+            {
+                if (_rmlsextension != value)
+                {
+                    _rmlsextension = value;
+
+                    if (RmlsExtension != null)
+                    {
+                        RmlExtensionsGuid = RmlsExtension.Guid;
+                    }
+
+                    OnRmlsExtensionChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationbase rml extension color calibrations tests.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstests; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstests != value)
+                {
+                    _rmlextensioncolorcalibrationstests = value;
+
+                    OnRmlExtensionColorCalibrationsTestsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtension has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionChanged(RmlsExtension rmlsextension)
+        {
+            RmlsExtensionChanged?.Invoke(this, rmlsextension);
+            RaisePropertyChanged(nameof(RmlsExtension));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorCalibrationsTests has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsTestsChanged(SynchronizedObservableCollection<RmlExtensionColorCalibrationsTest> rmlextensioncolorcalibrationstests)
+        {
+            RmlExtensionColorCalibrationsTestsChanged?.Invoke(this, rmlextensioncolorcalibrationstests);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorCalibrationBase" /> class.
+        /// </summary>
+        public RmlExtensionColorCalibrationBase() : base()
+        {
+
+            RmlExtensionColorCalibrationsTests = new SynchronizedObservableCollection<RmlExtensionColorCalibrationsTest>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTest.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTest.cs
new file mode 100644
index 000000000..5634c0034
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTest.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 RmlExtensionColorCalibrationsTest: RmlExtensionColorCalibrationsTestBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestBase.cs
new file mode 100644
index 000000000..5f3907bba
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestBase.cs
@@ -0,0 +1,183 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_CALIBRATIONS_TESTS")]
+    public abstract class RmlExtensionColorCalibrationsTestBase : ObservableEntity<RmlExtensionColorCalibrationsTest>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<RmlExtensionColorCalibration> RmlExtensionColorCalibrationChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData>> RmlExtensionColorCalibrationsTestsLiquidDataChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected String _rmlextensioncolorcalibrationguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestbase rml extension color calibration guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_COLOR_CALIBRATION_GUID")]
+        [ForeignKey("RmlExtensionColorCalibration")]
+
+        public  String RmlExtensionColorCalibrationGuid
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationguid != value)
+                {
+                    _rmlextensioncolorcalibrationguid = value;
+
+                }
+            }
+        }
+
+        protected RmlExtensionColorCalibration _rmlextensioncolorcalibration;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestbase rml extension color calibrations.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlExtensionColorCalibration RmlExtensionColorCalibration
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibration; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibration != value)
+                {
+                    _rmlextensioncolorcalibration = value;
+
+                    if (RmlExtensionColorCalibration != null)
+                    {
+                        RmlExtensionColorCalibrationGuid = RmlExtensionColorCalibration.Guid;
+                    }
+
+                    OnRmlExtensionColorCalibrationChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestbase rml extension color calibrations tests liquid data.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddata; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstestsliquiddata != value)
+                {
+                    _rmlextensioncolorcalibrationstestsliquiddata = value;
+
+                    OnRmlExtensionColorCalibrationsTestsLiquidDataChanged(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 RmlExtensionColorCalibration has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationChanged(RmlExtensionColorCalibration rmlextensioncolorcalibration)
+        {
+            RmlExtensionColorCalibrationChanged?.Invoke(this, rmlextensioncolorcalibration);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibration));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorCalibrationsTestsLiquidData has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsTestsLiquidDataChanged(SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> rmlextensioncolorcalibrationstestsliquiddata)
+        {
+            RmlExtensionColorCalibrationsTestsLiquidDataChanged?.Invoke(this, rmlextensioncolorcalibrationstestsliquiddata);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorCalibrationsTestBase" /> class.
+        /// </summary>
+        public RmlExtensionColorCalibrationsTestBase() : base()
+        {
+
+            RmlExtensionColorCalibrationsTestsLiquidData = new SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidData.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidData.cs
new file mode 100644
index 000000000..9cb724a2b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidData.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 RmlExtensionColorCalibrationsTestsLiquidData: RmlExtensionColorCalibrationsTestsLiquidDataBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs
new file mode 100644
index 000000000..d55773809
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs
@@ -0,0 +1,214 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA")]
+    public abstract class RmlExtensionColorCalibrationsTestsLiquidDataBase : ObservableEntity<RmlExtensionColorCalibrationsTestsLiquidData>
+    {
+
+        public event EventHandler<LiquidType> LiquidTypeChanged;
+
+        public event EventHandler<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTestChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint>> RmlExtensionColorCalibrationsTestsLiquidDataPointsChanged;
+
+        protected String _rmlextensioncolorcalibrationstestguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase rml extension color calibrations test guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID")]
+        [ForeignKey("RmlExtensionColorCalibrationsTest")]
+
+        public  String RmlExtensionColorCalibrationsTestGuid
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstestguid != value)
+                {
+                    _rmlextensioncolorcalibrationstestguid = value;
+
+                }
+            }
+        }
+
+        protected String _liquidtypeguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid type guid.
+        /// </summary>
+
+        [Column("LIQUID_TYPE_GUID")]
+        [ForeignKey("LiquidType")]
+
+        public  String LiquidTypeGuid
+        {
+            get 
+            {
+                return _liquidtypeguid; 
+            }
+
+            set 
+            {
+                if (_liquidtypeguid != value)
+                {
+                    _liquidtypeguid = value;
+
+                }
+            }
+        }
+
+        protected LiquidType _liquidtype;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual LiquidType LiquidType
+        {
+            get 
+            {
+                return _liquidtype; 
+            }
+
+            set 
+            {
+                if (_liquidtype != value)
+                {
+                    _liquidtype = value;
+
+                    if (LiquidType != null)
+                    {
+                        LiquidTypeGuid = LiquidType.Guid;
+                    }
+
+                    OnLiquidTypeChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlExtensionColorCalibrationsTest _rmlextensioncolorcalibrationstest;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase rml extension color calibrations tests.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlExtensionColorCalibrationsTest RmlExtensionColorCalibrationsTest
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstest; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstest != value)
+                {
+                    _rmlextensioncolorcalibrationstest = value;
+
+                    if (RmlExtensionColorCalibrationsTest != null)
+                    {
+                        RmlExtensionColorCalibrationsTestGuid = RmlExtensionColorCalibrationsTest.Guid;
+                    }
+
+                    OnRmlExtensionColorCalibrationsTestChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase rml extension color calibrations tests liquid data points.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddatapoints; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstestsliquiddatapoints != value)
+                {
+                    _rmlextensioncolorcalibrationstestsliquiddatapoints = value;
+
+                    OnRmlExtensionColorCalibrationsTestsLiquidDataPointsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the LiquidType has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypeChanged(LiquidType liquidtype)
+        {
+            LiquidTypeChanged?.Invoke(this, liquidtype);
+            RaisePropertyChanged(nameof(LiquidType));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorCalibrationsTest has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsTestChanged(RmlExtensionColorCalibrationsTest rmlextensioncolorcalibrationstest)
+        {
+            RmlExtensionColorCalibrationsTestChanged?.Invoke(this, rmlextensioncolorcalibrationstest);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTest));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorCalibrationsTestsLiquidDataPoints has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsTestsLiquidDataPointsChanged(SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> rmlextensioncolorcalibrationstestsliquiddatapoints)
+        {
+            RmlExtensionColorCalibrationsTestsLiquidDataPointsChanged?.Invoke(this, rmlextensioncolorcalibrationstestsliquiddatapoints);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorCalibrationsTestsLiquidDataBase" /> class.
+        /// </summary>
+        public RmlExtensionColorCalibrationsTestsLiquidDataBase() : base()
+        {
+
+            RmlExtensionColorCalibrationsTestsLiquidDataPoints = new SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataPoint.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataPoint.cs
new file mode 100644
index 000000000..06ad5ea7a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataPoint.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 RmlExtensionColorCalibrationsTestsLiquidDataPoint : RmlExtensionColorCalibrationsTestsLiquidDataPointBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataPointBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataPointBase.cs
new file mode 100644
index 000000000..26378441c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataPointBase.cs
@@ -0,0 +1,258 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS")]
+    public abstract class RmlExtensionColorCalibrationsTestsLiquidDataPointBase : ObservableEntity<RmlExtensionColorCalibrationsTestsLiquidDataPoint>
+    {
+
+        public event EventHandler<Double> InkChanged;
+
+        public event EventHandler<Double> LChanged;
+
+        public event EventHandler<Double> AChanged;
+
+        public event EventHandler<Double> BChanged;
+
+        public event EventHandler<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidDataChanged;
+
+        protected String _rmlextensioncolorcalibrationstestsliquiddataguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatapointbase rml extension color calibrations tests liquid data guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID")]
+        [ForeignKey("RmlExtensionColorCalibrationsTestsLiquidData")]
+
+        public  String RmlExtensionColorCalibrationsTestsLiquidDataGuid
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddataguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstestsliquiddataguid != value)
+                {
+                    _rmlextensioncolorcalibrationstestsliquiddataguid = value;
+
+                }
+            }
+        }
+
+        protected Double _ink;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatapointbase ink.
+        /// </summary>
+
+        [Column("INK")]
+
+        public  Double Ink
+        {
+            get 
+            {
+                return _ink; 
+            }
+
+            set 
+            {
+                if (_ink != value)
+                {
+                    _ink = value;
+
+                    OnInkChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _l;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatapointbase 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 rmlextensioncolorcalibrationstestsliquiddatapointbase 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 rmlextensioncolorcalibrationstestsliquiddatapointbase b.
+        /// </summary>
+
+        [Column("B")]
+
+        public  Double B
+        {
+            get 
+            {
+                return _b; 
+            }
+
+            set 
+            {
+                if (_b != value)
+                {
+                    _b = value;
+
+                    OnBChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlExtensionColorCalibrationsTestsLiquidData _rmlextensioncolorcalibrationstestsliquiddata;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatapointbase rml extension color calibrations tests liquid data.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlExtensionColorCalibrationsTestsLiquidData RmlExtensionColorCalibrationsTestsLiquidData
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddata; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrationstestsliquiddata != value)
+                {
+                    _rmlextensioncolorcalibrationstestsliquiddata = value;
+
+                    if (RmlExtensionColorCalibrationsTestsLiquidData != null)
+                    {
+                        RmlExtensionColorCalibrationsTestsLiquidDataGuid = RmlExtensionColorCalibrationsTestsLiquidData.Guid;
+                    }
+
+                    OnRmlExtensionColorCalibrationsTestsLiquidDataChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Ink has changed.
+        /// </summary>
+        protected virtual void OnInkChanged(Double ink)
+        {
+            InkChanged?.Invoke(this, ink);
+            RaisePropertyChanged(nameof(Ink));
+        }
+
+        /// <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 RmlExtensionColorCalibrationsTestsLiquidData has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsTestsLiquidDataChanged(RmlExtensionColorCalibrationsTestsLiquidData rmlextensioncolorcalibrationstestsliquiddata)
+        {
+            RmlExtensionColorCalibrationsTestsLiquidDataChanged?.Invoke(this, rmlextensioncolorcalibrationstestsliquiddata);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorCalibrationsTestsLiquidDataPointBase" /> class.
+        /// </summary>
+        public RmlExtensionColorCalibrationsTestsLiquidDataPointBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShade.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShade.cs
new file mode 100644
index 000000000..d18cfd750
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShade.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 RmlExtensionColorShade : RmlExtensionColorShadeBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs
new file mode 100644
index 000000000..44e7fe521
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs
@@ -0,0 +1,214 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_SHADES")]
+    public abstract class RmlExtensionColorShadeBase : ObservableEntity<RmlExtensionColorShade>
+    {
+
+        public event EventHandler<Machine> MachineChanged;
+
+        public event EventHandler<RmlsExtension> RmlsExtensionChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorShadesTest>> RmlExtensionColorShadesTestsChanged;
+
+        protected String _rmlextensionsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadebase rml extensions guid.
+        /// </summary>
+
+        [Column("RML_EXTENSIONS_GUID")]
+        [ForeignKey("RmlExtensions")]
+
+        public  String RmlExtensionsGuid
+        {
+            get 
+            {
+                return _rmlextensionsguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensionsguid != value)
+                {
+                    _rmlextensionsguid = value;
+
+                }
+            }
+        }
+
+        protected String _machineguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadebase machine guid.
+        /// </summary>
+
+        [Column("MACHINE_GUID")]
+        [ForeignKey("Machine")]
+
+        public  String MachineGuid
+        {
+            get 
+            {
+                return _machineguid; 
+            }
+
+            set 
+            {
+                if (_machineguid != value)
+                {
+                    _machineguid = value;
+
+                }
+            }
+        }
+
+        protected Machine _machine;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadebase machine.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Machine Machine
+        {
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                if (_machine != value)
+                {
+                    _machine = value;
+
+                    if (Machine != null)
+                    {
+                        MachineGuid = Machine.Guid;
+                    }
+
+                    OnMachineChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlsExtension _rmlsextension;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadebase rmls extensions.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlsExtension RmlsExtension
+        {
+            get 
+            {
+                return _rmlsextension; 
+            }
+
+            set 
+            {
+                if (_rmlsextension != value)
+                {
+                    _rmlsextension = value;
+
+                    if (RmlsExtension != null)
+                    {
+                        RmlExtensionsGuid = RmlsExtension.Guid;
+                    }
+
+                    OnRmlsExtensionChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadebase rml extension color shades tests.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestests; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshadestests != value)
+                {
+                    _rmlextensioncolorshadestests = value;
+
+                    OnRmlExtensionColorShadesTestsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
+        /// Called when the RmlsExtension has changed.
+        /// </summary>
+        protected virtual void OnRmlsExtensionChanged(RmlsExtension rmlsextension)
+        {
+            RmlsExtensionChanged?.Invoke(this, rmlsextension);
+            RaisePropertyChanged(nameof(RmlsExtension));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorShadesTests has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorShadesTestsChanged(SynchronizedObservableCollection<RmlExtensionColorShadesTest> rmlextensioncolorshadestests)
+        {
+            RmlExtensionColorShadesTestsChanged?.Invoke(this, rmlextensioncolorshadestests);
+            RaisePropertyChanged(nameof(RmlExtensionColorShadesTests));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorShadeBase" /> class.
+        /// </summary>
+        public RmlExtensionColorShadeBase() : base()
+        {
+
+            RmlExtensionColorShadesTests = new SynchronizedObservableCollection<RmlExtensionColorShadesTest>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTest.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTest.cs
new file mode 100644
index 000000000..88db0049c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTest.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 RmlExtensionColorShadesTest : RmlExtensionColorShadesTestBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestBase.cs
new file mode 100644
index 000000000..5bcce38e5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestBase.cs
@@ -0,0 +1,183 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_SHADES_TESTS")]
+    public abstract class RmlExtensionColorShadesTestBase : ObservableEntity<RmlExtensionColorShadesTest>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<RmlExtensionColorShade> RmlExtensionColorShadesChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorShadesTestsData>> RmlExtensionColorShadesTestsDataChanged;
+
+        protected String _rmlextensioncolorshadesguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestbase rml extension color shades guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_COLOR_SHADES_GUID")]
+        [ForeignKey("RmlExtensionColorShades")]
+
+        public  String RmlExtensionColorShadesGuid
+        {
+            get 
+            {
+                return _rmlextensioncolorshadesguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshadesguid != value)
+                {
+                    _rmlextensioncolorshadesguid = value;
+
+                }
+            }
+        }
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlExtensionColorShade _rmlextensioncolorshades;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestbase rml extension color shades.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlExtensionColorShade RmlExtensionColorShades
+        {
+            get 
+            {
+                return _rmlextensioncolorshades; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshades != value)
+                {
+                    _rmlextensioncolorshades = value;
+
+                    if (RmlExtensionColorShades != null)
+                    {
+                        RmlExtensionColorShadesGuid = RmlExtensionColorShades.Guid;
+                    }
+
+                    OnRmlExtensionColorShadesChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestbase rml extension color shades tests data.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsdata; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshadestestsdata != value)
+                {
+                    _rmlextensioncolorshadestestsdata = value;
+
+                    OnRmlExtensionColorShadesTestsDataChanged(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 RmlExtensionColorShades has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorShadesChanged(RmlExtensionColorShade rmlextensioncolorshades)
+        {
+            RmlExtensionColorShadesChanged?.Invoke(this, rmlextensioncolorshades);
+            RaisePropertyChanged(nameof(RmlExtensionColorShades));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorShadesTestsData has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorShadesTestsDataChanged(SynchronizedObservableCollection<RmlExtensionColorShadesTestsData> rmlextensioncolorshadestestsdata)
+        {
+            RmlExtensionColorShadesTestsDataChanged?.Invoke(this, rmlextensioncolorshadestestsdata);
+            RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorShadesTestBase" /> class.
+        /// </summary>
+        public RmlExtensionColorShadesTestBase() : base()
+        {
+
+            RmlExtensionColorShadesTestsData = new SynchronizedObservableCollection<RmlExtensionColorShadesTestsData>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestsData.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestsData.cs
new file mode 100644
index 000000000..3d9c77b11
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestsData.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 RmlExtensionColorShadesTestsData : RmlExtensionColorShadesTestsDataBase
+    {
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestsDataBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestsDataBase.cs
new file mode 100644
index 000000000..c441da0b2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadesTestsDataBase.cs
@@ -0,0 +1,600 @@
+//------------------------------------------------------------------------------
+// <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("RML_EXTENSION_COLOR_SHADES_TESTS_DATA")]
+    public abstract class RmlExtensionColorShadesTestsDataBase : ObservableEntity<RmlExtensionColorShadesTestsData>
+    {
+
+        public event EventHandler<Int32> ColorNumChanged;
+
+        public event EventHandler<Double> LChanged;
+
+        public event EventHandler<Double> AChanged;
+
+        public event EventHandler<Double> BChanged;
+
+        public event EventHandler<Nullable<Double>> CChanged;
+
+        public event EventHandler<Nullable<Double>> MChanged;
+
+        public event EventHandler<Nullable<Double>> YChanged;
+
+        public event EventHandler<Nullable<Double>> KChanged;
+
+        public event EventHandler<Nullable<Double>> TiChanged;
+
+        public event EventHandler<Double> LResChanged;
+
+        public event EventHandler<Double> AResChanged;
+
+        public event EventHandler<Double> BResChanged;
+
+        public event EventHandler<Double> DeltaEChanged;
+
+        public event EventHandler<RmlExtensionColorShadesTest> RmlExtensionColorShadesTestsChanged;
+
+        protected String _rmlextensioncolorshadestestsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase rml extension color shades tests guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_COLOR_SHADES_TESTS_GUID")]
+        [ForeignKey("RmlExtensionColorShadesTests")]
+
+        public  String RmlExtensionColorShadesTestsGuid
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshadestestsguid != value)
+                {
+                    _rmlextensioncolorshadestestsguid = value;
+
+                }
+            }
+        }
+
+        protected Int32 _colornum;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase color num.
+        /// </summary>
+
+        [Column("COLOR_NUM")]
+
+        public  Int32 ColorNum
+        {
+            get 
+            {
+                return _colornum; 
+            }
+
+            set 
+            {
+                if (_colornum != value)
+                {
+                    _colornum = value;
+
+                    OnColorNumChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _l;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase 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 rmlextensioncolorshadestestsdatabase 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 rmlextensioncolorshadestestsdatabase b.
+        /// </summary>
+
+        [Column("B")]
+
+        public  Double B
+        {
+            get 
+            {
+                return _b; 
+            }
+
+            set 
+            {
+                if (_b != value)
+                {
+                    _b = value;
+
+                    OnBChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _c;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase c.
+        /// </summary>
+
+        [Column("C")]
+
+        public  Nullable<Double> C
+        {
+            get 
+            {
+                return _c; 
+            }
+
+            set 
+            {
+                if (_c != value)
+                {
+                    _c = value;
+
+                    OnCChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _m;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase m.
+        /// </summary>
+
+        [Column("M")]
+
+        public  Nullable<Double> M
+        {
+            get 
+            {
+                return _m; 
+            }
+
+            set 
+            {
+                if (_m != value)
+                {
+                    _m = value;
+
+                    OnMChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _y;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase y.
+        /// </summary>
+
+        [Column("Y")]
+
+        public  Nullable<Double> Y
+        {
+            get 
+            {
+                return _y; 
+            }
+
+            set 
+            {
+                if (_y != value)
+                {
+                    _y = value;
+
+                    OnYChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _k;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase k.
+        /// </summary>
+
+        [Column("K")]
+
+        public  Nullable<Double> K
+        {
+            get 
+            {
+                return _k; 
+            }
+
+            set 
+            {
+                if (_k != value)
+                {
+                    _k = value;
+
+                    OnKChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _ti;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase ti.
+        /// </summary>
+
+        [Column("TI")]
+
+        public  Nullable<Double> Ti
+        {
+            get 
+            {
+                return _ti; 
+            }
+
+            set 
+            {
+                if (_ti != value)
+                {
+                    _ti = value;
+
+                    OnTiChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _lres;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase l res.
+        /// </summary>
+
+        [Column("L_RES")]
+
+        public  Double LRes
+        {
+            get 
+            {
+                return _lres; 
+            }
+
+            set 
+            {
+                if (_lres != value)
+                {
+                    _lres = value;
+
+                    OnLResChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _ares;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase a res.
+        /// </summary>
+
+        [Column("A_RES")]
+
+        public  Double ARes
+        {
+            get 
+            {
+                return _ares; 
+            }
+
+            set 
+            {
+                if (_ares != value)
+                {
+                    _ares = value;
+
+                    OnAResChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _bres;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase b res.
+        /// </summary>
+
+        [Column("B_RES")]
+
+        public  Double BRes
+        {
+            get 
+            {
+                return _bres; 
+            }
+
+            set 
+            {
+                if (_bres != value)
+                {
+                    _bres = value;
+
+                    OnBResChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _deltae;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase delta e.
+        /// </summary>
+
+        [Column("DELTA_E")]
+
+        public  Double DeltaE
+        {
+            get 
+            {
+                return _deltae; 
+            }
+
+            set 
+            {
+                if (_deltae != value)
+                {
+                    _deltae = value;
+
+                    OnDeltaEChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlExtensionColorShadesTest _rmlextensioncolorshadestests;
+
+        /// <summary>
+        /// Gets or sets the rmlextensioncolorshadestestsdatabase rml extension color shades tests.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual RmlExtensionColorShadesTest RmlExtensionColorShadesTests
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestests; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshadestests != value)
+                {
+                    _rmlextensioncolorshadestests = value;
+
+                    if (RmlExtensionColorShadesTests != null)
+                    {
+                        RmlExtensionColorShadesTestsGuid = RmlExtensionColorShadesTests.Guid;
+                    }
+
+                    OnRmlExtensionColorShadesTestsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the ColorNum has changed.
+        /// </summary>
+        protected virtual void OnColorNumChanged(Int32 colornum)
+        {
+            ColorNumChanged?.Invoke(this, colornum);
+            RaisePropertyChanged(nameof(ColorNum));
+        }
+
+        /// <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 C has changed.
+        /// </summary>
+        protected virtual void OnCChanged(Nullable<Double> c)
+        {
+            CChanged?.Invoke(this, c);
+            RaisePropertyChanged(nameof(C));
+        }
+
+        /// <summary>
+        /// Called when the M has changed.
+        /// </summary>
+        protected virtual void OnMChanged(Nullable<Double> m)
+        {
+            MChanged?.Invoke(this, m);
+            RaisePropertyChanged(nameof(M));
+        }
+
+        /// <summary>
+        /// Called when the Y has changed.
+        /// </summary>
+        protected virtual void OnYChanged(Nullable<Double> y)
+        {
+            YChanged?.Invoke(this, y);
+            RaisePropertyChanged(nameof(Y));
+        }
+
+        /// <summary>
+        /// Called when the K has changed.
+        /// </summary>
+        protected virtual void OnKChanged(Nullable<Double> k)
+        {
+            KChanged?.Invoke(this, k);
+            RaisePropertyChanged(nameof(K));
+        }
+
+        /// <summary>
+        /// Called when the Ti has changed.
+        /// </summary>
+        protected virtual void OnTiChanged(Nullable<Double> ti)
+        {
+            TiChanged?.Invoke(this, ti);
+            RaisePropertyChanged(nameof(Ti));
+        }
+
+        /// <summary>
+        /// Called when the LRes has changed.
+        /// </summary>
+        protected virtual void OnLResChanged(Double lres)
+        {
+            LResChanged?.Invoke(this, lres);
+            RaisePropertyChanged(nameof(LRes));
+        }
+
+        /// <summary>
+        /// Called when the ARes has changed.
+        /// </summary>
+        protected virtual void OnAResChanged(Double ares)
+        {
+            AResChanged?.Invoke(this, ares);
+            RaisePropertyChanged(nameof(ARes));
+        }
+
+        /// <summary>
+        /// Called when the BRes has changed.
+        /// </summary>
+        protected virtual void OnBResChanged(Double bres)
+        {
+            BResChanged?.Invoke(this, bres);
+            RaisePropertyChanged(nameof(BRes));
+        }
+
+        /// <summary>
+        /// Called when the DeltaE has changed.
+        /// </summary>
+        protected virtual void OnDeltaEChanged(Double deltae)
+        {
+            DeltaEChanged?.Invoke(this, deltae);
+            RaisePropertyChanged(nameof(DeltaE));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorShadesTests has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorShadesTestsChanged(RmlExtensionColorShadesTest rmlextensioncolorshadestests)
+        {
+            RmlExtensionColorShadesTestsChanged?.Invoke(this, rmlextensioncolorshadestests);
+            RaisePropertyChanged(nameof(RmlExtensionColorShadesTests));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionColorShadesTestsDataBase" /> class.
+        /// </summary>
+        public RmlExtensionColorShadesTestsDataBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs
index a5ef66b9d..09652ea08 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlsExtensionBase.cs
@@ -83,6 +83,10 @@ namespace Tango.BL.Entities
 
         public event EventHandler<YarnWhiteShade> YarnWhiteShadeChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibration>> RmlExtensionColorCalibrationsChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorShade>> RmlExtensionColorShadesChanged;
+
         public event EventHandler<Rml> RmlsChanged;
 
         protected String _rmlsguid;
@@ -1198,6 +1202,56 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase rml extension color calibrations.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrations; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorcalibrations != value)
+                {
+                    _rmlextensioncolorcalibrations = value;
+
+                    OnRmlExtensionColorCalibrationsChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades;
+
+        /// <summary>
+        /// Gets or sets the rmlsextensionbase rml extension color shades.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades
+        {
+            get 
+            {
+                return _rmlextensioncolorshades; 
+            }
+
+            set 
+            {
+                if (_rmlextensioncolorshades != value)
+                {
+                    _rmlextensioncolorshades = value;
+
+                    OnRmlExtensionColorShadesChanged(value);
+
+                }
+            }
+        }
+
         protected Rml _rmls;
 
         /// <summary>
@@ -1483,6 +1537,24 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionColorCalibrations has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorCalibrationsChanged(SynchronizedObservableCollection<RmlExtensionColorCalibration> rmlextensioncolorcalibrations)
+        {
+            RmlExtensionColorCalibrationsChanged?.Invoke(this, rmlextensioncolorcalibrations);
+            RaisePropertyChanged(nameof(RmlExtensionColorCalibrations));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionColorShades has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionColorShadesChanged(SynchronizedObservableCollection<RmlExtensionColorShade> rmlextensioncolorshades)
+        {
+            RmlExtensionColorShadesChanged?.Invoke(this, rmlextensioncolorshades);
+            RaisePropertyChanged(nameof(RmlExtensionColorShades));
+        }
+
+        /// <summary>
         /// Called when the Rmls has changed.
         /// </summary>
         protected virtual void OnRmlsChanged(Rml rmls)
@@ -1501,6 +1573,10 @@ namespace Tango.BL.Entities
 
             RmlExtensionTestResults = new SynchronizedObservableCollection<RmlExtensionTestResult>();
 
+            RmlExtensionColorCalibrations = new SynchronizedObservableCollection<RmlExtensionColorCalibration>();
+
+            RmlExtensionColorShades = new SynchronizedObservableCollection<RmlExtensionColorShade>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
index 00fb75b42..63970e879 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
@@ -50,7 +50,7 @@ namespace Tango.BL.Enumerations
         Catalog = 4,
 
         /// <summary>
-        /// (Catalog)
+        /// (HSB)
         /// </summary>
         [Description("HSB")]
         HSB = 5,
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index a799d7860..382bb0dca 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -703,6 +703,62 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrations.
+        /// </summary>
+        public DbSet<RmlExtensionColorCalibration> RmlExtensionColorCalibrations 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTests.
+        /// </summary>
+        public DbSet<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData.
+        /// </summary>
+        public DbSet<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints.
+        /// </summary>
+        public DbSet<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShades.
+        /// </summary>
+        public DbSet<RmlExtensionColorShade> RmlExtensionColorShades 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTests.
+        /// </summary>
+        public DbSet<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTestsData.
+        /// </summary>
+        public DbSet<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the Rmls.
         /// </summary>
         public DbSet<Rml> Rmls 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index c15da9c18..a95bbd787 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -3077,6 +3077,258 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrations.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrations; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrations View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTests.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstests; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationstestsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTests View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsTestsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddata; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddataViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddatapoints; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShades.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades
+        {
+            get 
+            {
+                return _rmlextensioncolorshades; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorshadesViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShades View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorShadesViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorshadesViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTests.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestests; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorshadestestsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTests View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorShadesTestsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTestsData.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsdata; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorshadestestsdataViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTestsData View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorShadesTestsDataViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsdataViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Rml> _rmls;
         /// <summary>
         /// Gets or sets the Rmls.
@@ -4117,6 +4369,20 @@ namespace Tango.BL
 
             PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions);
 
+            RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations);
+
+            RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests);
+
+            RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData);
+
+            RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints);
+
+            RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades);
+
+            RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests);
+
+            RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData);
+
             RmlsViewSource = CreateCollectionView(Rmls);
 
             RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index 8cf9ef0f2..f4ccd1d88 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -3077,6 +3077,258 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrations.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrations; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrations View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTests.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstests; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationstestsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTests View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsTestsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddata; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddataViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddatapoints; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShades.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades
+        {
+            get 
+            {
+                return _rmlextensioncolorshades; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorshadesViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShades View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorShadesViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorshadesViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTests.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestests; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorshadestestsViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTests View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorShadesTestsViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTestsData.
+        /// </summary>
+        public ObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsdata; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); 
+            }
+
+        }
+
+        private ICollectionView _rmlextensioncolorshadestestsdataViewSource;
+        /// <summary>
+        /// Gets or sets the RmlExtensionColorShadesTestsData View Source.
+        ///</summary>
+        public ICollectionView RmlExtensionColorShadesTestsDataViewSource
+        {
+            get 
+            {
+                return _rmlextensioncolorshadestestsdataViewSource; 
+            }
+
+            set 
+            {
+                _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Rml> _rmls;
         /// <summary>
         /// Gets or sets the Rmls.
@@ -4117,6 +4369,20 @@ namespace Tango.BL
 
             PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions);
 
+            RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations);
+
+            RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests);
+
+            RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData);
+
+            RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints);
+
+            RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades);
+
+            RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests);
+
+            RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData);
+
             RmlsViewSource = CreateCollectionView(Rmls);
 
             RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index ea05066f2..4b6429b87 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -287,6 +287,20 @@
     <Compile Include="DTO\PublishedProcedureProjectsVersionDTOBase.cs" />
     <Compile Include="DTO\RmlDTO.cs" />
     <Compile Include="DTO\RmlDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationsTestDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationsTestDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationsTestsLiquidDataDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationsTestsLiquidDataDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationsTestsLiquidDataPointDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorCalibrationsTestsLiquidDataPointDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorShadeDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorShadeDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorShadesTestDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorShadesTestDTOBase.cs" />
+    <Compile Include="DTO\RmlExtensionColorShadesTestsDataDTO.cs" />
+    <Compile Include="DTO\RmlExtensionColorShadesTestsDataDTOBase.cs" />
     <Compile Include="DTO\RmlExtensionTestResultDTO.cs" />
     <Compile Include="DTO\RmlExtensionTestResultDTOBase.cs" />
     <Compile Include="DTO\RmlsExtensionDTO.cs" />
@@ -457,6 +471,20 @@
     <Compile Include="Entities\PublishedProcedureProjectsVersionBase.cs" />
     <Compile Include="Entities\PublishedProcedureProjectsVersion.cs" />
     <Compile Include="Entities\RmlBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibration.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationsTest.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationsTestBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationsTestsLiquidData.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationsTestsLiquidDataBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationsTestsLiquidDataPoint.cs" />
+    <Compile Include="Entities\RmlExtensionColorCalibrationsTestsLiquidDataPointBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorShade.cs" />
+    <Compile Include="Entities\RmlExtensionColorShadeBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorShadesTest.cs" />
+    <Compile Include="Entities\RmlExtensionColorShadesTestBase.cs" />
+    <Compile Include="Entities\RmlExtensionColorShadesTestsData.cs" />
+    <Compile Include="Entities\RmlExtensionColorShadesTestsDataBase.cs" />
     <Compile Include="Entities\RmlExtensionTestResult.cs" />
     <Compile Include="Entities\RmlExtensionTestResultBase.cs" />
     <Compile Include="Entities\RmlsExtension.cs" />
@@ -772,7 +800,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
index 7d7114f7e..c07b67e50 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
@@ -20,6 +20,7 @@ namespace Tango.DAL.Remote.DB
             this.CATS = new HashSet<CAT>();
             this.IDS_PACKS = new HashSet<IDS_PACKS>();
             this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>();
+            this.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA = new HashSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA>();
         }
     
         public int ID { get; set; }
@@ -40,5 +41,7 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index 78b1e0f63..cf4ab958c 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -22,6 +22,8 @@ namespace Tango.DAL.Remote.DB
             this.DATA_STORE_ITEMS = new HashSet<DATA_STORE_ITEMS>();
             this.JOBS = new HashSet<JOB>();
             this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>();
+            this.RML_EXTENSION_COLOR_CALIBRATIONS = new HashSet<RML_EXTENSION_COLOR_CALIBRATIONS>();
+            this.RML_EXTENSION_COLOR_SHADES = new HashSet<RML_EXTENSION_COLOR_SHADES>();
             this.RML_EXTENSION_TEST_RESULTS = new HashSet<RML_EXTENSION_TEST_RESULTS>();
             this.SPOOLS = new HashSet<SPOOL>();
         }
@@ -78,6 +80,10 @@ 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<RML_EXTENSION_COLOR_CALIBRATIONS> RML_EXTENSION_COLOR_CALIBRATIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_SHADES> RML_EXTENSION_COLOR_SHADES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML_EXTENSION_TEST_RESULTS> RML_EXTENSION_TEST_RESULTS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SPOOL> SPOOLS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
index c19b0a06a..067b4894b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
@@ -19,6 +19,8 @@ namespace Tango.DAL.Remote.DB
         {
             this.COLOR_PROCESS_PARAMETERS = new HashSet<COLOR_PROCESS_PARAMETERS>();
             this.RML_EXTENSION_TEST_RESULTS = new HashSet<RML_EXTENSION_TEST_RESULTS>();
+            this.RML_EXTENSION_COLOR_CALIBRATIONS = new HashSet<RML_EXTENSION_COLOR_CALIBRATIONS>();
+            this.RML_EXTENSION_COLOR_SHADES = new HashSet<RML_EXTENSION_COLOR_SHADES>();
         }
     
         public int ID { get; set; }
@@ -67,6 +69,10 @@ namespace Tango.DAL.Remote.DB
         public virtual YARN_TEXTURINGS YARN_TEXTURINGS { get; set; }
         public virtual YARN_TYPES YARN_TYPES { get; set; }
         public virtual YARN_WHITE_SHADES YARN_WHITE_SHADES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS> RML_EXTENSION_COLOR_CALIBRATIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_SHADES> RML_EXTENSION_COLOR_SHADES { get; set; }
         public virtual RML RML { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs
new file mode 100644
index 000000000..f7aa3a9c4
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_CALIBRATIONS
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public RML_EXTENSION_COLOR_CALIBRATIONS()
+        {
+            this.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS = new HashSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSIONS_GUID { get; set; }
+        public string MACHINE_GUID { get; set; }
+    
+        public virtual MACHINE MACHINE { get; set; }
+        public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS.cs
new file mode 100644
index 000000000..d9dd25a7d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_CALIBRATIONS_TESTS
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public RML_EXTENSION_COLOR_CALIBRATIONS_TESTS()
+        {
+            this.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA = new HashSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+        public string RML_EXTENSION_COLOR_CALIBRATION_GUID { get; set; }
+    
+        public virtual RML_EXTENSION_COLOR_CALIBRATIONS RML_EXTENSION_COLOR_CALIBRATIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs
new file mode 100644
index 000000000..5a4c082be
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA()
+        {
+            this.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS = new HashSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID { get; set; }
+        public string LIQUID_TYPE_GUID { get; set; }
+    
+        public virtual LIQUID_TYPES LIQUID_TYPES { get; set; }
+        public virtual RML_EXTENSION_COLOR_CALIBRATIONS_TESTS RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS.cs
new file mode 100644
index 000000000..025580c1e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS.cs
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID { get; set; }
+        public double INK { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+    
+        public virtual RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs
new file mode 100644
index 000000000..c662feb8f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_SHADES
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public RML_EXTENSION_COLOR_SHADES()
+        {
+            this.RML_EXTENSION_COLOR_SHADES_TESTS = new HashSet<RML_EXTENSION_COLOR_SHADES_TESTS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSIONS_GUID { get; set; }
+        public string MACHINE_GUID { get; set; }
+    
+        public virtual MACHINE MACHINE { get; set; }
+        public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_SHADES_TESTS> RML_EXTENSION_COLOR_SHADES_TESTS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES_TESTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES_TESTS.cs
new file mode 100644
index 000000000..b917f088b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES_TESTS.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_SHADES_TESTS
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public RML_EXTENSION_COLOR_SHADES_TESTS()
+        {
+            this.RML_EXTENSION_COLOR_SHADES_TESTS_DATA = new HashSet<RML_EXTENSION_COLOR_SHADES_TESTS_DATA>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSION_COLOR_SHADES_GUID { get; set; }
+        public string NAME { get; set; }
+    
+        public virtual RML_EXTENSION_COLOR_SHADES RML_EXTENSION_COLOR_SHADES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_COLOR_SHADES_TESTS_DATA> RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES_TESTS_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES_TESTS_DATA.cs
new file mode 100644
index 000000000..c97ddfac3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES_TESTS_DATA.cs
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <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 RML_EXTENSION_COLOR_SHADES_TESTS_DATA
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string RML_EXTENSION_COLOR_SHADES_TESTS_GUID { get; set; }
+        public int COLOR_NUM { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+        public Nullable<double> C { get; set; }
+        public Nullable<double> M { get; set; }
+        public Nullable<double> Y { get; set; }
+        public Nullable<double> K { get; set; }
+        public Nullable<double> TI { get; set; }
+        public double L_RES { get; set; }
+        public double A_RES { get; set; }
+        public double B_RES { get; set; }
+        public double DELTA_E { get; set; }
+    
+        public virtual RML_EXTENSION_COLOR_SHADES_TESTS RML_EXTENSION_COLOR_SHADES_TESTS { 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 0b51ddbda..c89fc2a1f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -110,6 +110,13 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<PROCESS_PARAMETERS_TABLES_GROUPS> PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
         public virtual DbSet<PUBLISHED_PROCEDURE_PROJECTS> PUBLISHED_PROCEDURE_PROJECTS { get; set; }
         public virtual DbSet<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS> PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS> RML_EXTENSION_COLOR_CALIBRATIONS { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_SHADES> RML_EXTENSION_COLOR_SHADES { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS> RML_EXTENSION_COLOR_SHADES_TESTS { get; set; }
+        public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS_DATA> RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; }
         public virtual DbSet<RML> RMLS { get; set; }
         public virtual DbSet<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
index d26e67908..b9a889afd 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
+// T4 code generation is enabled for model 'C:\TFS\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 8e4a49e8f..17761bf6a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1093,6 +1093,91 @@
           <Property Name="AUTHOR" Type="nvarchar" MaxLength="200" Nullable="false" />
           <Property Name="PROJECT_JSON_STRING" Type="nvarchar(max)" Nullable="false" />
         </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS">
+          <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="RML_EXTENSIONS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+          <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" />
+          <Property Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_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="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+          <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="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="INK" Type="float" 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="RML_EXTENSION_COLOR_SHADES">
+          <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="RML_EXTENSIONS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS">
+          <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="RML_EXTENSION_COLOR_SHADES_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS_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="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="COLOR_NUM" 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="C" Type="float" />
+          <Property Name="M" Type="float" />
+          <Property Name="Y" Type="float" />
+          <Property Name="K" Type="float" />
+          <Property Name="TI" Type="float" />
+          <Property Name="L_RES" Type="float" Nullable="false" />
+          <Property Name="A_RES" Type="float" Nullable="false" />
+          <Property Name="B_RES" Type="float" Nullable="false" />
+          <Property Name="DELTA_E" Type="float" Nullable="false" />
+        </EntityType>
         <EntityType Name="RML_EXTENSION_TEST_RESULTS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2550,6 +2635,146 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES">
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MACHINES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS">
+              <PropertyRef Name="MACHINE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1">
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS">
+              <PropertyRef Name="RML_EXTENSIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES">
+          <End Role="LIQUID_TYPES" Type="Self.LIQUID_TYPES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LIQUID_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <PropertyRef Name="LIQUID_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+              <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS">
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Type="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+              <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_MACHINES">
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_SHADES" Type="Self.RML_EXTENSION_COLOR_SHADES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MACHINES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES">
+              <PropertyRef Name="MACHINE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1">
+          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_SHADES" Type="Self.RML_EXTENSION_COLOR_SHADES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES">
+              <PropertyRef Name="RML_EXTENSIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS">
+          <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" Type="Self.RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Type="Self.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_SHADES_TESTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA">
+              <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES">
+          <End Role="RML_EXTENSION_COLOR_SHADES" Type="Self.RML_EXTENSION_COLOR_SHADES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" Type="Self.RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_SHADES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS">
+              <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RML_EXTENSION_TEST_RESULTS_MACHINES">
           <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3201,6 +3426,13 @@
           <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="Self.PROCESS_PARAMETERS_TABLES_GROUPS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS" EntityType="Self.PUBLISHED_PROCEDURE_PROJECTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntityType="Self.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS" EntityType="Self.RML_EXTENSION_COLOR_CALIBRATIONS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntityType="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntityType="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntityType="Self.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_SHADES" EntityType="Self.RML_EXTENSION_COLOR_SHADES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS" EntityType="Self.RML_EXTENSION_COLOR_SHADES_TESTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="Self.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RML_EXTENSION_TEST_RESULTS" EntityType="Self.RML_EXTENSION_TEST_RESULTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS" EntityType="Self.RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS_EXTENSIONS" EntityType="Self.RMLS_EXTENSIONS" Schema="dbo" store:Type="Tables" />
@@ -3512,6 +3744,46 @@
             <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
             <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" Association="Self.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES">
+            <End Role="MACHINES" EntitySet="MACHINES" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1" Association="Self.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1">
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" Association="Self.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES">
+            <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Association="Self.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Association="Self.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" Association="Self.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS">
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_MACHINES" Association="Self.FK_RML_EXTENSION_COLOR_SHADES_MACHINES">
+            <End Role="MACHINES" EntitySet="MACHINES" />
+            <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" Association="Self.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1">
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+            <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" Association="Self.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS">
+            <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
+            <End Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" Association="Self.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES">
+            <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
+            <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_MACHINES" Association="Self.FK_RML_EXTENSION_TEST_RESULTS_MACHINES">
             <End Role="MACHINES" EntitySet="MACHINES" />
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
@@ -3843,6 +4115,13 @@
           <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" />
           <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS" EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" />
           <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+          <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" />
+          <EntitySet Name="RML_EXTENSION_COLOR_SHADES" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" />
+          <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" />
+          <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" />
           <EntitySet Name="RMLS" EntityType="RemoteModel.RML" />
           <EntitySet Name="RMLS_SPOOLS" EntityType="RemoteModel.RMLS_SPOOLS" />
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
@@ -4131,6 +4410,10 @@
             <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" />
             <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES">
+            <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+          </AssociationSet>
           <AssociationSet Name="FK_LIQUID_TYPES_RMLS_RMLS" Association="RemoteModel.FK_LIQUID_TYPES_RMLS_RMLS">
             <End Role="RML" EntitySet="RMLS" />
             <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" />
@@ -4155,6 +4438,14 @@
             <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" />
             <End Role="MACHINE" EntitySet="MACHINES" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES">
+            <End Role="MACHINE" EntitySet="MACHINES" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_MACHINES" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_MACHINES">
+            <End Role="MACHINE" EntitySet="MACHINES" />
+            <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
+          </AssociationSet>
           <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_MACHINES" Association="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES">
             <End Role="MACHINE" EntitySet="MACHINES" />
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
@@ -4203,6 +4494,34 @@
             <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
             <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1">
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS">
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+            <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1">
+            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
+            <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES">
+            <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
+            <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS">
+            <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
+            <End Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" />
+          </AssociationSet>
           <AssociationSet Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
             <End Role="RUBBING_RESULTS" EntitySet="RUBBING_RESULTS" />
@@ -4316,7 +4635,7 @@
           <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="RMLS_EXTENSIONS" />
           <NavigationProperty Name="COLOR_PROCESS_INK_UPTAKE" Relationship="RemoteModel.FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="COLOR_PROCESS_INK_UPTAKE" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_MACHINES" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="MACHINE" />
-        </EntityType>
+          </EntityType>
         <EntityType Name="RML_EXTENSION_TEST_RESULTS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4360,7 +4679,7 @@
           <NavigationProperty Name="TENSILE_RESULTS" Relationship="RemoteModel.FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="TENSILE_RESULTS" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="MACHINE" />
           <NavigationProperty Name="RUBBING_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RUBBING_RESULTS" />
-        </EntityType>
+          </EntityType>
         <EntityType Name="RMLS_EXTENSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4408,8 +4727,10 @@
           <NavigationProperty Name="YARN_TYPES" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPES" FromRole="RMLS_EXTENSIONS" ToRole="YARN_TYPES" />
           <NavigationProperty Name="YARN_WHITE_SHADES" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_WHITE_SHADES" FromRole="RMLS_EXTENSIONS" ToRole="YARN_WHITE_SHADES" />
           <Property Name="RML_LEVEL" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1" FromRole="RMLS_EXTENSIONS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" FromRole="RMLS_EXTENSIONS" ToRole="RML_EXTENSION_COLOR_SHADES" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_RMLS" FromRole="RMLS_EXTENSIONS" ToRole="RML" />
-        </EntityType>
+          </EntityType>
         <EntityType Name="TENSILE_RESULTS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -5621,6 +5942,7 @@
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_LIQUID_TYPES1" FromRole="LIQUID_TYPES" ToRole="CAT" />
           <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID_TYPES" ToRole="IDS_PACKS" />
           <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUID_TYPES_RMLS_LIQUID_TYPES" FromRole="LIQUID_TYPES" ToRole="LIQUID_TYPES_RMLS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" FromRole="LIQUID_TYPES" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
         </EntityType>
         <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
@@ -5723,6 +6045,8 @@
           <NavigationProperty Name="MACHINE_VERSIONS" Relationship="RemoteModel.FK_MACHINES_MACHINE_VERSIONS" FromRole="MACHINE" ToRole="MACHINE_VERSIONS" />
           <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_MACHINES" FromRole="MACHINE" ToRole="MACHINES_EVENTS" />
           <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_MACHINES_ORGANIZATIONS" FromRole="MACHINE" ToRole="ORGANIZATION" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" FromRole="MACHINE" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_MACHINES" FromRole="MACHINE" ToRole="RML_EXTENSION_COLOR_SHADES" />
           <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="MACHINE" ToRole="RML_EXTENSION_TEST_RESULTS" />
           <NavigationProperty Name="SPOOLS" Relationship="RemoteModel.FK_SPOOLS_MACHINES" FromRole="MACHINE" ToRole="SPOOL" />
         </EntityType>
@@ -5907,6 +6231,106 @@
           <Property Name="PROJECT_JSON_STRING" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="PUBLISHED_PROCEDURE_PROJECTS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" ToRole="PUBLISHED_PROCEDURE_PROJECTS" />
         </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS">
+          <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="RML_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="MACHINE" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="RMLS_EXTENSIONS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+          <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" />
+          <Property Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_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="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="LIQUID_TYPES" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+          <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="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="INK" Type="Double" 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="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_SHADES">
+          <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="RML_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_MACHINES" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="MACHINE" />
+          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="RMLS_EXTENSIONS" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS">
+          <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="RML_EXTENSION_COLOR_SHADES_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS" ToRole="RML_EXTENSION_COLOR_SHADES" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" />
+        </EntityType>
+        <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS_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="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="COLOR_NUM" 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="C" Type="Double" />
+          <Property Name="M" Type="Double" />
+          <Property Name="Y" Type="Double" />
+          <Property Name="K" Type="Double" />
+          <Property Name="TI" Type="Double" />
+          <Property Name="L_RES" Type="Double" Nullable="false" />
+          <Property Name="A_RES" Type="Double" Nullable="false" />
+          <Property Name="B_RES" Type="Double" Nullable="false" />
+          <Property Name="DELTA_E" Type="Double" Nullable="false" />
+          <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" />
+        </EntityType>
         <EntityType Name="RML">
           <Key>
             <PropertyRef Name="GUID" />
@@ -7183,6 +7607,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES">
+          <End Type="RemoteModel.LIQUID_TYPES" Role="LIQUID_TYPES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LIQUID_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <PropertyRef Name="LIQUID_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_LIQUID_TYPES_RMLS_RMLS">
           <End Type="RemoteModel.RML" Role="RML" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -7261,6 +7699,34 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES">
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MACHINE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS">
+              <PropertyRef Name="MACHINE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_MACHINES">
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MACHINE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES">
+              <PropertyRef Name="MACHINE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RML_EXTENSION_TEST_RESULTS_MACHINES">
           <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -7417,6 +7883,104 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS1">
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS">
+              <PropertyRef Name="RML_EXTENSIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS">
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+              <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+              <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1">
+          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS_EXTENSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES">
+              <PropertyRef Name="RML_EXTENSIONS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES">
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Role="RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_SHADES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS">
+              <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS">
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Role="RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_COLOR_SHADES_TESTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA">
+              <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
           <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -8990,6 +9554,98 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS">
+                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
+                <ScalarProperty Name="RML_EXTENSIONS_GUID" ColumnName="RML_EXTENSIONS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS">
+                <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATION_GUID" />
+                <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="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA">
+                <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
+                <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS">
+                <ScalarProperty Name="B" ColumnName="B" />
+                <ScalarProperty Name="A" ColumnName="A" />
+                <ScalarProperty Name="L" ColumnName="L" />
+                <ScalarProperty Name="INK" ColumnName="INK" />
+                <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES">
+                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
+                <ScalarProperty Name="RML_EXTENSIONS_GUID" ColumnName="RML_EXTENSIONS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES_TESTS">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES_TESTS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="RML_EXTENSION_COLOR_SHADES_GUID" ColumnName="RML_EXTENSION_COLOR_SHADES_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA">
+            <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA">
+              <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA">
+                <ScalarProperty Name="DELTA_E" ColumnName="DELTA_E" />
+                <ScalarProperty Name="B_RES" ColumnName="B_RES" />
+                <ScalarProperty Name="A_RES" ColumnName="A_RES" />
+                <ScalarProperty Name="L_RES" ColumnName="L_RES" />
+                <ScalarProperty Name="TI" ColumnName="TI" />
+                <ScalarProperty Name="K" ColumnName="K" />
+                <ScalarProperty Name="Y" ColumnName="Y" />
+                <ScalarProperty Name="M" ColumnName="M" />
+                <ScalarProperty Name="C" ColumnName="C" />
+                <ScalarProperty Name="B" ColumnName="B" />
+                <ScalarProperty Name="A" ColumnName="A" />
+                <ScalarProperty Name="L" ColumnName="L" />
+                <ScalarProperty Name="COLOR_NUM" ColumnName="COLOR_NUM" />
+                <ScalarProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" ColumnName="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="RMLS">
             <EntityTypeMapping TypeName="RemoteModel.RML">
               <MappingFragment StoreEntitySet="RMLS">
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 cc936cddc..61920906b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,97 +5,104 @@
     <!-- 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="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="90.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="11.75" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="34.75" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="36.625" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="17.625" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="13.75" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="34.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="74.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="65.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="94.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="93.5" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="14.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="22.125" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="45.5" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="98.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="79.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="102.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="83.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="71.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="82.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="74.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="80.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="98.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="88.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="75.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="78.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="106.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="87.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="43.75" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="37.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="15.75" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="25.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="14.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="49.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="28.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="31.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="11.375" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="43.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="54" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.5" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="50" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="10.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="22" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="7.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="31.75" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="15.75" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="17.75" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="40.875" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="17.75" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="17.75" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="18" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="30" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="30.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="62.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="82.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="73.75" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="3.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="31.75" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="42.625" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="58.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="26.25" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="70" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="91.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="90.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="76.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="5.875" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="38" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="28.875" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="7.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="6.5" PointY="87.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="8.75" PointY="65.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="55.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="69.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="11.5" PointY="87.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="13.75" PointY="70" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.5" PointY="62" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11.75" PointY="59.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="8.5" PointY="74.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10.75" PointY="70.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="56.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="61.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="86.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="79.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="35.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="43.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="9" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="42.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="34.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="14.75" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="39.375" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="60.25" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.75" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="16.75" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="19" PointY="2.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Width="1.5" PointX="8.25" PointY="83.125" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Width="1.5" PointX="10.5" PointY="83.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Width="1.5" PointX="12.75" PointY="47.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Width="1.5" PointX="15" PointY="47.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" Width="1.5" PointX="8.25" PointY="78.875" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Width="1.5" PointX="10.5" PointY="79" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Width="1.5" PointX="12.75" PointY="77.875" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="25.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="17.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="32.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="52.875" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="17.75" PointY="19.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="37.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="19.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="19.75" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="19.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="29.375" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -160,12 +167,15 @@
         <AssociationConnector Association="RemoteModel.FK_SEGMENTS_JOBS" />
         <AssociationConnector Association="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" />
         <AssociationConnector Association="RemoteModel.FK_LIQUID_TYPES_RMLS_LIQUID_TYPES" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_LIQUID_TYPES_RMLS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINE_STUDIO_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_MACHINE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_TANGO_VERSIONS_MACHINE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_ORGANIZATIONS" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_SPOOLS_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_CONDITIONS" />
@@ -177,6 +187,11 @@
         <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_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" />
+        <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" />
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 8a7ccc017..10f151494 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -300,6 +300,27 @@
     <Compile Include="DB\RMLS_SPOOLS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_CALIBRATIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_CALIBRATIONS_TESTS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_SHADES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_SHADES_TESTS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML_EXTENSION_COLOR_SHADES_TESTS_DATA.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\RML_EXTENSION_TEST_RESULTS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -458,7 +479,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