merge

33 files changed, 266 insertions, 1680 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_LOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_LOGS.cs
deleted file mode 100644
index 7bfa1fa2c..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_LOGS.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 ACTION_LOGS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public int TYPE { get; set; }
-        public string USER_GUID { get; set; }
-        public string RELATED_OBJECT_NAME { get; set; }
-        public string RELATED_OBJECT_GUID { get; set; }
-        public string MESSAGE { get; set; }
-        public string DIFFERENCE { get; set; }
-    
-        public virtual USER USER { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
index 6ba539edb..60d4a2e98 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
@@ -50,7 +50,6 @@ namespace Tango.DAL.Remote.DB
         public bool CORRECTED { get; set; }
         public string COLOR_CATALOG_GUID { get; set; }
         public string COLOR_CATALOGS_ITEM_GUID { get; set; }
-        public bool IS_TRANSPARENT { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
         public virtual COLOR_CATALOGS_ITEMS COLOR_CATALOGS_ITEMS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs
index 86c0156b7..31989101d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs
@@ -20,7 +20,6 @@ namespace Tango.DAL.Remote.DB
             this.BRUSH_STOPS = new HashSet<BRUSH_STOPS>();
             this.COLOR_CATALOGS_GROUPS = new HashSet<COLOR_CATALOGS_GROUPS>();
             this.JOBS = new HashSet<JOB>();
-            this.SITES_CATALOGS = new HashSet<SITES_CATALOGS>();
         }
     
         public int ID { get; set; }
@@ -39,7 +38,5 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<COLOR_CATALOGS_GROUPS> COLOR_CATALOGS_GROUPS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<SITES_CATALOGS> SITES_CATALOGS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs
index e1a81b759..d2a9c4479 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         {
             this.BRUSH_STOPS = new HashSet<BRUSH_STOPS>();
             this.JOBS = new HashSet<JOB>();
+            this.MACHINES = new HashSet<MACHINE>();
         }
     
         public int ID { get; set; }
@@ -33,5 +34,7 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<BRUSH_STOPS> BRUSH_STOPS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<MACHINE> MACHINES { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DATA_STORE_ITEMS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DATA_STORE_ITEMS.cs
deleted file mode 100644
index 6fcfe6a86..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DATA_STORE_ITEMS.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 DATA_STORE_ITEMS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string MACHINE_GUID { get; set; }
-        public string COLLECTION_NAME { get; set; }
-        public string KEY { get; set; }
-        public int DATA_TYPE { get; set; }
-        public byte[] VALUE { get; set; }
-        public bool IS_DELETED { get; set; }
-        public bool IS_SYNCHRONIZED { get; set; }
-    
-        public virtual MACHINE MACHINE { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
index d404c0be0..9b4079131 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
@@ -35,7 +35,6 @@ namespace Tango.DAL.Remote.DB
         public string EVENT_ACTIONS { get; set; }
         public bool REQUIRES_USER_INTERVENTION { get; set; }
         public string GUIDANCE { get; set; }
-        public bool PERSISTENT { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/FSE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/FSE_VERSIONS.cs
deleted file mode 100644
index 277d2e92d..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/FSE_VERSIONS.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 FSE_VERSIONS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string VERSION { get; set; }
-        public string BLOB_NAME { get; set; }
-        public string INSTALLER_BLOB_NAME { get; set; }
-        public string COMMENTS { get; set; }
-        public string USER_GUID { get; set; }
-    
-        public virtual USER USER { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/GLOBAL_DATA_STORE_ITEMS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/GLOBAL_DATA_STORE_ITEMS.cs
deleted file mode 100644
index 36a808b9d..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/GLOBAL_DATA_STORE_ITEMS.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 GLOBAL_DATA_STORE_ITEMS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string COLLECTION_NAME { get; set; }
-        public string KEY { get; set; }
-        public int DATA_TYPE { get; set; }
-        public byte[] VALUE { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
index 992493cbc..3f68baea7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
@@ -53,7 +53,6 @@ namespace Tango.DAL.Remote.DB
         public int T_ON_MIN { get; set; }
         public int T_OFF_MIN { get; set; }
         public bool ACTIVE { get; set; }
-        public int P01_CONFIG_WORD { get; set; }
     
         public virtual HARDWARE_MOTOR_TYPES HARDWARE_MOTOR_TYPES { get; set; }
         public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
index f30b43230..eb8c0a998 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public JOB()
         {
+            this.JOB_RUNS = new HashSet<JOB_RUNS>();
             this.SEGMENTS = new HashSet<SEGMENT>();
         }
     
@@ -56,12 +57,12 @@ namespace Tango.DAL.Remote.DB
         public Nullable<System.DateTime> SAMPLE_DYE_APPROVE_DATE { get; set; }
         public int EDITING_STATE { get; set; }
         public double LENGTH_PERCENTAGE_FACTOR { get; set; }
-        public bool IS_SYNCHRONIZED { get; set; }
-        public int SOURCE { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
         public virtual COLOR_SPACES COLOR_SPACES { get; set; }
         public virtual CUSTOMER CUSTOMER { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<JOB_RUNS> JOB_RUNS { get; set; }
         public virtual MACHINE MACHINE { get; set; }
         public virtual RML RML { get; set; }
         public virtual SPOOL_TYPES SPOOL_TYPES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
index 15c819d3a..fb591afa0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -17,34 +17,13 @@ namespace Tango.DAL.Remote.DB
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
-        public string MACHINE_GUID { get; set; }
         public string JOB_GUID { get; set; }
-        public string RML_GUID { get; set; }
-        public string USER_GUID { get; set; }
-        public string JOB_NAME { get; set; }
-        public int JOB_DESIGNATION { get; set; }
-        public int JOB_SOURCE { get; set; }
-        public string JOB_STRING { get; set; }
         public System.DateTime START_DATE { get; set; }
-        public Nullable<System.DateTime> UPLOADING_START_DATE { get; set; }
-        public Nullable<System.DateTime> HEATING_START_DATE { get; set; }
-        public Nullable<System.DateTime> ACTUAL_START_DATE { get; set; }
         public System.DateTime END_DATE { get; set; }
         public int STATUS { get; set; }
-        public double JOB_LENGTH { get; set; }
-        public bool IS_GRADIENT { get; set; }
-        public int GRADIENT_RESOLUTION_CM { get; set; }
-        public string LIQUID_QUANTITY_STRING { get; set; }
-        public int CYAN_QUANTITY { get; set; }
-        public int MAGENTA_QUANTITY { get; set; }
-        public int YELLOW_QUANTITY { get; set; }
-        public int BLACK_QUANTITY { get; set; }
-        public int TRANSPARENT_QUANTITY { get; set; }
-        public int LUBRICANT_QUANTITY { get; set; }
-        public int CLEANER_QUANTITY { get; set; }
         public double END_POSITION { get; set; }
         public string FAILED_MESSAGE { get; set; }
-        public bool IS_HEAD_CLEANING { get; set; }
-        public bool IS_SYNCHRONIZED { get; set; }
+    
+        public virtual JOB JOB { get; set; }
     }
 }
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 ba99cf489..1ace97bf4 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
@@ -31,7 +31,6 @@ namespace Tango.DAL.Remote.DB
         public int COLOR { get; set; }
         public int PREFERRED_INDEX { get; set; }
         public bool HAS_PIGMENT { get; set; }
-        public string SHORT_NAME { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { 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 14fe4f04e..9e83e7e4d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -18,7 +18,6 @@ namespace Tango.DAL.Remote.DB
         public MACHINE()
         {
             this.CATS = new HashSet<CAT>();
-            this.DATA_STORE_ITEMS = new HashSet<DATA_STORE_ITEMS>();
             this.JOBS = new HashSet<JOB>();
             this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>();
             this.SPOOLS = new HashSet<SPOOL>();
@@ -31,7 +30,6 @@ namespace Tango.DAL.Remote.DB
         public string NAME { get; set; }
         public System.DateTime PRODUCTION_DATE { get; set; }
         public string ORGANIZATION_GUID { get; set; }
-        public string SITE_GUID { get; set; }
         public string MACHINE_VERSION_GUID { get; set; }
         public string CONFIGURATION_GUID { get; set; }
         public string DEFAULT_RML_GUID { get; set; }
@@ -57,20 +55,19 @@ namespace Tango.DAL.Remote.DB
         public bool IS_DEVICE_REGISTERED { get; set; }
         public string DEVICE_ID { get; set; }
         public string DEVICE_NAME { get; set; }
-        public int HEAD_TYPE { get; set; }
-        public string ACTIVATION_KEY { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { get; set; }
+        public virtual COLOR_SPACES COLOR_SPACES { get; set; }
         public virtual CONFIGURATION CONFIGURATION { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<DATA_STORE_ITEMS> DATA_STORE_ITEMS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
         public virtual MACHINE_VERSIONS MACHINE_VERSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
         public virtual ORGANIZATION ORGANIZATION { get; set; }
+        public virtual RML RML { get; set; }
+        public virtual SPOOL_TYPES SPOOL_TYPES { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SPOOL> SPOOLS { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs
index c555a1ce3..d83f123a2 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs
@@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB
         public string USER_GUID { get; set; }
         public System.DateTime DATE_TIME { get; set; }
         public string DESCRIPTION { get; set; }
-        public bool IS_SYNCHRONIZED { get; set; }
     
         public virtual EVENT_TYPES EVENT_TYPES { get; set; }
         public virtual MACHINE MACHINE { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs
index 71be380f5..0073f82ef 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs
@@ -19,7 +19,6 @@ namespace Tango.DAL.Remote.DB
         {
             this.CUSTOMERS = new HashSet<CUSTOMER>();
             this.MACHINES = new HashSet<MACHINE>();
-            this.SITES = new HashSet<SITE>();
             this.USERS = new HashSet<USER>();
         }
     
@@ -37,8 +36,6 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<MACHINE> MACHINES { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<SITE> SITES { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<USER> USERS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs
index 5896f742e..31dcd44d3 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs
@@ -39,17 +39,6 @@ namespace Tango.DAL.Remote.DB
         public double HEAD_AIR_FLOW { get; set; }
         public string PROCESS_PARAMETERS_TABLES_GROUP_GUID { get; set; }
         public int TABLE_INDEX { get; set; }
-        public double HEAD_ZONE7_TEMP { get; set; }
-        public double HEAD_ZONE8_TEMP { get; set; }
-        public double HEAD_ZONE9_TEMP { get; set; }
-        public double HEAD_ZONE10_TEMP { get; set; }
-        public double HEAD_ZONE11_TEMP { get; set; }
-        public double HEAD_ZONE12_TEMP { get; set; }
-        public double R_BLOWER_FLOW { get; set; }
-        public double R_BLOWER_TEMP { get; set; }
-        public double L_BLOWER_FLOW { get; set; }
-        public double L_BLOWER_TEMP { get; set; }
-        public double PRESSURE_BUILD_UP { get; set; }
     
         public virtual PROCESS_PARAMETERS_TABLES_GROUPS PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS.cs
deleted file mode 100644
index e9919233e..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 PUBLISHED_PROCEDURE_PROJECTS
-    {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public PUBLISHED_PROCEDURE_PROJECTS()
-        {
-            this.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS = new HashSet<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS>();
-        }
-    
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string NAME { get; set; }
-        public string DESCRIPTION { get; set; }
-        public System.DateTime PUBLISH_DATE { get; set; }
-        public int SORTING_INDEX { get; set; }
-        public bool IS_VISIBLE { get; set; }
-        public int VISIBILITY { get; set; }
-    
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS> PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs
deleted file mode 100644
index 6d601ee71..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 PUBLISHED_PROCEDURE_PROJECTS_VERSIONS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string PUBLISHED_PROCEDURE_PROJECT_GUID { get; set; }
-        public int VERSION { get; set; }
-        public string AUTHOR { get; set; }
-        public string PROJECT_JSON_STRING { get; set; }
-    
-        public virtual PUBLISHED_PROCEDURE_PROJECTS PUBLISHED_PROCEDURE_PROJECTS { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index af0077df7..063cd7f8e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -21,16 +21,14 @@ namespace Tango.DAL.Remote.DB
             this.COLOR_CATALOGS_ITEMS_RECIPES = new HashSet<COLOR_CATALOGS_ITEMS_RECIPES>();
             this.JOBS = new HashSet<JOB>();
             this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>();
+            this.MACHINES = new HashSet<MACHINE>();
             this.PROCESS_PARAMETERS_TABLES_GROUPS = new HashSet<PROCESS_PARAMETERS_TABLES_GROUPS>();
-            this.RMLS_SPOOLS = new HashSet<RMLS_SPOOLS>();
-            this.SITES_RMLS = new HashSet<SITES_RMLS>();
         }
     
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public string NAME { get; set; }
-        public string DISPLAY_NAME { get; set; }
         public string MANUFACTURER { get; set; }
         public int CODE { get; set; }
         public double WHITE_POINT_L { get; set; }
@@ -56,23 +54,6 @@ namespace Tango.DAL.Remote.DB
         public byte[] THUMBNAIL { get; set; }
         public string CCT_GUID { get; set; }
         public int COLOR_CONVERSION_VERSION { get; set; }
-        public bool USE_COLOR_LIB_GRADIENTS { get; set; }
-        public int HEAD_TYPE { get; set; }
-        public int QUALIFICATION_LEVEL { get; set; }
-        public Nullable<System.DateTime> QUALIFICATION_DATE { get; set; }
-        public string SPOOLS_CALIBRATIONS_STRING { get; set; }
-        public int FEEDER_P { get; set; }
-        public int FEEDER_I { get; set; }
-        public int FEEDER_D { get; set; }
-        public int PULLER_P { get; set; }
-        public int PULLER_I { get; set; }
-        public int PULLER_D { get; set; }
-        public int WINDER_P { get; set; }
-        public int WINDER_I { get; set; }
-        public int WINDER_D { get; set; }
-        public bool BYPASS_ROCKERS { get; set; }
-        public int CLEANER_FLOW { get; set; }
-        public double ARC_HEAD_CLEANING_MOTOR_SPEED { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { get; set; }
@@ -86,14 +67,12 @@ namespace Tango.DAL.Remote.DB
         public virtual LINEAR_MASS_DENSITY_UNITS LINEAR_MASS_DENSITY_UNITS { 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<MACHINE> MACHINES { get; set; }
         public virtual MEDIA_CONDITIONS MEDIA_CONDITIONS { get; set; }
         public virtual MEDIA_MATERIALS MEDIA_MATERIALS { get; set; }
         public virtual MEDIA_PURPOSES MEDIA_PURPOSES { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<PROCESS_PARAMETERS_TABLES_GROUPS> PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<SITES_RMLS> SITES_RMLS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs
deleted file mode 100644
index a314530ec..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 RMLS_SPOOLS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string SPOOL_TYPE_GUID { get; set; }
-        public string RML_GUID { get; set; }
-        public Nullable<double> ROTATIONS_PER_PASSAGE { get; set; }
-        public Nullable<double> LENGTH { get; set; }
-        public Nullable<int> BACKING_RATE { get; set; }
-        public Nullable<int> BOTTOM_BACKING_RATE { get; set; }
-    
-        public virtual RML RML { get; set; }
-        public virtual SPOOL_TYPES SPOOL_TYPES { 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 016f3182e..a1cc4d407 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -26,7 +26,6 @@ namespace Tango.DAL.Remote.DB
         }
     
         public virtual DbSet<SYNC_CONFIGURATIONS> SYNC_CONFIGURATIONS { get; set; }
-        public virtual DbSet<ACTION_LOGS> ACTION_LOGS { get; set; }
         public virtual DbSet<ADDRESS> ADDRESSES { get; set; }
         public virtual DbSet<APPLICATION_DISPLAY_PANEL_VERSIONS> APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; }
@@ -43,15 +42,12 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<CUSTOMER> CUSTOMERS { get; set; }
-        public virtual DbSet<DATA_STORE_ITEMS> DATA_STORE_ITEMS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; }
         public virtual DbSet<DISPENSER> DISPENSERS { get; set; }
         public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; }
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
         public virtual DbSet<FIBER_SYNTHS> FIBER_SYNTHS { get; set; }
-        public virtual DbSet<FSE_VERSIONS> FSE_VERSIONS { get; set; }
-        public virtual DbSet<GLOBAL_DATA_STORE_ITEMS> GLOBAL_DATA_STORE_ITEMS { get; set; }
         public virtual DbSet<HARDWARE_BLOWER_TYPES> HARDWARE_BLOWER_TYPES { get; set; }
         public virtual DbSet<HARDWARE_BLOWERS> HARDWARE_BLOWERS { get; set; }
         public virtual DbSet<HARDWARE_BREAK_SENSOR_TYPES> HARDWARE_BREAK_SENSOR_TYPES { get; set; }
@@ -86,20 +82,13 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<PERMISSION> PERMISSIONS { get; set; }
         public virtual DbSet<PROCESS_PARAMETERS_TABLES> PROCESS_PARAMETERS_TABLES { get; set; }
         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> RMLS { get; set; }
-        public virtual DbSet<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
         public virtual DbSet<SEGMENT> SEGMENTS { get; set; }
-        public virtual DbSet<SITE> SITES { get; set; }
-        public virtual DbSet<SITES_CATALOGS> SITES_CATALOGS { get; set; }
-        public virtual DbSet<SITES_RMLS> SITES_RMLS { get; set; }
         public virtual DbSet<SPOOL_TYPES> SPOOL_TYPES { get; set; }
         public virtual DbSet<SPOOL> SPOOLS { get; set; }
         public virtual DbSet<sysdiagram> sysdiagrams { get; set; }
-        public virtual DbSet<TANGO_UPDATES> TANGO_UPDATES { get; set; }
         public virtual DbSet<TANGO_VERSIONS> TANGO_VERSIONS { get; set; }
         public virtual DbSet<TECH_CONTROLLERS> TECH_CONTROLLERS { get; set; }
         public virtual DbSet<TECH_DISPENSERS> TECH_DISPENSERS { 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..17bc2683d 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 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index af3179379..19fb2c9fc 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -5,20 +5,6 @@
     <!-- SSDL content -->
     <edmx:StorageModels>
     <Schema Namespace="RemoteModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
-        <EntityType Name="ACTION_LOGS">
-          <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="TYPE" Type="int" Nullable="false" />
-          <Property Name="USER_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="RELATED_OBJECT_NAME" Type="nvarchar" MaxLength="200" />
-          <Property Name="RELATED_OBJECT_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="MESSAGE" Type="nvarchar(max)" />
-          <Property Name="DIFFERENCE" Type="nvarchar(max)" />
-        </EntityType>
         <EntityType Name="ADDRESSES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -104,7 +90,6 @@
           <Property Name="CORRECTED" Type="bit" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" />
           <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="IS_TRANSPARENT" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
           <Key>
@@ -254,21 +239,6 @@
           <Property Name="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
         </EntityType>
-        <EntityType Name="DATA_STORE_ITEMS">
-          <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="MACHINE_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="COLLECTION_NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="KEY" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="DATA_TYPE" Type="int" Nullable="false" />
-          <Property Name="VALUE" Type="image" Nullable="false" />
-          <Property Name="IS_DELETED" Type="bit" Nullable="false" />
-          <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
-        </EntityType>
         <EntityType Name="DISPENSER_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -325,7 +295,6 @@
           <Property Name="EVENT_ACTIONS" Type="varchar" MaxLength="50" />
           <Property Name="REQUIRES_USER_INTERVENTION" Type="bit" Nullable="false" />
           <Property Name="GUIDANCE" Type="nvarchar(max)" />
-          <Property Name="PERSISTENT" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="FIBER_SHAPES">
           <Key>
@@ -347,31 +316,6 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
         </EntityType>
-        <EntityType Name="FSE_VERSIONS">
-          <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="VERSION" Type="varchar" MaxLength="50" Nullable="false" />
-          <Property Name="BLOB_NAME" Type="varchar" MaxLength="200" Nullable="false" />
-          <Property Name="INSTALLER_BLOB_NAME" Type="varchar" MaxLength="200" />
-          <Property Name="COMMENTS" Type="nvarchar(max)" Nullable="false" />
-          <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-        </EntityType>
-        <EntityType Name="GLOBAL_DATA_STORE_ITEMS">
-          <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="COLLECTION_NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="KEY" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="DATA_TYPE" Type="int" Nullable="false" />
-          <Property Name="VALUE" Type="image" Nullable="false" />
-        </EntityType>
         <EntityType Name="HARDWARE_BLOWER_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -508,7 +452,6 @@
           <Property Name="T_ON_MIN" Type="int" Nullable="false" />
           <Property Name="T_OFF_MIN" Type="int" Nullable="false" />
           <Property Name="ACTIVE" Type="bit" Nullable="false" />
-          <Property Name="P01_CONFIG_WORD" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="HARDWARE_PID_CONTROL_TYPES">
           <Key>
@@ -643,35 +586,12 @@
           <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="MACHINE_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="JOB_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="RML_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="USER_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="JOB_NAME" Type="nvarchar" MaxLength="100" />
-          <Property Name="JOB_DESIGNATION" Type="int" Nullable="false" />
-          <Property Name="JOB_SOURCE" Type="int" Nullable="false" />
-          <Property Name="JOB_STRING" Type="nvarchar(max)" />
+          <Property Name="JOB_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="START_DATE" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="UPLOADING_START_DATE" Type="datetime2" Precision="3" />
-          <Property Name="HEATING_START_DATE" Type="datetime2" Precision="3" />
-          <Property Name="ACTUAL_START_DATE" Type="datetime2" Precision="3" />
           <Property Name="END_DATE" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="STATUS" Type="int" Nullable="false" />
-          <Property Name="JOB_LENGTH" Type="float" Nullable="false" />
-          <Property Name="IS_GRADIENT" Type="bit" Nullable="false" />
-          <Property Name="GRADIENT_RESOLUTION_CM" Type="int" Nullable="false" />
-          <Property Name="LIQUID_QUANTITY_STRING" Type="nvarchar(max)" />
-          <Property Name="CYAN_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="MAGENTA_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="YELLOW_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="BLACK_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="TRANSPARENT_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="LUBRICANT_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="CLEANER_QUANTITY" Type="int" Nullable="false" />
           <Property Name="END_POSITION" Type="float" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="nvarchar" MaxLength="300" />
-          <Property Name="IS_HEAD_CLEANING" Type="bit" Nullable="false" />
-          <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="JOBS">
           <Key>
@@ -683,7 +603,7 @@
           <Property Name="CREATION_DATE" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="LAST_RUN" Type="datetime2" Precision="3" />
           <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="USER_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="WINDING_METHOD_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="SPOOL_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
@@ -713,8 +633,6 @@
           <Property Name="SAMPLE_DYE_APPROVE_DATE" Type="datetime2" Precision="3" />
           <Property Name="EDITING_STATE" Type="int" Nullable="false" />
           <Property Name="LENGTH_PERCENTAGE_FACTOR" Type="float" Nullable="false" />
-          <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
-          <Property Name="SOURCE" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
@@ -739,7 +657,6 @@
           <Property Name="COLOR" Type="int" Nullable="false" />
           <Property Name="PREFERRED_INDEX" Type="int" Nullable="false" />
           <Property Name="HAS_PIGMENT" Type="bit" Nullable="false" />
-          <Property Name="SHORT_NAME" Type="nvarchar" MaxLength="4" />
         </EntityType>
         <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
@@ -788,7 +705,6 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="50" />
           <Property Name="PRODUCTION_DATE" Type="datetime" Nullable="false" />
           <Property Name="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="SITE_GUID" Type="varchar" MaxLength="36" />
           <Property Name="MACHINE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="CONFIGURATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="DEFAULT_RML_GUID" Type="varchar" MaxLength="36" />
@@ -814,8 +730,6 @@
           <Property Name="IS_DEVICE_REGISTERED" Type="bit" Nullable="false" />
           <Property Name="DEVICE_ID" Type="nvarchar(max)" />
           <Property Name="DEVICE_NAME" Type="nvarchar" MaxLength="200" />
-          <Property Name="HEAD_TYPE" Type="int" Nullable="false" />
-          <Property Name="ACTIVATION_KEY" Type="varchar" MaxLength="8" />
         </EntityType>
         <EntityType Name="MACHINES_EVENTS">
           <Key>
@@ -830,7 +744,6 @@
           <Property Name="USER_GUID" Type="varchar" MaxLength="36" />
           <Property Name="DATE_TIME" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar(max)" />
-          <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="MEDIA_CONDITIONS">
           <Key>
@@ -892,7 +805,7 @@
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
-          <Property Name="NAME" Type="nvarchar" MaxLength="60" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="40" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" />
         </EntityType>
         <EntityType Name="PROCESS_PARAMETERS_TABLES">
@@ -924,17 +837,6 @@
           <Property Name="HEAD_AIR_FLOW" Type="float" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLES_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="TABLE_INDEX" Type="int" Nullable="false" />
-          <Property Name="HEAD_ZONE7_TEMP" Type="float" Nullable="false" />
-          <Property Name="HEAD_ZONE8_TEMP" Type="float" Nullable="false" />
-          <Property Name="HEAD_ZONE9_TEMP" Type="float" Nullable="false" />
-          <Property Name="HEAD_ZONE10_TEMP" Type="float" Nullable="false" />
-          <Property Name="HEAD_ZONE11_TEMP" Type="float" Nullable="false" />
-          <Property Name="HEAD_ZONE12_TEMP" Type="float" Nullable="false" />
-          <Property Name="R_BLOWER_FLOW" Type="float" Nullable="false" />
-          <Property Name="R_BLOWER_TEMP" Type="float" Nullable="false" />
-          <Property Name="L_BLOWER_FLOW" Type="float" Nullable="false" />
-          <Property Name="L_BLOWER_TEMP" Type="float" Nullable="false" />
-          <Property Name="PRESSURE_BUILD_UP" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS">
           <Key>
@@ -948,32 +850,6 @@
           <Property Name="ACTIVE" Type="bit" Nullable="false" />
           <Property Name="SAVE_DATE" Type="datetime2" Precision="3" Nullable="false" />
         </EntityType>
-        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS">
-          <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="100" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="nvarchar(max)" />
-          <Property Name="PUBLISH_DATE" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="SORTING_INDEX" Type="int" Nullable="false" />
-          <Property Name="IS_VISIBLE" Type="bit" Nullable="false" />
-          <Property Name="VISIBILITY" Type="int" Nullable="false" />
-        </EntityType>
-        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-          <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="PUBLISHED_PROCEDURE_PROJECT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="VERSION" Type="int" Nullable="false" />
-          <Property Name="AUTHOR" Type="nvarchar" MaxLength="200" Nullable="false" />
-          <Property Name="PROJECT_JSON_STRING" Type="nvarchar(max)" Nullable="false" />
-        </EntityType>
         <EntityType Name="RMLS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -982,7 +858,6 @@
           <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="DISPLAY_NAME" Type="nvarchar" MaxLength="200" />
           <Property Name="MANUFACTURER" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
           <Property Name="WHITE_POINT_L" Type="float" Nullable="false" />
@@ -1008,37 +883,6 @@
           <Property Name="THUMBNAIL" Type="image" />
           <Property Name="CCT_GUID" Type="varchar" MaxLength="36" />
           <Property Name="COLOR_CONVERSION_VERSION" Type="int" Nullable="false" />
-          <Property Name="USE_COLOR_LIB_GRADIENTS" Type="bit" Nullable="false" />
-          <Property Name="HEAD_TYPE" Type="int" Nullable="false" />
-          <Property Name="QUALIFICATION_LEVEL" Type="int" Nullable="false" />
-          <Property Name="QUALIFICATION_DATE" Type="datetime2" Precision="3" />
-          <Property Name="SPOOLS_CALIBRATIONS_STRING" Type="nvarchar(max)" />
-          <Property Name="FEEDER_P" Type="int" Nullable="false" />
-          <Property Name="FEEDER_I" Type="int" Nullable="false" />
-          <Property Name="FEEDER_D" Type="int" Nullable="false" />
-          <Property Name="PULLER_P" Type="int" Nullable="false" />
-          <Property Name="PULLER_I" Type="int" Nullable="false" />
-          <Property Name="PULLER_D" Type="int" Nullable="false" />
-          <Property Name="WINDER_P" Type="int" Nullable="false" />
-          <Property Name="WINDER_I" Type="int" Nullable="false" />
-          <Property Name="WINDER_D" Type="int" Nullable="false" />
-          <Property Name="BYPASS_ROCKERS" Type="bit" Nullable="false" />
-          <Property Name="CLEANER_FLOW" Type="int" Nullable="false" />
-          <Property Name="ARC_HEAD_CLEANING_MOTOR_SPEED" Type="float" Nullable="false" />
-        </EntityType>
-        <EntityType Name="RMLS_SPOOLS">
-          <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="SPOOL_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="ROTATIONS_PER_PASSAGE" Type="float" />
-          <Property Name="LENGTH" Type="float" />
-          <Property Name="BACKING_RATE" Type="int" />
-          <Property Name="BOTTOM_BACKING_RATE" Type="int" />
         </EntityType>
         <EntityType Name="ROLES">
           <Key>
@@ -1073,37 +917,6 @@
           <Property Name="LENGTH" Type="float" Nullable="false" />
           <Property Name="SEGMENT_INDEX" Type="int" Nullable="false" />
         </EntityType>
-        <EntityType Name="SITES">
-          <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="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
-        </EntityType>
-        <EntityType Name="SITES_CATALOGS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-        </EntityType>
-        <EntityType Name="SITES_RMLS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1117,11 +930,6 @@
           <Property Name="WEIGHT" Type="float" Nullable="false" />
           <Property Name="DIAMETER" Type="float" Nullable="false" />
           <Property Name="ROTATIONS_PER_PASSAGE" Type="float" Nullable="false" />
-          <Property Name="START_OFFSET_PULSES" Type="int" Nullable="false" />
-          <Property Name="BACKING_RATE" Type="int" Nullable="false" />
-          <Property Name="SEGMENT_OFFSET_PULSES" Type="int" Nullable="false" />
-          <Property Name="BOTTOM_BACKING_RATE" Type="int" Nullable="false" />
-          <Property Name="LIMIT_SWITCH_START_POINT_OFFSET" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="SPOOLS">
           <Key>
@@ -1132,11 +940,10 @@
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="SPOOL_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="START_OFFSET_PULSES" Type="int" />
-          <Property Name="BACKING_RATE" Type="int" />
-          <Property Name="SEGMENT_OFFSET_PULSES" Type="int" />
-          <Property Name="BOTTOM_BACKING_RATE" Type="int" />
-          <Property Name="LIMIT_SWITCH_START_POINT_OFFSET" Type="int" />
+          <Property Name="START_OFFSET_PULSES" Type="int" Nullable="false" />
+          <Property Name="BACKING_RATE" Type="int" Nullable="false" />
+          <Property Name="SEGMENT_OFFSET_PULSES" Type="int" Nullable="false" />
+          <Property Name="BOTTOM_BACKING_RATE" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
@@ -1156,23 +963,6 @@
           <Property Name="version" Type="int" />
           <Property Name="definition" Type="varbinary(max)" />
         </EntityType>
-        <EntityType Name="TANGO_UPDATES">
-          <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="APPLICATION_VERSION" Type="varchar" MaxLength="50" />
-          <Property Name="FIRMWARE_VERSION" Type="varchar" MaxLength="50" />
-          <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="STATUS" Type="int" Nullable="false" />
-          <Property Name="FAILED_REASON" Type="nvarchar(max)" />
-          <Property Name="FAILED_LOG" Type="nvarchar(max)" />
-          <Property Name="START_DATE" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="END_DATE" Type="datetime2" Precision="3" />
-          <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
-        </EntityType>
         <EntityType Name="TANGO_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1181,13 +971,12 @@
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="VERSION" Type="varchar" MaxLength="50" Nullable="false" />
-          <Property Name="FIRMWARE_VERSION" Type="varchar" MaxLength="50" />
+          <Property Name="FIRMWARE_VERSION" Type="varchar" MaxLength="50" Nullable="false" />
           <Property Name="BLOB_NAME" Type="varchar" MaxLength="200" Nullable="false" />
           <Property Name="INSTALLER_BLOB_NAME" Type="varchar" MaxLength="200" />
           <Property Name="COMMENTS" Type="nvarchar(max)" Nullable="false" />
           <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="MACHINE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="DISABLED" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="TECH_CONTROLLERS">
           <Key>
@@ -1289,7 +1078,6 @@
           <Property Name="CONTACT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="ADDRESS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_LOGIN" Type="datetime2" Precision="3" />
-          <Property Name="PASSWORD_CHANGE_REQUIRED" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="USERS_ROLES">
           <Key>
@@ -1312,18 +1100,6 @@
           <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" />
           <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
         </EntityType>
-        <Association Name="FK_ACTION_LOGS_USERS">
-          <End Role="USERS" Type="Self.USERS" Multiplicity="0..1" />
-          <End Role="ACTION_LOGS" Type="Self.ACTION_LOGS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="USERS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="ACTION_LOGS">
-              <PropertyRef Name="USER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_BRUSH_STOPS_COLOR_CATALOGS">
           <End Role="COLOR_CATALOGS" Type="Self.COLOR_CATALOGS" Multiplicity="0..1" />
           <End Role="BRUSH_STOPS" Type="Self.BRUSH_STOPS" Multiplicity="*" />
@@ -1558,20 +1334,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_DATA_STORES_MACHINES">
-          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="0..1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="DATA_STORE_ITEMS" Type="Self.DATA_STORE_ITEMS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="MACHINES">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="DATA_STORE_ITEMS">
-              <PropertyRef Name="MACHINE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_DISPENSERS_DISPENSER_TYPES">
           <End Role="DISPENSER_TYPES" Type="Self.DISPENSER_TYPES" Multiplicity="1" />
           <End Role="DISPENSERS" Type="Self.DISPENSERS" Multiplicity="*" />
@@ -1584,18 +1346,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_FSE_VERSIONS_USERS">
-          <End Role="USERS" Type="Self.USERS" Multiplicity="1" />
-          <End Role="FSE_VERSIONS" Type="Self.FSE_VERSIONS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="USERS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="FSE_VERSIONS">
-              <PropertyRef Name="USER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES">
           <End Role="HARDWARE_BLOWER_TYPES" Type="Self.HARDWARE_BLOWER_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -1848,6 +1598,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_JOB_RUNS_JOBS">
+          <End Role="JOBS" Type="Self.JOBS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="JOB_RUNS" Type="Self.JOB_RUNS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="JOBS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="JOB_RUNS">
+              <PropertyRef Name="JOB_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_JOBS_COLOR_CATALOGS">
           <End Role="COLOR_CATALOGS" Type="Self.COLOR_CATALOGS" Multiplicity="0..1" />
           <End Role="JOBS" Type="Self.JOBS" Multiplicity="*" />
@@ -1899,9 +1663,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_JOBS_RMLS">
-          <End Role="RMLS" Type="Self.RMLS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="1" />
           <End Role="JOBS" Type="Self.JOBS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="RMLS">
@@ -1925,7 +1687,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_JOBS_USERS">
-          <End Role="USERS" Type="Self.USERS" Multiplicity="0..1" />
+          <End Role="USERS" Type="Self.USERS" Multiplicity="1" />
           <End Role="JOBS" Type="Self.JOBS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="USERS">
@@ -1988,6 +1750,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_MACHINES_COLOR_SPACES">
+          <End Role="COLOR_SPACES" Type="Self.COLOR_SPACES" Multiplicity="0..1" />
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_SPACES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="MACHINES">
+              <PropertyRef Name="DEFAULT_COLOR_SPACE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_MACHINES_CONFIGURATIONS">
           <End Role="CONFIGURATIONS" Type="Self.CONFIGURATIONS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2017,9 +1791,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_MACHINES_EVENTS_MACHINES">
-          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="0..1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="0..1" />
           <End Role="MACHINES_EVENTS" Type="Self.MACHINES_EVENTS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="MACHINES">
@@ -2068,6 +1840,30 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_MACHINES_RMLS2">
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="0..1" />
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="MACHINES">
+              <PropertyRef Name="DEFAULT_RML_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_MACHINES_SPOOL_TYPES">
+          <End Role="SPOOL_TYPES" Type="Self.SPOOL_TYPES" Multiplicity="0..1" />
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SPOOL_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="MACHINES">
+              <PropertyRef Name="DEFAULT_SPOOL_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_ORGANIZATIONS_ADDRESSES">
           <End Role="ADDRESSES" Type="Self.ADDRESSES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2124,20 +1920,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-          <End Role="PUBLISHED_PROCEDURE_PROJECTS" Type="Self.PUBLISHED_PROCEDURE_PROJECTS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Type="Self.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="PUBLISHED_PROCEDURE_PROJECTS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-              <PropertyRef Name="PUBLISHED_PROCEDURE_PROJECT_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_RML_FIBER_SHAPES">
           <End Role="FIBER_SHAPES" Type="Self.FIBER_SHAPES" Multiplicity="1" />
           <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" />
@@ -2222,34 +2004,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_RMLS_SPOOLS_RMLS">
-          <End Role="RMLS" Type="Self.RMLS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="RMLS_SPOOLS" Type="Self.RMLS_SPOOLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="RMLS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RMLS_SPOOLS">
-              <PropertyRef Name="RML_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_RMLS_SPOOLS_SPOOL_TYPES">
-          <End Role="SPOOL_TYPES" Type="Self.SPOOL_TYPES" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="RMLS_SPOOLS" Type="Self.RMLS_SPOOLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SPOOL_TYPES">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RMLS_SPOOLS">
-              <PropertyRef Name="SPOOL_TYPE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_ROLES_PERMISSIONS_PERMISSIONS">
           <End Role="PERMISSIONS" Type="Self.PERMISSIONS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2292,74 +2046,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_SITES_CATALOGS_COLOR_CATALOGS">
-          <End Role="COLOR_CATALOGS" Type="Self.COLOR_CATALOGS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="SITES_CATALOGS" Type="Self.SITES_CATALOGS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="COLOR_CATALOGS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_CATALOGS">
-              <PropertyRef Name="COLOR_CATALOG_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_SITES_CATALOGS_SITES">
-          <End Role="SITES" Type="Self.SITES" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="SITES_CATALOGS" Type="Self.SITES_CATALOGS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SITES">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_CATALOGS">
-              <PropertyRef Name="SITE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_SITES_ORGANIZATIONS">
-          <End Role="ORGANIZATIONS" Type="Self.ORGANIZATIONS" Multiplicity="1" />
-          <End Role="SITES" Type="Self.SITES" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="ORGANIZATIONS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES">
-              <PropertyRef Name="ORGANIZATION_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_SITES_RMLS_RMLS">
-          <End Role="RMLS" Type="Self.RMLS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="SITES_RMLS" Type="Self.SITES_RMLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="RMLS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_RMLS">
-              <PropertyRef Name="RML_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_SITES_RMLS_SITES">
-          <End Role="SITES" Type="Self.SITES" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="SITES_RMLS" Type="Self.SITES_RMLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SITES">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_RMLS">
-              <PropertyRef Name="SITE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_SPOOLS_MACHINES">
           <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2375,9 +2061,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_SPOOLS_SPOOL_TYPES">
-          <End Role="SPOOL_TYPES" Type="Self.SPOOL_TYPES" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Role="SPOOL_TYPES" Type="Self.SPOOL_TYPES" Multiplicity="1" />
           <End Role="SPOOLS" Type="Self.SPOOLS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="SPOOL_TYPES">
@@ -2463,9 +2147,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_USERS_ROLES_USERS">
-          <End Role="USERS" Type="Self.USERS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Role="USERS" Type="Self.USERS" Multiplicity="1" />
           <End Role="USERS_ROLES" Type="Self.USERS_ROLES" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="USERS">
@@ -2477,7 +2159,6 @@
           </ReferentialConstraint>
         </Association>
         <EntityContainer Name="RemoteModelStoreContainer">
-          <EntitySet Name="ACTION_LOGS" EntityType="Self.ACTION_LOGS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESSES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
@@ -2494,15 +2175,12 @@
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CUSTOMERS" EntityType="Self.CUSTOMERS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="DATA_STORE_ITEMS" EntityType="Self.DATA_STORE_ITEMS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="FIBER_SYNTHS" EntityType="Self.FIBER_SYNTHS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="FSE_VERSIONS" EntityType="Self.FSE_VERSIONS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="GLOBAL_DATA_STORE_ITEMS" EntityType="Self.GLOBAL_DATA_STORE_ITEMS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="Self.HARDWARE_BLOWER_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_BLOWERS" EntityType="Self.HARDWARE_BLOWERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_BREAK_SENSOR_TYPES" EntityType="Self.HARDWARE_BREAK_SENSOR_TYPES" Schema="dbo" store:Type="Tables" />
@@ -2537,21 +2215,14 @@
           <EntitySet Name="PERMISSIONS" EntityType="Self.PERMISSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES" EntityType="Self.PROCESS_PARAMETERS_TABLES" Schema="dbo" store:Type="Tables" />
           <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="RMLS" EntityType="Self.RMLS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="RMLS_SPOOLS" EntityType="Self.RMLS_SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ROLES" EntityType="Self.ROLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SEGMENTS" EntityType="Self.SEGMENTS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="SITES" EntityType="Self.SITES" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="SITES_CATALOGS" EntityType="Self.SITES_CATALOGS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="SITES_RMLS" EntityType="Self.SITES_RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOL_TYPES" EntityType="Self.SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOLS" EntityType="Self.SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="sysdiagrams" EntityType="Self.sysdiagrams" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="TANGO_UPDATES" EntityType="Self.TANGO_UPDATES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="TANGO_VERSIONS" EntityType="Self.TANGO_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="TECH_CONTROLLERS" EntityType="Self.TECH_CONTROLLERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="TECH_DISPENSERS" EntityType="Self.TECH_DISPENSERS" Schema="dbo" store:Type="Tables" />
@@ -2562,10 +2233,6 @@
           <EntitySet Name="USERS" EntityType="Self.USERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="WINDING_METHODS" EntityType="Self.WINDING_METHODS" Schema="dbo" store:Type="Tables" />
-          <AssociationSet Name="FK_ACTION_LOGS_USERS" Association="Self.FK_ACTION_LOGS_USERS">
-            <End Role="USERS" EntitySet="USERS" />
-            <End Role="ACTION_LOGS" EntitySet="ACTION_LOGS" />
-          </AssociationSet>
           <AssociationSet Name="FK_BRUSH_STOPS_COLOR_CATALOGS" Association="Self.FK_BRUSH_STOPS_COLOR_CATALOGS">
             <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
             <End Role="BRUSH_STOPS" EntitySet="BRUSH_STOPS" />
@@ -2638,18 +2305,10 @@
             <End Role="ORGANIZATIONS" EntitySet="ORGANIZATIONS" />
             <End Role="CUSTOMERS" EntitySet="CUSTOMERS" />
           </AssociationSet>
-          <AssociationSet Name="FK_DATA_STORES_MACHINES" Association="Self.FK_DATA_STORES_MACHINES">
-            <End Role="MACHINES" EntitySet="MACHINES" />
-            <End Role="DATA_STORE_ITEMS" EntitySet="DATA_STORE_ITEMS" />
-          </AssociationSet>
           <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="Self.FK_DISPENSERS_DISPENSER_TYPES">
             <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
             <End Role="DISPENSERS" EntitySet="DISPENSERS" />
           </AssociationSet>
-          <AssociationSet Name="FK_FSE_VERSIONS_USERS" Association="Self.FK_FSE_VERSIONS_USERS">
-            <End Role="USERS" EntitySet="USERS" />
-            <End Role="FSE_VERSIONS" EntitySet="FSE_VERSIONS" />
-          </AssociationSet>
           <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" Association="Self.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES">
             <End Role="HARDWARE_BLOWER_TYPES" EntitySet="HARDWARE_BLOWER_TYPES" />
             <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" />
@@ -2726,6 +2385,10 @@
             <End Role="MID_TANK_TYPES" EntitySet="MID_TANK_TYPES" />
             <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
+          <AssociationSet Name="FK_JOB_RUNS_JOBS" Association="Self.FK_JOB_RUNS_JOBS">
+            <End Role="JOBS" EntitySet="JOBS" />
+            <End Role="JOB_RUNS" EntitySet="JOB_RUNS" />
+          </AssociationSet>
           <AssociationSet Name="FK_JOBS_COLOR_CATALOGS" Association="Self.FK_JOBS_COLOR_CATALOGS">
             <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
             <End Role="JOBS" EntitySet="JOBS" />
@@ -2770,6 +2433,10 @@
             <End Role="USERS" EntitySet="USERS" />
             <End Role="MACHINE_STUDIO_VERSIONS" EntitySet="MACHINE_STUDIO_VERSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_MACHINES_COLOR_SPACES" Association="Self.FK_MACHINES_COLOR_SPACES">
+            <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" />
+            <End Role="MACHINES" EntitySet="MACHINES" />
+          </AssociationSet>
           <AssociationSet Name="FK_MACHINES_CONFIGURATIONS" Association="Self.FK_MACHINES_CONFIGURATIONS">
             <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" />
             <End Role="MACHINES" EntitySet="MACHINES" />
@@ -2794,6 +2461,14 @@
             <End Role="ORGANIZATIONS" EntitySet="ORGANIZATIONS" />
             <End Role="MACHINES" EntitySet="MACHINES" />
           </AssociationSet>
+          <AssociationSet Name="FK_MACHINES_RMLS2" Association="Self.FK_MACHINES_RMLS2">
+            <End Role="RMLS" EntitySet="RMLS" />
+            <End Role="MACHINES" EntitySet="MACHINES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_MACHINES_SPOOL_TYPES" Association="Self.FK_MACHINES_SPOOL_TYPES">
+            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
+            <End Role="MACHINES" EntitySet="MACHINES" />
+          </AssociationSet>
           <AssociationSet Name="FK_ORGANIZATIONS_ADDRESSES" Association="Self.FK_ORGANIZATIONS_ADDRESSES">
             <End Role="ADDRESSES" EntitySet="ADDRESSES" />
             <End Role="ORGANIZATIONS" EntitySet="ORGANIZATIONS" />
@@ -2810,10 +2485,6 @@
             <End Role="PROCESS_PARAMETERS_TABLES_GROUPS" EntitySet="PROCESS_PARAMETERS_TABLES_GROUPS" />
             <End Role="PROCESS_PARAMETERS_TABLES" EntitySet="PROCESS_PARAMETERS_TABLES" />
           </AssociationSet>
-          <AssociationSet Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" Association="Self.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-            <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_FIBER_SHAPES" Association="Self.FK_RML_FIBER_SHAPES">
             <End Role="FIBER_SHAPES" EntitySet="FIBER_SHAPES" />
             <End Role="RMLS" EntitySet="RMLS" />
@@ -2842,14 +2513,6 @@
             <End Role="CCTS" EntitySet="CCTS" />
             <End Role="RMLS" EntitySet="RMLS" />
           </AssociationSet>
-          <AssociationSet Name="FK_RMLS_SPOOLS_RMLS" Association="Self.FK_RMLS_SPOOLS_RMLS">
-            <End Role="RMLS" EntitySet="RMLS" />
-            <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_RMLS_SPOOLS_SPOOL_TYPES" Association="Self.FK_RMLS_SPOOLS_SPOOL_TYPES">
-            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
-            <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
-          </AssociationSet>
           <AssociationSet Name="FK_ROLES_PERMISSIONS_PERMISSIONS" Association="Self.FK_ROLES_PERMISSIONS_PERMISSIONS">
             <End Role="PERMISSIONS" EntitySet="PERMISSIONS" />
             <End Role="ROLES_PERMISSIONS" EntitySet="ROLES_PERMISSIONS" />
@@ -2862,26 +2525,6 @@
             <End Role="JOBS" EntitySet="JOBS" />
             <End Role="SEGMENTS" EntitySet="SEGMENTS" />
           </AssociationSet>
-          <AssociationSet Name="FK_SITES_CATALOGS_COLOR_CATALOGS" Association="Self.FK_SITES_CATALOGS_COLOR_CATALOGS">
-            <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
-            <End Role="SITES_CATALOGS" EntitySet="SITES_CATALOGS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_SITES_CATALOGS_SITES" Association="Self.FK_SITES_CATALOGS_SITES">
-            <End Role="SITES" EntitySet="SITES" />
-            <End Role="SITES_CATALOGS" EntitySet="SITES_CATALOGS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_SITES_ORGANIZATIONS" Association="Self.FK_SITES_ORGANIZATIONS">
-            <End Role="ORGANIZATIONS" EntitySet="ORGANIZATIONS" />
-            <End Role="SITES" EntitySet="SITES" />
-          </AssociationSet>
-          <AssociationSet Name="FK_SITES_RMLS_RMLS" Association="Self.FK_SITES_RMLS_RMLS">
-            <End Role="RMLS" EntitySet="RMLS" />
-            <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_SITES_RMLS_SITES" Association="Self.FK_SITES_RMLS_SITES">
-            <End Role="SITES" EntitySet="SITES" />
-            <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
-          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_MACHINES" Association="Self.FK_SPOOLS_MACHINES">
             <End Role="MACHINES" EntitySet="MACHINES" />
             <End Role="SPOOLS" EntitySet="SPOOLS" />
@@ -2925,7 +2568,6 @@
       <Schema Namespace="RemoteModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityContainer Name="RemoteDB" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="RemoteModel.SYNC_CONFIGURATIONS" />
-          <EntitySet Name="ACTION_LOGS" EntityType="RemoteModel.ACTION_LOGS" />
           <EntitySet Name="ADDRESSES" EntityType="RemoteModel.ADDRESS" />
           <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" />
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" />
@@ -2942,15 +2584,12 @@
           <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" />
           <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" />
           <EntitySet Name="CUSTOMERS" EntityType="RemoteModel.CUSTOMER" />
-          <EntitySet Name="DATA_STORE_ITEMS" EntityType="RemoteModel.DATA_STORE_ITEMS" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="RemoteModel.DISPENSER_TYPES" />
           <EntitySet Name="DISPENSERS" EntityType="RemoteModel.DISPENSER" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" />
           <EntitySet Name="EVENT_TYPES" EntityType="RemoteModel.EVENT_TYPES" />
           <EntitySet Name="FIBER_SHAPES" EntityType="RemoteModel.FIBER_SHAPES" />
           <EntitySet Name="FIBER_SYNTHS" EntityType="RemoteModel.FIBER_SYNTHS" />
-          <EntitySet Name="FSE_VERSIONS" EntityType="RemoteModel.FSE_VERSIONS" />
-          <EntitySet Name="GLOBAL_DATA_STORE_ITEMS" EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" />
           <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" />
           <EntitySet Name="HARDWARE_BLOWERS" EntityType="RemoteModel.HARDWARE_BLOWERS" />
           <EntitySet Name="HARDWARE_BREAK_SENSOR_TYPES" EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" />
@@ -2985,20 +2624,13 @@
           <EntitySet Name="PERMISSIONS" EntityType="RemoteModel.PERMISSION" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" />
           <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="RMLS" EntityType="RemoteModel.RML" />
-          <EntitySet Name="RMLS_SPOOLS" EntityType="RemoteModel.RMLS_SPOOLS" />
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="RemoteModel.ROLES_PERMISSIONS" />
           <EntitySet Name="SEGMENTS" EntityType="RemoteModel.SEGMENT" />
-          <EntitySet Name="SITES" EntityType="RemoteModel.SITE" />
-          <EntitySet Name="SITES_CATALOGS" EntityType="RemoteModel.SITES_CATALOGS" />
-          <EntitySet Name="SITES_RMLS" EntityType="RemoteModel.SITES_RMLS" />
           <EntitySet Name="SPOOL_TYPES" EntityType="RemoteModel.SPOOL_TYPES" />
           <EntitySet Name="SPOOLS" EntityType="RemoteModel.SPOOL" />
           <EntitySet Name="sysdiagrams" EntityType="RemoteModel.sysdiagram" />
-          <EntitySet Name="TANGO_UPDATES" EntityType="RemoteModel.TANGO_UPDATES" />
           <EntitySet Name="TANGO_VERSIONS" EntityType="RemoteModel.TANGO_VERSIONS" />
           <EntitySet Name="TECH_CONTROLLERS" EntityType="RemoteModel.TECH_CONTROLLERS" />
           <EntitySet Name="TECH_DISPENSERS" EntityType="RemoteModel.TECH_DISPENSERS" />
@@ -3009,10 +2641,6 @@
           <EntitySet Name="USERS" EntityType="RemoteModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="RemoteModel.USERS_ROLES" />
           <EntitySet Name="WINDING_METHODS" EntityType="RemoteModel.WINDING_METHODS" />
-          <AssociationSet Name="FK_ACTION_LOGS_USERS" Association="RemoteModel.FK_ACTION_LOGS_USERS">
-            <End Role="USER" EntitySet="USERS" />
-            <End Role="ACTION_LOGS" EntitySet="ACTION_LOGS" />
-          </AssociationSet>
           <AssociationSet Name="FK_ORGANIZATIONS_ADDRESSES" Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES">
             <End Role="ADDRESS" EntitySet="ADDRESSES" />
             <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" />
@@ -3077,10 +2705,6 @@
             <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
             <End Role="JOB" EntitySet="JOBS" />
           </AssociationSet>
-          <AssociationSet Name="FK_SITES_CATALOGS_COLOR_CATALOGS" Association="RemoteModel.FK_SITES_CATALOGS_COLOR_CATALOGS">
-            <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
-            <End Role="SITES_CATALOGS" EntitySet="SITES_CATALOGS" />
-          </AssociationSet>
           <AssociationSet Name="FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS">
             <End Role="COLOR_CATALOGS_GROUPS" EntitySet="COLOR_CATALOGS_GROUPS" />
             <End Role="COLOR_CATALOGS_ITEMS" EntitySet="COLOR_CATALOGS_ITEMS" />
@@ -3097,6 +2721,10 @@
             <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" />
             <End Role="JOB" EntitySet="JOBS" />
           </AssociationSet>
+          <AssociationSet Name="FK_MACHINES_COLOR_SPACES" Association="RemoteModel.FK_MACHINES_COLOR_SPACES">
+            <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" />
+            <End Role="MACHINE" EntitySet="MACHINES" />
+          </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS">
             <End Role="EMBEDDED_FIRMWARE_VERSIONS" EntitySet="EMBEDDED_FIRMWARE_VERSIONS" />
             <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" />
@@ -3129,10 +2757,6 @@
             <End Role="CUSTOMER" EntitySet="CUSTOMERS" />
             <End Role="JOB" EntitySet="JOBS" />
           </AssociationSet>
-          <AssociationSet Name="FK_DATA_STORES_MACHINES" Association="RemoteModel.FK_DATA_STORES_MACHINES">
-            <End Role="MACHINE" EntitySet="MACHINES" />
-            <End Role="DATA_STORE_ITEMS" EntitySet="DATA_STORE_ITEMS" />
-          </AssociationSet>
           <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES">
             <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
             <End Role="DISPENSER" EntitySet="DISPENSERS" />
@@ -3153,10 +2777,6 @@
             <End Role="FIBER_SYNTHS" EntitySet="FIBER_SYNTHS" />
             <End Role="RML" EntitySet="RMLS" />
           </AssociationSet>
-          <AssociationSet Name="FK_FSE_VERSIONS_USERS" Association="RemoteModel.FK_FSE_VERSIONS_USERS">
-            <End Role="USER" EntitySet="USERS" />
-            <End Role="FSE_VERSIONS" EntitySet="FSE_VERSIONS" />
-          </AssociationSet>
           <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES">
             <End Role="HARDWARE_BLOWER_TYPES" EntitySet="HARDWARE_BLOWER_TYPES" />
             <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" />
@@ -3225,6 +2845,10 @@
             <End Role="MID_TANK_TYPES" EntitySet="MID_TANK_TYPES" />
             <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
+          <AssociationSet Name="FK_JOB_RUNS_JOBS" Association="RemoteModel.FK_JOB_RUNS_JOBS">
+            <End Role="JOB" EntitySet="JOBS" />
+            <End Role="JOB_RUNS" EntitySet="JOB_RUNS" />
+          </AssociationSet>
           <AssociationSet Name="FK_JOBS_MACHINES" Association="RemoteModel.FK_JOBS_MACHINES">
             <End Role="MACHINE" EntitySet="MACHINES" />
             <End Role="JOB" EntitySet="JOBS" />
@@ -3281,6 +2905,14 @@
             <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" />
             <End Role="MACHINE" EntitySet="MACHINES" />
           </AssociationSet>
+          <AssociationSet Name="FK_MACHINES_RMLS2" Association="RemoteModel.FK_MACHINES_RMLS2">
+            <End Role="RML" EntitySet="RMLS" />
+            <End Role="MACHINE" EntitySet="MACHINES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_MACHINES_SPOOL_TYPES" Association="RemoteModel.FK_MACHINES_SPOOL_TYPES">
+            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
+            <End Role="MACHINE" EntitySet="MACHINES" />
+          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_MACHINES" Association="RemoteModel.FK_SPOOLS_MACHINES">
             <End Role="MACHINE" EntitySet="MACHINES" />
             <End Role="SPOOL" EntitySet="SPOOLS" />
@@ -3301,10 +2933,6 @@
             <End Role="MEDIA_PURPOSES" EntitySet="MEDIA_PURPOSES" />
             <End Role="RML" EntitySet="RMLS" />
           </AssociationSet>
-          <AssociationSet Name="FK_SITES_ORGANIZATIONS" Association="RemoteModel.FK_SITES_ORGANIZATIONS">
-            <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" />
-            <End Role="SITE" EntitySet="SITES" />
-          </AssociationSet>
           <AssociationSet Name="FK_USERS_ORGANIZATIONS" Association="RemoteModel.FK_USERS_ORGANIZATIONS">
             <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" />
             <End Role="USER" EntitySet="USERS" />
@@ -3321,22 +2949,6 @@
             <End Role="RML" EntitySet="RMLS" />
             <End Role="PROCESS_PARAMETERS_TABLES_GROUPS" EntitySet="PROCESS_PARAMETERS_TABLES_GROUPS" />
           </AssociationSet>
-          <AssociationSet Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" Association="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-            <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
-            <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_RMLS_SPOOLS_RMLS" Association="RemoteModel.FK_RMLS_SPOOLS_RMLS">
-            <End Role="RML" EntitySet="RMLS" />
-            <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_SITES_RMLS_RMLS" Association="RemoteModel.FK_SITES_RMLS_RMLS">
-            <End Role="RML" EntitySet="RMLS" />
-            <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_RMLS_SPOOLS_SPOOL_TYPES" Association="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES">
-            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
-            <End Role="RMLS_SPOOLS" EntitySet="RMLS_SPOOLS" />
-          </AssociationSet>
           <AssociationSet Name="FK_ROLES_PERMISSIONS_ROLES" Association="RemoteModel.FK_ROLES_PERMISSIONS_ROLES">
             <End Role="ROLE" EntitySet="ROLES" />
             <End Role="ROLES_PERMISSIONS" EntitySet="ROLES_PERMISSIONS" />
@@ -3345,14 +2957,6 @@
             <End Role="ROLE" EntitySet="ROLES" />
             <End Role="USERS_ROLES" EntitySet="USERS_ROLES" />
           </AssociationSet>
-          <AssociationSet Name="FK_SITES_CATALOGS_SITES" Association="RemoteModel.FK_SITES_CATALOGS_SITES">
-            <End Role="SITE" EntitySet="SITES" />
-            <End Role="SITES_CATALOGS" EntitySet="SITES_CATALOGS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_SITES_RMLS_SITES" Association="RemoteModel.FK_SITES_RMLS_SITES">
-            <End Role="SITE" EntitySet="SITES" />
-            <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
-          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_SPOOL_TYPES" Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES">
             <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
             <End Role="SPOOL" EntitySet="SPOOLS" />
@@ -3374,21 +2978,6 @@
           <Property Name="TABLE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="SYNC_TYPE" Type="Int32" Nullable="false" />
         </EntityType>
-        <EntityType Name="ACTION_LOGS">
-          <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="TYPE" Type="Int32" Nullable="false" />
-          <Property Name="USER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="RELATED_OBJECT_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
-          <Property Name="RELATED_OBJECT_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="MESSAGE" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="DIFFERENCE" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="USER" Relationship="RemoteModel.FK_ACTION_LOGS_USERS" FromRole="ACTION_LOGS" ToRole="USER" />
-        </EntityType>
         <EntityType Name="ADDRESS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3479,7 +3068,6 @@
           <Property Name="CORRECTED" Type="Boolean" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="IS_TRANSPARENT" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS_ITEMS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS_ITEMS" />
           <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="BRUSH_STOPS" ToRole="COLOR_SPACES" />
@@ -3541,7 +3129,6 @@
           <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS" ToRole="BRUSH_STOPS" />
           <NavigationProperty Name="COLOR_CATALOGS_GROUPS" Relationship="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS" ToRole="COLOR_CATALOGS_GROUPS" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS" ToRole="JOB" />
-          <NavigationProperty Name="SITES_CATALOGS" Relationship="RemoteModel.FK_SITES_CATALOGS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS" ToRole="SITES_CATALOGS" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS_GROUPS">
           <Key>
@@ -3612,6 +3199,7 @@
           <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" />
           <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="BRUSH_STOPS" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="JOB" />
+          <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="MACHINE" />
         </EntityType>
         <EntityType Name="CONFIGURATION">
           <Key>
@@ -3662,22 +3250,6 @@
           <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" FromRole="CUSTOMER" ToRole="ORGANIZATION" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_CUSTOMERS" FromRole="CUSTOMER" ToRole="JOB" />
         </EntityType>
-        <EntityType Name="DATA_STORE_ITEMS">
-          <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="MACHINE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="COLLECTION_NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="KEY" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="DATA_TYPE" Type="Int32" Nullable="false" />
-          <Property Name="VALUE" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
-          <Property Name="IS_DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
-          <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_DATA_STORES_MACHINES" FromRole="DATA_STORE_ITEMS" ToRole="MACHINE" />
-        </EntityType>
         <EntityType Name="DISPENSER_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3738,7 +3310,6 @@
           <Property Name="EVENT_ACTIONS" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="REQUIRES_USER_INTERVENTION" Type="Boolean" Nullable="false" />
           <Property Name="GUIDANCE" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="PERSISTENT" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="EVENT_TYPES" ToRole="MACHINES_EVENTS" />
         </EntityType>
         <EntityType Name="FIBER_SHAPES">
@@ -3763,32 +3334,6 @@
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="FIBER_SYNTHS" ToRole="RML" />
         </EntityType>
-        <EntityType Name="FSE_VERSIONS">
-          <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="VERSION" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="BLOB_NAME" Type="String" Nullable="false" MaxLength="200" FixedLength="false" Unicode="false" />
-          <Property Name="INSTALLER_BLOB_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
-          <Property Name="COMMENTS" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="USER" Relationship="RemoteModel.FK_FSE_VERSIONS_USERS" FromRole="FSE_VERSIONS" ToRole="USER" />
-        </EntityType>
-        <EntityType Name="GLOBAL_DATA_STORE_ITEMS">
-          <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="COLLECTION_NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="KEY" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="DATA_TYPE" Type="Int32" Nullable="false" />
-          <Property Name="VALUE" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
-        </EntityType>
         <EntityType Name="HARDWARE_BLOWER_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3935,7 +3480,6 @@
           <Property Name="T_ON_MIN" Type="Int32" Nullable="false" />
           <Property Name="T_OFF_MIN" Type="Int32" Nullable="false" />
           <Property Name="ACTIVE" Type="Boolean" Nullable="false" />
-          <Property Name="P01_CONFIG_WORD" Type="Int32" Nullable="false" />
           <NavigationProperty Name="HARDWARE_MOTOR_TYPES" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_MOTOR_TYPES" FromRole="HARDWARE_MOTORS" ToRole="HARDWARE_MOTOR_TYPES" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_VERSIONS" FromRole="HARDWARE_MOTORS" ToRole="HARDWARE_VERSIONS" />
         </EntityType>
@@ -4096,35 +3640,13 @@
           <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="MACHINE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="JOB_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="RML_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="USER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="JOB_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="JOB_DESIGNATION" Type="Int32" Nullable="false" />
-          <Property Name="JOB_SOURCE" Type="Int32" Nullable="false" />
-          <Property Name="JOB_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="JOB_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="START_DATE" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="UPLOADING_START_DATE" Type="DateTime" Precision="3" />
-          <Property Name="HEATING_START_DATE" Type="DateTime" Precision="3" />
-          <Property Name="ACTUAL_START_DATE" Type="DateTime" Precision="3" />
           <Property Name="END_DATE" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="STATUS" Type="Int32" Nullable="false" />
-          <Property Name="JOB_LENGTH" Type="Double" Nullable="false" />
-          <Property Name="IS_GRADIENT" Type="Boolean" Nullable="false" />
-          <Property Name="GRADIENT_RESOLUTION_CM" Type="Int32" Nullable="false" />
-          <Property Name="LIQUID_QUANTITY_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="CYAN_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="MAGENTA_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="YELLOW_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="BLACK_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="TRANSPARENT_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="LUBRICANT_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="CLEANER_QUANTITY" Type="Int32" Nullable="false" />
           <Property Name="END_POSITION" Type="Double" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="String" MaxLength="300" FixedLength="false" Unicode="true" />
-          <Property Name="IS_HEAD_CLEANING" Type="Boolean" Nullable="false" />
-          <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
+          <NavigationProperty Name="JOB" Relationship="RemoteModel.FK_JOB_RUNS_JOBS" FromRole="JOB_RUNS" ToRole="JOB" />
         </EntityType>
         <EntityType Name="JOB">
           <Key>
@@ -4136,7 +3658,7 @@
           <Property Name="CREATION_DATE" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="LAST_RUN" Type="DateTime" Precision="3" />
           <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="USER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="WINDING_METHOD_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="SPOOL_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
@@ -4166,11 +3688,10 @@
           <Property Name="SAMPLE_DYE_APPROVE_DATE" Type="DateTime" Precision="3" />
           <Property Name="EDITING_STATE" Type="Int32" Nullable="false" />
           <Property Name="LENGTH_PERCENTAGE_FACTOR" Type="Double" Nullable="false" />
-          <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
-          <Property Name="SOURCE" Type="Int32" Nullable="false" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_JOBS_COLOR_CATALOGS" FromRole="JOB" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_JOBS_COLOR_SPACES" FromRole="JOB" ToRole="COLOR_SPACES" />
           <NavigationProperty Name="CUSTOMER" Relationship="RemoteModel.FK_JOBS_CUSTOMERS" FromRole="JOB" ToRole="CUSTOMER" />
+          <NavigationProperty Name="JOB_RUNS" Relationship="RemoteModel.FK_JOB_RUNS_JOBS" FromRole="JOB" ToRole="JOB_RUNS" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_JOBS_MACHINES" FromRole="JOB" ToRole="MACHINE" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_JOBS_RMLS" FromRole="JOB" ToRole="RML" />
           <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="JOB" ToRole="SPOOL_TYPES" />
@@ -4202,7 +3723,6 @@
           <Property Name="COLOR" Type="Int32" Nullable="false" />
           <Property Name="PREFERRED_INDEX" Type="Int32" Nullable="false" />
           <Property Name="HAS_PIGMENT" Type="Boolean" Nullable="false" />
-          <Property Name="SHORT_NAME" Type="String" MaxLength="4" FixedLength="false" Unicode="true" />
           <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" />
@@ -4259,7 +3779,6 @@
           <Property Name="NAME" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="PRODUCTION_DATE" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="SITE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="DEFAULT_RML_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
@@ -4285,15 +3804,15 @@
           <Property Name="IS_DEVICE_REGISTERED" Type="Boolean" Nullable="false" />
           <Property Name="DEVICE_ID" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="DEVICE_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
-          <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" />
-          <Property Name="ACTIVATION_KEY" Type="String" MaxLength="8" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="MACHINE" ToRole="CAT" />
+          <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_MACHINES_COLOR_SPACES" FromRole="MACHINE" ToRole="COLOR_SPACES" />
           <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS" FromRole="MACHINE" ToRole="CONFIGURATION" />
-          <NavigationProperty Name="DATA_STORE_ITEMS" Relationship="RemoteModel.FK_DATA_STORES_MACHINES" FromRole="MACHINE" ToRole="DATA_STORE_ITEMS" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_MACHINES" FromRole="MACHINE" ToRole="JOB" />
           <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" Relationship="RemoteModel.FK_MACHINES_RMLS2" FromRole="MACHINE" ToRole="RML" />
+          <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_MACHINES_SPOOL_TYPES" FromRole="MACHINE" ToRole="SPOOL_TYPES" />
           <NavigationProperty Name="SPOOLS" Relationship="RemoteModel.FK_SPOOLS_MACHINES" FromRole="MACHINE" ToRole="SPOOL" />
         </EntityType>
         <EntityType Name="MACHINES_EVENTS">
@@ -4309,7 +3828,6 @@
           <Property Name="USER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="DATE_TIME" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="DESCRIPTION" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="MACHINES_EVENTS" ToRole="EVENT_TYPES" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_MACHINES_EVENTS_MACHINES" FromRole="MACHINES_EVENTS" ToRole="MACHINE" />
           <NavigationProperty Name="USER" Relationship="RemoteModel.FK_MACHINES_EVENTS_USERS" FromRole="MACHINES_EVENTS" ToRole="USER" />
@@ -4373,7 +3891,6 @@
           <NavigationProperty Name="CONTACT" Relationship="RemoteModel.FK_ORGANIZATIONS_CONTACTS" FromRole="ORGANIZATION" ToRole="CONTACT" />
           <NavigationProperty Name="CUSTOMERS" Relationship="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="CUSTOMER" />
           <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="MACHINE" />
-          <NavigationProperty Name="SITES" Relationship="RemoteModel.FK_SITES_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="SITE" />
           <NavigationProperty Name="USERS" Relationship="RemoteModel.FK_USERS_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="USER" />
         </EntityType>
         <EntityType Name="PERMISSION">
@@ -4384,7 +3901,7 @@
           <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="CODE" Type="Int32" Nullable="false" />
-          <Property Name="NAME" Type="String" Nullable="false" MaxLength="60" FixedLength="false" Unicode="true" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="ROLES_PERMISSIONS" Relationship="RemoteModel.FK_ROLES_PERMISSIONS_PERMISSIONS" FromRole="PERMISSION" ToRole="ROLES_PERMISSIONS" />
         </EntityType>
@@ -4417,17 +3934,6 @@
           <Property Name="HEAD_AIR_FLOW" Type="Double" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLES_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="TABLE_INDEX" Type="Int32" Nullable="false" />
-          <Property Name="HEAD_ZONE7_TEMP" Type="Double" Nullable="false" />
-          <Property Name="HEAD_ZONE8_TEMP" Type="Double" Nullable="false" />
-          <Property Name="HEAD_ZONE9_TEMP" Type="Double" Nullable="false" />
-          <Property Name="HEAD_ZONE10_TEMP" Type="Double" Nullable="false" />
-          <Property Name="HEAD_ZONE11_TEMP" Type="Double" Nullable="false" />
-          <Property Name="HEAD_ZONE12_TEMP" Type="Double" Nullable="false" />
-          <Property Name="R_BLOWER_FLOW" Type="Double" Nullable="false" />
-          <Property Name="R_BLOWER_TEMP" Type="Double" Nullable="false" />
-          <Property Name="L_BLOWER_FLOW" Type="Double" Nullable="false" />
-          <Property Name="L_BLOWER_TEMP" Type="Double" Nullable="false" />
-          <Property Name="PRESSURE_BUILD_UP" Type="Double" Nullable="false" />
           <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" />
         </EntityType>
         <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS">
@@ -4444,34 +3950,6 @@
           <NavigationProperty Name="PROCESS_PARAMETERS_TABLES" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES_GROUPS" ToRole="PROCESS_PARAMETERS_TABLES" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" FromRole="PROCESS_PARAMETERS_TABLES_GROUPS" ToRole="RML" />
         </EntityType>
-        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS">
-          <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="100" FixedLength="false" Unicode="true" />
-          <Property Name="DESCRIPTION" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="PUBLISH_DATE" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="SORTING_INDEX" Type="Int32" Nullable="false" />
-          <Property Name="IS_VISIBLE" Type="Boolean" Nullable="false" />
-          <Property Name="VISIBILITY" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_PROCEDURE_PROJECTS" ToRole="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
-        </EntityType>
-        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-          <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="PUBLISHED_PROCEDURE_PROJECT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="VERSION" Type="Int32" Nullable="false" />
-          <Property Name="AUTHOR" Type="String" Nullable="false" MaxLength="200" FixedLength="false" Unicode="true" />
-          <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">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4480,7 +3958,6 @@
           <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="DISPLAY_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
           <Property Name="MANUFACTURER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="WHITE_POINT_L" Type="Double" Nullable="false" />
@@ -4506,23 +3983,6 @@
           <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" />
           <Property Name="CCT_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="COLOR_CONVERSION_VERSION" Type="Int32" Nullable="false" />
-          <Property Name="USE_COLOR_LIB_GRADIENTS" Type="Boolean" Nullable="false" />
-          <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" />
-          <Property Name="QUALIFICATION_LEVEL" Type="Int32" Nullable="false" />
-          <Property Name="QUALIFICATION_DATE" Type="DateTime" Precision="3" />
-          <Property Name="SPOOLS_CALIBRATIONS_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="FEEDER_P" Type="Int32" Nullable="false" />
-          <Property Name="FEEDER_I" Type="Int32" Nullable="false" />
-          <Property Name="FEEDER_D" Type="Int32" Nullable="false" />
-          <Property Name="PULLER_P" Type="Int32" Nullable="false" />
-          <Property Name="PULLER_I" Type="Int32" Nullable="false" />
-          <Property Name="PULLER_D" Type="Int32" Nullable="false" />
-          <Property Name="WINDER_P" Type="Int32" Nullable="false" />
-          <Property Name="WINDER_I" Type="Int32" Nullable="false" />
-          <Property Name="WINDER_D" Type="Int32" Nullable="false" />
-          <Property Name="BYPASS_ROCKERS" Type="Boolean" Nullable="false" />
-          <Property Name="CLEANER_FLOW" Type="Int32" Nullable="false" />
-          <Property Name="ARC_HEAD_CLEANING_MOTOR_SPEED" Type="Double" Nullable="false" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" />
           <NavigationProperty Name="CCT" Relationship="RemoteModel.FK_RMLS_CCTS" FromRole="RML" ToRole="CCT" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" />
@@ -4531,28 +3991,11 @@
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_RMLS" FromRole="RML" ToRole="JOB" />
           <NavigationProperty Name="LINEAR_MASS_DENSITY_UNITS" Relationship="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" FromRole="RML" ToRole="LINEAR_MASS_DENSITY_UNITS" />
           <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUID_TYPES_RMLS_RMLS" FromRole="RML" ToRole="LIQUID_TYPES_RMLS" />
+          <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_RMLS2" FromRole="RML" ToRole="MACHINE" />
           <NavigationProperty Name="MEDIA_CONDITIONS" Relationship="RemoteModel.FK_RML_MEDIA_CONDITIONS" FromRole="RML" ToRole="MEDIA_CONDITIONS" />
           <NavigationProperty Name="MEDIA_MATERIALS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="RML" ToRole="MEDIA_MATERIALS" />
           <NavigationProperty Name="MEDIA_PURPOSES" Relationship="RemoteModel.FK_RML_MEDIA_PURPOSES" FromRole="RML" ToRole="MEDIA_PURPOSES" />
           <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" FromRole="RML" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" />
-          <NavigationProperty Name="RMLS_SPOOLS" Relationship="RemoteModel.FK_RMLS_SPOOLS_RMLS" FromRole="RML" ToRole="RMLS_SPOOLS" />
-          <NavigationProperty Name="SITES_RMLS" Relationship="RemoteModel.FK_SITES_RMLS_RMLS" FromRole="RML" ToRole="SITES_RMLS" />
-        </EntityType>
-        <EntityType Name="RMLS_SPOOLS">
-          <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="SPOOL_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="ROTATIONS_PER_PASSAGE" Type="Double" />
-          <Property Name="LENGTH" Type="Double" />
-          <Property Name="BACKING_RATE" Type="Int32" />
-          <Property Name="BOTTOM_BACKING_RATE" Type="Int32" />
-          <NavigationProperty Name="RML" Relationship="RemoteModel.FK_RMLS_SPOOLS_RMLS" FromRole="RMLS_SPOOLS" ToRole="RML" />
-          <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" FromRole="RMLS_SPOOLS" ToRole="SPOOL_TYPES" />
         </EntityType>
         <EntityType Name="ROLE">
           <Key>
@@ -4593,44 +4036,6 @@
           <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_SEGMENTS" FromRole="SEGMENT" ToRole="BRUSH_STOPS" />
           <NavigationProperty Name="JOB" Relationship="RemoteModel.FK_SEGMENTS_JOBS" FromRole="SEGMENT" ToRole="JOB" />
         </EntityType>
-        <EntityType Name="SITE">
-          <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="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_SITES_ORGANIZATIONS" FromRole="SITE" ToRole="ORGANIZATION" />
-          <NavigationProperty Name="SITES_CATALOGS" Relationship="RemoteModel.FK_SITES_CATALOGS_SITES" FromRole="SITE" ToRole="SITES_CATALOGS" />
-          <NavigationProperty Name="SITES_RMLS" Relationship="RemoteModel.FK_SITES_RMLS_SITES" FromRole="SITE" ToRole="SITES_RMLS" />
-        </EntityType>
-        <EntityType Name="SITES_CATALOGS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="SITE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="COLOR_CATALOG_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_SITES_CATALOGS_COLOR_CATALOGS" FromRole="SITES_CATALOGS" ToRole="COLOR_CATALOGS" />
-          <NavigationProperty Name="SITE" Relationship="RemoteModel.FK_SITES_CATALOGS_SITES" FromRole="SITES_CATALOGS" ToRole="SITE" />
-        </EntityType>
-        <EntityType Name="SITES_RMLS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="SITE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="RML" Relationship="RemoteModel.FK_SITES_RMLS_RMLS" FromRole="SITES_RMLS" ToRole="RML" />
-          <NavigationProperty Name="SITE" Relationship="RemoteModel.FK_SITES_RMLS_SITES" FromRole="SITES_RMLS" ToRole="SITE" />
-        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4644,13 +4049,8 @@
           <Property Name="WEIGHT" Type="Double" Nullable="false" />
           <Property Name="DIAMETER" Type="Double" Nullable="false" />
           <Property Name="ROTATIONS_PER_PASSAGE" Type="Double" Nullable="false" />
-          <Property Name="START_OFFSET_PULSES" Type="Int32" Nullable="false" />
-          <Property Name="BACKING_RATE" Type="Int32" Nullable="false" />
-          <Property Name="SEGMENT_OFFSET_PULSES" Type="Int32" Nullable="false" />
-          <Property Name="BOTTOM_BACKING_RATE" Type="Int32" Nullable="false" />
-          <Property Name="LIMIT_SWITCH_START_POINT_OFFSET" Type="Int32" Nullable="false" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="JOB" />
-          <NavigationProperty Name="RMLS_SPOOLS" Relationship="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="RMLS_SPOOLS" />
+          <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="MACHINE" />
           <NavigationProperty Name="SPOOLS" Relationship="RemoteModel.FK_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="SPOOL" />
         </EntityType>
         <EntityType Name="SPOOL">
@@ -4662,11 +4062,10 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="SPOOL_TYPE_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" />
-          <Property Name="START_OFFSET_PULSES" Type="Int32" />
-          <Property Name="BACKING_RATE" Type="Int32" />
-          <Property Name="SEGMENT_OFFSET_PULSES" Type="Int32" />
-          <Property Name="BOTTOM_BACKING_RATE" Type="Int32" />
-          <Property Name="LIMIT_SWITCH_START_POINT_OFFSET" Type="Int32" />
+          <Property Name="START_OFFSET_PULSES" Type="Int32" Nullable="false" />
+          <Property Name="BACKING_RATE" Type="Int32" Nullable="false" />
+          <Property Name="SEGMENT_OFFSET_PULSES" Type="Int32" Nullable="false" />
+          <Property Name="BOTTOM_BACKING_RATE" Type="Int32" Nullable="false" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_SPOOLS_MACHINES" FromRole="SPOOL" ToRole="MACHINE" />
           <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_SPOOLS_SPOOL_TYPES" FromRole="SPOOL" ToRole="SPOOL_TYPES" />
         </EntityType>
@@ -4680,23 +4079,6 @@
           <Property Name="version" Type="Int32" />
           <Property Name="definition" Type="Binary" MaxLength="Max" FixedLength="false" />
         </EntityType>
-        <EntityType Name="TANGO_UPDATES">
-          <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="APPLICATION_VERSION" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="FIRMWARE_VERSION" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="STATUS" Type="Int32" Nullable="false" />
-          <Property Name="FAILED_REASON" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="FAILED_LOG" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="START_DATE" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="END_DATE" Type="DateTime" Precision="3" />
-          <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
-        </EntityType>
         <EntityType Name="TANGO_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4705,13 +4087,12 @@
           <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="VERSION" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="FIRMWARE_VERSION" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="FIRMWARE_VERSION" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="BLOB_NAME" Type="String" Nullable="false" MaxLength="200" FixedLength="false" Unicode="false" />
           <Property Name="INSTALLER_BLOB_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
           <Property Name="COMMENTS" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="DISABLED" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="MACHINE_VERSIONS" Relationship="RemoteModel.FK_TANGO_VERSIONS_MACHINE_VERSIONS" FromRole="TANGO_VERSIONS" ToRole="MACHINE_VERSIONS" />
           <NavigationProperty Name="USER" Relationship="RemoteModel.FK_TANGO_VERSIONS_USERS" FromRole="TANGO_VERSIONS" ToRole="USER" />
         </EntityType>
@@ -4815,11 +4196,8 @@
           <Property Name="CONTACT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="ADDRESS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_LOGIN" Type="DateTime" Precision="3" />
-          <Property Name="PASSWORD_CHANGE_REQUIRED" Type="Boolean" Nullable="false" />
-          <NavigationProperty Name="ACTION_LOGS" Relationship="RemoteModel.FK_ACTION_LOGS_USERS" FromRole="USER" ToRole="ACTION_LOGS" />
           <NavigationProperty Name="ADDRESS" Relationship="RemoteModel.FK_USERS_ADDRESSES" FromRole="USER" ToRole="ADDRESS" />
           <NavigationProperty Name="CONTACT" Relationship="RemoteModel.FK_USERS_CONTACTS" FromRole="USER" ToRole="CONTACT" />
-          <NavigationProperty Name="FSE_VERSIONS" Relationship="RemoteModel.FK_FSE_VERSIONS_USERS" FromRole="USER" ToRole="FSE_VERSIONS" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_USERS" FromRole="USER" ToRole="JOB" />
           <NavigationProperty Name="MACHINE_STUDIO_VERSIONS" Relationship="RemoteModel.FK_MACHINE_STUDIO_VERSIONS_USERS" FromRole="USER" ToRole="MACHINE_STUDIO_VERSIONS" />
           <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_USERS" FromRole="USER" ToRole="MACHINES_EVENTS" />
@@ -4851,18 +4229,6 @@
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_WINDING_METHODS" FromRole="WINDING_METHODS" ToRole="JOB" />
         </EntityType>
-        <Association Name="FK_ACTION_LOGS_USERS">
-          <End Type="RemoteModel.USER" Role="USER" Multiplicity="0..1" />
-          <End Type="RemoteModel.ACTION_LOGS" Role="ACTION_LOGS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="USER">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="ACTION_LOGS">
-              <PropertyRef Name="USER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_ORGANIZATIONS_ADDRESSES">
           <End Type="RemoteModel.ADDRESS" Role="ADDRESS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5067,20 +4433,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_SITES_CATALOGS_COLOR_CATALOGS">
-          <End Type="RemoteModel.COLOR_CATALOGS" Role="COLOR_CATALOGS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.SITES_CATALOGS" Role="SITES_CATALOGS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="COLOR_CATALOGS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_CATALOGS">
-              <PropertyRef Name="COLOR_CATALOG_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS">
           <End Type="RemoteModel.COLOR_CATALOGS_GROUPS" Role="COLOR_CATALOGS_GROUPS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5135,6 +4487,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_MACHINES_COLOR_SPACES">
+          <End Type="RemoteModel.COLOR_SPACES" Role="COLOR_SPACES" Multiplicity="0..1" />
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_SPACES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="MACHINE">
+              <PropertyRef Name="DEFAULT_COLOR_SPACE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS">
           <End Type="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Role="EMBEDDED_FIRMWARE_VERSIONS" Multiplicity="1" />
           <End Type="RemoteModel.CONFIGURATION" Role="CONFIGURATION" Multiplicity="*" />
@@ -5239,20 +4603,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_DATA_STORES_MACHINES">
-          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="0..1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.DATA_STORE_ITEMS" Role="DATA_STORE_ITEMS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="MACHINE">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="DATA_STORE_ITEMS">
-              <PropertyRef Name="MACHINE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_DISPENSERS_DISPENSER_TYPES">
           <End Type="RemoteModel.DISPENSER_TYPES" Role="DISPENSER_TYPES" Multiplicity="1" />
           <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="*" />
@@ -5315,18 +4665,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_FSE_VERSIONS_USERS">
-          <End Type="RemoteModel.USER" Role="USER" Multiplicity="1" />
-          <End Type="RemoteModel.FSE_VERSIONS" Role="FSE_VERSIONS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="USER">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="FSE_VERSIONS">
-              <PropertyRef Name="USER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES">
           <End Type="RemoteModel.HARDWARE_BLOWER_TYPES" Role="HARDWARE_BLOWER_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5553,6 +4891,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_JOB_RUNS_JOBS">
+          <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.JOB_RUNS" Role="JOB_RUNS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="JOB">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="JOB_RUNS">
+              <PropertyRef Name="JOB_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_JOBS_MACHINES">
           <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5568,9 +4920,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_JOBS_RMLS">
-          <End Type="RemoteModel.RML" Role="RML" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="1" />
           <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="RML">
@@ -5594,7 +4944,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_JOBS_USERS">
-          <End Type="RemoteModel.USER" Role="USER" Multiplicity="0..1" />
+          <End Type="RemoteModel.USER" Role="USER" Multiplicity="1" />
           <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="USER">
@@ -5708,9 +5058,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_MACHINES_EVENTS_MACHINES">
-          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="0..1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="0..1" />
           <End Type="RemoteModel.MACHINES_EVENTS" Role="MACHINES_EVENTS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="MACHINE">
@@ -5735,6 +5083,30 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_MACHINES_RMLS2">
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="0..1" />
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="MACHINE">
+              <PropertyRef Name="DEFAULT_RML_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_MACHINES_SPOOL_TYPES">
+          <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="0..1" />
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SPOOL_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="MACHINE">
+              <PropertyRef Name="DEFAULT_SPOOL_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_SPOOLS_MACHINES">
           <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5797,18 +5169,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_SITES_ORGANIZATIONS">
-          <End Type="RemoteModel.ORGANIZATION" Role="ORGANIZATION" Multiplicity="1" />
-          <End Type="RemoteModel.SITE" Role="SITE" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="ORGANIZATION">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITE">
-              <PropertyRef Name="ORGANIZATION_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_USERS_ORGANIZATIONS">
           <End Type="RemoteModel.ORGANIZATION" Role="ORGANIZATION" Multiplicity="1" />
           <End Type="RemoteModel.USER" Role="USER" Multiplicity="*" />
@@ -5863,62 +5223,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-          <End Type="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Role="PUBLISHED_PROCEDURE_PROJECTS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="PUBLISHED_PROCEDURE_PROJECTS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-              <PropertyRef Name="PUBLISHED_PROCEDURE_PROJECT_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_RMLS_SPOOLS_RMLS">
-          <End Type="RemoteModel.RML" Role="RML" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.RMLS_SPOOLS" Role="RMLS_SPOOLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="RML">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RMLS_SPOOLS">
-              <PropertyRef Name="RML_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_SITES_RMLS_RMLS">
-          <End Type="RemoteModel.RML" Role="RML" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.SITES_RMLS" Role="SITES_RMLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="RML">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_RMLS">
-              <PropertyRef Name="RML_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_RMLS_SPOOLS_SPOOL_TYPES">
-          <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.RMLS_SPOOLS" Role="RMLS_SPOOLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SPOOL_TYPES">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RMLS_SPOOLS">
-              <PropertyRef Name="SPOOL_TYPE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_ROLES_PERMISSIONS_ROLES">
           <End Type="RemoteModel.ROLE" Role="ROLE" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5947,38 +5251,8 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_SITES_CATALOGS_SITES">
-          <End Type="RemoteModel.SITE" Role="SITE" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.SITES_CATALOGS" Role="SITES_CATALOGS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SITE">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_CATALOGS">
-              <PropertyRef Name="SITE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_SITES_RMLS_SITES">
-          <End Type="RemoteModel.SITE" Role="SITE" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.SITES_RMLS" Role="SITES_RMLS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SITE">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="SITES_RMLS">
-              <PropertyRef Name="SITE_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_SPOOLS_SPOOL_TYPES">
-          <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1" />
           <End Type="RemoteModel.SPOOL" Role="SPOOL" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="SPOOL_TYPES">
@@ -6002,9 +5276,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_USERS_ROLES_USERS">
-          <End Type="RemoteModel.USER" Role="USER" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
+          <End Type="RemoteModel.USER" Role="USER" Multiplicity="1" />
           <End Type="RemoteModel.USERS_ROLES" Role="USERS_ROLES" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="USER">
@@ -6030,21 +5302,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ACTION_LOGS">
-            <EntityTypeMapping TypeName="RemoteModel.ACTION_LOGS">
-              <MappingFragment StoreEntitySet="ACTION_LOGS">
-                <ScalarProperty Name="DIFFERENCE" ColumnName="DIFFERENCE" />
-                <ScalarProperty Name="MESSAGE" ColumnName="MESSAGE" />
-                <ScalarProperty Name="RELATED_OBJECT_GUID" ColumnName="RELATED_OBJECT_GUID" />
-                <ScalarProperty Name="RELATED_OBJECT_NAME" ColumnName="RELATED_OBJECT_NAME" />
-                <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
-                <ScalarProperty Name="TYPE" ColumnName="TYPE" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="ADDRESSES">
             <EntityTypeMapping TypeName="RemoteModel.ADDRESS">
               <MappingFragment StoreEntitySet="ADDRESSES">
@@ -6097,7 +5354,6 @@
           <EntitySetMapping Name="BRUSH_STOPS">
             <EntityTypeMapping TypeName="RemoteModel.BRUSH_STOPS">
               <MappingFragment StoreEntitySet="BRUSH_STOPS">
-                <ScalarProperty Name="IS_TRANSPARENT" ColumnName="IS_TRANSPARENT" />
                 <ScalarProperty Name="COLOR_CATALOGS_ITEM_GUID" ColumnName="COLOR_CATALOGS_ITEM_GUID" />
                 <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" />
                 <ScalarProperty Name="CORRECTED" ColumnName="CORRECTED" />
@@ -6296,22 +5552,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="DATA_STORE_ITEMS">
-            <EntityTypeMapping TypeName="RemoteModel.DATA_STORE_ITEMS">
-              <MappingFragment StoreEntitySet="DATA_STORE_ITEMS">
-                <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
-                <ScalarProperty Name="IS_DELETED" ColumnName="IS_DELETED" />
-                <ScalarProperty Name="VALUE" ColumnName="VALUE" />
-                <ScalarProperty Name="DATA_TYPE" ColumnName="DATA_TYPE" />
-                <ScalarProperty Name="KEY" ColumnName="KEY" />
-                <ScalarProperty Name="COLLECTION_NAME" ColumnName="COLLECTION_NAME" />
-                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="DISPENSER_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.DISPENSER_TYPES">
               <MappingFragment StoreEntitySet="DISPENSER_TYPES">
@@ -6355,7 +5595,6 @@
           <EntitySetMapping Name="EVENT_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES">
               <MappingFragment StoreEntitySet="EVENT_TYPES">
-                <ScalarProperty Name="PERSISTENT" ColumnName="PERSISTENT" />
                 <ScalarProperty Name="GUIDANCE" ColumnName="GUIDANCE" />
                 <ScalarProperty Name="REQUIRES_USER_INTERVENTION" ColumnName="REQUIRES_USER_INTERVENTION" />
                 <ScalarProperty Name="EVENT_ACTIONS" ColumnName="EVENT_ACTIONS" />
@@ -6396,33 +5635,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="FSE_VERSIONS">
-            <EntityTypeMapping TypeName="RemoteModel.FSE_VERSIONS">
-              <MappingFragment StoreEntitySet="FSE_VERSIONS">
-                <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
-                <ScalarProperty Name="COMMENTS" ColumnName="COMMENTS" />
-                <ScalarProperty Name="INSTALLER_BLOB_NAME" ColumnName="INSTALLER_BLOB_NAME" />
-                <ScalarProperty Name="BLOB_NAME" ColumnName="BLOB_NAME" />
-                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="GLOBAL_DATA_STORE_ITEMS">
-            <EntityTypeMapping TypeName="RemoteModel.GLOBAL_DATA_STORE_ITEMS">
-              <MappingFragment StoreEntitySet="GLOBAL_DATA_STORE_ITEMS">
-                <ScalarProperty Name="VALUE" ColumnName="VALUE" />
-                <ScalarProperty Name="DATA_TYPE" ColumnName="DATA_TYPE" />
-                <ScalarProperty Name="KEY" ColumnName="KEY" />
-                <ScalarProperty Name="COLLECTION_NAME" ColumnName="COLLECTION_NAME" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="HARDWARE_BLOWER_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_BLOWER_TYPES">
               <MappingFragment StoreEntitySet="HARDWARE_BLOWER_TYPES">
@@ -6526,7 +5738,6 @@
           <EntitySetMapping Name="HARDWARE_MOTORS">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_MOTORS">
               <MappingFragment StoreEntitySet="HARDWARE_MOTORS">
-                <ScalarProperty Name="P01_CONFIG_WORD" ColumnName="P01_CONFIG_WORD" />
                 <ScalarProperty Name="ACTIVE" ColumnName="ACTIVE" />
                 <ScalarProperty Name="T_OFF_MIN" ColumnName="T_OFF_MIN" />
                 <ScalarProperty Name="T_ON_MIN" ColumnName="T_ON_MIN" />
@@ -6707,35 +5918,12 @@
           <EntitySetMapping Name="JOB_RUNS">
             <EntityTypeMapping TypeName="RemoteModel.JOB_RUNS">
               <MappingFragment StoreEntitySet="JOB_RUNS">
-                <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
-                <ScalarProperty Name="IS_HEAD_CLEANING" ColumnName="IS_HEAD_CLEANING" />
                 <ScalarProperty Name="FAILED_MESSAGE" ColumnName="FAILED_MESSAGE" />
                 <ScalarProperty Name="END_POSITION" ColumnName="END_POSITION" />
-                <ScalarProperty Name="CLEANER_QUANTITY" ColumnName="CLEANER_QUANTITY" />
-                <ScalarProperty Name="LUBRICANT_QUANTITY" ColumnName="LUBRICANT_QUANTITY" />
-                <ScalarProperty Name="TRANSPARENT_QUANTITY" ColumnName="TRANSPARENT_QUANTITY" />
-                <ScalarProperty Name="BLACK_QUANTITY" ColumnName="BLACK_QUANTITY" />
-                <ScalarProperty Name="YELLOW_QUANTITY" ColumnName="YELLOW_QUANTITY" />
-                <ScalarProperty Name="MAGENTA_QUANTITY" ColumnName="MAGENTA_QUANTITY" />
-                <ScalarProperty Name="CYAN_QUANTITY" ColumnName="CYAN_QUANTITY" />
-                <ScalarProperty Name="LIQUID_QUANTITY_STRING" ColumnName="LIQUID_QUANTITY_STRING" />
-                <ScalarProperty Name="GRADIENT_RESOLUTION_CM" ColumnName="GRADIENT_RESOLUTION_CM" />
-                <ScalarProperty Name="IS_GRADIENT" ColumnName="IS_GRADIENT" />
-                <ScalarProperty Name="JOB_LENGTH" ColumnName="JOB_LENGTH" />
                 <ScalarProperty Name="STATUS" ColumnName="STATUS" />
                 <ScalarProperty Name="END_DATE" ColumnName="END_DATE" />
-                <ScalarProperty Name="ACTUAL_START_DATE" ColumnName="ACTUAL_START_DATE" />
-                <ScalarProperty Name="HEATING_START_DATE" ColumnName="HEATING_START_DATE" />
-                <ScalarProperty Name="UPLOADING_START_DATE" ColumnName="UPLOADING_START_DATE" />
                 <ScalarProperty Name="START_DATE" ColumnName="START_DATE" />
-                <ScalarProperty Name="JOB_STRING" ColumnName="JOB_STRING" />
-                <ScalarProperty Name="JOB_SOURCE" ColumnName="JOB_SOURCE" />
-                <ScalarProperty Name="JOB_DESIGNATION" ColumnName="JOB_DESIGNATION" />
-                <ScalarProperty Name="JOB_NAME" ColumnName="JOB_NAME" />
-                <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
-                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
                 <ScalarProperty Name="JOB_GUID" ColumnName="JOB_GUID" />
-                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
@@ -6745,8 +5933,6 @@
           <EntitySetMapping Name="JOBS">
             <EntityTypeMapping TypeName="RemoteModel.JOB">
               <MappingFragment StoreEntitySet="JOBS">
-                <ScalarProperty Name="SOURCE" ColumnName="SOURCE" />
-                <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
                 <ScalarProperty Name="LENGTH_PERCENTAGE_FACTOR" ColumnName="LENGTH_PERCENTAGE_FACTOR" />
                 <ScalarProperty Name="EDITING_STATE" ColumnName="EDITING_STATE" />
                 <ScalarProperty Name="SAMPLE_DYE_APPROVE_DATE" ColumnName="SAMPLE_DYE_APPROVE_DATE" />
@@ -6800,7 +5986,6 @@
           <EntitySetMapping Name="LIQUID_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.LIQUID_TYPES">
               <MappingFragment StoreEntitySet="LIQUID_TYPES">
-                <ScalarProperty Name="SHORT_NAME" ColumnName="SHORT_NAME" />
                 <ScalarProperty Name="HAS_PIGMENT" ColumnName="HAS_PIGMENT" />
                 <ScalarProperty Name="PREFERRED_INDEX" ColumnName="PREFERRED_INDEX" />
                 <ScalarProperty Name="COLOR" ColumnName="COLOR" />
@@ -6855,8 +6040,6 @@
           <EntitySetMapping Name="MACHINES">
             <EntityTypeMapping TypeName="RemoteModel.MACHINE">
               <MappingFragment StoreEntitySet="MACHINES">
-                <ScalarProperty Name="ACTIVATION_KEY" ColumnName="ACTIVATION_KEY" />
-                <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" />
                 <ScalarProperty Name="DEVICE_NAME" ColumnName="DEVICE_NAME" />
                 <ScalarProperty Name="DEVICE_ID" ColumnName="DEVICE_ID" />
                 <ScalarProperty Name="IS_DEVICE_REGISTERED" ColumnName="IS_DEVICE_REGISTERED" />
@@ -6882,7 +6065,6 @@
                 <ScalarProperty Name="DEFAULT_RML_GUID" ColumnName="DEFAULT_RML_GUID" />
                 <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
                 <ScalarProperty Name="MACHINE_VERSION_GUID" ColumnName="MACHINE_VERSION_GUID" />
-                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
                 <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" />
                 <ScalarProperty Name="PRODUCTION_DATE" ColumnName="PRODUCTION_DATE" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
@@ -6896,7 +6078,6 @@
           <EntitySetMapping Name="MACHINES_EVENTS">
             <EntityTypeMapping TypeName="RemoteModel.MACHINES_EVENTS">
               <MappingFragment StoreEntitySet="MACHINES_EVENTS">
-                <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="DATE_TIME" ColumnName="DATE_TIME" />
                 <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
@@ -6981,17 +6162,6 @@
           <EntitySetMapping Name="PROCESS_PARAMETERS_TABLES">
             <EntityTypeMapping TypeName="RemoteModel.PROCESS_PARAMETERS_TABLES">
               <MappingFragment StoreEntitySet="PROCESS_PARAMETERS_TABLES">
-                <ScalarProperty Name="PRESSURE_BUILD_UP" ColumnName="PRESSURE_BUILD_UP" />
-                <ScalarProperty Name="L_BLOWER_TEMP" ColumnName="L_BLOWER_TEMP" />
-                <ScalarProperty Name="L_BLOWER_FLOW" ColumnName="L_BLOWER_FLOW" />
-                <ScalarProperty Name="R_BLOWER_TEMP" ColumnName="R_BLOWER_TEMP" />
-                <ScalarProperty Name="R_BLOWER_FLOW" ColumnName="R_BLOWER_FLOW" />
-                <ScalarProperty Name="HEAD_ZONE12_TEMP" ColumnName="HEAD_ZONE12_TEMP" />
-                <ScalarProperty Name="HEAD_ZONE11_TEMP" ColumnName="HEAD_ZONE11_TEMP" />
-                <ScalarProperty Name="HEAD_ZONE10_TEMP" ColumnName="HEAD_ZONE10_TEMP" />
-                <ScalarProperty Name="HEAD_ZONE9_TEMP" ColumnName="HEAD_ZONE9_TEMP" />
-                <ScalarProperty Name="HEAD_ZONE8_TEMP" ColumnName="HEAD_ZONE8_TEMP" />
-                <ScalarProperty Name="HEAD_ZONE7_TEMP" ColumnName="HEAD_ZONE7_TEMP" />
                 <ScalarProperty Name="TABLE_INDEX" ColumnName="TABLE_INDEX" />
                 <ScalarProperty Name="PROCESS_PARAMETERS_TABLES_GROUP_GUID" ColumnName="PROCESS_PARAMETERS_TABLES_GROUP_GUID" />
                 <ScalarProperty Name="HEAD_AIR_FLOW" ColumnName="HEAD_AIR_FLOW" />
@@ -7033,54 +6203,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="PUBLISHED_PROCEDURE_PROJECTS">
-            <EntityTypeMapping TypeName="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS">
-              <MappingFragment StoreEntitySet="PUBLISHED_PROCEDURE_PROJECTS">
-                <ScalarProperty Name="VISIBILITY" ColumnName="VISIBILITY" />
-                <ScalarProperty Name="IS_VISIBLE" ColumnName="IS_VISIBLE" />
-                <ScalarProperty Name="SORTING_INDEX" ColumnName="SORTING_INDEX" />
-                <ScalarProperty Name="PUBLISH_DATE" ColumnName="PUBLISH_DATE" />
-                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
-                <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="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-            <EntityTypeMapping TypeName="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-              <MappingFragment StoreEntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
-                <ScalarProperty Name="PROJECT_JSON_STRING" ColumnName="PROJECT_JSON_STRING" />
-                <ScalarProperty Name="AUTHOR" ColumnName="AUTHOR" />
-                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
-                <ScalarProperty Name="PUBLISHED_PROCEDURE_PROJECT_GUID" ColumnName="PUBLISHED_PROCEDURE_PROJECT_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">
-                <ScalarProperty Name="ARC_HEAD_CLEANING_MOTOR_SPEED" ColumnName="ARC_HEAD_CLEANING_MOTOR_SPEED" />
-                <ScalarProperty Name="CLEANER_FLOW" ColumnName="CLEANER_FLOW" />
-                <ScalarProperty Name="BYPASS_ROCKERS" ColumnName="BYPASS_ROCKERS" />
-                <ScalarProperty Name="WINDER_D" ColumnName="WINDER_D" />
-                <ScalarProperty Name="WINDER_I" ColumnName="WINDER_I" />
-                <ScalarProperty Name="WINDER_P" ColumnName="WINDER_P" />
-                <ScalarProperty Name="PULLER_D" ColumnName="PULLER_D" />
-                <ScalarProperty Name="PULLER_I" ColumnName="PULLER_I" />
-                <ScalarProperty Name="PULLER_P" ColumnName="PULLER_P" />
-                <ScalarProperty Name="FEEDER_D" ColumnName="FEEDER_D" />
-                <ScalarProperty Name="FEEDER_I" ColumnName="FEEDER_I" />
-                <ScalarProperty Name="FEEDER_P" ColumnName="FEEDER_P" />
-                <ScalarProperty Name="SPOOLS_CALIBRATIONS_STRING" ColumnName="SPOOLS_CALIBRATIONS_STRING" />
-                <ScalarProperty Name="QUALIFICATION_DATE" ColumnName="QUALIFICATION_DATE" />
-                <ScalarProperty Name="QUALIFICATION_LEVEL" ColumnName="QUALIFICATION_LEVEL" />
-                <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" />
-                <ScalarProperty Name="USE_COLOR_LIB_GRADIENTS" ColumnName="USE_COLOR_LIB_GRADIENTS" />
                 <ScalarProperty Name="COLOR_CONVERSION_VERSION" ColumnName="COLOR_CONVERSION_VERSION" />
                 <ScalarProperty Name="CCT_GUID" ColumnName="CCT_GUID" />
                 <ScalarProperty Name="THUMBNAIL" ColumnName="THUMBNAIL" />
@@ -7106,7 +6231,6 @@
                 <ScalarProperty Name="WHITE_POINT_L" ColumnName="WHITE_POINT_L" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="MANUFACTURER" ColumnName="MANUFACTURER" />
-                <ScalarProperty Name="DISPLAY_NAME" ColumnName="DISPLAY_NAME" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -7114,21 +6238,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="RMLS_SPOOLS">
-            <EntityTypeMapping TypeName="RemoteModel.RMLS_SPOOLS">
-              <MappingFragment StoreEntitySet="RMLS_SPOOLS">
-                <ScalarProperty Name="BOTTOM_BACKING_RATE" ColumnName="BOTTOM_BACKING_RATE" />
-                <ScalarProperty Name="BACKING_RATE" ColumnName="BACKING_RATE" />
-                <ScalarProperty Name="LENGTH" ColumnName="LENGTH" />
-                <ScalarProperty Name="ROTATIONS_PER_PASSAGE" ColumnName="ROTATIONS_PER_PASSAGE" />
-                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
-                <ScalarProperty Name="SPOOL_TYPE_GUID" ColumnName="SPOOL_TYPE_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="ROLES">
             <EntityTypeMapping TypeName="RemoteModel.ROLE">
               <MappingFragment StoreEntitySet="ROLES">
@@ -7165,48 +6274,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="SITES">
-            <EntityTypeMapping TypeName="RemoteModel.SITE">
-              <MappingFragment StoreEntitySet="SITES">
-                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
-                <ScalarProperty Name="NAME" ColumnName="NAME" />
-                <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="SITES_CATALOGS">
-            <EntityTypeMapping TypeName="RemoteModel.SITES_CATALOGS">
-              <MappingFragment StoreEntitySet="SITES_CATALOGS">
-                <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" />
-                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="SITES_RMLS">
-            <EntityTypeMapping TypeName="RemoteModel.SITES_RMLS">
-              <MappingFragment StoreEntitySet="SITES_RMLS">
-                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
-                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="SPOOL_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.SPOOL_TYPES">
               <MappingFragment StoreEntitySet="SPOOL_TYPES">
-                <ScalarProperty Name="LIMIT_SWITCH_START_POINT_OFFSET" ColumnName="LIMIT_SWITCH_START_POINT_OFFSET" />
-                <ScalarProperty Name="BOTTOM_BACKING_RATE" ColumnName="BOTTOM_BACKING_RATE" />
-                <ScalarProperty Name="SEGMENT_OFFSET_PULSES" ColumnName="SEGMENT_OFFSET_PULSES" />
-                <ScalarProperty Name="BACKING_RATE" ColumnName="BACKING_RATE" />
-                <ScalarProperty Name="START_OFFSET_PULSES" ColumnName="START_OFFSET_PULSES" />
                 <ScalarProperty Name="ROTATIONS_PER_PASSAGE" ColumnName="ROTATIONS_PER_PASSAGE" />
                 <ScalarProperty Name="DIAMETER" ColumnName="DIAMETER" />
                 <ScalarProperty Name="WEIGHT" ColumnName="WEIGHT" />
@@ -7222,7 +6292,6 @@
           <EntitySetMapping Name="SPOOLS">
             <EntityTypeMapping TypeName="RemoteModel.SPOOL">
               <MappingFragment StoreEntitySet="SPOOLS">
-                <ScalarProperty Name="LIMIT_SWITCH_START_POINT_OFFSET" ColumnName="LIMIT_SWITCH_START_POINT_OFFSET" />
                 <ScalarProperty Name="BOTTOM_BACKING_RATE" ColumnName="BOTTOM_BACKING_RATE" />
                 <ScalarProperty Name="SEGMENT_OFFSET_PULSES" ColumnName="SEGMENT_OFFSET_PULSES" />
                 <ScalarProperty Name="BACKING_RATE" ColumnName="BACKING_RATE" />
@@ -7246,28 +6315,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="TANGO_UPDATES">
-            <EntityTypeMapping TypeName="RemoteModel.TANGO_UPDATES">
-              <MappingFragment StoreEntitySet="TANGO_UPDATES">
-                <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
-                <ScalarProperty Name="END_DATE" ColumnName="END_DATE" />
-                <ScalarProperty Name="START_DATE" ColumnName="START_DATE" />
-                <ScalarProperty Name="FAILED_LOG" ColumnName="FAILED_LOG" />
-                <ScalarProperty Name="FAILED_REASON" ColumnName="FAILED_REASON" />
-                <ScalarProperty Name="STATUS" ColumnName="STATUS" />
-                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
-                <ScalarProperty Name="FIRMWARE_VERSION" ColumnName="FIRMWARE_VERSION" />
-                <ScalarProperty Name="APPLICATION_VERSION" ColumnName="APPLICATION_VERSION" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="TANGO_VERSIONS">
             <EntityTypeMapping TypeName="RemoteModel.TANGO_VERSIONS">
               <MappingFragment StoreEntitySet="TANGO_VERSIONS">
-                <ScalarProperty Name="DISABLED" ColumnName="DISABLED" />
                 <ScalarProperty Name="MACHINE_VERSION_GUID" ColumnName="MACHINE_VERSION_GUID" />
                 <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
                 <ScalarProperty Name="COMMENTS" ColumnName="COMMENTS" />
@@ -7376,7 +6426,6 @@
           <EntitySetMapping Name="USERS">
             <EntityTypeMapping TypeName="RemoteModel.USER">
               <MappingFragment StoreEntitySet="USERS">
-                <ScalarProperty Name="PASSWORD_CHANGE_REQUIRED" ColumnName="PASSWORD_CHANGE_REQUIRED" />
                 <ScalarProperty Name="LAST_LOGIN" ColumnName="LAST_LOGIN" />
                 <ScalarProperty Name="ADDRESS_GUID" ColumnName="ADDRESS_GUID" />
                 <ScalarProperty Name="CONTACT_GUID" ColumnName="CONTACT_GUID" />
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 476e859b4..79b65efb0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -4,92 +4,80 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- 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="38.25" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="59" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="63.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="84.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="74" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="39.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="7.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="6.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="24.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="68.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="55.125" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="56.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="90.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="89.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="77" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="32.625" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="47.125" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="8.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="102.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="85.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="98.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="84.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="98.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="79.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="94.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="72.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="78.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="65.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="76.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="94.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="80.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="23.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="34.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="51.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="44.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="42.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="13" />
-        <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="38.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="55.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.25" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="1.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="51.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="51.625" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="29" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="11.75" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="5.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="34.25" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="35.625" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="31.125" />
-        <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
+      <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="59" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="33.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="39.125" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="16" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="14" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="4.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="63.125" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="14.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="11.75" PointY="51" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="14" PointY="50.5" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="36.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="13.25" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="28.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="11.75" PointY="44.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="14" PointY="36.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="54.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="40.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.75" PointY="48.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="14.75" PointY="40.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="17" PointY="36.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="8.75" PointY="44.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11" PointY="30.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="45.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="49.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="39.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="14" PointY="44" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="16.25" PointY="30.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="34.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="14.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="15.5" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="14" PointY="47.375" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="61" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="16.25" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="52" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="16.25" PointY="46.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="18.5" PointY="46.875" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="10.5" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="18.5" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="6.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="8.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="28.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="18.5" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="34.125" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
@@ -106,11 +94,11 @@
         <AssociationConnector Association="RemoteModel.FK_RMLS_CCTS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_COLOR_CATALOGS" />
-        <AssociationConnector Association="RemoteModel.FK_SITES_CATALOGS_COLOR_CATALOGS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_COLOR_SPACES" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINES_COLOR_SPACES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_CONFIGURATIONS" />
@@ -119,13 +107,11 @@
         <AssociationConnector Association="RemoteModel.FK_USERS_CONTACTS" />
         <AssociationConnector Association="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_CUSTOMERS" />
-        <AssociationConnector Association="RemoteModel.FK_DATA_STORES_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_DISPENSERS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" />
         <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SYNTHESIS" />
-        <AssociationConnector Association="RemoteModel.FK_FSE_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES" />
@@ -143,6 +129,7 @@
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_IDS_PACK_FORMULAS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" />
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_MID_TANK_TYPES" />
+        <AssociationConnector Association="RemoteModel.FK_JOB_RUNS_JOBS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_SPOOL_TYPES" />
@@ -157,24 +144,19 @@
         <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_MACHINES_RMLS2" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINES_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_SPOOLS_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_CONDITIONS" />
         <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_MATERIALS" />
         <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_PURPOSES" />
-        <AssociationConnector Association="RemoteModel.FK_SITES_ORGANIZATIONS" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ORGANIZATIONS" />
         <AssociationConnector Association="RemoteModel.FK_ROLES_PERMISSIONS_PERMISSIONS" />
         <AssociationConnector Association="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" />
         <AssociationConnector Association="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" />
-        <AssociationConnector Association="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" />
-        <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_RMLS" />
-        <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_RMLS" />
-        <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_ROLES_PERMISSIONS_ROLES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_ROLES" />
-        <AssociationConnector Association="RemoteModel.FK_SITES_CATALOGS_SITES" />
-        <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_SITES" />
         <AssociationConnector Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_TANGO_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_USERS" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
deleted file mode 100644
index c0aa38e97..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 SITE
-    {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public SITE()
-        {
-            this.SITES_CATALOGS = new HashSet<SITES_CATALOGS>();
-            this.SITES_RMLS = new HashSet<SITES_RMLS>();
-        }
-    
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string ORGANIZATION_GUID { get; set; }
-        public string NAME { get; set; }
-        public string DESCRIPTION { get; set; }
-    
-        public virtual ORGANIZATION ORGANIZATION { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<SITES_CATALOGS> SITES_CATALOGS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<SITES_RMLS> SITES_RMLS { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_CATALOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_CATALOGS.cs
deleted file mode 100644
index 4868cf35a..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_CATALOGS.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tango.DAL.Remote.DB
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class SITES_CATALOGS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string SITE_GUID { get; set; }
-        public string COLOR_CATALOG_GUID { get; set; }
-    
-        public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
-        public virtual SITE SITE { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs
deleted file mode 100644
index 945dd8bf9..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tango.DAL.Remote.DB
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class SITES_RMLS
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string SITE_GUID { get; set; }
-        public string RML_GUID { get; set; }
-    
-        public virtual RML RML { get; set; }
-        public virtual SITE SITE { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs
index d983a5d69..74996acd0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs
@@ -19,11 +19,10 @@ namespace Tango.DAL.Remote.DB
         public System.DateTime LAST_UPDATED { get; set; }
         public string SPOOL_TYPE_GUID { get; set; }
         public string MACHINE_GUID { get; set; }
-        public Nullable<int> START_OFFSET_PULSES { get; set; }
-        public Nullable<int> BACKING_RATE { get; set; }
-        public Nullable<int> SEGMENT_OFFSET_PULSES { get; set; }
-        public Nullable<int> BOTTOM_BACKING_RATE { get; set; }
-        public Nullable<int> LIMIT_SWITCH_START_POINT_OFFSET { get; set; }
+        public int START_OFFSET_PULSES { get; set; }
+        public int BACKING_RATE { get; set; }
+        public int SEGMENT_OFFSET_PULSES { get; set; }
+        public int BOTTOM_BACKING_RATE { get; set; }
     
         public virtual MACHINE MACHINE { get; set; }
         public virtual SPOOL_TYPES SPOOL_TYPES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
index af2355553..1d8b75f90 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
@@ -18,7 +18,7 @@ namespace Tango.DAL.Remote.DB
         public SPOOL_TYPES()
         {
             this.JOBS = new HashSet<JOB>();
-            this.RMLS_SPOOLS = new HashSet<RMLS_SPOOLS>();
+            this.MACHINES = new HashSet<MACHINE>();
             this.SPOOLS = new HashSet<SPOOL>();
         }
     
@@ -31,16 +31,11 @@ namespace Tango.DAL.Remote.DB
         public double WEIGHT { get; set; }
         public double DIAMETER { get; set; }
         public double ROTATIONS_PER_PASSAGE { get; set; }
-        public int START_OFFSET_PULSES { get; set; }
-        public int BACKING_RATE { get; set; }
-        public int SEGMENT_OFFSET_PULSES { get; set; }
-        public int BOTTOM_BACKING_RATE { get; set; }
-        public int LIMIT_SWITCH_START_POINT_OFFSET { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
+        public virtual ICollection<MACHINE> MACHINES { 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/TANGO_UPDATES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/TANGO_UPDATES.cs
deleted file mode 100644
index b591f562c..000000000
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/TANGO_UPDATES.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <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 TANGO_UPDATES
-    {
-        public int ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public string APPLICATION_VERSION { get; set; }
-        public string FIRMWARE_VERSION { get; set; }
-        public string MACHINE_GUID { get; set; }
-        public int STATUS { get; set; }
-        public string FAILED_REASON { get; set; }
-        public string FAILED_LOG { get; set; }
-        public System.DateTime START_DATE { get; set; }
-        public Nullable<System.DateTime> END_DATE { get; set; }
-        public bool IS_SYNCHRONIZED { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/TANGO_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/TANGO_VERSIONS.cs
index ba1dbb55b..4c46e8170 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/TANGO_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/TANGO_VERSIONS.cs
@@ -24,7 +24,6 @@ namespace Tango.DAL.Remote.DB
         public string COMMENTS { get; set; }
         public string USER_GUID { get; set; }
         public string MACHINE_VERSION_GUID { get; set; }
-        public bool DISABLED { get; set; }
     
         public virtual MACHINE_VERSIONS MACHINE_VERSIONS { get; set; }
         public virtual USER USER { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
index 75cc4e444..f8c124d43 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
@@ -17,8 +17,6 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public USER()
         {
-            this.ACTION_LOGS = new HashSet<ACTION_LOGS>();
-            this.FSE_VERSIONS = new HashSet<FSE_VERSIONS>();
             this.JOBS = new HashSet<JOB>();
             this.MACHINE_STUDIO_VERSIONS = new HashSet<MACHINE_STUDIO_VERSIONS>();
             this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>();
@@ -36,15 +34,10 @@ namespace Tango.DAL.Remote.DB
         public string CONTACT_GUID { get; set; }
         public string ADDRESS_GUID { get; set; }
         public Nullable<System.DateTime> LAST_LOGIN { get; set; }
-        public bool PASSWORD_CHANGE_REQUIRED { get; set; }
     
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ACTION_LOGS> ACTION_LOGS { get; set; }
         public virtual ADDRESS ADDRESS { get; set; }
         public virtual CONTACT CONTACT { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<FSE_VERSIONS> FSE_VERSIONS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<MACHINE_STUDIO_VERSIONS> MACHINE_STUDIO_VERSIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index fbb64ecc1..b6b4d18c8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -66,9 +66,6 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="DB\ACTION_LOGS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\ADDRESS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -117,9 +114,6 @@
     <Compile Include="DB\CUSTOMER.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\DATA_STORE_ITEMS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\DISPENSER.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -138,12 +132,6 @@
     <Compile Include="DB\FIBER_SYNTHS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\FSE_VERSIONS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="DB\GLOBAL_DATA_STORE_ITEMS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\HARDWARE_BLOWERS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -246,12 +234,6 @@
     <Compile Include="DB\PROCESS_PARAMETERS_TABLES_GROUPS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\PUBLISHED_PROCEDURE_PROJECTS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="DB\PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\RemoteADO.Context.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -270,9 +252,6 @@
     <Compile Include="DB\RML.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\RMLS_SPOOLS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\ROLE.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -282,15 +261,6 @@
     <Compile Include="DB\SEGMENT.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\SITE.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="DB\SITES_CATALOGS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="DB\SITES_RMLS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\SPOOL.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -303,9 +273,6 @@
     <Compile Include="DB\sysdiagram.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\TANGO_UPDATES.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\TANGO_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -386,7 +353,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