Added DAL.Observables project.

Changes DB table CONFIGURATIONS_DISPENSER to IDS_PACKS.
CHanges DB table SYNC_CONFIGURATION to SYNC_CONFIGURATIONS

75 files changed, 579 insertions, 390 deletions

diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db
index 8078aba98..8ed3793fe 100644
--- a/Software/DB/Tango.db
+++ b/Software/DB/Tango.db
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index a104c319c..ecbf7c35f 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 11c96237e..3765be606 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
index a6512dbee..7de161f71 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
@@ -8,6 +8,8 @@ namespace Tango.CodeGeneration
 {
     public class EntityCodeFile : Class
     {
+        public String EntityName { get; set; }
+
         public String TableName { get; set; }
 
         public List<EntityCodeFileField> Fields { get; set; }
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index 301b9f58c..7e577bbca 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -4,9 +4,10 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
-    public class @(Model.Name) : ObservableEntity<@(Model.TableName)>
+    [EntityFieldName("@(Model.TableName)")]
+    public class @(Model.Name) : ObservableEntity<@(Model.EntityName)>
     {
         @foreach (var prop in Model.Fields)
         {
@@ -36,7 +37,7 @@ namespace Tango.DAL.Remote.ObservableEntities
         /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
         /// </summary>
         /// <param name="entity">The entity.</param>
-        public @(Model.Name)(@(Model.TableName) entity) : base(entity)
+        public @(Model.Name)(@(Model.EntityName) entity) : base(entity)
         {
             Init();
             MapEntityToObservable(entity, this);
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
index 2e0a1a7f3..f97fed77c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class CONFIGURATIONS_DISPENSERS
+    public partial class IDS_PACKS
     {
         public long ID { get; set; }
         public string GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 68f08b6b1..cef37a5d8 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -34,7 +34,6 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; }
         public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
-        public virtual DbSet<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; }
         public virtual DbSet<DISPENSER> DISPENSERS { get; set; }
@@ -45,6 +44,7 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
         public virtual DbSet<FIBER_SYNTHESIS> FIBER_SYNTHESIS { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
+        public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
         public virtual DbSet<LIQUID> LIQUIDS { get; set; }
         public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; }
@@ -62,7 +62,7 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<RML> RMLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
-        public virtual DbSet<SYNC_CONFIGURATION> SYNC_CONFIGURATION { get; set; }
+        public virtual DbSet<SYNC_CONFIGURATIONS> SYNC_CONFIGURATIONS { get; set; }
         public virtual DbSet<USER> USERS { get; set; }
         public virtual DbSet<USERS_ROLES> USERS_ROLES { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 67e38b06d..7b8078983 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -105,19 +105,6 @@
           <Property Name="EMBEDDED_SOFTWARE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="HARDWARE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="CONFIGURATIONS_DISPENSERS">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
-          <Property Name="DELETED" Type="bit" Nullable="false" />
-          <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="CARTRIDGE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-        </EntityType>
         <EntityType Name="CONTACTS">
           <Key>
             <PropertyRef Name="ID" />
@@ -219,6 +206,19 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
+        <EntityType Name="IDS_PACKS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="integer" Nullable="false" />
+          <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="CARTRIDGE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+        </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
             <PropertyRef Name="ID" />
@@ -421,7 +421,7 @@
           <Property Name="ROLE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="PERMISSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="SYNC_CONFIGURATION">
+        <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -464,7 +464,6 @@
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" store:Type="Tables" />
           <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" store:Type="Tables" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="Self.CONFIGURATIONS_DISPENSERS" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" store:Type="Tables" />
           <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" store:Type="Tables" />
@@ -475,6 +474,7 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" store:Type="Tables" />
           <EntitySet Name="FIBER_SYNTHESIS" EntityType="Self.FIBER_SYNTHESIS" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" store:Type="Tables" />
+          <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" store:Type="Tables" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" store:Type="Tables" />
           <EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" store:Type="Tables" />
           <EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" store:Type="Tables" />
@@ -492,7 +492,7 @@
           <EntitySet Name="RMLS" EntityType="Self.RMLS" store:Type="Tables" />
           <EntitySet Name="ROLES" EntityType="Self.ROLES" store:Type="Tables" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" store:Type="Tables" />
-          <EntitySet Name="SYNC_CONFIGURATION" EntityType="Self.SYNC_CONFIGURATION" store:Type="Tables" />
+          <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" store:Type="Tables" />
           <EntitySet Name="USERS" EntityType="Self.USERS" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" store:Type="Tables" />
         </EntityContainer>
@@ -510,7 +510,6 @@
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="LocalModel.CARTRIDGE_TYPES" />
           <EntitySet Name="CARTRIDGES" EntityType="LocalModel.CARTRIDGE" />
           <EntitySet Name="CONFIGURATIONS" EntityType="LocalModel.CONFIGURATION" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" />
           <EntitySet Name="CONTACTS" EntityType="LocalModel.CONTACT" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="LocalModel.DISPENSER_TYPES" />
           <EntitySet Name="DISPENSERS" EntityType="LocalModel.DISPENSER" />
@@ -521,6 +520,7 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="LocalModel.FIBER_SHAPES" />
           <EntitySet Name="FIBER_SYNTHESIS" EntityType="LocalModel.FIBER_SYNTHESIS" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="LocalModel.HARDWARE_VERSIONS" />
+          <EntitySet Name="IDS_PACKS" EntityType="LocalModel.IDS_PACKS" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" />
           <EntitySet Name="LIQUIDS" EntityType="LocalModel.LIQUID" />
           <EntitySet Name="LIQUIDS_RMLS" EntityType="LocalModel.LIQUIDS_RMLS" />
@@ -538,7 +538,7 @@
           <EntitySet Name="RMLS" EntityType="LocalModel.RML" />
           <EntitySet Name="ROLES" EntityType="LocalModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="LocalModel.ROLES_PERMISSIONS" />
-          <EntitySet Name="SYNC_CONFIGURATION" EntityType="LocalModel.SYNC_CONFIGURATION" />
+          <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="LocalModel.SYNC_CONFIGURATIONS" />
           <EntitySet Name="USERS" EntityType="LocalModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="LocalModel.USERS_ROLES" />
         </EntityContainer>
@@ -642,19 +642,6 @@
           <Property Name="EMBEDDED_SOFTWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="HARDWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="CONFIGURATIONS_DISPENSERS">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
-          <Property Name="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-        </EntityType>
         <EntityType Name="CONTACT">
           <Key>
             <PropertyRef Name="ID" />
@@ -756,6 +743,19 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
         </EntityType>
+        <EntityType Name="IDS_PACKS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int64" Nullable="false" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
+          <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+        </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
             <PropertyRef Name="ID" />
@@ -958,7 +958,7 @@
           <Property Name="ROLE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="PERMISSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="SYNC_CONFIGURATION">
+        <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -1106,20 +1106,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="CONFIGURATIONS_DISPENSERS">
-            <EntityTypeMapping TypeName="LocalModel.CONFIGURATIONS_DISPENSERS">
-              <MappingFragment StoreEntitySet="CONFIGURATIONS_DISPENSERS">
-                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
-                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
-                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
-                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
-                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="CONTACTS">
             <EntityTypeMapping TypeName="LocalModel.CONTACT">
               <MappingFragment StoreEntitySet="CONTACTS">
@@ -1231,6 +1217,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="IDS_PACKS">
+            <EntityTypeMapping TypeName="LocalModel.IDS_PACKS">
+              <MappingFragment StoreEntitySet="IDS_PACKS">
+                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
+                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
+                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
+                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="LINEAR_MASS_DENSITY_UNITS">
             <EntityTypeMapping TypeName="LocalModel.LINEAR_MASS_DENSITY_UNITS">
               <MappingFragment StoreEntitySet="LINEAR_MASS_DENSITY_UNITS">
@@ -1450,9 +1450,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="SYNC_CONFIGURATION">
-            <EntityTypeMapping TypeName="LocalModel.SYNC_CONFIGURATION">
-              <MappingFragment StoreEntitySet="SYNC_CONFIGURATION">
+          <EntitySetMapping Name="SYNC_CONFIGURATIONS">
+            <EntityTypeMapping TypeName="LocalModel.SYNC_CONFIGURATIONS">
+              <MappingFragment StoreEntitySet="SYNC_CONFIGURATIONS">
                 <ScalarProperty Name="SYNC_TYPE" ColumnName="SYNC_TYPE" />
                 <ScalarProperty Name="TABLE_NAME" ColumnName="TABLE_NAME" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index c47285d87..6f8768e4b 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -14,37 +14,37 @@
         <EntityTypeShape EntityType="LocalModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.CARTRIDGE" Width="1.5" PointX="6.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="4.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="6.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="10.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="10.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="10.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="6.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="8.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="10.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="10.75" PointY="9.75" />
         <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="4.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.LIQUIDS_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="6.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="6.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="10.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="12.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="14.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="2.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATION" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="16.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="4.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="8.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="10.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="2.75" PointY="15.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="4.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="6.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs
index ab7b23673..cd4c89899 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class SYNC_CONFIGURATION
+    public partial class SYNC_CONFIGURATIONS
     {
         public long ID { get; set; }
         public string TABLE_NAME { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index 7ace8155c..f891e703d 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -92,9 +92,6 @@
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\CONFIGURATIONS_DISPENSERS.cs">
-      <DependentUpon>LocalADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\CONTACT.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -125,6 +122,9 @@
     <Compile Include="DB\HARDWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\IDS_PACKS.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -191,7 +191,7 @@
     <Compile Include="DB\ROLES_PERMISSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\SYNC_CONFIGURATION.cs">
+    <Compile Include="DB\SYNC_CONFIGURATIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\USER.cs">
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/App.config b/Software/Visual_Studio/Tango.DAL.Observables/App.config
new file mode 100644
index 000000000..2fb423e8b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/App.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
+</configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Action.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs
index 17126bb82..f011fba71 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Action.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("ACTIONS")]
     public class Action : ObservableEntity<ACTION>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Address.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs
index 166fbb411..ef8a64f24 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Address.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("ADDRESSES")]
     public class Address : ObservableEntity<ADDRESS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationDisplayPanelVersion.cs
index 451474310..4a06b47f1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationDisplayPanelVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationDisplayPanelVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("APPLICATION_DISPLAY_PANEL_VERSIONS")]
     public class ApplicationDisplayPanelVersion : ObservableEntity<APPLICATION_DISPLAY_PANEL_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationFirmwareVersion.cs
index dfe97e702..509b7afe6 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationFirmwareVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationFirmwareVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("APPLICATION_FIRMWARE_VERSIONS")]
     public class ApplicationFirmwareVersion : ObservableEntity<APPLICATION_FIRMWARE_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationOsVersion.cs
index 86ebb4d5b..7d2c937e2 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationOsVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationOsVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("APPLICATION_OS_VERSIONS")]
     public class ApplicationOsVersion : ObservableEntity<APPLICATION_OS_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationVersion.cs
index d824d2b43..63400b251 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("APPLICATION_VERSIONS")]
     public class ApplicationVersion : ObservableEntity<APPLICATION_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Cartridge.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cartridge.cs
index c2d5e92b6..ba41838e7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Cartridge.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cartridge.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("CARTRIDGES")]
     public class Cartridge : ObservableEntity<CARTRIDGE>
     {
 
@@ -47,21 +48,21 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         }
 
