Added CARTRIDGE_TYPES & DISPENSER_TYPES tables to SQLServer & SQLite.

18 files changed, 412 insertions, 78 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ADDRESS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ADDRESS.cs
index fe7a6503a..edecaf250 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/ADDRESS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ADDRESS.cs
@@ -18,7 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
-        public string ADDRESS1 { get; set; }
+        public string ADDRESS_STRING { get; set; }
         public string LOCALITY { get; set; }
         public string COUNTRY { get; set; }
         public string CITY { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs
index 214fde992..23dea85e1 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs
@@ -18,5 +18,6 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public string CARTRIDGE_TYPE_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs
new file mode 100644
index 000000000..87d05642b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class CARTRIDGE_TYPES
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
index 211d141cb..41fedc263 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
@@ -18,5 +18,6 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public string DISPENSER_TYPE_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
new file mode 100644
index 000000000..f66752a5e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DISPENSER_TYPES
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { 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 f27e0af4d..68f08b6b1 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -31,10 +31,12 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_OS_VERSIONS> APPLICATION_OS_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; }
+        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; }
         public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { 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 1bd77ac1d..67e38b06d 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -25,7 +25,7 @@
           <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="ADDRESS" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="ADDRESS_STRING" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LOCALITY" Type="nvarchar" MaxLength="2147483647" />
           <Property Name="COUNTRY" Type="nvarchar" MaxLength="2147483647" />
           <Property Name="CITY" Type="nvarchar" MaxLength="2147483647" />
@@ -69,6 +69,15 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
+        <EntityType Name="CARTRIDGE_TYPES">
+          <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" />
+        </EntityType>
         <EntityType Name="CARTRIDGES">
           <Key>
             <PropertyRef Name="ID" />
@@ -77,6 +86,7 @@
           <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="CARTRIDGE_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="CONFIGURATIONS">
           <Key>
@@ -123,6 +133,15 @@
           <Property Name="PHONE_NUMBER" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="FAX" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
+        <EntityType Name="DISPENSER_TYPES">
+          <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" />
+        </EntityType>
         <EntityType Name="DISPENSERS">
           <Key>
             <PropertyRef Name="ID" />
@@ -131,6 +150,7 @@
           <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="DISPENSER_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -441,10 +461,12 @@
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" store:Type="Tables" />
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" store:Type="Tables" />
+          <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" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" store:Type="Tables" />
@@ -485,10 +507,12 @@
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" />
           <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="LocalModel.APPLICATION_OS_VERSIONS" />
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="LocalModel.APPLICATION_VERSIONS" />
+          <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" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" />
@@ -538,7 +562,7 @@
           <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="ADDRESS1" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="ADDRESS_STRING" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LOCALITY" Type="String" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="COUNTRY" Type="String" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="CITY" Type="String" MaxLength="2147483647" FixedLength="false" Unicode="true" />
@@ -582,6 +606,15 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
         </EntityType>
+        <EntityType Name="CARTRIDGE_TYPES">
+          <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" />
+        </EntityType>
         <EntityType Name="CARTRIDGE">
           <Key>
             <PropertyRef Name="ID" />
@@ -590,6 +623,7 @@
           <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="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="CONFIGURATION">
           <Key>
@@ -636,6 +670,15 @@
           <Property Name="PHONE_NUMBER" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="FAX" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
+        <EntityType Name="DISPENSER_TYPES">
+          <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" />
+        </EntityType>
         <EntityType Name="DISPENSER">
           <Key>
             <PropertyRef Name="ID" />
@@ -644,6 +687,7 @@
           <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="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -975,7 +1019,7 @@
                 <ScalarProperty Name="CITY" ColumnName="CITY" />
                 <ScalarProperty Name="COUNTRY" ColumnName="COUNTRY" />
                 <ScalarProperty Name="LOCALITY" ColumnName="LOCALITY" />
-                <ScalarProperty Name="ADDRESS1" ColumnName="ADDRESS" />
+                <ScalarProperty Name="ADDRESS_STRING" ColumnName="ADDRESS_STRING" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1023,9 +1067,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="CARTRIDGE_TYPES">
+            <EntityTypeMapping TypeName="LocalModel.CARTRIDGE_TYPES">
+              <MappingFragment StoreEntitySet="CARTRIDGE_TYPES">
+                <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="CARTRIDGES">
             <EntityTypeMapping TypeName="LocalModel.CARTRIDGE">
               <MappingFragment StoreEntitySet="CARTRIDGES">
+                <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1081,9 +1136,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="DISPENSER_TYPES">
+            <EntityTypeMapping TypeName="LocalModel.DISPENSER_TYPES">
+              <MappingFragment StoreEntitySet="DISPENSER_TYPES">
+                <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="DISPENSERS">
             <EntityTypeMapping TypeName="LocalModel.DISPENSER">
               <MappingFragment StoreEntitySet="DISPENSERS">
+                <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
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 1062722a0..c47285d87 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -11,38 +11,40 @@
         <EntityTypeShape EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="4.75" />
         <EntityTypeShape EntityType="LocalModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="2.75" PointY="4.75" />
         <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSIONS" Width="1.5" PointX="4.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.CARTRIDGE" Width="1.5" PointX="6.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="2.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="4.75" PointY="8.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="8.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="6.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="8.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="10.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="10.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUIDS_RMLS" Width="1.5" PointX="0.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="2.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="4.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="4.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="6.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="8.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="8.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="10.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATION" Width="1.5" PointX="2.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="12.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="14.75" PointY="15.75" />
+        <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.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" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
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 6ffbbc37b..7ace8155c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -86,6 +86,9 @@
     <Compile Include="DB\CARTRIDGE.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\CARTRIDGE_TYPES.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -98,6 +101,9 @@
     <Compile Include="DB\DISPENSER.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\DISPENSER_TYPES.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\EMBEDDED_FIRMWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ADDRESS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ADDRESS.cs
index d224e3273..43484cd40 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ADDRESS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ADDRESS.cs
@@ -25,7 +25,7 @@ namespace Tango.DAL.Remote.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
-        public string ADDRESS1 { get; set; }
+        public string ADDRESS_STRING { get; set; }
         public string LOCALITY { get; set; }
         public string COUNTRY { get; set; }
         public string CITY { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs
index 9018b13db..db72e4fae 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs
@@ -24,7 +24,9 @@ namespace Tango.DAL.Remote.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public string CARTRIDGE_TYPE_GUID { get; set; }
     
+        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; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs
new file mode 100644
index 000000000..5962542b0
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class CARTRIDGE_TYPES
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public CARTRIDGE_TYPES()
+        {
+            this.CARTRIDGES = new HashSet<CARTRIDGE>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<CARTRIDGE> CARTRIDGES { 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 592b04eae..ad28cb2d6 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
@@ -24,8 +24,10 @@ namespace Tango.DAL.Remote.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         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; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
new file mode 100644
index 000000000..29996cd88
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DISPENSER_TYPES
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public DISPENSER_TYPES()
+        {
+            this.DISPENSERS = new HashSet<DISPENSER>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<DISPENSER> DISPENSERS { 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 1371eb9a3..a4f64b6f0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -31,10 +31,12 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_OS_VERSIONS> APPLICATION_OS_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; }
+        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; }
         public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 765e34d19..a9317db6d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -25,7 +25,7 @@
           <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="ADDRESS" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="ADDRESS_STRING" Type="nvarchar" MaxLength="100" Nullable="false" />
           <Property Name="LOCALITY" Type="nvarchar" MaxLength="56" />
           <Property Name="COUNTRY" Type="nvarchar" MaxLength="50" />
           <Property Name="CITY" Type="nvarchar" MaxLength="30" />
@@ -69,6 +69,15 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
+        <EntityType Name="CARTRIDGE_TYPES">
+          <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" />
+        </EntityType>
         <EntityType Name="CARTRIDGES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -77,6 +86,7 @@
           <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="CARTRIDGE_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
         <EntityType Name="CONFIGURATIONS">
           <Key>
@@ -123,6 +133,15 @@
           <Property Name="PHONE_NUMBER" Type="nvarchar" MaxLength="50" />
           <Property Name="FAX" Type="nvarchar" MaxLength="50" />
         </EntityType>
+        <EntityType Name="DISPENSER_TYPES">
+          <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" />
+        </EntityType>
         <EntityType Name="DISPENSERS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -131,6 +150,7 @@
           <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="DISPENSER_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -446,6 +466,18 @@
           <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="ROLE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <Association Name="FK_CARTRIDGES_CARTRIDGE_TYPES">
+          <End Role="CARTRIDGE_TYPES" Type="Self.CARTRIDGE_TYPES" Multiplicity="1" />
+          <End Role="CARTRIDGES" Type="Self.CARTRIDGES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="CARTRIDGE_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CARTRIDGES">
+              <PropertyRef Name="CARTRIDGE_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS">
           <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" Type="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Multiplicity="1" />
           <End Role="CONFIGURATIONS" Type="Self.CONFIGURATIONS" Multiplicity="*" />
@@ -578,6 +610,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_DISPENSERS_DISPENSER_TYPES">
+          <End Role="DISPENSER_TYPES" Type="Self.DISPENSER_TYPES" Multiplicity="1" />
+          <End Role="DISPENSERS" Type="Self.DISPENSERS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="DISPENSER_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="DISPENSERS">
+              <PropertyRef Name="DISPENSER_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_EVENTS_ACTIONS_ACTIONS">
           <End Role="ACTIONS" Type="Self.ACTIONS" Multiplicity="1" />
           <End Role="EVENTS_ACTIONS" Type="Self.EVENTS_ACTIONS" Multiplicity="*" />
@@ -943,10 +987,12 @@
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" Schema="dbo" store:Type="Tables" />
+          <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" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
@@ -975,6 +1021,10 @@
           <EntitySet Name="SYNC_CONFIGURATION" EntityType="Self.SYNC_CONFIGURATION" 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">
+            <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" />
+            <End Role="CARTRIDGES" EntitySet="CARTRIDGES" />
+          </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" Association="Self.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS">
             <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" EntitySet="APPLICATION_DISPLAY_PANEL_VERSIONS" />
             <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" />
@@ -1019,6 +1069,10 @@
             <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
             <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="Self.FK_DISPENSERS_DISPENSER_TYPES">
+            <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
+            <End Role="DISPENSERS" EntitySet="DISPENSERS" />
+          </AssociationSet>
           <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="Self.FK_EVENTS_ACTIONS_ACTIONS">
             <End Role="ACTIONS" EntitySet="ACTIONS" />
             <End Role="EVENTS_ACTIONS" EntitySet="EVENTS_ACTIONS" />
@@ -1147,10 +1201,12 @@
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" />
           <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="RemoteModel.APPLICATION_OS_VERSIONS" />
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="RemoteModel.APPLICATION_VERSIONS" />
+          <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" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" />
@@ -1207,6 +1263,10 @@
             <End Role="APPLICATION_VERSIONS" EntitySet="APPLICATION_VERSIONS" />
             <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_CARTRIDGES_CARTRIDGE_TYPES" Association="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES">
+            <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" />
+            <End Role="CARTRIDGE" EntitySet="CARTRIDGES" />
+          </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" />
@@ -1251,6 +1311,10 @@
             <End Role="CONTACT" EntitySet="CONTACTS" />
             <End Role="USER" EntitySet="USERS" />
           </AssociationSet>
+          <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES">
+            <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
+            <End Role="DISPENSER" EntitySet="DISPENSERS" />
+          </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" />
@@ -1361,7 +1425,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="ADDRESS1" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="ADDRESS_STRING" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="LOCALITY" Type="String" MaxLength="56" FixedLength="false" Unicode="true" />
           <Property Name="COUNTRY" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="CITY" Type="String" MaxLength="30" FixedLength="false" Unicode="true" />
@@ -1411,6 +1475,16 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="CONFIGURATIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" FromRole="APPLICATION_VERSIONS" ToRole="CONFIGURATION" />
         </EntityType>
+        <EntityType Name="CARTRIDGE_TYPES">
+          <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" />
+          <NavigationProperty Name="CARTRIDGES" Relationship="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" FromRole="CARTRIDGE_TYPES" ToRole="CARTRIDGE" />
+        </EntityType>
         <EntityType Name="CARTRIDGE">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1419,6 +1493,8 @@
           <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="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" />
         </EntityType>
         <EntityType Name="CONFIGURATION">
@@ -1482,6 +1558,16 @@
           <NavigationProperty Name="ORGANIZATIONS" Relationship="RemoteModel.FK_ORGANIZATIONS_CONTACTS" FromRole="CONTACT" ToRole="ORGANIZATION" />
           <NavigationProperty Name="USERS" Relationship="RemoteModel.FK_USERS_CONTACTS" FromRole="CONTACT" ToRole="USER" />
         </EntityType>
+        <EntityType Name="DISPENSER_TYPES">
+          <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" />
+          <NavigationProperty Name="DISPENSERS" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER_TYPES" ToRole="DISPENSER" />
+        </EntityType>
         <EntityType Name="DISPENSER">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1490,7 +1576,9 @@
           <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="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" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -1947,6 +2035,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_CARTRIDGES_CARTRIDGE_TYPES">
+          <End Type="RemoteModel.CARTRIDGE_TYPES" Role="CARTRIDGE_TYPES" Multiplicity="1" />
+          <End Type="RemoteModel.CARTRIDGE" Role="CARTRIDGE" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="CARTRIDGE_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CARTRIDGE">
+              <PropertyRef Name="CARTRIDGE_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES">
           <End Type="RemoteModel.CARTRIDGE" Role="CARTRIDGE" Multiplicity="1" />
           <End Type="RemoteModel.CONFIGURATIONS_DISPENSERS" Role="CONFIGURATIONS_DISPENSERS" Multiplicity="*" />
@@ -2081,6 +2181,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_DISPENSERS_DISPENSER_TYPES">
+          <End Type="RemoteModel.DISPENSER_TYPES" Role="DISPENSER_TYPES" Multiplicity="1" />
+          <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="DISPENSER_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="DISPENSER">
+              <PropertyRef Name="DISPENSER_TYPE_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="*" />
@@ -2379,7 +2491,7 @@
                 <ScalarProperty Name="CITY" ColumnName="CITY" />
                 <ScalarProperty Name="COUNTRY" ColumnName="COUNTRY" />
                 <ScalarProperty Name="LOCALITY" ColumnName="LOCALITY" />
-                <ScalarProperty Name="ADDRESS1" ColumnName="ADDRESS" />
+                <ScalarProperty Name="ADDRESS_STRING" ColumnName="ADDRESS_STRING" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2427,9 +2539,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="CARTRIDGE_TYPES">
+            <EntityTypeMapping TypeName="RemoteModel.CARTRIDGE_TYPES">
+              <MappingFragment StoreEntitySet="CARTRIDGE_TYPES">
+                <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="CARTRIDGES">
             <EntityTypeMapping TypeName="RemoteModel.CARTRIDGE">
               <MappingFragment StoreEntitySet="CARTRIDGES">
+                <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2485,9 +2608,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="DISPENSER_TYPES">
+            <EntityTypeMapping TypeName="RemoteModel.DISPENSER_TYPES">
+              <MappingFragment StoreEntitySet="DISPENSER_TYPES">
+                <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="DISPENSERS">
             <EntityTypeMapping TypeName="RemoteModel.DISPENSER">
               <MappingFragment StoreEntitySet="DISPENSERS">
+                <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 10280402b..65c83430d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,44 +5,46 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION" Width="1.5" PointX="6.75" PointY="49.25" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="41.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="23.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="12.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="4.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="5.25" PointY="5.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="37" />
-        <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="15" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="9.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT" Width="1.5" PointX="3.75" PointY="41.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENTS_ACTIONS" Width="1.5" PointX="9" PointY="41.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="5.75" PointY="18.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHESIS" Width="1.5" PointX="5.75" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="5.875" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="5.75" PointY="27.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID" Width="1.5" PointX="3" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUIDS_RMLS" Width="1.5" PointX="10.25" PointY="11.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="26.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS_CONFIGURATIONS" Width="1.5" PointX="8.25" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="6" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="5.75" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="5.75" PointY="15.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="5.75" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="5.75" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="32.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="3.75" PointY="49.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="8" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="3.75" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="6" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATION" Width="1.5" PointX="7.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3.75" PointY="36.625" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="6" PointY="38.125" />
+        <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.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.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.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" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS_CONFIGURATIONS" Width="1.5" PointX="8.25" PointY="6" />
+        <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.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.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" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -50,6 +52,7 @@
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_FIRMWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_OS_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" />
+        <AssociationConnector Association="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" />
@@ -61,6 +64,7 @@
         <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_EVENTS_ACTIONS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" />
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 7e1c4bf94..d8288d7f6 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -86,6 +86,9 @@
     <Compile Include="DB\CARTRIDGE.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\CARTRIDGE_TYPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -98,6 +101,9 @@
     <Compile Include="DB\DISPENSER.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\DISPENSER_TYPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\EMBEDDED_FIRMWARE_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>