Global Data Store !

5 files changed, 149 insertions, 80 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/GLOBAL_DATA_STORE_ITEMS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/GLOBAL_DATA_STORE_ITEMS.cs
new file mode 100644
index 000000000..36a808b9d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/GLOBAL_DATA_STORE_ITEMS.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class GLOBAL_DATA_STORE_ITEMS
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string COLLECTION_NAME { get; set; }
+        public string KEY { get; set; }
+        public int DATA_TYPE { get; set; }
+        public byte[] VALUE { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 70ffb9bb0..016f3182e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -51,6 +51,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<GLOBAL_DATA_STORE_ITEMS> GLOBAL_DATA_STORE_ITEMS { get; set; }
         public virtual DbSet<HARDWARE_BLOWER_TYPES> HARDWARE_BLOWER_TYPES { get; set; }
         public virtual DbSet<HARDWARE_BLOWERS> HARDWARE_BLOWERS { get; set; }
         public virtual DbSet<HARDWARE_BREAK_SENSOR_TYPES> HARDWARE_BREAK_SENSOR_TYPES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 4f0b08210..01417ab3e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -265,7 +265,7 @@
           <Property Name="COLLECTION_NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="KEY" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="DATA_TYPE" Type="int" Nullable="false" />
-          <Property Name="VALUE" Type="image" />
+          <Property Name="VALUE" Type="image" Nullable="false" />
           <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="DISPENSER_TYPES">
@@ -359,6 +359,18 @@
           <Property Name="COMMENTS" Type="nvarchar(max)" Nullable="false" />
           <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <EntityType Name="GLOBAL_DATA_STORE_ITEMS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="COLLECTION_NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="KEY" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="DATA_TYPE" Type="int" Nullable="false" />
+          <Property Name="VALUE" Type="image" Nullable="false" />
+        </EntityType>
         <EntityType Name="HARDWARE_BLOWER_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2487,6 +2499,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="GLOBAL_DATA_STORE_ITEMS" EntityType="Self.GLOBAL_DATA_STORE_ITEMS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="Self.HARDWARE_BLOWER_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_BLOWERS" EntityType="Self.HARDWARE_BLOWERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_BREAK_SENSOR_TYPES" EntityType="Self.HARDWARE_BREAK_SENSOR_TYPES" Schema="dbo" store:Type="Tables" />
@@ -2934,6 +2947,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="GLOBAL_DATA_STORE_ITEMS" EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" />
           <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" />
           <EntitySet Name="HARDWARE_BLOWERS" EntityType="RemoteModel.HARDWARE_BLOWERS" />
           <EntitySet Name="HARDWARE_BREAK_SENSOR_TYPES" EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" />
@@ -3656,7 +3670,7 @@
           <Property Name="COLLECTION_NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="KEY" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="DATA_TYPE" Type="Int32" Nullable="false" />
-          <Property Name="VALUE" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <Property Name="VALUE" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
           <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_DATA_STORES_MACHINES" FromRole="DATA_STORE_ITEMS" ToRole="MACHINE" />
         </EntityType>
@@ -3759,6 +3773,18 @@
           <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="USER" Relationship="RemoteModel.FK_FSE_VERSIONS_USERS" FromRole="FSE_VERSIONS" ToRole="USER" />
         </EntityType>
+        <EntityType Name="GLOBAL_DATA_STORE_ITEMS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="COLLECTION_NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="KEY" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="DATA_TYPE" Type="Int32" Nullable="false" />
+          <Property Name="VALUE" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
+        </EntityType>
         <EntityType Name="HARDWARE_BLOWER_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6377,6 +6403,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="GLOBAL_DATA_STORE_ITEMS">
+            <EntityTypeMapping TypeName="RemoteModel.GLOBAL_DATA_STORE_ITEMS">
+              <MappingFragment StoreEntitySet="GLOBAL_DATA_STORE_ITEMS">
+                <ScalarProperty Name="VALUE" ColumnName="VALUE" />
+                <ScalarProperty Name="DATA_TYPE" ColumnName="DATA_TYPE" />
+                <ScalarProperty Name="KEY" ColumnName="KEY" />
+                <ScalarProperty Name="COLLECTION_NAME" ColumnName="COLLECTION_NAME" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="HARDWARE_BLOWER_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_BLOWER_TYPES">
               <MappingFragment StoreEntitySet="HARDWARE_BLOWER_TYPES">
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 3e8cdf1ab..44584e115 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,89 +5,90 @@
     <!-- 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="34.375" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="55.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="84.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="74.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="81.75" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="27.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="36.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="68.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="62.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="59.875" />
         <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="42" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="29.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="15.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="69.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="59.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="27.75" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="56.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="88.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="87.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="63.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="15.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="104.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="82.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="63.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="73.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="100.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="77" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="96" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="66.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="70.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="76.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="96.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="77.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="100.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="81.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="38" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="44.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="7.75" PointY="42.625" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="23.875" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="20.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="8.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="65.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="40.375" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="72.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.5" PointY="82.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="7.75" PointY="82" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="65.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="10" PointY="41.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="16" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="26.875" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="11.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="10.5" PointY="85.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12.75" PointY="76.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="12.5" PointY="59.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="14.75" PointY="64.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="86.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="76" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.5" PointY="57" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11.75" PointY="62.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.5" PointY="81.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="14.75" PointY="69.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="76.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="71.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="7.5" PointY="87.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9.75" PointY="76.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="7.75" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10" PointY="47" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="0.75" />
         <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="32.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="29.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="48.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="44.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="23.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="92.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="38.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="57.125" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="24" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="28.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="52" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="56.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="12.25" PointY="44.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="13.125" />
+        <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="32.75" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="7.75" PointY="38.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="8.5" />
         <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.625" />
         <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.375" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="3.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="6" PointY="1.125" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="11.75" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="14" PointY="1.125" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.25" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="15.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="53.125" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="19.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="12.5" />
         <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="29.625" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="37.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="32.125" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="12.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="1.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="3" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="5.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="39.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="17.75" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="17.75" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="24.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="2" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
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 cd916e94f..fbb64ecc1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -141,6 +141,9 @@
     <Compile Include="DB\FSE_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\GLOBAL_DATA_STORE_ITEMS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\HARDWARE_BLOWERS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -383,7 +386,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file