-        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        private ObservableCollection<IdsPack> _idspacks;
         /// <summary>
-        /// Gets or sets the cartridge configurations dispensers.
+        /// Gets or sets the cartridge ids packs.
         /// </summary>
-        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
-        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        [EntityFieldName("IDS_PACKS")]
+        public ObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
-                return _configurationsdispensers; 
+                return _idspacks; 
             }
 
             set 
             {
-                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+                _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); 
             }
 
         }
@@ -92,7 +93,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
             CartridgeTypes = new CartridgeType();
 
-            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+            IdsPacks = new ObservableCollection<IdsPack>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs
index b9062d790..d84e02f9e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/CartridgeType.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("CARTRIDGE_TYPES")]
     public class CartridgeType : ObservableEntity<CARTRIDGE_TYPES>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Configuration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Configuration.cs
index bd35e24f7..cf46ebdaa 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Configuration.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Configuration.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("CONFIGURATIONS")]
     public class Configuration : ObservableEntity<CONFIGURATION>
     {
 
@@ -237,21 +238,21 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         }
 
-        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        private ObservableCollection<IdsPack> _idspacks;
         /// <summary>
-        /// Gets or sets the configuration configurations dispensers.
+        /// Gets or sets the configuration ids packs.
         /// </summary>
-        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
-        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        [EntityFieldName("IDS_PACKS")]
+        public ObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
-                return _configurationsdispensers; 
+                return _idspacks; 
             }
 
             set 
             {
-                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+                _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); 
             }
 
         }
@@ -383,7 +384,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
             ApplicationVersions = new ApplicationVersion();
 
-            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+            IdsPacks = new ObservableCollection<IdsPack>();
 
             EmbeddedFirmwareVersions = new EmbeddedFirmwareVersion();
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Contact.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs
index aa93cff44..a595a9633 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Contact.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("CONTACTS")]
     public class Contact : ObservableEntity<CONTACT>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Dispenser.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Dispenser.cs
index 7c522ba81..b00f33314 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Dispenser.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Dispenser.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("DISPENSERS")]
     public class Dispenser : ObservableEntity<DISPENSER>
     {
 
@@ -28,40 +29,40 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         }
 
-        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        private DispenserType _dispensertypes;
         /// <summary>
-        /// Gets or sets the dispenser configurations dispensers.
+        /// Gets or sets the dispenser dispenser types.
         /// </summary>
-        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
-        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        [EntityFieldName("DISPENSER_TYPES")]
+        public DispenserType DispenserTypes
         {
             get 
             {
-                return _configurationsdispensers; 
+                return _dispensertypes; 
             }
 
             set 
             {
-                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+                _dispensertypes = value; RaisePropertyChanged(nameof(DispenserTypes)); 
             }
 
         }
 
-        private DispenserType _dispensertypes;
+        private ObservableCollection<IdsPack> _idspacks;
         /// <summary>
-        /// Gets or sets the dispenser dispenser types.
+        /// Gets or sets the dispenser ids packs.
         /// </summary>
-        [EntityFieldName("DISPENSER_TYPES")]
-        public DispenserType DispenserTypes
+        [EntityFieldName("IDS_PACKS")]
+        public ObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
-                return _dispensertypes; 
+                return _idspacks; 
             }
 
             set 
             {
-                _dispensertypes = value; RaisePropertyChanged(nameof(DispenserTypes)); 
+                _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); 
             }
 
         }
@@ -90,10 +91,10 @@ namespace Tango.DAL.Remote.ObservableEntities
         private void Init()
         {
 
-            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
-
             DispenserTypes = new DispenserType();
 
+            IdsPacks = new ObservableCollection<IdsPack>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs
index fe0e7c4d6..3c04564f0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/DispenserType.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("DISPENSER_TYPES")]
     public class DispenserType : ObservableEntity<DISPENSER_TYPES>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedFirmwareVersion.cs
index 4da78dabb..885955242 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedFirmwareVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedFirmwareVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("EMBEDDED_FIRMWARE_VERSIONS")]
     public class EmbeddedFirmwareVersion : ObservableEntity<EMBEDDED_FIRMWARE_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedSoftwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedSoftwareVersion.cs
index c1e43c886..25d8255cf 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedSoftwareVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedSoftwareVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("EMBEDDED_SOFTWARE_VERSIONS")]
     public class EmbeddedSoftwareVersion : ObservableEntity<EMBEDDED_SOFTWARE_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Event.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs
index d2dbc2860..6ff14beb0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Event.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("EVENTS")]
     public class Event : ObservableEntity<EVENT>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EventsAction.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventsAction.cs
index 697a9eacb..b324700a6 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EventsAction.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventsAction.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("EVENTS_ACTIONS")]
     public class EventsAction : ObservableEntity<EVENTS_ACTIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberShape.cs
index 9388e1a0f..298d180e7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberShape.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberShape.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("FIBER_SHAPES")]
     public class FiberShape : ObservableEntity<FIBER_SHAPES>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberSynthesi.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberSynthesi.cs
index ac9c4dd5b..687c3ac21 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberSynthesi.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberSynthesi.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("FIBER_SYNTHESIS")]
     public class FiberSynthesi : ObservableEntity<FIBER_SYNTHESIS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/HardwareVersion.cs
index fb2bac943..054f9f20d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/HardwareVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/HardwareVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("HARDWARE_VERSIONS")]
     public class HardwareVersion : ObservableEntity<HARDWARE_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ConfigurationsDispenser.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs
