Added organizations rmls and machines rmls.

18 files changed, 676 insertions, 72 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs
new file mode 100644
index 000000000..308438b14
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs
@@ -0,0 +1,14 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.DTO
+{
+    public class MachinesRmlDTO : MachinesRmlDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs
new file mode 100644
index 000000000..5ae7d3992
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class MachinesRmlDTOBase : ObservableEntityDTO<MachinesRmlDTO, MachinesRml>
+    {
+
+        /// <summary>
+        /// machine guid
+        /// </summary>
+        public String MachineGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// rml guid
+        /// </summary>
+        public String RmlGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs
new file mode 100644
index 000000000..796c1812d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs
@@ -0,0 +1,14 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.DTO
+{
+    public class OrganizationsRmlDTO : OrganizationsRmlDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs
new file mode 100644
index 000000000..339e846af
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class OrganizationsRmlDTOBase : ObservableEntityDTO<OrganizationsRmlDTO, OrganizationsRml>
+    {
+
+        /// <summary>
+        /// organization guid
+        /// </summary>
+        public String OrganizationGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// rml guid
+        /// </summary>
+        public String RmlGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs
new file mode 100644
index 000000000..6fe2ef16e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class MachinesRml : MachinesRmlBase
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs
new file mode 100644
index 000000000..efb9cd997
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs
@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+using System.ComponentModel;
+
+namespace Tango.BL.Entities
+{
+    [Table("MACHINES_RMLS")]
+    public abstract class MachinesRmlBase : ObservableEntity<MachinesRml>
+    {
+
+        protected String _machineguid;
+
+        /// <summary>
+        /// Gets or sets the machinesrmlbase machine guid.
+        /// </summary>
+
+        [Column("MACHINE_GUID")]
+
+        public  String MachineGuid
+        {
+            get 
+            {
+                return _machineguid; 
+            }
+
+            set 
+            {
+                if (_machineguid != value)
+                {
+                    _machineguid = value;
+
+                }
+            }
+        }
+
+        protected String _rmlguid;
+
+        /// <summary>
+        /// Gets or sets the machinesrmlbase rml guid.
+        /// </summary>
+
+        [Column("RML_GUID")]
+
+        public  String RmlGuid
+        {
+            get 
+            {
+                return _rmlguid; 
+            }
+
+            set 
+            {
+                if (_rmlguid != value)
+                {
+                    _rmlguid = value;
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachinesRmlBase" /> class.
+        /// </summary>
+        public MachinesRmlBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs
new file mode 100644
index 000000000..70c8fb66f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class OrganizationsRml : OrganizationsRmlBase
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs
new file mode 100644
index 000000000..d1f338428
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs
@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+using System.ComponentModel;
+
+namespace Tango.BL.Entities
+{
+    [Table("ORGANIZATIONS_RMLS")]
+    public abstract class OrganizationsRmlBase : ObservableEntity<OrganizationsRml>
+    {
+
+        protected String _organizationguid;
+
+        /// <summary>
+        /// Gets or sets the organizationsrmlbase organization guid.
+        /// </summary>
+
+        [Column("ORGANIZATION_GUID")]
+
+        public  String OrganizationGuid
+        {
+            get 
+            {
+                return _organizationguid; 
+            }
+
+            set 
+            {
+                if (_organizationguid != value)
+                {
+                    _organizationguid = value;
+
+                }
+            }
+        }
+
+        protected String _rmlguid;
+
+        /// <summary>
+        /// Gets or sets the organizationsrmlbase rml guid.
+        /// </summary>
+
+        [Column("RML_GUID")]
+
+        public  String RmlGuid
+        {
+            get 
+            {
+                return _rmlguid; 
+            }
+
+            set 
+            {
+                if (_rmlguid != value)
+                {
+                    _rmlguid = value;
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrganizationsRmlBase" /> class.
+        /// </summary>
+        public OrganizationsRmlBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index 5e75822ab..25c3b5682 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -415,6 +415,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the MachinesRmls.
+        /// </summary>
+        public DbSet<MachinesRml> MachinesRmls 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the MediaConditions.
         /// </summary>
         public DbSet<MediaCondition> MediaConditions 
@@ -455,6 +463,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the OrganizationsRmls.
+        /// </summary>
+        public DbSet<OrganizationsRml> OrganizationsRmls 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the Permissions.
         /// </summary>
         public DbSet<Permission> Permissions 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index c6b9bfb9f..cb259995b 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -1781,6 +1781,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<MachinesRml> _machinesrmls;
+        /// <summary>
+        /// Gets or sets the MachinesRmls.
+        /// </summary>
+        public ObservableCollection<MachinesRml> MachinesRmls
+        {
+            get 
+            {
+                return _machinesrmls; 
+            }
+
+            set 
+            {
+                _machinesrmls = value; RaisePropertyChanged(nameof(MachinesRmls)); 
+            }
+
+        }
+
+        private ICollectionView _machinesrmlsViewSource;
+        /// <summary>
+        /// Gets or sets the MachinesRmls View Source.
+        ///</summary>
+        public ICollectionView MachinesRmlsViewSource
+        {
+            get 
+            {
+                return _machinesrmlsViewSource; 
+            }
+
+            set 
+            {
+                _machinesrmlsViewSource = value; RaisePropertyChanged(nameof(MachinesRmlsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<MediaCondition> _mediaconditions;
         /// <summary>
         /// Gets or sets the MediaConditions.
@@ -1961,6 +1997,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<OrganizationsRml> _organizationsrmls;
+        /// <summary>
+        /// Gets or sets the OrganizationsRmls.
+        /// </summary>
+        public ObservableCollection<OrganizationsRml> OrganizationsRmls
+        {
+            get 
+            {
+                return _organizationsrmls; 
+            }
+
+            set 
+            {
+                _organizationsrmls = value; RaisePropertyChanged(nameof(OrganizationsRmls)); 
+            }
+
+        }
+
+        private ICollectionView _organizationsrmlsViewSource;
+        /// <summary>
+        /// Gets or sets the OrganizationsRmls View Source.
+        ///</summary>
+        public ICollectionView OrganizationsRmlsViewSource
+        {
+            get 
+            {
+                return _organizationsrmlsViewSource; 
+            }
+
+            set 
+            {
+                _organizationsrmlsViewSource = value; RaisePropertyChanged(nameof(OrganizationsRmlsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Permission> _permissions;
         /// <summary>
         /// Gets or sets the Permissions.
@@ -2821,6 +2893,8 @@ namespace Tango.BL
 
             MachinesEventsViewSource = CreateCollectionView(MachinesEvents);
 
+            MachinesRmlsViewSource = CreateCollectionView(MachinesRmls);
+
             MediaConditionsViewSource = CreateCollectionView(MediaConditions);
 
             MediaMaterialsViewSource = CreateCollectionView(MediaMaterials);
@@ -2831,6 +2905,8 @@ namespace Tango.BL
 
             OrganizationsViewSource = CreateCollectionView(Organizations);
 
+            OrganizationsRmlsViewSource = CreateCollectionView(OrganizationsRmls);
+
             PermissionsViewSource = CreateCollectionView(Permissions);
 
             ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index f5054f89d..3b24aa506 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -1781,6 +1781,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<MachinesRml> _machinesrmls;
+        /// <summary>
+        /// Gets or sets the MachinesRmls.
+        /// </summary>
+        public ObservableCollection<MachinesRml> MachinesRmls
+        {
+            get 
+            {
+                return _machinesrmls; 
+            }
+
+            set 
+            {
+                _machinesrmls = value; RaisePropertyChanged(nameof(MachinesRmls)); 
+            }
+
+        }
+
+        private ICollectionView _machinesrmlsViewSource;
+        /// <summary>
+        /// Gets or sets the MachinesRmls View Source.
+        ///</summary>
+        public ICollectionView MachinesRmlsViewSource
+        {
+            get 
+            {
+                return _machinesrmlsViewSource; 
+            }
+
+            set 
+            {
+                _machinesrmlsViewSource = value; RaisePropertyChanged(nameof(MachinesRmlsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<MediaCondition> _mediaconditions;
         /// <summary>
         /// Gets or sets the MediaConditions.
@@ -1961,6 +1997,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<OrganizationsRml> _organizationsrmls;
+        /// <summary>
+        /// Gets or sets the OrganizationsRmls.
+        /// </summary>
+        public ObservableCollection<OrganizationsRml> OrganizationsRmls
+        {
+            get 
+            {
+                return _organizationsrmls; 
+            }
+
+            set 
+            {
+                _organizationsrmls = value; RaisePropertyChanged(nameof(OrganizationsRmls)); 
+            }
+
+        }
+
+        private ICollectionView _organizationsrmlsViewSource;
+        /// <summary>
+        /// Gets or sets the OrganizationsRmls View Source.
+        ///</summary>
+        public ICollectionView OrganizationsRmlsViewSource
+        {
+            get 
+            {
+                return _organizationsrmlsViewSource; 
+            }
+
+            set 
+            {
+                _organizationsrmlsViewSource = value; RaisePropertyChanged(nameof(OrganizationsRmlsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Permission> _permissions;
         /// <summary>
         /// Gets or sets the Permissions.
@@ -2821,6 +2893,8 @@ namespace Tango.BL
 
             MachinesEventsViewSource = CreateCollectionView(MachinesEvents);
 
+            MachinesRmlsViewSource = CreateCollectionView(MachinesRmls);
+
             MediaConditionsViewSource = CreateCollectionView(MediaConditions);
 
             MediaMaterialsViewSource = CreateCollectionView(MediaMaterials);
@@ -2831,6 +2905,8 @@ namespace Tango.BL
 
             OrganizationsViewSource = CreateCollectionView(Organizations);
 
+            OrganizationsRmlsViewSource = CreateCollectionView(OrganizationsRmls);
+
             PermissionsViewSource = CreateCollectionView(Permissions);
 
             ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index ed134d37d..c3c1b9ab9 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -206,6 +206,8 @@
     <Compile Include="DTO\MachineDTOBase.cs" />
     <Compile Include="DTO\MachinesEventDTO.cs" />
     <Compile Include="DTO\MachinesEventDTOBase.cs" />
+    <Compile Include="DTO\MachinesRmlDTO.cs" />
+    <Compile Include="DTO\MachinesRmlDTOBase.cs" />
     <Compile Include="DTO\MachineStudioVersionDTO.cs" />
     <Compile Include="DTO\MachineStudioVersionDTOBase.cs" />
     <Compile Include="DTO\MachineVersionDTO.cs" />
@@ -220,6 +222,8 @@
     <Compile Include="DTO\MidTankTypeDTOBase.cs" />
     <Compile Include="DTO\OrganizationDTO.cs" />
     <Compile Include="DTO\OrganizationDTOBase.cs" />
+    <Compile Include="DTO\OrganizationsRmlDTO.cs" />
+    <Compile Include="DTO\OrganizationsRmlDTOBase.cs" />
     <Compile Include="DTO\PermissionDTO.cs" />
     <Compile Include="DTO\PermissionDTOBase.cs" />
     <Compile Include="DTO\ProcessParametersTableDTO.cs" />
@@ -319,6 +323,8 @@
     <Compile Include="Entities\LiquidTypesRmlBase.cs" />
     <Compile Include="Entities\MachineBase.cs" />
     <Compile Include="Entities\MachinesEventBase.cs" />
+    <Compile Include="Entities\MachinesRml.cs" />
+    <Compile Include="Entities\MachinesRmlBase.cs" />
     <Compile Include="Entities\MachineStudioVersionBase.cs" />
     <Compile Include="Entities\MachineVersionBase.cs" />
     <Compile Include="Entities\MediaConditionBase.cs" />
@@ -326,6 +332,8 @@
     <Compile Include="Entities\MediaPurposBase.cs" />
     <Compile Include="Entities\MidTankTypeBase.cs" />
     <Compile Include="Entities\OrganizationBase.cs" />
+    <Compile Include="Entities\OrganizationsRml.cs" />
+    <Compile Include="Entities\OrganizationsRmlBase.cs" />
     <Compile Include="Entities\PermissionBase.cs" />
     <Compile Include="Entities\ProcessParametersTableBase.cs" />
     <Compile Include="Entities\ProcessParametersTablesGroupBase.cs" />
@@ -566,7 +574,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs
new file mode 100644
index 000000000..64cdfe830
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <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 MACHINES_RMLS
+    {
+        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 RML_GUID { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs
new file mode 100644
index 000000000..1db95419e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <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 ORGANIZATIONS_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 RML_GUID { 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 b24e297ca..fc248bbfe 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -74,11 +74,13 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; }
         public virtual DbSet<MACHINE> MACHINES { get; set; }
         public virtual DbSet<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
+        public virtual DbSet<MACHINES_RMLS> MACHINES_RMLS { get; set; }
         public virtual DbSet<MEDIA_CONDITIONS> MEDIA_CONDITIONS { get; set; }
         public virtual DbSet<MEDIA_MATERIALS> MEDIA_MATERIALS { get; set; }
         public virtual DbSet<MEDIA_PURPOSES> MEDIA_PURPOSES { get; set; }
         public virtual DbSet<MID_TANK_TYPES> MID_TANK_TYPES { get; set; }
         public virtual DbSet<ORGANIZATION> ORGANIZATIONS { get; set; }
+        public virtual DbSet<ORGANIZATIONS_RMLS> ORGANIZATIONS_RMLS { get; set; }
         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; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 1a27648e2..44dffd473 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -749,6 +749,16 @@
           <Property Name="DESCRIPTION" Type="nvarchar(max)" />
           <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
         </EntityType>
+        <EntityType Name="MACHINES_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="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="MEDIA_CONDITIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -801,6 +811,16 @@
           <Property Name="CONTACT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="ADDRESS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <EntityType Name="ORGANIZATIONS_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="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="PERMISSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -974,8 +994,8 @@
           <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" Nullable="false" />
-          <Property Name="FIRMWARE_VERSION" Type="varchar" MaxLength="50" 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)" />
@@ -2217,11 +2237,13 @@
           <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINES" EntityType="Self.MACHINES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINES_EVENTS" EntityType="Self.MACHINES_EVENTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="MACHINES_RMLS" EntityType="Self.MACHINES_RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MEDIA_CONDITIONS" EntityType="Self.MEDIA_CONDITIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MEDIA_MATERIALS" EntityType="Self.MEDIA_MATERIALS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MEDIA_PURPOSES" EntityType="Self.MEDIA_PURPOSES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MID_TANK_TYPES" EntityType="Self.MID_TANK_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ORGANIZATIONS" EntityType="Self.ORGANIZATIONS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="ORGANIZATIONS_RMLS" EntityType="Self.ORGANIZATIONS_RMLS" Schema="dbo" store:Type="Tables" />
           <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" />
@@ -2623,11 +2645,13 @@
           <EntitySet Name="MACHINE_VERSIONS" EntityType="RemoteModel.MACHINE_VERSIONS" />
           <EntitySet Name="MACHINES" EntityType="RemoteModel.MACHINE" />
           <EntitySet Name="MACHINES_EVENTS" EntityType="RemoteModel.MACHINES_EVENTS" />
+          <EntitySet Name="MACHINES_RMLS" EntityType="RemoteModel.MACHINES_RMLS" />
           <EntitySet Name="MEDIA_CONDITIONS" EntityType="RemoteModel.MEDIA_CONDITIONS" />
           <EntitySet Name="MEDIA_MATERIALS" EntityType="RemoteModel.MEDIA_MATERIALS" />
           <EntitySet Name="MEDIA_PURPOSES" EntityType="RemoteModel.MEDIA_PURPOSES" />
           <EntitySet Name="MID_TANK_TYPES" EntityType="RemoteModel.MID_TANK_TYPES" />
           <EntitySet Name="ORGANIZATIONS" EntityType="RemoteModel.ORGANIZATION" />
+          <EntitySet Name="ORGANIZATIONS_RMLS" EntityType="RemoteModel.ORGANIZATIONS_RMLS" />
           <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" />
@@ -3838,6 +3862,16 @@
           <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" />
         </EntityType>
+        <EntityType Name="MACHINES_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="MACHINE_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" />
+        </EntityType>
         <EntityType Name="MEDIA_CONDITIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3899,6 +3933,16 @@
           <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="MACHINE" />
           <NavigationProperty Name="USERS" Relationship="RemoteModel.FK_USERS_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="USER" />
         </EntityType>
+        <EntityType Name="ORGANIZATIONS_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="ORGANIZATION_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" />
+        </EntityType>
         <EntityType Name="PERMISSION">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4092,8 +4136,8 @@
           <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" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="FIRMWARE_VERSION" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <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" />
@@ -6106,6 +6150,17 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="MACHINES_RMLS">
+            <EntityTypeMapping TypeName="RemoteModel.MACHINES_RMLS">
+              <MappingFragment StoreEntitySet="MACHINES_RMLS">
+                <ScalarProperty Name="RML_GUID" ColumnName="RML_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" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="MEDIA_CONDITIONS">
             <EntityTypeMapping TypeName="RemoteModel.MEDIA_CONDITIONS">
               <MappingFragment StoreEntitySet="MEDIA_CONDITIONS">
@@ -6163,6 +6218,17 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="ORGANIZATIONS_RMLS">
+            <EntityTypeMapping TypeName="RemoteModel.ORGANIZATIONS_RMLS">
+              <MappingFragment StoreEntitySet="ORGANIZATIONS_RMLS">
+                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
+                <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="PERMISSIONS">
             <EntityTypeMapping TypeName="RemoteModel.PERMISSION">
               <MappingFragment StoreEntitySet="PERMISSIONS">
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 a3618fb5f..a30733407 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,80 +5,82 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="58.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="49.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="46.875" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="12.25" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="7.5" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="24" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="24.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="32.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="19" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="19.25" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="16.5" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="32.75" />
         <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="8" />
         <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="8.375" />
         <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="8.25" PointY="43.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="42.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="62.375" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="60.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="3.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="39.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="11.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="30.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="3.75" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6" PointY="37.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="65.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="38.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="3.75" PointY="67.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6" PointY="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="8.75" PointY="69" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11" PointY="42.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="0.75" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="8.75" PointY="47.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="11" PointY="34.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="38.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="28.75" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="11.25" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="17" PointY="8.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="19.25" PointY="8.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="45.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="20.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="26.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="12.75" PointY="50" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="15" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="54" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="41.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.75" PointY="58" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9" PointY="43.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.75" PointY="53.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="15" PointY="38.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.75" PointY="16" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="58" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="45.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="41.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.75" PointY="50" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12" PointY="37.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="19.25" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="21.5" PointY="21.25" />
         <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="13.5" PointY="16.75" />
         <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="12.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="33.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="27.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="64.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="60.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="57" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="14.25" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_RMLS" Width="1.5" PointX="2.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="16" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="29.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="24" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="19.25" PointY="34.5" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="26.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATIONS_RMLS" Width="1.5" PointX="2.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="15.25" PointY="52.625" />
         <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.625" />
         <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.25" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="38.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="39" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="29.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="27.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="2.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.5" PointY="27.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="11.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="11.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="28.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="34.125" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="15.25" PointY="48.5" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="17.5" PointY="48.625" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="24.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="19.5" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="4.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="11.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.5" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="6.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="17.5" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="11.25" PointY="13.375" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
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 a7e392def..cda3f47c2 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -204,6 +204,9 @@
     <Compile Include="DB\MACHINES_EVENTS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\MACHINES_RMLS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\MACHINE_STUDIO_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -225,6 +228,9 @@
     <Compile Include="DB\ORGANIZATION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\ORGANIZATIONS_RMLS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\PERMISSION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -356,7 +362,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