Added GBD and LUB to DB and BL.

6 files changed, 324 insertions, 94 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/GBD.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/GBD.cs
new file mode 100644
index 000000000..49143f0a6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/GBD.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class GBD
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public GBD()
+        {
+            this.RMLS = new HashSet<RML>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public string FILE_NAME { get; set; }
+        public byte[] DATA { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML> RMLS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LUB.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LUB.cs
new file mode 100644
index 000000000..ca2d801c9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LUB.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class LUB
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public LUB()
+        {
+            this.RMLS = new HashSet<RML>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public string FILE_NAME { get; set; }
+        public byte[] DATA { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML> RMLS { 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 f4c6880bc..5488e8c54 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -56,6 +56,8 @@ namespace Tango.DAL.Remote.DB
         public int RANK { get; set; }
         public byte[] THUMBNAIL { get; set; }
         public string CCT_GUID { get; set; }
+        public string GBD_GUID { get; set; }
+        public string LUB_GUID { get; set; }
         public int COLOR_CONVERSION_VERSION { get; set; }
         public bool USE_COLOR_LIB_GRADIENTS { get; set; }
         public bool USE_LIGHT_INKS { get; set; }
@@ -89,11 +91,13 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<COLOR_CATALOGS_ITEMS_RECIPES> COLOR_CATALOGS_ITEMS_RECIPES { get; set; }
         public virtual FIBER_SHAPES FIBER_SHAPES { get; set; }
         public virtual FIBER_SYNTHS FIBER_SYNTHS { get; set; }
+        public virtual GBD GBD { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<JOB> JOBS { get; set; }
         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; }
+        public virtual LUB LUB { 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; }
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 a4879a500..b611a0972 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -80,6 +80,7 @@ namespace Tango.DAL.Remote.DB
         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<GBD> GBDS { 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; }
@@ -103,6 +104,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
         public virtual DbSet<LIQUID_TYPES> LIQUID_TYPES { get; set; }
         public virtual DbSet<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; }
+        public virtual DbSet<LUB> LUBS { get; set; }
         public virtual DbSet<MACHINE_PROTOTYPES> MACHINE_PROTOTYPES { get; set; }
         public virtual DbSet<MACHINE_STUDIO_VERSIONS> MACHINE_STUDIO_VERSIONS { get; set; }
         public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { 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 b9dccd261..d52f40cab 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -456,6 +456,18 @@
           <Property Name="COMMENTS" Type="nvarchar(max)" Nullable="false" />
           <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <EntityType Name="GBDS">
+          <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" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
+          <Property Name="FILE_NAME" Type="nvarchar" MaxLength="100" />
+          <Property Name="DATA" Type="image" />
+        </EntityType>
         <EntityType Name="GLOBAL_DATA_STORE_ITEMS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -854,6 +866,18 @@
           <Property Name="MAX_NL_PER_CM" Type="float" Nullable="false" />
           <Property Name="DEFAULT_CAT_DATA" Type="image" />
         </EntityType>
+        <EntityType Name="LUBS">
+          <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" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
+          <Property Name="FILE_NAME" Type="nvarchar" MaxLength="100" />
+          <Property Name="DATA" Type="image" />
+        </EntityType>
         <EntityType Name="MACHINE_PROTOTYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1280,6 +1304,8 @@
           <Property Name="RANK" Type="int" Nullable="false" />
           <Property Name="THUMBNAIL" Type="image" />
           <Property Name="CCT_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="GBD_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="LUB_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="USE_LIGHT_INKS" Type="bit" Nullable="false" />
@@ -3162,6 +3188,30 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_GBDS">
+          <End Role="GBDS" Type="Self.GBDS" Multiplicity="0..1" />
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="GBDS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS">
+              <PropertyRef Name="GBD_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RMLS_LUBS">
+          <End Role="LUBS" Type="Self.LUBS" Multiplicity="0..1" />
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LUBS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS">
+              <PropertyRef Name="LUB_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_SPOOLS_RMLS">
           <End Role="RMLS" Type="Self.RMLS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3531,6 +3581,7 @@
           <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="GBDS" EntityType="Self.GBDS" 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" />
@@ -3554,6 +3605,7 @@
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="LIQUID_TYPES" EntityType="Self.LIQUID_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="Self.LIQUID_TYPES_RMLS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="LUBS" EntityType="Self.LUBS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINE_PROTOTYPES" EntityType="Self.MACHINE_PROTOTYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINE_STUDIO_VERSIONS" EntityType="Self.MACHINE_STUDIO_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" Schema="dbo" store:Type="Tables" />
@@ -4039,6 +4091,14 @@
             <End Role="YARN_WHITE_SHADES" EntitySet="YARN_WHITE_SHADES" />
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_GBDS" Association="Self.FK_RMLS_GBDS">
+            <End Role="GBDS" EntitySet="GBDS" />
+            <End Role="RMLS" EntitySet="RMLS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RMLS_LUBS" Association="Self.FK_RMLS_LUBS">
+            <End Role="LUBS" EntitySet="LUBS" />
+            <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" />
@@ -4292,6 +4352,7 @@
           <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="GBDS" EntityType="RemoteModel.GBD" />
           <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" />
@@ -4315,6 +4376,7 @@
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" />
           <EntitySet Name="LIQUID_TYPES" EntityType="RemoteModel.LIQUID_TYPES" />
           <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="RemoteModel.LIQUID_TYPES_RMLS" />
+          <EntitySet Name="LUBS" EntityType="RemoteModel.LUB" />
           <EntitySet Name="MACHINE_PROTOTYPES" EntityType="RemoteModel.MACHINE_PROTOTYPES" />
           <EntitySet Name="MACHINE_STUDIO_VERSIONS" EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" />
           <EntitySet Name="MACHINE_VERSIONS" EntityType="RemoteModel.MACHINE_VERSIONS" />
@@ -4529,6 +4591,10 @@
             <End Role="USER" EntitySet="USERS" />
             <End Role="FSE_VERSIONS" EntitySet="FSE_VERSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_GBDS" Association="RemoteModel.FK_RMLS_GBDS">
+            <End Role="GBD" EntitySet="GBDS" />
+            <End Role="RML" EntitySet="RMLS" />
+          </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" />
@@ -4641,6 +4707,10 @@
             <End Role="RML" EntitySet="RMLS" />
             <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_LUBS" Association="RemoteModel.FK_RMLS_LUBS">
+            <End Role="LUB" EntitySet="LUBS" />
+            <End Role="RML" EntitySet="RMLS" />
+          </AssociationSet>
           <AssociationSet Name="FK_MACHINE_STUDIO_VERSIONS_USERS" Association="RemoteModel.FK_MACHINE_STUDIO_VERSIONS_USERS">
             <End Role="USER" EntitySet="USERS" />
             <End Role="MACHINE_STUDIO_VERSIONS" EntitySet="MACHINE_STUDIO_VERSIONS" />
@@ -5949,6 +6019,19 @@
           <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="GBD">
+          <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" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
+          <Property Name="FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_GBDS" FromRole="GBD" ToRole="RML" />
+        </EntityType>
         <EntityType Name="GLOBAL_DATA_STORE_ITEMS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6400,6 +6483,19 @@
           <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_LIQUID_TYPES_RMLS_LIQUID_TYPES" FromRole="LIQUID_TYPES_RMLS" ToRole="LIQUID_TYPES" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_LIQUID_TYPES_RMLS_RMLS" FromRole="LIQUID_TYPES_RMLS" ToRole="RML" />
         </EntityType>
+        <EntityType Name="LUB">
+          <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" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
+          <Property Name="FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_LUBS" FromRole="LUB" ToRole="RML" />
+        </EntityType>
         <EntityType Name="MACHINE_PROTOTYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6722,6 +6818,8 @@
           <Property Name="RANK" Type="Int32" Nullable="false" />
           <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" />
           <Property Name="CCT_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="GBD_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LUB_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="USE_LIGHT_INKS" Type="Boolean" Nullable="false" />
@@ -6752,9 +6850,11 @@
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" />
           <NavigationProperty Name="FIBER_SHAPES" Relationship="RemoteModel.FK_RML_FIBER_SHAPES" FromRole="RML" ToRole="FIBER_SHAPES" />
           <NavigationProperty Name="FIBER_SYNTHS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="RML" ToRole="FIBER_SYNTHS" />
+          <NavigationProperty Name="GBD" Relationship="RemoteModel.FK_RMLS_GBDS" FromRole="RML" ToRole="GBD" />
           <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="LUB" Relationship="RemoteModel.FK_RMLS_LUBS" FromRole="RML" ToRole="LUB" />
           <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" />
@@ -7685,6 +7785,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_GBDS">
+          <End Type="RemoteModel.GBD" Role="GBD" Multiplicity="0..1" />
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="GBD">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML">
+              <PropertyRef Name="GBD_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" />
@@ -8057,6 +8169,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_LUBS">
+          <End Type="RemoteModel.LUB" Role="LUB" Multiplicity="0..1" />
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LUB">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML">
+              <PropertyRef Name="LUB_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_MACHINE_STUDIO_VERSIONS_USERS">
           <End Type="RemoteModel.USER" Role="USER" Multiplicity="1" />
           <End Type="RemoteModel.MACHINE_STUDIO_VERSIONS" Role="MACHINE_STUDIO_VERSIONS" Multiplicity="*" />
@@ -9351,6 +9475,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="GBDS">
+            <EntityTypeMapping TypeName="RemoteModel.GBD">
+              <MappingFragment StoreEntitySet="GBDS">
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" />
+                <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="GLOBAL_DATA_STORE_ITEMS">
             <EntityTypeMapping TypeName="RemoteModel.GLOBAL_DATA_STORE_ITEMS">
               <MappingFragment StoreEntitySet="GLOBAL_DATA_STORE_ITEMS">
@@ -9772,6 +9909,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="LUBS">
+            <EntityTypeMapping TypeName="RemoteModel.LUB">
+              <MappingFragment StoreEntitySet="LUBS">
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" />
+                <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="MACHINE_PROTOTYPES">
             <EntityTypeMapping TypeName="RemoteModel.MACHINE_PROTOTYPES">
               <MappingFragment StoreEntitySet="MACHINE_PROTOTYPES">
@@ -10067,6 +10217,8 @@
                 <ScalarProperty Name="USE_LIGHT_INKS" ColumnName="USE_LIGHT_INKS" />
                 <ScalarProperty Name="USE_COLOR_LIB_GRADIENTS" ColumnName="USE_COLOR_LIB_GRADIENTS" />
                 <ScalarProperty Name="COLOR_CONVERSION_VERSION" ColumnName="COLOR_CONVERSION_VERSION" />
+                <ScalarProperty Name="LUB_GUID" ColumnName="LUB_GUID" />
+                <ScalarProperty Name="GBD_GUID" ColumnName="GBD_GUID" />
                 <ScalarProperty Name="CCT_GUID" ColumnName="CCT_GUID" />
                 <ScalarProperty Name="THUMBNAIL" ColumnName="THUMBNAIL" />
                 <ScalarProperty Name="RANK" ColumnName="RANK" />
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 afabb27e9..f48276400 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,100 +5,102 @@
     <!-- 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="46.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="80" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="37.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="37.375" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="34" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="94.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="94.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="93.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="74.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="65.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="24.5" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="99.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="98.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="90.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="10.25" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="36.125" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="7.5" PointY="73.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="9.75" PointY="77.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="99.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9.75" PointY="89.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="76.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="103.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="80.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="69.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="81.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="72.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="83.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="82.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="103.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="38.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="50.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="49" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="41.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="27.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="40.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="43" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="5.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.5" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="2.75" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="5" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="10.25" PointY="55" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="9.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="31.25" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="15.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="41.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="17.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="27.625" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="28.875" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="1.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="8" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="68.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="86.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="89.75" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.5" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9" PointY="40.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="13.5" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="15.75" PointY="15.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="78.5" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="64.75" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="34.125" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="64.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="105.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="104.625" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="38.25" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="10.5" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="41.25" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="8.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="79.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="92.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="83.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="89" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="97.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="87.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="85.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="89.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="109.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="97.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="101.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="93" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="92.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="109.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="97.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="43.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="40.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="32" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="3.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="25.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="16.75" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="52.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="52.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="28.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="7.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="36.375" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.125" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.125" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="17.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="25.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="42.625" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="8.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="19.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="37.25" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -138,6 +140,7 @@
         <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_RMLS_GBDS" />
         <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" />
@@ -165,6 +168,7 @@
         <AssociationConnector Association="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" />
         <AssociationConnector Association="RemoteModel.FK_LIQUID_TYPES_RMLS_LIQUID_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_LIQUID_TYPES_RMLS_RMLS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_LUBS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINE_STUDIO_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_MACHINE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_TANGO_VERSIONS_MACHINE_VERSIONS" />