index 01bed7444..78f340ea4 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ConfigurationsDispenser.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs
@@ -4,14 +4,15 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
-    public class ConfigurationsDispenser : ObservableEntity<CONFIGURATIONS_DISPENSERS>
+    [EntityFieldName("IDS_PACKS")]
+    public class IdsPack : ObservableEntity<IDS_PACKS>
     {
 
         private String _configurationguid;
         /// <summary>
-        /// Gets or sets the configurationsdispenser configuration guid.
+        /// Gets or sets the idspack configuration guid.
         /// </summary>
         [EntityFieldName("CONFIGURATION_GUID")]
         public String ConfigurationGuid
@@ -30,7 +31,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private String _dispenserguid;
         /// <summary>
-        /// Gets or sets the configurationsdispenser dispenser guid.
+        /// Gets or sets the idspack dispenser guid.
         /// </summary>
         [EntityFieldName("DISPENSER_GUID")]
         public String DispenserGuid
@@ -49,7 +50,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private String _liquidguid;
         /// <summary>
-        /// Gets or sets the configurationsdispenser liquid guid.
+        /// Gets or sets the idspack liquid guid.
         /// </summary>
         [EntityFieldName("LIQUID_GUID")]
         public String LiquidGuid
@@ -68,7 +69,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private String _cartridgeguid;
         /// <summary>
-        /// Gets or sets the configurationsdispenser cartridge guid.
+        /// Gets or sets the idspack cartridge guid.
         /// </summary>
         [EntityFieldName("CARTRIDGE_GUID")]
         public String CartridgeGuid
@@ -87,7 +88,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private Cartridge _cartridge;
         /// <summary>
-        /// Gets or sets the configurationsdispenser cartridge.
+        /// Gets or sets the idspack cartridge.
         /// </summary>
         [EntityFieldName("CARTRIDGE")]
         public Cartridge Cartridge
@@ -106,7 +107,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private Configuration _configuration;
         /// <summary>
-        /// Gets or sets the configurationsdispenser configuration.
+        /// Gets or sets the idspack configuration.
         /// </summary>
         [EntityFieldName("CONFIGURATION")]
         public Configuration Configuration
@@ -125,7 +126,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private Dispenser _dispenser;
         /// <summary>
-        /// Gets or sets the configurationsdispenser dispenser.
+        /// Gets or sets the idspack dispenser.
         /// </summary>
         [EntityFieldName("DISPENSER")]
         public Dispenser Dispenser
@@ -144,7 +145,7 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         private Liquid _liquid;
         /// <summary>
-        /// Gets or sets the configurationsdispenser liquid.
+        /// Gets or sets the idspack liquid.
         /// </summary>
         [EntityFieldName("LIQUID")]
         public Liquid Liquid
@@ -162,18 +163,18 @@ namespace Tango.DAL.Remote.ObservableEntities
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ConfigurationsDispenser" /> class.
+        /// Initializes a new instance of the <see cref="IdsPack" /> class.
         /// </summary>
-        public ConfigurationsDispenser() : base()
+        public IdsPack() : base()
         {
             Init();
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ConfigurationsDispenser" /> class.
+        /// Initializes a new instance of the <see cref="IdsPack" /> class.
         /// </summary>
         /// <param name="entity">The entity.</param>
-        public ConfigurationsDispenser(CONFIGURATIONS_DISPENSERS entity) : base(entity)
+        public IdsPack(IDS_PACKS entity) : base(entity)
         {
             Init();
             MapEntityToObservable(entity, this);
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LinearMassDensityUnit.cs
index fce4a5795..7659ae915 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LinearMassDensityUnit.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LinearMassDensityUnit.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("LINEAR_MASS_DENSITY_UNITS")]
     public class LinearMassDensityUnit : ObservableEntity<LINEAR_MASS_DENSITY_UNITS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Liquid.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Liquid.cs
index 820315615..4c021757a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Liquid.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Liquid.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("LIQUIDS")]
     public class Liquid : ObservableEntity<LIQUID>
     {
 
@@ -66,21 +67,21 @@ namespace Tango.DAL.Remote.ObservableEntities
 
         }
 
-        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        private ObservableCollection<IdsPack> _idspacks;
         /// <summary>
-        /// Gets or sets the liquid configurations dispensers.
+        /// Gets or sets the liquid ids packs.
         /// </summary>
-        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
-        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        [EntityFieldName("IDS_PACKS")]
+        public ObservableCollection<IdsPack> IdsPacks
         {
             get 
             {
-                return _configurationsdispensers; 
+                return _idspacks; 
             }
 
             set 
             {
-                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+                _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); 
             }
 
         }
@@ -128,7 +129,7 @@ namespace Tango.DAL.Remote.ObservableEntities
         private void Init()
         {
 
-            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+            IdsPacks = new ObservableCollection<IdsPack>();
 
             LiquidsRmls = new ObservableCollection<LiquidsRml>();
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LiquidsRml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs
index f99c1bc7a..a7282f017 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LiquidsRml.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("LIQUIDS_RMLS")]
     public class LiquidsRml : ObservableEntity<LIQUIDS_RMLS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Machine.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs
index db3b2e693..bdbe5d67d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MACHINES")]
     public class Machine : ObservableEntity<MACHINE>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersion.cs
index 0efdcc78d..20ae58a1d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersion.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MACHINE_VERSIONS")]
     public class MachineVersion : ObservableEntity<MACHINE_VERSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersionsConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersionsConfiguration.cs
index a3fd5419e..0934bc127 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersionsConfiguration.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersionsConfiguration.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MACHINE_VERSIONS_CONFIGURATIONS")]
     public class MachineVersionsConfiguration : ObservableEntity<MACHINE_VERSIONS_CONFIGURATIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesConfiguration.cs
index 2573c7780..aab51c6ad 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesConfiguration.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesConfiguration.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MACHINES_CONFIGURATIONS")]
     public class MachinesConfiguration : ObservableEntity<MACHINES_CONFIGURATIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs
index 5617754b9..a4aa8dc74 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesEvent.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MACHINES_EVENTS")]
     public class MachinesEvent : ObservableEntity<MACHINES_EVENTS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaColor.cs
index ccda3cd96..d6f34bfdd 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaColor.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaColor.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MEDIA_COLORS")]
     public class MediaColor : ObservableEntity<MEDIA_COLORS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaCondition.cs
index a87fe2368..9a60ae966 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaCondition.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaCondition.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MEDIA_CONDITIONS")]
     public class MediaCondition : ObservableEntity<MEDIA_CONDITIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaMaterial.cs
index 21287f56e..1cb05d2ff 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaMaterial.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaMaterial.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MEDIA_MATERIALS")]
     public class MediaMaterial : ObservableEntity<MEDIA_MATERIALS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaPurpos.cs
index 39bd5f27e..53c4df0c1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaPurpos.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaPurpos.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("MEDIA_PURPOSES")]
     public class MediaPurpos : ObservableEntity<MEDIA_PURPOSES>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Organization.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Organization.cs
index 041ad549f..379c7b0a5 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Organization.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Organization.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("ORGANIZATIONS")]
     public class Organization : ObservableEntity<ORGANIZATION>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Permission.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs
index b29a373fd..27696112b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Permission.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("PERMISSIONS")]
     public class Permission : ObservableEntity<PERMISSION>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Rml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
index 7f9a4152c..a77aa5017 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("RMLS")]
     public class Rml : ObservableEntity<RML>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Role.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Role.cs
index 1c1697972..13c157a6a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Role.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Role.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("ROLES")]
     public class Role : ObservableEntity<ROLE>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesPermission.cs
index d650219aa..8a8cf7449 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/RolesPermission.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesPermission.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("ROLES_PERMISSIONS")]
     public class RolesPermission : ObservableEntity<ROLES_PERMISSIONS>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/SyncConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/SyncConfiguration.cs
index 87785eeb6..febc4bc5a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/SyncConfiguration.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/SyncConfiguration.cs
@@ -4,9 +4,10 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
-    public class SyncConfiguration : ObservableEntity<SYNC_CONFIGURATION>
+    [EntityFieldName("SYNC_CONFIGURATIONS")]
+    public class SyncConfiguration : ObservableEntity<SYNC_CONFIGURATIONS>
     {
 
         /// <summary>
@@ -21,7 +22,7 @@ namespace Tango.DAL.Remote.ObservableEntities
         /// Initializes a new instance of the <see cref="SyncConfiguration" /> class.
         /// </summary>
         /// <param name="entity">The entity.</param>
-        public SyncConfiguration(SYNC_CONFIGURATION entity) : base(entity)
+        public SyncConfiguration(SYNC_CONFIGURATIONS entity) : base(entity)
         {
             Init();
             MapEntityToObservable(entity, this);
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/User.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs
index 31342cc54..6cf1295f2 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/User.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("USERS")]
     public class User : ObservableEntity<USER>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs
index 59a07f9ea..5a9e16441 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/UsersRole.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs
@@ -4,8 +4,9 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
+    [EntityFieldName("USERS_ROLES")]
     public class UsersRole : ObservableEntity<USERS_ROLES>
     {
 
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/EntityFieldNameAttribute.cs b/Software/Visual_Studio/Tango.DAL.Observables/EntityFieldNameAttribute.cs
index bca969d5f..2cb63fffd 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/EntityFieldNameAttribute.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/EntityFieldNameAttribute.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
     public class EntityFieldNameAttribute : Attribute
     {
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs
new file mode 100644
index 000000000..57a27bf0c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.DAL.Observables
+{
+    public static class ExtensionMethods
+    {
+        public static String GetDALName(this Type type)
+        {
+            return (type.GetCustomAttributes(typeof(EntityFieldNameAttribute), false).SingleOrDefault() as EntityFieldNameAttribute).Name;
+        }
+
+        public static String GetDALName(this PropertyInfo prop)
+        {
+            return (prop.GetCustomAttributes(typeof(EntityFieldNameAttribute), false).SingleOrDefault() as EntityFieldNameAttribute).Name;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/IObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs
index 2205b3a64..c4280b54b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/IObservableEntity.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Remote.ObservableEntities;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
     public interface IObservableEntity
     {
@@ -21,8 +21,8 @@ namespace Tango.DAL.Remote.ObservableEntities
         [EntityFieldName("DELETED")]
         bool Deleted { get; set; }
 
-        void Save();
+        void Save(DbContext context);
 
-        void Save(List<IObservableEntity> savedEntities);
+        void Save(List<IObservableEntity> savedEntities, DbContext context);
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/ObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs
index da547a7d1..523fab35f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/ObservableEntity.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs
@@ -11,9 +11,10 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Tango.Core;
 using Tango.DAL.Remote.DB;
+using Tango.DAL.Remote;
 using Tango.Settings;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
     internal static class LoadedObjectsService
     {
@@ -81,6 +82,8 @@ namespace Tango.DAL.Remote.ObservableEntities
         public ObservableEntity()
         {
             Entity = Activator.CreateInstance<T>();
+            Guid = System.Guid.NewGuid().ToString();
+            LastUpdated = DateTime.Now;
             _isNew = true;
         }
 
@@ -154,12 +157,12 @@ namespace Tango.DAL.Remote.ObservableEntities
             }
         }
 
-        public void Save()
+        public void Save(DbContext context)
         {
-            Save(new List<IObservableEntity>());
+            Save(new List<IObservableEntity>(), context);
         }
 
-        public void Save(List<IObservableEntity> savedEntities)
+        public void Save(List<IObservableEntity> savedEntities, DbContext context)
         {
             savedEntities.Add(this);
 
@@ -167,7 +170,7 @@ namespace Tango.DAL.Remote.ObservableEntities
             {
                 foreach (var prop in this.GetType().GetProperties())
                 {
-                    String dalName = (prop.GetCustomAttributes(typeof(EntityFieldNameAttribute), false).SingleOrDefault() as EntityFieldNameAttribute).Name;
+                    String dalName = prop.GetDALName();
 
                     if (prop.PropertyType.IsGenericType)
                     {
@@ -175,7 +178,7 @@ namespace Tango.DAL.Remote.ObservableEntities
                         {
                             if (!savedEntities.Contains(item))
                             {
-                                item.Save(savedEntities);
+                                item.Save(savedEntities, context);
                             }
                         }
                     }
@@ -184,7 +187,7 @@ namespace Tango.DAL.Remote.ObservableEntities
                         var item = (prop.GetValue(this) as IObservableEntity);
                         if (!savedEntities.Contains(item))
                         {
-                            item.Save(savedEntities);
+                            item.Save(savedEntities, context);
                         }
                         var propEntityType = prop.PropertyType.GetProperty("Entity", BindingFlags.NonPublic | BindingFlags.Instance);
                         typeof(T).GetProperty(dalName).SetValue(Entity, propEntityType.GetValue((prop.GetValue(this))));
@@ -197,8 +200,8 @@ namespace Tango.DAL.Remote.ObservableEntities
 
                 if (_isNew)
                 {
-                    String tabelName = this.GetType().Name.ToUpper();
-                    DbSet<T> dbSet = typeof(RemoteDB).GetProperty(tabelName) as DbSet<T>;
+                    String tabelName = this.GetType().GetDALName();
+                    DbSet<T> dbSet = typeof(RemoteDB).GetProperty(tabelName).GetValue(context) as DbSet<T>;
                     dbSet.Add(Entity);
                 }
 
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..322413ef9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Tango - Data Access Layer Observables Mapping")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
new file mode 100644
index 000000000..e9d8a37fa
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tango.DAL.Observables</RootNamespace>
+    <AssemblyName>Tango.DAL.Observables</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\Build\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Entities\Action.cs" />
+    <Compile Include="Entities\Address.cs" />
+    <Compile Include="Entities\ApplicationDisplayPanelVersion.cs" />
+    <Compile Include="Entities\ApplicationFirmwareVersion.cs" />
+    <Compile Include="Entities\ApplicationOsVersion.cs" />
+    <Compile Include="Entities\ApplicationVersion.cs" />
+    <Compile Include="Entities\Cartridge.cs" />
+    <Compile Include="Entities\CartridgeType.cs" />
+    <Compile Include="Entities\Configuration.cs" />
+    <Compile Include="Entities\Contact.cs" />
+    <Compile Include="Entities\Dispenser.cs" />
+    <Compile Include="Entities\DispenserType.cs" />
+    <Compile Include="Entities\EmbeddedFirmwareVersion.cs" />
+    <Compile Include="Entities\EmbeddedSoftwareVersion.cs" />
+    <Compile Include="Entities\Event.cs" />
+    <Compile Include="Entities\EventsAction.cs" />
+    <Compile Include="Entities\FiberShape.cs" />
+    <Compile Include="Entities\FiberSynthesi.cs" />
+    <Compile Include="Entities\HardwareVersion.cs" />
+    <Compile Include="Entities\IdsPack.cs" />
+    <Compile Include="Entities\LinearMassDensityUnit.cs" />
+    <Compile Include="Entities\Liquid.cs" />
+    <Compile Include="Entities\LiquidsRml.cs" />
+    <Compile Include="Entities\Machine.cs" />
+    <Compile Include="Entities\MachinesConfiguration.cs" />
+    <Compile Include="Entities\MachinesEvent.cs" />
+    <Compile Include="Entities\MachineVersion.cs" />
+    <Compile Include="Entities\MachineVersionsConfiguration.cs" />
+    <Compile Include="Entities\MediaColor.cs" />
+    <Compile Include="Entities\MediaCondition.cs" />
+    <Compile Include="Entities\MediaMaterial.cs" />
+    <Compile Include="Entities\MediaPurpos.cs" />
+    <Compile Include="Entities\Organization.cs" />
+    <Compile Include="Entities\Permission.cs" />
+    <Compile Include="Entities\Rml.cs" />
+    <Compile Include="Entities\Role.cs" />
+    <Compile Include="Entities\RolesPermission.cs" />
+    <Compile Include="Entities\SyncConfiguration.cs" />
+    <Compile Include="Entities\User.cs" />
+    <Compile Include="Entities\UsersRole.cs" />
+    <Compile Include="EntityFieldNameAttribute.cs" />
+    <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="IObservableEntity.cs" />
+    <Compile Include="ObservableEntity.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.DAL.Remote\Tango.DAL.Remote.csproj">
+      <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project>
+      <Name>Tango.DAL.Remote</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/packages.config b/Software/Visual_Studio/Tango.DAL.Observables/packages.config
new file mode 100644
index 000000000..9256e1591
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.0.0" targetFramework="net46" />
+</packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs
index db72e4fae..282117f7f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs
@@ -17,7 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public CARTRIDGE()
         {
-            this.CONFIGURATIONS_DISPENSERS = new HashSet<CONFIGURATIONS_DISPENSERS>();
+            this.IDS_PACKS = new HashSet<IDS_PACKS>();
         }
     
         public int ID { get; set; }
@@ -28,6 +28,6 @@ namespace Tango.DAL.Remote.DB
     
         public virtual CARTRIDGE_TYPES CARTRIDGE_TYPES { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
+        public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs
index 51c32d758..8512a90e7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs
@@ -17,7 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public CONFIGURATION()
         {
-            this.CONFIGURATIONS_DISPENSERS = new HashSet<CONFIGURATIONS_DISPENSERS>();
+            this.IDS_PACKS = new HashSet<IDS_PACKS>();
             this.MACHINE_VERSIONS_CONFIGURATIONS = new HashSet<MACHINE_VERSIONS_CONFIGURATIONS>();
             this.MACHINES_CONFIGURATIONS = new HashSet<MACHINES_CONFIGURATIONS>();
         }
@@ -40,7 +40,7 @@ namespace Tango.DAL.Remote.DB
         public virtual APPLICATION_OS_VERSIONS APPLICATION_OS_VERSIONS { get; set; }
         public virtual APPLICATION_VERSIONS APPLICATION_VERSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
+        public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual EMBEDDED_FIRMWARE_VERSIONS EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual EMBEDDED_SOFTWARE_VERSIONS EMBEDDED_SOFTWARE_VERSIONS { get; set; }
         public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
index ad28cb2d6..d93806560 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
@@ -17,7 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public DISPENSER()
         {
-            this.CONFIGURATIONS_DISPENSERS = new HashSet<CONFIGURATIONS_DISPENSERS>();
+            this.IDS_PACKS = new HashSet<IDS_PACKS>();
         }
     
         public int ID { get; set; }
@@ -26,8 +26,8 @@ namespace Tango.DAL.Remote.DB
         public bool DELETED { get; set; }
         public string DISPENSER_TYPE_GUID { get; set; }
     
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
         public virtual DISPENSER_TYPES DISPENSER_TYPES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATIONS_DISPENSERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs
index 92dff02d7..a29ec7795 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATIONS_DISPENSERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Remote.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class CONFIGURATIONS_DISPENSERS
+    public partial class IDS_PACKS
     {
         public int ID { get; set; }
         public string GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs
index 91f751d4b..85bded1c8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs
@@ -17,7 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public LIQUID()
         {
-            this.CONFIGURATIONS_DISPENSERS = new HashSet<CONFIGURATIONS_DISPENSERS>();
+            this.IDS_PACKS = new HashSet<IDS_PACKS>();
             this.LIQUIDS_RMLS = new HashSet<LIQUIDS_RMLS>();
         }
     
@@ -30,7 +30,7 @@ namespace Tango.DAL.Remote.DB
         public double VERSION { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
+        public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<LIQUIDS_RMLS> LIQUIDS_RMLS { 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 a4f64b6f0..af6af171c 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -34,7 +34,6 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; }
         public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
-        public virtual DbSet<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; }
         public virtual DbSet<DISPENSER> DISPENSERS { get; set; }
@@ -45,6 +44,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
         public virtual DbSet<FIBER_SYNTHESIS> FIBER_SYNTHESIS { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
+        public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
         public virtual DbSet<LIQUID> LIQUIDS { get; set; }
         public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; }
@@ -62,7 +62,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<RML> RMLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
-        public virtual DbSet<SYNC_CONFIGURATION> SYNC_CONFIGURATION { get; set; }
+        public virtual DbSet<SYNC_CONFIGURATIONS> SYNC_CONFIGURATIONS { get; set; }
         public virtual DbSet<USER> USERS { get; set; }
         public virtual DbSet<USERS_ROLES> USERS_ROLES { 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 a9317db6d..a73b40ac8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -105,19 +105,6 @@
           <Property Name="EMBEDDED_SOFTWARE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="HARDWARE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
-        <EntityType Name="CONFIGURATIONS_DISPENSERS">
-          <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="datetime" Nullable="false" />
-          <Property Name="DELETED" Type="bit" Nullable="false" />
-          <Property Name="CONFIGURATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="DISPENSER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="LIQUID_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="CARTRIDGE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-        </EntityType>
         <EntityType Name="CONTACTS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -224,6 +211,19 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
+        <EntityType Name="IDS_PACKS">
+          <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="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="DISPENSER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LIQUID_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="CARTRIDGE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -433,7 +433,7 @@
           <Property Name="ROLE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="PERMISSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
-        <EntityType Name="SYNC_CONFIGURATION">
+        <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -528,48 +528,48 @@
         </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES">
           <End Role="CARTRIDGES" Type="Self.CARTRIDGES" Multiplicity="1" />
-          <End Role="CONFIGURATIONS_DISPENSERS" Type="Self.CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
+          <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="CARTRIDGES">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
+            <Dependent Role="IDS_PACKS">
               <PropertyRef Name="CARTRIDGE_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS">
           <End Role="CONFIGURATIONS" Type="Self.CONFIGURATIONS" Multiplicity="1" />
-          <End Role="CONFIGURATIONS_DISPENSERS" Type="Self.CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
+          <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="CONFIGURATIONS">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
+            <Dependent Role="IDS_PACKS">
               <PropertyRef Name="DISPENSER_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS">
           <End Role="DISPENSERS" Type="Self.DISPENSERS" Multiplicity="1" />
-          <End Role="CONFIGURATIONS_DISPENSERS" Type="Self.CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
+          <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="DISPENSERS">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
+            <Dependent Role="IDS_PACKS">
               <PropertyRef Name="DISPENSER_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS">
           <End Role="LIQUIDS" Type="Self.LIQUIDS" Multiplicity="1" />
-          <End Role="CONFIGURATIONS_DISPENSERS" Type="Self.CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
+          <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="LIQUIDS">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
+            <Dependent Role="IDS_PACKS">
               <PropertyRef Name="LIQUID_GUID" />
             </Dependent>
           </ReferentialConstraint>
@@ -990,7 +990,6 @@
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="Self.CONFIGURATIONS_DISPENSERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" Schema="dbo" store:Type="Tables" />
@@ -1001,6 +1000,7 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="FIBER_SYNTHESIS" EntityType="Self.FIBER_SYNTHESIS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" Schema="dbo" store:Type="Tables" />
@@ -1018,7 +1018,7 @@
           <EntitySet Name="RMLS" EntityType="Self.RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ROLES" EntityType="Self.ROLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="SYNC_CONFIGURATION" EntityType="Self.SYNC_CONFIGURATION" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="USERS" EntityType="Self.USERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" Schema="dbo" store:Type="Tables" />
           <AssociationSet Name="FK_CARTRIDGES_CARTRIDGE_TYPES" Association="Self.FK_CARTRIDGES_CARTRIDGE_TYPES">
@@ -1043,19 +1043,19 @@
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" Association="Self.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES">
             <End Role="CARTRIDGES" EntitySet="CARTRIDGES" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" Association="Self.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS">
             <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" Association="Self.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS">
             <End Role="DISPENSERS" EntitySet="DISPENSERS" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" Association="Self.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS">
             <End Role="LIQUIDS" EntitySet="LIQUIDS" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" Association="Self.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS">
             <End Role="EMBEDDED_FIRMWARE_VERSIONS" EntitySet="EMBEDDED_FIRMWARE_VERSIONS" />
@@ -1204,7 +1204,6 @@
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="RemoteModel.CARTRIDGE_TYPES" />
           <EntitySet Name="CARTRIDGES" EntityType="RemoteModel.CARTRIDGE" />
           <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="RemoteModel.CONFIGURATIONS_DISPENSERS" />
           <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="RemoteModel.DISPENSER_TYPES" />
           <EntitySet Name="DISPENSERS" EntityType="RemoteModel.DISPENSER" />
@@ -1215,6 +1214,7 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="RemoteModel.FIBER_SHAPES" />
           <EntitySet Name="FIBER_SYNTHESIS" EntityType="RemoteModel.FIBER_SYNTHESIS" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="RemoteModel.HARDWARE_VERSIONS" />
+          <EntitySet Name="IDS_PACKS" EntityType="RemoteModel.IDS_PACKS" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" />
           <EntitySet Name="LIQUIDS" EntityType="RemoteModel.LIQUID" />
           <EntitySet Name="LIQUIDS_RMLS" EntityType="RemoteModel.LIQUIDS_RMLS" />
@@ -1232,7 +1232,7 @@
           <EntitySet Name="RMLS" EntityType="RemoteModel.RML" />
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="RemoteModel.ROLES_PERMISSIONS" />
-          <EntitySet Name="SYNC_CONFIGURATION" EntityType="RemoteModel.SYNC_CONFIGURATION" />
+          <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="RemoteModel.SYNC_CONFIGURATIONS" />
           <EntitySet Name="USERS" EntityType="RemoteModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="RemoteModel.USERS_ROLES" />
           <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS">
@@ -1269,11 +1269,11 @@
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES">
             <End Role="CARTRIDGE" EntitySet="CARTRIDGES" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS">
             <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS">
             <End Role="EMBEDDED_FIRMWARE_VERSIONS" EntitySet="EMBEDDED_FIRMWARE_VERSIONS" />
@@ -1295,14 +1295,6 @@
             <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" />
             <End Role="MACHINES_CONFIGURATIONS" EntitySet="MACHINES_CONFIGURATIONS" />
           </AssociationSet>
-          <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS">
-            <End Role="DISPENSER" EntitySet="DISPENSERS" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
-          </AssociationSet>
-          <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS">
-            <End Role="LIQUID" EntitySet="LIQUIDS" />
-            <End Role="CONFIGURATIONS_DISPENSERS" EntitySet="CONFIGURATIONS_DISPENSERS" />
-          </AssociationSet>
           <AssociationSet Name="FK_ORGANIZATIONS_CONTACTS" Association="RemoteModel.FK_ORGANIZATIONS_CONTACTS">
             <End Role="CONTACT" EntitySet="CONTACTS" />
             <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" />
@@ -1315,6 +1307,10 @@
             <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
             <End Role="DISPENSER" EntitySet="DISPENSERS" />
           </AssociationSet>
+          <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS">
+            <End Role="DISPENSER" EntitySet="DISPENSERS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
+          </AssociationSet>
           <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS">
             <End Role="EVENT" EntitySet="EVENTS" />
             <End Role="EVENTS_ACTIONS" EntitySet="EVENTS_ACTIONS" />
@@ -1331,6 +1327,10 @@
             <End Role="FIBER_SYNTHESIS" EntitySet="FIBER_SYNTHESIS" />
             <End Role="RML" EntitySet="RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS">
+            <End Role="LIQUID" EntitySet="LIQUIDS" />
+            <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RML_LINEAR_MASS_DENSITY_UNITS" Association="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS">
             <End Role="LINEAR_MASS_DENSITY_UNITS" EntitySet="LINEAR_MASS_DENSITY_UNITS" />
             <End Role="RML" EntitySet="RMLS" />
@@ -1495,7 +1495,7 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="CARTRIDGE_TYPES" Relationship="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" FromRole="CARTRIDGE" ToRole="CARTRIDGE_TYPES" />
-          <NavigationProperty Name="CONFIGURATIONS_DISPENSERS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" FromRole="CARTRIDGE" ToRole="CONFIGURATIONS_DISPENSERS" />
+          <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" FromRole="CARTRIDGE" ToRole="IDS_PACKS" />
         </EntityType>
         <EntityType Name="CONFIGURATION">
           <Key>
@@ -1517,30 +1517,13 @@
           <NavigationProperty Name="APPLICATION_FIRMWARE_VERSIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_APPLICATION_FIRMWARE_VERSIONS" FromRole="CONFIGURATION" ToRole="APPLICATION_FIRMWARE_VERSIONS" />
           <NavigationProperty Name="APPLICATION_OS_VERSIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_APPLICATION_OS_VERSIONS" FromRole="CONFIGURATION" ToRole="APPLICATION_OS_VERSIONS" />
           <NavigationProperty Name="APPLICATION_VERSIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" FromRole="CONFIGURATION" ToRole="APPLICATION_VERSIONS" />
-          <NavigationProperty Name="CONFIGURATIONS_DISPENSERS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" FromRole="CONFIGURATION" ToRole="CONFIGURATIONS_DISPENSERS" />
+          <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" FromRole="CONFIGURATION" ToRole="IDS_PACKS" />
           <NavigationProperty Name="EMBEDDED_FIRMWARE_VERSIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" FromRole="CONFIGURATION" ToRole="EMBEDDED_FIRMWARE_VERSIONS" />
           <NavigationProperty Name="EMBEDDED_SOFTWARE_VERSIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_SOFTWARE_VERSIONS" FromRole="CONFIGURATION" ToRole="EMBEDDED_SOFTWARE_VERSIONS" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" FromRole="CONFIGURATION" ToRole="HARDWARE_VERSIONS" />
           <NavigationProperty Name="MACHINE_VERSIONS_CONFIGURATIONS" Relationship="RemoteModel.FK_MACHINE_VERSIONS_CONFIGURATIONS_CONFIGURATIONS" FromRole="CONFIGURATION" ToRole="MACHINE_VERSIONS_CONFIGURATIONS" />
           <NavigationProperty Name="MACHINES_CONFIGURATIONS" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS_CONFIGURATIONS" FromRole="CONFIGURATION" ToRole="MACHINES_CONFIGURATIONS" />
         </EntityType>
-        <EntityType Name="CONFIGURATIONS_DISPENSERS">
-          <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="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="CARTRIDGE" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" FromRole="CONFIGURATIONS_DISPENSERS" ToRole="CARTRIDGE" />
-          <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" FromRole="CONFIGURATIONS_DISPENSERS" ToRole="CONFIGURATION" />
-          <NavigationProperty Name="DISPENSER" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="CONFIGURATIONS_DISPENSERS" ToRole="DISPENSER" />
-          <NavigationProperty Name="LIQUID" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="CONFIGURATIONS_DISPENSERS" ToRole="LIQUID" />
-        </EntityType>
         <EntityType Name="CONTACT">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1577,8 +1560,8 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="CONFIGURATIONS_DISPENSERS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="DISPENSER" ToRole="CONFIGURATIONS_DISPENSERS" />
           <NavigationProperty Name="DISPENSER_TYPES" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER" ToRole="DISPENSER_TYPES" />
+          <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="DISPENSER" ToRole="IDS_PACKS" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -1661,6 +1644,23 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="CONFIGURATIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="CONFIGURATION" />
         </EntityType>
+        <EntityType Name="IDS_PACKS">
+          <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="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="CARTRIDGE" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" FromRole="IDS_PACKS" ToRole="CARTRIDGE" />
+          <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" FromRole="IDS_PACKS" ToRole="CONFIGURATION" />
+          <NavigationProperty Name="DISPENSER" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="IDS_PACKS" ToRole="DISPENSER" />
+          <NavigationProperty Name="LIQUID" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="IDS_PACKS" ToRole="LIQUID" />
+        </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1684,7 +1684,7 @@
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="VERSION" Type="Double" Nullable="false" />
-          <NavigationProperty Name="CONFIGURATIONS_DISPENSERS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID" ToRole="CONFIGURATIONS_DISPENSERS" />
+          <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID" ToRole="IDS_PACKS" />
           <NavigationProperty Name="LIQUIDS_RMLS" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUID" ToRole="LIQUIDS_RMLS" />
         </EntityType>
         <EntityType Name="LIQUIDS_RMLS">
@@ -1909,7 +1909,7 @@
           <NavigationProperty Name="PERMISSION" Relationship="RemoteModel.FK_ROLES_PERMISSIONS_PERMISSIONS" FromRole="ROLES_PERMISSIONS" ToRole="PERMISSION" />
           <NavigationProperty Name="ROLE" Relationship="RemoteModel.FK_ROLES_PERMISSIONS_ROLES" FromRole="ROLES_PERMISSIONS" ToRole="ROLE" />
         </EntityType>
-        <EntityType Name="SYNC_CONFIGURATION">
+        <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -2049,24 +2049,24 @@
         </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES">
           <End Type="RemoteModel.CARTRIDGE" Role="CARTRIDGE" Multiplicity="1" />
-          <End Type="RemoteModel.CONFIGURATIONS_DISPENSERS" Role="CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
+          <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="CARTRIDGE">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
+            <Dependent Role="IDS_PACKS">
               <PropertyRef Name="CARTRIDGE_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS">
           <End Type="RemoteModel.CONFIGURATION" Role="CONFIGURATION" Multiplicity="1" />
-          <End Type="RemoteModel.CONFIGURATIONS_DISPENSERS" Role="CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
+          <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="CONFIGURATION">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
+            <Dependent Role="IDS_PACKS">
               <PropertyRef Name="DISPENSER_GUID" />
             </Dependent>
           </ReferentialConstraint>
@@ -2131,30 +2131,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS">
-          <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="1" />
-          <End Type="RemoteModel.CONFIGURATIONS_DISPENSERS" Role="CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="DISPENSER">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
-              <PropertyRef Name="DISPENSER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS">
-          <End Type="RemoteModel.LIQUID" Role="LIQUID" Multiplicity="1" />
-          <End Type="RemoteModel.CONFIGURATIONS_DISPENSERS" Role="CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="LIQUID">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="CONFIGURATIONS_DISPENSERS">
-              <PropertyRef Name="LIQUID_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_ORGANIZATIONS_CONTACTS">
           <End Type="RemoteModel.CONTACT" Role="CONTACT" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2193,6 +2169,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS">
+          <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="1" />
+          <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="DISPENSER">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="IDS_PACKS">
+              <PropertyRef Name="DISPENSER_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_EVENTS_ACTIONS_EVENTS">
           <End Type="RemoteModel.EVENT" Role="EVENT" Multiplicity="1" />
           <End Type="RemoteModel.EVENTS_ACTIONS" Role="EVENTS_ACTIONS" Multiplicity="*" />
@@ -2241,6 +2229,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS">
+          <End Type="RemoteModel.LIQUID" Role="LIQUID" Multiplicity="1" />
+          <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LIQUID">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="IDS_PACKS">
+              <PropertyRef Name="LIQUID_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RML_LINEAR_MASS_DENSITY_UNITS">
           <End Type="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Role="LINEAR_MASS_DENSITY_UNITS" Multiplicity="1" />
           <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" />
@@ -2578,20 +2578,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="CONFIGURATIONS_DISPENSERS">
-            <EntityTypeMapping TypeName="RemoteModel.CONFIGURATIONS_DISPENSERS">
-              <MappingFragment StoreEntitySet="CONFIGURATIONS_DISPENSERS">
-                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
-                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
-                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
-                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
-                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="CONTACTS">
             <EntityTypeMapping TypeName="RemoteModel.CONTACT">
               <MappingFragment StoreEntitySet="CONTACTS">
@@ -2708,6 +2694,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="IDS_PACKS">
+            <EntityTypeMapping TypeName="RemoteModel.IDS_PACKS">
+              <MappingFragment StoreEntitySet="IDS_PACKS">
+                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
+                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
+                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
+                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="LINEAR_MASS_DENSITY_UNITS">
             <EntityTypeMapping TypeName="RemoteModel.LINEAR_MASS_DENSITY_UNITS">
               <MappingFragment StoreEntitySet="LINEAR_MASS_DENSITY_UNITS">
@@ -2934,9 +2934,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="SYNC_CONFIGURATION">
-            <EntityTypeMapping TypeName="RemoteModel.SYNC_CONFIGURATION">
-              <MappingFragment StoreEntitySet="SYNC_CONFIGURATION">
+          <EntitySetMapping Name="SYNC_CONFIGURATIONS">
+            <EntityTypeMapping TypeName="RemoteModel.SYNC_CONFIGURATIONS">
+              <MappingFragment StoreEntitySet="SYNC_CONFIGURATIONS">
                 <ScalarProperty Name="SYNC_TYPE" ColumnName="SYNC_TYPE" />
                 <ScalarProperty Name="TABLE_NAME" ColumnName="TABLE_NAME" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
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 65c83430d..79df7bb02 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -6,26 +6,26 @@
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
         <EntityTypeShape EntityType="RemoteModel.ACTION" Width="1.5" PointX="9" PointY="37.375" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="37.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="23.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="6.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="15.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="23.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="46.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="46.375" />
         <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="5.25" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="41.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="46.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="46.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="20.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="37.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="20.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="18.125" />
         <EntityTypeShape EntityType="RemoteModel.EVENT" Width="1.5" PointX="6" PointY="41.25" />
         <EntityTypeShape EntityType="RemoteModel.EVENTS_ACTIONS" Width="1.5" PointX="11.25" PointY="41.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="5.75" PointY="27.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHESIS" Width="1.5" PointX="5.75" PointY="24.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="5.75" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="5.75" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHESIS" Width="1.5" PointX="5.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="5.75" PointY="31" />
         <EntityTypeShape EntityType="RemoteModel.LIQUID" Width="1.5" PointX="3" PointY="10.875" />
         <EntityTypeShape EntityType="RemoteModel.LIQUIDS_RMLS" Width="1.5" PointX="10.25" PointY="12.25" />
         <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="27.375" />
@@ -33,16 +33,16 @@
         <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="31" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="2" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="8.25" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="5.75" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="5.75" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="5.75" PointY="15.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="5.75" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="5.75" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="5.75" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="5.75" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="5.75" PointY="27.875" />
         <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="32.625" />
         <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6.75" PointY="45.625" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="8" PointY="10.125" />
         <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="3.75" PointY="41.5" />
         <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="9" PointY="41.625" />
-        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATION" Width="1.5" PointX="7.75" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="7.75" PointY="1.75" />
         <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3.75" PointY="37" />
         <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="6" PointY="37.625" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
@@ -60,15 +60,15 @@
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINE_VERSIONS_CONFIGURATIONS_CONFIGURATIONS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_CONFIGURATIONS_CONFIGURATIONS" />
-        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" />
-        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_CONTACTS" />
         <AssociationConnector Association="RemoteModel.FK_USERS_CONTACTS" />
         <AssociationConnector Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" />
         <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SYNTHESIS" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" />
         <AssociationConnector Association="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" />
         <AssociationConnector Association="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" />
         <AssociationConnector Association="RemoteModel.FK_LIQUIDS_RML_RML" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SYNC_CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SYNC_CONFIGURATIONS.cs
index 8a15d6b51..1cbd3fc15 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SYNC_CONFIGURATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SYNC_CONFIGURATIONS.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Remote.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class SYNC_CONFIGURATION
+    public partial class SYNC_CONFIGURATIONS
     {
         public int ID { get; set; }
         public string TABLE_NAME { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 83dc2a007..129b01850 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -92,9 +92,6 @@
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\CONFIGURATIONS_DISPENSERS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\CONTACT.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -125,6 +122,9 @@
     <Compile Include="DB\HARDWARE_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\IDS_PACKS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -191,7 +191,7 @@
     <Compile Include="DB\ROLES_PERMISSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\SYNC_CONFIGURATION.cs">
+    <Compile Include="DB\SYNC_CONFIGURATIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\USER.cs">
@@ -200,49 +200,6 @@
     <Compile Include="DB\USERS_ROLES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="ObservableEntities\IObservableEntity.cs" />
-    <Compile Include="ObservableEntities\Entities\Action.cs" />
-    <Compile Include="ObservableEntities\Entities\Address.cs" />
-    <Compile Include="ObservableEntities\Entities\ApplicationDisplayPanelVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\ApplicationFirmwareVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\ApplicationOsVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\ApplicationVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\Cartridge.cs" />
-    <Compile Include="ObservableEntities\Entities\CartridgeType.cs" />
-    <Compile Include="ObservableEntities\Entities\Configuration.cs" />
-    <Compile Include="ObservableEntities\Entities\ConfigurationsDispenser.cs" />
-    <Compile Include="ObservableEntities\Entities\Contact.cs" />
-    <Compile Include="ObservableEntities\Entities\Dispenser.cs" />
-    <Compile Include="ObservableEntities\Entities\DispenserType.cs" />
-    <Compile Include="ObservableEntities\Entities\EmbeddedFirmwareVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\EmbeddedSoftwareVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\Event.cs" />
-    <Compile Include="ObservableEntities\Entities\EventsAction.cs" />
-    <Compile Include="ObservableEntities\Entities\FiberShape.cs" />
-    <Compile Include="ObservableEntities\Entities\FiberSynthesi.cs" />
-    <Compile Include="ObservableEntities\Entities\HardwareVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\LinearMassDensityUnit.cs" />
-    <Compile Include="ObservableEntities\Entities\Liquid.cs" />
-    <Compile Include="ObservableEntities\Entities\LiquidsRml.cs" />
-    <Compile Include="ObservableEntities\Entities\Machine.cs" />
-    <Compile Include="ObservableEntities\Entities\MachinesConfiguration.cs" />
-    <Compile Include="ObservableEntities\Entities\MachinesEvent.cs" />
-    <Compile Include="ObservableEntities\Entities\MachineVersion.cs" />
-    <Compile Include="ObservableEntities\Entities\MachineVersionsConfiguration.cs" />
-    <Compile Include="ObservableEntities\Entities\MediaColor.cs" />
-    <Compile Include="ObservableEntities\Entities\MediaCondition.cs" />
-    <Compile Include="ObservableEntities\Entities\MediaMaterial.cs" />
-    <Compile Include="ObservableEntities\Entities\MediaPurpos.cs" />
-    <Compile Include="ObservableEntities\Entities\Organization.cs" />
-    <Compile Include="ObservableEntities\Entities\Permission.cs" />
-    <Compile Include="ObservableEntities\Entities\Rml.cs" />
-    <Compile Include="ObservableEntities\Entities\Role.cs" />
-    <Compile Include="ObservableEntities\Entities\RolesPermission.cs" />
-    <Compile Include="ObservableEntities\Entities\SyncConfiguration.cs" />
-    <Compile Include="ObservableEntities\Entities\User.cs" />
-    <Compile Include="ObservableEntities\Entities\UsersRole.cs" />
-    <Compile Include="ObservableEntities\EntityFieldNameAttribute.cs" />
-    <Compile Include="ObservableEntities\ObservableEntity.cs" />
     <Compile Include="Partials\RemoteDB.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/Software/Visual_Studio/Tango.Synchronization/Local/Constants.cs b/Software/Visual_Studio/Tango.Synchronization/Local/Constants.cs
index 5557c43c8..a1494243c 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Local/Constants.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Local/Constants.cs
@@ -14,7 +14,7 @@ namespace Tango.Synchronization.Local
         public const String COLUMN_TYPE = "type";
         public const String IS_NOT_NULL = "notnull";
         public const String DEFAULT_VALUE = "dflt_value";
-        public const String SYNC_CONFIGURATIONS_TABLE_NAME = "SYNC_CONFIGURATION";
+        public const String SYNC_CONFIGURATIONS_TABLE_NAME = "SYNC_CONFIGURATIONS";
         public const String SYNC_CONFIGURATION_TABLE_NAME_COLUMN = "TABLE_NAME";
         public const String SYNC_CONFIGURATION_SYNC_TYPE_COLUMN = "SYNC_TYPE";
 
diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs
index 0bd76dbd1..82bc53c1f 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs
@@ -40,7 +40,7 @@ namespace Tango.Synchronization.Remote
             LogManager.Log("Querying all local configurations...");
             var local_configurations = _localDB.CONFIGURATIONS.ToList();
             LogManager.Log("Querying all local configuration dispensers...");
-            var local_configurations_dispensers = _localDB.CONFIGURATIONS_DISPENSERS.ToList();
+            var local_configurations_dispensers = _localDB.IDS_PACKS.ToList();
             LogManager.Log("Querying all local contacts...");
             var local_contacts = _localDB.CONTACTS.ToList();
             LogManager.Log("Querying all local dispensers...");
@@ -102,7 +102,7 @@ namespace Tango.Synchronization.Remote
 
             LogManager.Log("Querying all remote configurations dispensers...");
             guids = remote_configurations.Select(x => x.GUID).ToList();
-            var remote_configurations_dispensers = _remoteDB.CONFIGURATIONS_DISPENSERS.Where(x => guids.Contains(x.CONFIGURATION_GUID)).ToList();
+            var remote_configurations_dispensers = _remoteDB.IDS_PACKS.Where(x => guids.Contains(x.CONFIGURATION_GUID)).ToList();
 
             LogManager.Log("Querying all remote dispensers...");
             guids = remote_configurations_dispensers.Select(x => x.DISPENSER_GUID).ToList();
@@ -113,7 +113,7 @@ namespace Tango.Synchronization.Remote
             var remote_cartridges = _remoteDB.CARTRIDGES.Where(x => guids.Contains(x.GUID)).ToList();
 
 
-            foreach (var config in _remoteDB.SYNC_CONFIGURATION.Where(x => (SyncConfiguration)x.SYNC_TYPE == SyncConfiguration.OverwriteLocal))
+            foreach (var config in _remoteDB.SYNC_CONFIGURATIONS.Where(x => (SyncConfiguration)x.SYNC_TYPE == SyncConfiguration.OverwriteLocal))
             {
                 OverrideTable(config);
             }
@@ -129,7 +129,7 @@ namespace Tango.Synchronization.Remote
             CompareCollections(remote_configurations, local_configurations, _remoteDB.CONFIGURATIONS, _localDB.CONFIGURATIONS);
 
             LogManager.Log("Comparing configurations dispensers");
-            CompareCollections(remote_configurations_dispensers, local_configurations_dispensers, _remoteDB.CONFIGURATIONS_DISPENSERS, _localDB.CONFIGURATIONS_DISPENSERS);
+            CompareCollections(remote_configurations_dispensers, local_configurations_dispensers, _remoteDB.IDS_PACKS, _localDB.IDS_PACKS);
 
             LogManager.Log("Comparing contacts");
             CompareCollections(remote_contacts, local_contacts, _remoteDB.CONTACTS, _localDB.CONTACTS);
@@ -211,7 +211,7 @@ namespace Tango.Synchronization.Remote
             }
         }
 
-        private void OverrideTable(remote.SYNC_CONFIGURATION config)
+        private void OverrideTable(remote.SYNC_CONFIGURATIONS config)
         {
             LogManager.Log("Generating table override difference for " + config.TABLE_NAME + "...");
 
diff --git a/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs
index b4dda025b..6e546b306 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tango.DAL.Remote.DB;
-using Tango.DAL.Remote.ObservableEntities;
+using Tango.DAL.Observables;
 using Tango.Settings;
 using System.Linq;
 using System.Collections;
@@ -26,7 +26,8 @@ namespace Tango.UnitTesting
             {
                 EntityCodeFile codeFile = new EntityCodeFile(Singularize(ObservableEntity<Object>.DalNameToStandardName(table.Name)))
                 {
-                    TableName = Singularize(table.Name)
+                    EntityName = Singularize(table.Name),
+                    TableName = table.Name,
                 };
 
                 foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(4))
@@ -75,8 +76,11 @@ namespace Tango.UnitTesting
                 foreach (var machine in machines)
                 {
                     machine.SerialNumber = "1111";
-                    machine.Save();
+                    machine.Organization.Address.AddressString = "HOW HOW HOW";
+                    machine.Save(db);
                 }
+
+                db.SaveChanges();
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
index 0953bcd19..a8274bc5f 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
+++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
@@ -102,6 +102,10 @@
       <Project>{0e0eef3e-8f4e-4f23-9d19-479fd8d76c12}</Project>
       <Name>Tango.DAL.Local</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tango.DAL.Observables\Tango.DAL.Observables.csproj">
+      <Project>{0ecd6da8-7aa6-48d9-8b65-279d176ad9af}</Project>
+      <Name>Tango.DAL.Observables</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.DAL.Remote\Tango.DAL.Remote.csproj">
       <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project>
       <Name>Tango.DAL.Remote</Name>
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index b8da66fbf..b8fc45063 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Protobuf", "Tango.Protobuf\Tango.Protobuf.csproj", "{40073806-914E-4E78-97AB-FA9639308EBE}"
 EndProject
@@ -79,6 +79,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Scripting", "Tango.Sc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.SharedUI", "Tango.SharedUI\Tango.SharedUI.csproj", "{8491D07B-C1F6-4B62-A412-41B9FD2D6538}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL.Observables", "Tango.DAL.Observables\Tango.DAL.Observables.csproj", "{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -435,6 +437,18 @@ Global
 		{8491D07B-C1F6-4B62-A412-41B9FD2D6538}.Release|x64.Build.0 = Release|Any CPU
 		{8491D07B-C1F6-4B62-A412-41B9FD2D6538}.Release|x86.ActiveCfg = Release|Any CPU
 		{8491D07B-C1F6-4B62-A412-41B9FD2D6538}.Release|x86.Build.0 = Release|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x86.Build.0 = Debug|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x64.Build.0 = Release|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db
index 8078aba98..8ed3793fe 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db
+++ b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db