Split DAL to DAl.Local & DAL.Remote due to ambiguity of table names in EF.

Implemented Unit testing for SQLite & SQL Server connections.
author: Roy Ben-Shabat <Roy@Twine-s.com> 2017-11-27 20:35:08 +0200
committer: Roy Ben-Shabat <Roy@Twine-s.com> 2017-11-27 20:35:08 +0200
commit: 7060dc80c707fc0441ff69fe4f899107cb3f6fc1 (patch)
tree: a72e2cf1be9fcce77e27446d93501bfc9b452265 /Software/Visual_Studio
parent: d1038a08bdf51b1310be4ef00ebe9e21b0e12f81 (diff)
download: Tango-7060dc80c707fc0441ff69fe4f899107cb3f6fc1.tar.gz
Tango-7060dc80c707fc0441ff69fe4f899107cb3f6fc1.zip
102 files changed, 1092 insertions, 829 deletions
diff --git a/Software/Visual_Studio/Tango.DAL.Local/App.config b/Software/Visual_Studio/Tango.DAL.Local/App.config
new file mode 100644
index 000000000..8c1be0e4c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/App.config
@@ -0,0 +1,25 @@
+<?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" />
+      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+    </providers>
+  </entityFramework>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SQLite.EF6" />
+      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
+      <remove invariant="System.Data.SQLite" />
+      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
+    </DbProviderFactories>
+  </system.data>
+  <connectionStrings>
+    
+  <add name="LocalDB" connectionString="metadata=res://*/DB.LocalADO.csdl|res://*/DB.LocalADO.ssdl|res://*/DB.LocalADO.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;data source=D:\Development\Tango\Software\DB\Tango.db&quot;" providerName="System.Data.EntityClient" /></connectionStrings>
+</configuration>
+\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL/Local/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs
index 453e9fa2f..6bc2a9274 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/ACTION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,11 @@ namespace Tango.DAL.Local
     public partial class ACTION
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public long CODE { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL/Local/ADDRESS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ADDRESS.cs
index 4f0b4f223..808244106 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/ADDRESS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ADDRESS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class ADDRESS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/APPLICATION_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs
index 2b7d9e8db..3cf9cd3ce 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/APPLICATION_FIRMWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class APPLICATION_FIRMWARE_VERSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/APPLICATION_OS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs
index 4bf53ad0e..a3d4afab8 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/APPLICATION_OS_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class APPLICATION_OS_VERSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/APPLICATION_VERSION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSION.cs
index d770a26c6..1e745d1ac 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/APPLICATION_VERSION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class APPLICATION_VERSION
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATION.cs
index 506c0c7e5..7acc1ee6b 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/CONFIGURATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class CONFIGURATION
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/CONFIGURATIONS_DISPENSERS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs
index 1263b5ae2..3a289e206 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/CONFIGURATIONS_DISPENSERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class CONFIGURATIONS_DISPENSERS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/CONTACT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CONTACT.cs
index 16a7cf5b3..cf792d22d 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/CONTACT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CONTACT.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class CONTACT
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
index f9a58c32f..211d141cb 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/DISPENSER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class DISPENSER
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/EMBEDDED_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
index 1829bf889..d44343495 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/EMBEDDED_FIRMWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class EMBEDDED_FIRMWARE_VERSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/EMBEDDED_SOFTWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
index b9c436f07..a0b0a7b22 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/EMBEDDED_SOFTWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class EMBEDDED_SOFTWARE_VERSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/EVENT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs
index 58a0e3787..f9c8837ac 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/EVENT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class EVENT
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/EVENTS_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs
index 6d1489135..84bcb5f03 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/EVENTS_ACTIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class EVENTS_ACTIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/FIBER_SHAPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SHAPES.cs
index 97cea26f8..b90db2f5d 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/FIBER_SHAPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SHAPES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class FIBER_SHAPES
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/FIBER_SYNTHESIS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHESIS.cs
index cef1e4762..07f0375b6 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/FIBER_SYNTHESIS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHESIS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class FIBER_SYNTHESIS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs
index 54c60031f..0ceb68f7c 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/HARDWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class HARDWARE_VERSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/LINEAR_MASS_DENSITY_UNITS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LINEAR_MASS_DENSITY_UNITS.cs
index 3e46c893b..84cd28833 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LINEAR_MASS_DENSITY_UNITS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LINEAR_MASS_DENSITY_UNITS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class LINEAR_MASS_DENSITY_UNITS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/LIQUID.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs
index 9d7cef88a..30028c84c 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LIQUID.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class LIQUID
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/LIQUIDS_RML.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RML.cs
index 7c82eb97d..07f8ed49c 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LIQUIDS_RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RML.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class LIQUIDS_RML
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
index e4d63758b..1a5119212 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class LIQUID_TYPES
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 0a8a75211..47b8dd69c 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Data.Entity;
diff --git a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.Context.tt b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.tt
index 058773afd..058773afd 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.Context.tt
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.tt
diff --git a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Designer.cs
index 9b904ed35..81ec10f3f 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL\Local\LocalADO.edmx'. 
+// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Local\DB\LocalADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.cs
index 7cc066228..7cc066228 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.cs
diff --git a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index d33a577d6..57e44c3ed 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -4,23 +4,26 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-      <Schema Namespace="LocalModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="DateTime Kind=Local;Data Source=D:\Development\Tango\Software\DB\Tango.db" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="LocalModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="Data Source=D:\Development\Tango\Software\DB\Tango.db" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="ACTIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="CODE" Type="integer" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="ADDRESSES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="APPLICATION_FIRMWARE_VERSIONS">
@@ -28,8 +31,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="APPLICATION_OS_VERSIONS">
@@ -37,8 +40,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="APPLICATION_VERSION">
@@ -46,8 +49,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="CONFIGURATIONS">
@@ -55,8 +58,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="CONFIGURATIONS_DISPENSERS">
@@ -64,8 +67,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="CONTACTS">
@@ -73,8 +76,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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">
@@ -82,8 +85,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="EMBEDDED_FIRMWARE_VERSIONS">
@@ -91,8 +94,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="EMBEDDED_SOFTWARE_VERSIONS">
@@ -100,8 +103,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="EVENTS">
@@ -109,8 +112,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="EVENTS_ACTIONS">
@@ -118,8 +121,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="FIBER_SHAPES">
@@ -127,8 +130,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="FIBER_SYNTHESIS">
@@ -136,8 +139,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="HARDWARE_VERSIONS">
@@ -145,8 +148,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="LINEAR_MASS_DENSITY_UNITS">
@@ -154,8 +157,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="LIQUID_TYPES">
@@ -163,8 +166,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="LIQUIDS">
@@ -172,8 +175,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="LIQUIDS_RML">
@@ -181,8 +184,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MACHINE_VERSIONS">
@@ -190,8 +193,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MACHINES">
@@ -199,8 +202,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MACHINES_EVENTS">
@@ -208,8 +211,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MEDIA_COLORS">
@@ -217,8 +220,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MEDIA_CONDITIONS">
@@ -226,8 +229,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MEDIA_MATERIALS">
@@ -235,8 +238,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="MEDIA_PURPOSES">
@@ -244,8 +247,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="ORGANIZATIONS">
@@ -253,8 +256,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="PERMISSIONS">
@@ -262,8 +265,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="RML">
@@ -271,8 +274,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="ROLES">
@@ -280,8 +283,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="ROLES_PERMISSIONS">
@@ -289,8 +292,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="USERS">
@@ -298,8 +301,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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="USERS_ROLES">
@@ -307,8 +310,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" />
+          <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>
         <EntityContainer Name="LocalModelStoreContainer">
@@ -347,27 +350,65 @@
           <EntitySet Name="USERS" EntityType="Self.USERS" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" store:Type="Tables" />
         </EntityContainer>
-      </Schema>
-    </edmx:StorageModels>
+      </Schema></edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
       <Schema Namespace="LocalModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
+        <EntityContainer Name="LocalDB" annotation:LazyLoadingEnabled="true">
+          <EntitySet Name="ACTIONS" EntityType="LocalModel.ACTION" />
+          <EntitySet Name="ADDRESSES" EntityType="LocalModel.ADDRESS" />
+          <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" />
+          <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="LocalModel.APPLICATION_OS_VERSIONS" />
+          <EntitySet Name="APPLICATION_VERSION" EntityType="LocalModel.APPLICATION_VERSION" />
+          <EntitySet Name="CONFIGURATIONS" EntityType="LocalModel.CONFIGURATION" />
+          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" />
+          <EntitySet Name="CONTACTS" EntityType="LocalModel.CONTACT" />
+          <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" />
+          <EntitySet Name="EVENTS" EntityType="LocalModel.EVENT" />
+          <EntitySet Name="EVENTS_ACTIONS" EntityType="LocalModel.EVENTS_ACTIONS" />
+          <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="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" />
+          <EntitySet Name="LIQUID_TYPES" EntityType="LocalModel.LIQUID_TYPES" />
+          <EntitySet Name="LIQUIDS" EntityType="LocalModel.LIQUID" />
+          <EntitySet Name="LIQUIDS_RML" EntityType="LocalModel.LIQUIDS_RML" />
+          <EntitySet Name="MACHINE_VERSIONS" EntityType="LocalModel.MACHINE_VERSIONS" />
+          <EntitySet Name="MACHINES" EntityType="LocalModel.MACHINE" />
+          <EntitySet Name="MACHINES_EVENTS" EntityType="LocalModel.MACHINES_EVENTS" />
+          <EntitySet Name="MEDIA_COLORS" EntityType="LocalModel.MEDIA_COLORS" />
+          <EntitySet Name="MEDIA_CONDITIONS" EntityType="LocalModel.MEDIA_CONDITIONS" />
+          <EntitySet Name="MEDIA_MATERIALS" EntityType="LocalModel.MEDIA_MATERIALS" />
+          <EntitySet Name="MEDIA_PURPOSES" EntityType="LocalModel.MEDIA_PURPOSES" />
+          <EntitySet Name="ORGANIZATIONS" EntityType="LocalModel.ORGANIZATION" />
+          <EntitySet Name="PERMISSIONS" EntityType="LocalModel.PERMISSION" />
+          <EntitySet Name="RMLs" EntityType="LocalModel.RML" />
+          <EntitySet Name="ROLES" EntityType="LocalModel.ROLE" />
+          <EntitySet Name="ROLES_PERMISSIONS" EntityType="LocalModel.ROLES_PERMISSIONS" />
+          <EntitySet Name="USERS" EntityType="LocalModel.USER" />
+          <EntitySet Name="USERS_ROLES" EntityType="LocalModel.USERS_ROLES" />
+        </EntityContainer>
         <EntityType Name="ACTION">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="CODE" Type="Int64" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="ADDRESS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="APPLICATION_FIRMWARE_VERSIONS">
@@ -375,8 +416,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="APPLICATION_OS_VERSIONS">
@@ -384,8 +425,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="APPLICATION_VERSION">
@@ -393,8 +434,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="CONFIGURATION">
@@ -402,8 +443,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="CONFIGURATIONS_DISPENSERS">
@@ -411,8 +452,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="CONTACT">
@@ -420,8 +461,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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">
@@ -429,8 +470,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="EMBEDDED_FIRMWARE_VERSIONS">
@@ -438,8 +479,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="EMBEDDED_SOFTWARE_VERSIONS">
@@ -447,8 +488,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="EVENT">
@@ -456,8 +497,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="EVENTS_ACTIONS">
@@ -465,8 +506,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="FIBER_SHAPES">
@@ -474,8 +515,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="FIBER_SYNTHESIS">
@@ -483,8 +524,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="HARDWARE_VERSIONS">
@@ -492,8 +533,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="LINEAR_MASS_DENSITY_UNITS">
@@ -501,8 +542,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="LIQUID_TYPES">
@@ -510,8 +551,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="LIQUID">
@@ -519,8 +560,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="LIQUIDS_RML">
@@ -528,8 +569,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MACHINE_VERSIONS">
@@ -537,8 +578,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MACHINE">
@@ -546,8 +587,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MACHINES_EVENTS">
@@ -555,8 +596,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MEDIA_COLORS">
@@ -564,8 +605,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MEDIA_CONDITIONS">
@@ -573,8 +614,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MEDIA_MATERIALS">
@@ -582,8 +623,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="MEDIA_PURPOSES">
@@ -591,8 +632,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="ORGANIZATION">
@@ -600,8 +641,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="PERMISSION">
@@ -609,8 +650,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="RML">
@@ -618,8 +659,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="ROLE">
@@ -627,8 +668,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="ROLES_PERMISSIONS">
@@ -636,8 +677,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="USER">
@@ -645,8 +686,8 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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="USERS_ROLES">
@@ -654,46 +695,10 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="Guid" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" />
+          <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>
-        <EntityContainer Name="LocalDB" annotation:LazyLoadingEnabled="true">
-          <EntitySet Name="ACTIONS" EntityType="Self.ACTION" />
-          <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESS" />
-          <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" />
-          <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" />
-          <EntitySet Name="APPLICATION_VERSION" EntityType="Self.APPLICATION_VERSION" />
-          <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATION" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="Self.CONFIGURATIONS_DISPENSERS" />
-          <EntitySet Name="CONTACTS" EntityType="Self.CONTACT" />
-          <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSER" />
-          <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" />
-          <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" />
-          <EntitySet Name="EVENTS" EntityType="Self.EVENT" />
-          <EntitySet Name="EVENTS_ACTIONS" EntityType="Self.EVENTS_ACTIONS" />
-          <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" />
-          <EntitySet Name="FIBER_SYNTHESIS" EntityType="Self.FIBER_SYNTHESIS" />
-          <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" />
-          <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" />
-          <EntitySet Name="LIQUID_TYPES" EntityType="Self.LIQUID_TYPES" />
-          <EntitySet Name="LIQUIDS" EntityType="Self.LIQUID" />
-          <EntitySet Name="LIQUIDS_RML" EntityType="Self.LIQUIDS_RML" />
-          <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" />
-          <EntitySet Name="MACHINES" EntityType="Self.MACHINE" />
-          <EntitySet Name="MACHINES_EVENTS" EntityType="Self.MACHINES_EVENTS" />
-          <EntitySet Name="MEDIA_COLORS" EntityType="Self.MEDIA_COLORS" />
-          <EntitySet Name="MEDIA_CONDITIONS" EntityType="Self.MEDIA_CONDITIONS" />
-          <EntitySet Name="MEDIA_MATERIALS" EntityType="Self.MEDIA_MATERIALS" />
-          <EntitySet Name="MEDIA_PURPOSES" EntityType="Self.MEDIA_PURPOSES" />
-          <EntitySet Name="ORGANIZATIONS" EntityType="Self.ORGANIZATION" />
-          <EntitySet Name="PERMISSIONS" EntityType="Self.PERMISSION" />
-          <EntitySet Name="RMLs" EntityType="Self.RML" />
-          <EntitySet Name="ROLES" EntityType="Self.ROLE" />
-          <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" />
-          <EntitySet Name="USERS" EntityType="Self.USER" />
-          <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" />
-        </EntityContainer>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -703,340 +708,343 @@
           <EntitySetMapping Name="ACTIONS">
             <EntityTypeMapping TypeName="LocalModel.ACTION">
               <MappingFragment StoreEntitySet="ACTIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <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="ADDRESSES">
             <EntityTypeMapping TypeName="LocalModel.ADDRESS">
               <MappingFragment StoreEntitySet="ADDRESSES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="APPLICATION_FIRMWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_FIRMWARE_VERSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="APPLICATION_OS_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_OS_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_OS_VERSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="APPLICATION_VERSION">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_VERSION">
               <MappingFragment StoreEntitySet="APPLICATION_VERSION">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="CONFIGURATIONS">
             <EntityTypeMapping TypeName="LocalModel.CONFIGURATION">
               <MappingFragment StoreEntitySet="CONFIGURATIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="CONFIGURATIONS_DISPENSERS">
             <EntityTypeMapping TypeName="LocalModel.CONFIGURATIONS_DISPENSERS">
               <MappingFragment StoreEntitySet="CONFIGURATIONS_DISPENSERS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="EMBEDDED_FIRMWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.EMBEDDED_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="EMBEDDED_SOFTWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.EMBEDDED_SOFTWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_SOFTWARE_VERSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="EVENTS">
             <EntityTypeMapping TypeName="LocalModel.EVENT">
               <MappingFragment StoreEntitySet="EVENTS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="EVENTS_ACTIONS">
             <EntityTypeMapping TypeName="LocalModel.EVENTS_ACTIONS">
               <MappingFragment StoreEntitySet="EVENTS_ACTIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="FIBER_SHAPES">
             <EntityTypeMapping TypeName="LocalModel.FIBER_SHAPES">
               <MappingFragment StoreEntitySet="FIBER_SHAPES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="FIBER_SYNTHESIS">
             <EntityTypeMapping TypeName="LocalModel.FIBER_SYNTHESIS">
               <MappingFragment StoreEntitySet="FIBER_SYNTHESIS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="HARDWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.HARDWARE_VERSIONS">
               <MappingFragment StoreEntitySet="HARDWARE_VERSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="LIQUID_TYPES">
             <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES">
               <MappingFragment StoreEntitySet="LIQUID_TYPES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="LIQUIDS">
             <EntityTypeMapping TypeName="LocalModel.LIQUID">
               <MappingFragment StoreEntitySet="LIQUIDS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="LIQUIDS_RML">
             <EntityTypeMapping TypeName="LocalModel.LIQUIDS_RML">
               <MappingFragment StoreEntitySet="LIQUIDS_RML">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MACHINE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.MACHINE_VERSIONS">
               <MappingFragment StoreEntitySet="MACHINE_VERSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MACHINES">
             <EntityTypeMapping TypeName="LocalModel.MACHINE">
               <MappingFragment StoreEntitySet="MACHINES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MACHINES_EVENTS">
             <EntityTypeMapping TypeName="LocalModel.MACHINES_EVENTS">
               <MappingFragment StoreEntitySet="MACHINES_EVENTS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MEDIA_COLORS">
             <EntityTypeMapping TypeName="LocalModel.MEDIA_COLORS">
               <MappingFragment StoreEntitySet="MEDIA_COLORS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MEDIA_CONDITIONS">
             <EntityTypeMapping TypeName="LocalModel.MEDIA_CONDITIONS">
               <MappingFragment StoreEntitySet="MEDIA_CONDITIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MEDIA_MATERIALS">
             <EntityTypeMapping TypeName="LocalModel.MEDIA_MATERIALS">
               <MappingFragment StoreEntitySet="MEDIA_MATERIALS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="MEDIA_PURPOSES">
             <EntityTypeMapping TypeName="LocalModel.MEDIA_PURPOSES">
               <MappingFragment StoreEntitySet="MEDIA_PURPOSES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="ORGANIZATIONS">
             <EntityTypeMapping TypeName="LocalModel.ORGANIZATION">
               <MappingFragment StoreEntitySet="ORGANIZATIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="PERMISSIONS">
             <EntityTypeMapping TypeName="LocalModel.PERMISSION">
               <MappingFragment StoreEntitySet="PERMISSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="RMLs">
             <EntityTypeMapping TypeName="LocalModel.RML">
               <MappingFragment StoreEntitySet="RML">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="ROLES">
             <EntityTypeMapping TypeName="LocalModel.ROLE">
               <MappingFragment StoreEntitySet="ROLES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="ROLES_PERMISSIONS">
             <EntityTypeMapping TypeName="LocalModel.ROLES_PERMISSIONS">
               <MappingFragment StoreEntitySet="ROLES_PERMISSIONS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="USERS">
             <EntityTypeMapping TypeName="LocalModel.USER">
               <MappingFragment StoreEntitySet="USERS">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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="USERS_ROLES">
             <EntityTypeMapping TypeName="LocalModel.USERS_ROLES">
               <MappingFragment StoreEntitySet="USERS_ROLES">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <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>
diff --git a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index 0cbd0d8b0..d0490a23a 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -4,41 +4,41 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="eff90f9fb96c408a9d2a961c69acb704" Name="Diagram1" ZoomLevel="81">
-        <EntityTypeShape EntityType="LocalModel.ACTION" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.ADDRESS" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="2.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSION" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="4.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="6.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="0.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="2.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="4.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="6.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="8.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="8.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="8.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="4.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="6.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.LIQUIDS_RML" Width="1.5" PointX="8.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="10.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="10.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="10.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="10.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="2.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="12.75" PointY="3.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="4.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="12.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="6.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="8.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="12.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="10.75" PointY="12.75" IsExpanded="true" />
+      <Diagram DiagramId="67415a77da9a47f2810e9bfd67b9921a" Name="Diagram1">
+        <EntityTypeShape EntityType="LocalModel.ACTION" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.ADDRESS" Width="1.5" PointX="2.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="2.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSION" Width="1.5" PointX="4.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="0.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="2.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="6.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="8.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="8.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="0.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="2.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="4.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="6.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="8.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUIDS_RML" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="10.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="10.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="10.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="2.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="12.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="4.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="12.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="6.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="8.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="10.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="12.75" PointY="12.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.tt b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.tt
index 4acc3fed3..4acc3fed3 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/LocalADO.tt
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.tt
diff --git a/Software/Visual_Studio/Tango.DAL/Local/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs
index e152d45e7..cfffb4426 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MACHINE
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs
index 405b349ef..a3e6ca953 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MACHINES_EVENTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MACHINES_EVENTS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/MACHINE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs
index d5965201f..e1a5d108c 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MACHINE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MACHINE_VERSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/MEDIA_COLORS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_COLORS.cs
index c2c5ba7a2..c8ed1229f 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MEDIA_COLORS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_COLORS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MEDIA_COLORS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/MEDIA_CONDITIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs
index 1d8d62cab..43a07a2a8 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MEDIA_CONDITIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MEDIA_CONDITIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/MEDIA_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_MATERIALS.cs
index 03f8b9c61..d2726980e 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MEDIA_MATERIALS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_MATERIALS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MEDIA_MATERIALS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/MEDIA_PURPOSES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_PURPOSES.cs
index 1a439f435..f335c2949 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/MEDIA_PURPOSES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_PURPOSES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class MEDIA_PURPOSES
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/ORGANIZATION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ORGANIZATION.cs
index 825c3c3f7..b0e471487 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/ORGANIZATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ORGANIZATION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class ORGANIZATION
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/PERMISSION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs
index 65d304100..368dcf103 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/PERMISSION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class PERMISSION
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/RML.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
index b7271ecaf..44730636f 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class RML
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/ROLE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs
index 856d6417a..19841df9e 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/ROLE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class ROLE
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/ROLES_PERMISSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs
index a37c39808..76ac2e872 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/ROLES_PERMISSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class ROLES_PERMISSIONS
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/USER.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/USER.cs
index fb5a35e68..b705398f7 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/USER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/USER.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class USER
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/USERS_ROLES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/USERS_ROLES.cs
index c83adc195..b0d2aa5e5 100644
--- a/Software/Visual_Studio/Tango.DAL/Local/USERS_ROLES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/USERS_ROLES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     using System;
     using System.Collections.Generic;
@@ -15,8 +15,8 @@ namespace Tango.DAL.Local
     public partial class USERS_ROLES
     {
         public long ID { get; set; }
-        public System.Guid GUID { get; set; }
-        public Nullable<System.DateTime> LAST_UPDATED { 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/Partials/LocalDB.cs b/Software/Visual_Studio/Tango.DAL.Local/Partials/LocalDB.cs
index b067ac6e3..2ad765a2b 100644
--- a/Software/Visual_Studio/Tango.DAL/Partials/LocalDB.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/Partials/LocalDB.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.DAL.Local
+namespace Tango.DAL.Local.DB
 {
     public partial class LocalDB : DbContext
     {
@@ -16,8 +16,7 @@ namespace Tango.DAL.Local
 
         private static String ComposeConnectionString(String filePath)
         {
-            //TODO: implement file connection strings.
-            return null;
+            return String.Format("metadata=res://*/DB.LocalADO.csdl|res://*/DB.LocalADO.ssdl|res://*/DB.LocalADO.msl;provider=System.Data.SQLite.EF6;provider connection string=\"data source={0}\"", filePath);
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
index 370dd5e05..5d006eb2a 100644
--- a/Software/Visual_Studio/Tango.DAL/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
@@ -2,5 +2,5 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Tango - Data Access Layer")]
+[assembly: AssemblyTitle("Tango - Local Data Access Layer")]
 [assembly: ComVisible(false)]
 \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL/Tango.DAL.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index cc9e99c3d..6ea3badfc 100644
--- a/Software/Visual_Studio/Tango.DAL/Tango.DAL.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -4,16 +4,15 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5B78CAD8-1298-46EC-907F-89A73BEEF75E}</ProjectGuid>
+    <ProjectGuid>{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tango.DAL</RootNamespace>
-    <AssemblyName>Tango.DAL</AssemblyName>
+    <RootNamespace>Tango.DAL.Local</RootNamespace>
+    <AssemblyName>Tango.DAL.Local</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,291 +65,151 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="Class1.cs" />
-    <Compile Include="Local\ACTION.cs">
+    <Compile Include="DB\ACTION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\ADDRESS.cs">
+    <Compile Include="DB\ADDRESS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\APPLICATION_FIRMWARE_VERSIONS.cs">
+    <Compile Include="DB\APPLICATION_FIRMWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\APPLICATION_OS_VERSIONS.cs">
+    <Compile Include="DB\APPLICATION_OS_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\APPLICATION_VERSION.cs">
+    <Compile Include="DB\APPLICATION_VERSION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\CONFIGURATION.cs">
+    <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\CONFIGURATIONS_DISPENSERS.cs">
+    <Compile Include="DB\CONFIGURATIONS_DISPENSERS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\CONTACT.cs">
+    <Compile Include="DB\CONTACT.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\DISPENSER.cs">
+    <Compile Include="DB\DISPENSER.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\EMBEDDED_FIRMWARE_VERSIONS.cs">
+    <Compile Include="DB\EMBEDDED_FIRMWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\EMBEDDED_SOFTWARE_VERSIONS.cs">
+    <Compile Include="DB\EMBEDDED_SOFTWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\EVENT.cs">
+    <Compile Include="DB\EVENT.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\EVENTS_ACTIONS.cs">
+    <Compile Include="DB\EVENTS_ACTIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\FIBER_SHAPES.cs">
+    <Compile Include="DB\FIBER_SHAPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\FIBER_SYNTHESIS.cs">
+    <Compile Include="DB\FIBER_SYNTHESIS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\HARDWARE_VERSIONS.cs">
+    <Compile Include="DB\HARDWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LINEAR_MASS_DENSITY_UNITS.cs">
+    <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LIQUID.cs">
+    <Compile Include="DB\LIQUID.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LIQUIDS_RML.cs">
+    <Compile Include="DB\LIQUIDS_RML.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LIQUID_TYPES.cs">
+    <Compile Include="DB\LIQUID_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LocalADO.Context.cs">
+    <Compile Include="DB\LocalADO.Context.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>LocalADO.Context.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LocalADO.cs">
+    <Compile Include="DB\LocalADO.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\LocalADO.Designer.cs">
+    <Compile Include="DB\LocalADO.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>LocalADO.edmx</DependentUpon>
     </Compile>
-    <Compile Include="Local\MACHINE.cs">
+    <Compile Include="DB\MACHINE.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\MACHINES_EVENTS.cs">
+    <Compile Include="DB\MACHINES_EVENTS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\MACHINE_VERSIONS.cs">
+    <Compile Include="DB\MACHINE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\MEDIA_COLORS.cs">
+    <Compile Include="DB\MEDIA_COLORS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\MEDIA_CONDITIONS.cs">
+    <Compile Include="DB\MEDIA_CONDITIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\MEDIA_MATERIALS.cs">
+    <Compile Include="DB\MEDIA_MATERIALS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\MEDIA_PURPOSES.cs">
+    <Compile Include="DB\MEDIA_PURPOSES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\ORGANIZATION.cs">
+    <Compile Include="DB\ORGANIZATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\PERMISSION.cs">
+    <Compile Include="DB\PERMISSION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\RML.cs">
+    <Compile Include="DB\RML.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\ROLE.cs">
+    <Compile Include="DB\ROLE.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\ROLES_PERMISSIONS.cs">
+    <Compile Include="DB\ROLES_PERMISSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\USER.cs">
+    <Compile Include="DB\USER.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="Local\USERS_ROLES.cs">
+    <Compile Include="DB\USERS_ROLES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="Partials\LocalDB.cs" />
-    <Compile Include="Partials\ServerDB.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Server\ACTION.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ADDRESS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\APPLICATION_DISPLAY_PANEL_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\APPLICATION_FIRMWARE_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\APPLICATION_OS_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\APPLICATION_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\CONFIGURATION.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\CONFIGURATIONS_DISPENSERS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\CONTACT.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\DISPENSER.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\EMBEDDED_FIRMWARE_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\EMBEDDED_SOFTWARE_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\EVENT.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\EVENTS_ACTIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\FIBER_SHAPES.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\FIBER_SYNTHESIS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\HARDWARE_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\LINEAR_MASS_DENSITY_UNITS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\LIQUID.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\LIQUIDS_RML.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\LIQUID_TYPES.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MACHINE.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MACHINES_EVENTS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MACHINE_VERSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MEDIA_COLORS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MEDIA_CONDITIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MEDIA_MATERIALS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\MEDIA_PURPOSES.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ORGANIZATION.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\PERMISSION.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\RML.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ROLE.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ROLES_PERMISSIONS.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ServerADO.Context.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ServerADO.Context.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ServerADO.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\ServerADO.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ServerADO.edmx</DependentUpon>
-    </Compile>
-    <Compile Include="Server\USER.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Server\USERS_ROLES.cs">
-      <DependentUpon>ServerADO.tt</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <EntityDeploy Include="Local\LocalADO.edmx">
+    <EntityDeploy Include="DB\LocalADO.edmx">
       <Generator>EntityModelCodeGenerator</Generator>
       <LastGenOutput>LocalADO.Designer.cs</LastGenOutput>
     </EntityDeploy>
-    <None Include="Local\LocalADO.edmx.diagram">
+    <None Include="DB\LocalADO.edmx.diagram">
       <DependentUpon>LocalADO.edmx</DependentUpon>
     </None>
     <None Include="packages.config" />
-    <EntityDeploy Include="Server\ServerADO.edmx">
-      <Generator>EntityModelCodeGenerator</Generator>
-      <LastGenOutput>ServerADO.Designer.cs</LastGenOutput>
-    </EntityDeploy>
-    <None Include="Server\ServerADO.edmx.diagram">
-      <DependentUpon>ServerADO.edmx</DependentUpon>
-    </None>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Local\LocalADO.Context.tt">
+    <Content Include="DB\LocalADO.Context.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <DependentUpon>LocalADO.edmx</DependentUpon>
       <LastGenOutput>LocalADO.Context.cs</LastGenOutput>
     </Content>
-    <Content Include="Local\LocalADO.tt">
+    <Content Include="DB\LocalADO.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <DependentUpon>LocalADO.edmx</DependentUpon>
       <LastGenOutput>LocalADO.cs</LastGenOutput>
     </Content>
-    <Content Include="Server\ServerADO.Context.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>ServerADO.edmx</DependentUpon>
-      <LastGenOutput>ServerADO.Context.cs</LastGenOutput>
-    </Content>
-    <Content Include="Server\ServerADO.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>ServerADO.edmx</DependentUpon>
-      <LastGenOutput>ServerADO.cs</LastGenOutput>
-    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets')" />
diff --git a/Software/Visual_Studio/Tango.DAL/packages.config b/Software/Visual_Studio/Tango.DAL.Local/packages.config
index d412cd302..bee3cc627 100644
--- a/Software/Visual_Studio/Tango.DAL/packages.config
+++ b/Software/Visual_Studio/Tango.DAL.Local/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.0.0" targetFramework="net45" />
+  <package id="EntityFramework" version="6.0.0" targetFramework="net46" />
   <package id="System.Data.SQLite" version="1.0.106.0" targetFramework="net46" />
   <package id="System.Data.SQLite.Core" version="1.0.106.0" targetFramework="net46" />
   <package id="System.Data.SQLite.EF6" version="1.0.106.0" targetFramework="net46" />
diff --git a/Software/Visual_Studio/Tango.DAL/App.config b/Software/Visual_Studio/Tango.DAL.Remote/App.config
index da64f12b6..78a5cb60c 100644
--- a/Software/Visual_Studio/Tango.DAL/App.config
+++ b/Software/Visual_Studio/Tango.DAL.Remote/App.config
@@ -11,9 +11,6 @@
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
     </providers>
   </entityFramework>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-  </startup>
   <system.data>
     <DbProviderFactories>
       <remove invariant="System.Data.SQLite.EF6" />
@@ -23,7 +20,6 @@
     </DbProviderFactories>
   </system.data>
   <connectionStrings>
-    <add name="ServerDB" connectionString="metadata=res://*/Server.ServerADO.csdl|res://*/Server.ServerADO.ssdl|res://*/Server.ServerADO.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LOCALHOST\SQLEXPRESS;initial catalog=Tango;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="LocalDB" connectionString="metadata=res://*/Local.LocalADO.csdl|res://*/Local.LocalADO.ssdl|res://*/Local.LocalADO.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;datetime kind=Local;data source=D:\Development\Tango\Software\DB\Tango.db&quot;" providerName="System.Data.EntityClient" />
+    <add name="RemoteDB" connectionString="metadata=res://*/DB.RemoteADO.csdl|res://*/DB.RemoteADO.ssdl|res://*/DB.RemoteADO.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LOCALHOST\SQLEXPRESS;initial catalog=Tango;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
 </configuration>
 \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs
index 29cb2c743..0d6d93cbd 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ACTION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ADDRESS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ADDRESS.cs
index 5e03a0e41..3cbe7d0d6 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ADDRESS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ADDRESS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_DISPLAY_PANEL_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs
index 78f32085f..efba337da 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_DISPLAY_PANEL_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_FIRMWARE_VERSIONS.cs
index cfbfcc003..a51070adc 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_FIRMWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_FIRMWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_OS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs
index ae1e44231..2db9b1ceb 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_OS_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs
index 09d52db49..307d86358 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/APPLICATION_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs
index eb00a7d15..1d80a58a8 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/CONFIGURATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/CONFIGURATIONS_DISPENSERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATIONS_DISPENSERS.cs
index 1f992944d..314130c6a 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/CONFIGURATIONS_DISPENSERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATIONS_DISPENSERS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/CONTACT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONTACT.cs
index 1487a5469..776de0b9d 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/CONTACT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONTACT.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
index 13d028189..0d85157cf 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/DISPENSER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/EMBEDDED_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
index 7b2729d88..57c0ff17d 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/EMBEDDED_FIRMWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/EMBEDDED_SOFTWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
index 6acdefd0f..8729b1f14 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/EMBEDDED_SOFTWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/EVENT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs
index e018f5f39..abfb0420f 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/EVENT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/EVENTS_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs
index bc69dd833..58797a747 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/EVENTS_ACTIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/FIBER_SHAPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SHAPES.cs
index 09daa4056..bc97ccc51 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/FIBER_SHAPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SHAPES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/FIBER_SYNTHESIS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SYNTHESIS.cs
index c2f1fa847..4182e0bc2 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/FIBER_SYNTHESIS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SYNTHESIS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
index 39e14abef..da7891f4c 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/HARDWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/LINEAR_MASS_DENSITY_UNITS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LINEAR_MASS_DENSITY_UNITS.cs
index ec9ca0836..a0af02a1d 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/LINEAR_MASS_DENSITY_UNITS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LINEAR_MASS_DENSITY_UNITS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/LIQUID.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs
index ed3185986..68bfed902 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/LIQUID.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/LIQUIDS_RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RML.cs
index c0ce89bb3..3dff203c6 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/LIQUIDS_RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RML.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
index 9600f7b01..f666b3517 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index a2cd90798..5a319a9fd 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs
index 83d1efd4d..94084ead1 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MACHINES_EVENTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MACHINE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs
index 614d87c17..581cb39a2 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MACHINE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_COLORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs
index dadf7a615..3a05bfc13 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_COLORS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_CONDITIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs
index 65a10ac37..d4127674f 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_CONDITIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs
index f64a19e64..ad0e44d0c 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_MATERIALS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_PURPOSES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs
index 93195785c..0db016179 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/MEDIA_PURPOSES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ORGANIZATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs
index ce4f7cb65..68ca7f84c 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ORGANIZATION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/PERMISSION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs
index c3497f3a4..a8c6105c3 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/PERMISSION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index 342354455..e43af9f36 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ROLE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs
index d01063593..f18f0663b 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ROLE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ROLES_PERMISSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs
index e8c474918..910f18079 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ROLES_PERMISSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 1012c5955..903a4857a 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -7,16 +7,16 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
     
-    public partial class ServerDB : DbContext
+    public partial class RemoteDB : DbContext
     {
-        public ServerDB()
-            : base("name=ServerDB")
+        public RemoteDB()
+            : base("name=RemoteDB")
         {
         }
     
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.Context.tt b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.tt
index a95d77359..2f65065ba 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.Context.tt
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.tt
@@ -2,7 +2,7 @@
 <#@ include file="EF6.Utility.CS.ttinclude"#><#@
  output extension=".cs"#><#
 
-const string inputFile = @"ServerADO.edmx";
+const string inputFile = @"RemoteADO.edmx";
 var textTransform = DynamicTextTransformation.Create(this);
 var code = new CodeGenerationTools(this);
 var ef = new MetadataTools(this);
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
index 5fa6d05e8..17bc2683d 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL\Server\ServerADO.edmx'. 
+// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.cs
index 7cc066228..7cc066228 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.cs
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index f6cee39ed..5d48fdcd1 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-      <Schema Namespace="ServerModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+      <Schema Namespace="RemoteModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="ACTIONS">
           <Key>
             <PropertyRef Name="ID" />
@@ -875,7 +875,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="ServerModelStoreContainer">
+        <EntityContainer Name="RemoteModelStoreContainer">
           <EntitySet Name="ACTIONS" EntityType="Self.ACTIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESSES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Schema="dbo" store:Type="Tables" />
@@ -1068,7 +1068,7 @@
     </edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
-      <Schema Namespace="ServerModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
+      <Schema Namespace="RemoteModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityType Name="ACTION">
           <Key>
             <PropertyRef Name="ID" />
@@ -2015,7 +2015,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="ServerDB" annotation:LazyLoadingEnabled="true">
+        <EntityContainer Name="RemoteDB" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="ACTIONS" EntityType="Self.ACTION" />
           <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESS" />
           <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" />
@@ -2209,9 +2209,9 @@
     <!-- C-S mapping content -->
     <edmx:Mappings>
       <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
-        <EntityContainerMapping StorageEntityContainer="ServerModelStoreContainer" CdmEntityContainer="ServerDB">
+        <EntityContainerMapping StorageEntityContainer="RemoteModelStoreContainer" CdmEntityContainer="RemoteDB">
           <EntitySetMapping Name="ACTIONS">
-            <EntityTypeMapping TypeName="ServerModel.ACTION">
+            <EntityTypeMapping TypeName="RemoteModel.ACTION">
               <MappingFragment StoreEntitySet="ACTIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2224,7 +2224,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="ADDRESSES">
-            <EntityTypeMapping TypeName="ServerModel.ADDRESS">
+            <EntityTypeMapping TypeName="RemoteModel.ADDRESS">
               <MappingFragment StoreEntitySet="ADDRESSES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2241,7 +2241,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="APPLICATION_DISPLAY_PANEL_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.APPLICATION_DISPLAY_PANEL_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_DISPLAY_PANEL_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2251,7 +2251,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="APPLICATION_FIRMWARE_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.APPLICATION_FIRMWARE_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.APPLICATION_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_FIRMWARE_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2261,7 +2261,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="APPLICATION_OS_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.APPLICATION_OS_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.APPLICATION_OS_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_OS_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2271,7 +2271,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="APPLICATION_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.APPLICATION_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.APPLICATION_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2281,7 +2281,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="CONFIGURATIONS">
-            <EntityTypeMapping TypeName="ServerModel.CONFIGURATION">
+            <EntityTypeMapping TypeName="RemoteModel.CONFIGURATION">
               <MappingFragment StoreEntitySet="CONFIGURATIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2300,7 +2300,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="CONFIGURATIONS_DISPENSERS">
-            <EntityTypeMapping TypeName="ServerModel.CONFIGURATIONS_DISPENSERS">
+            <EntityTypeMapping TypeName="RemoteModel.CONFIGURATIONS_DISPENSERS">
               <MappingFragment StoreEntitySet="CONFIGURATIONS_DISPENSERS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2313,7 +2313,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="CONTACTS">
-            <EntityTypeMapping TypeName="ServerModel.CONTACT">
+            <EntityTypeMapping TypeName="RemoteModel.CONTACT">
               <MappingFragment StoreEntitySet="CONTACTS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2329,7 +2329,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="DISPENSERS">
-            <EntityTypeMapping TypeName="ServerModel.DISPENSER">
+            <EntityTypeMapping TypeName="RemoteModel.DISPENSER">
               <MappingFragment StoreEntitySet="DISPENSERS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2339,7 +2339,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="EMBEDDED_FIRMWARE_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.EMBEDDED_FIRMWARE_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2349,7 +2349,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="EMBEDDED_SOFTWARE_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.EMBEDDED_SOFTWARE_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_SOFTWARE_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2359,7 +2359,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="EVENTS">
-            <EntityTypeMapping TypeName="ServerModel.EVENT">
+            <EntityTypeMapping TypeName="RemoteModel.EVENT">
               <MappingFragment StoreEntitySet="EVENTS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2372,7 +2372,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="EVENTS_ACTIONS">
-            <EntityTypeMapping TypeName="ServerModel.EVENTS_ACTIONS">
+            <EntityTypeMapping TypeName="RemoteModel.EVENTS_ACTIONS">
               <MappingFragment StoreEntitySet="EVENTS_ACTIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2384,7 +2384,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="FIBER_SHAPES">
-            <EntityTypeMapping TypeName="ServerModel.FIBER_SHAPES">
+            <EntityTypeMapping TypeName="RemoteModel.FIBER_SHAPES">
               <MappingFragment StoreEntitySet="FIBER_SHAPES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2396,7 +2396,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="FIBER_SYNTHESIS">
-            <EntityTypeMapping TypeName="ServerModel.FIBER_SYNTHESIS">
+            <EntityTypeMapping TypeName="RemoteModel.FIBER_SYNTHESIS">
               <MappingFragment StoreEntitySet="FIBER_SYNTHESIS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2408,7 +2408,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="HARDWARE_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.HARDWARE_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.HARDWARE_VERSIONS">
               <MappingFragment StoreEntitySet="HARDWARE_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2418,7 +2418,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="LINEAR_MASS_DENSITY_UNITS">
-            <EntityTypeMapping TypeName="ServerModel.LINEAR_MASS_DENSITY_UNITS">
+            <EntityTypeMapping TypeName="RemoteModel.LINEAR_MASS_DENSITY_UNITS">
               <MappingFragment StoreEntitySet="LINEAR_MASS_DENSITY_UNITS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2430,7 +2430,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="LIQUID_TYPES">
-            <EntityTypeMapping TypeName="ServerModel.LIQUID_TYPES">
+            <EntityTypeMapping TypeName="RemoteModel.LIQUID_TYPES">
               <MappingFragment StoreEntitySet="LIQUID_TYPES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2443,7 +2443,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="LIQUIDS">
-            <EntityTypeMapping TypeName="ServerModel.LIQUID">
+            <EntityTypeMapping TypeName="RemoteModel.LIQUID">
               <MappingFragment StoreEntitySet="LIQUIDS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2456,7 +2456,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="LIQUIDS_RML">
-            <EntityTypeMapping TypeName="ServerModel.LIQUIDS_RML">
+            <EntityTypeMapping TypeName="RemoteModel.LIQUIDS_RML">
               <MappingFragment StoreEntitySet="LIQUIDS_RML">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2468,7 +2468,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MACHINE_VERSIONS">
-            <EntityTypeMapping TypeName="ServerModel.MACHINE_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.MACHINE_VERSIONS">
               <MappingFragment StoreEntitySet="MACHINE_VERSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2480,7 +2480,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MACHINES">
-            <EntityTypeMapping TypeName="ServerModel.MACHINE">
+            <EntityTypeMapping TypeName="RemoteModel.MACHINE">
               <MappingFragment StoreEntitySet="MACHINES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2494,7 +2494,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MACHINES_EVENTS">
-            <EntityTypeMapping TypeName="ServerModel.MACHINES_EVENTS">
+            <EntityTypeMapping TypeName="RemoteModel.MACHINES_EVENTS">
               <MappingFragment StoreEntitySet="MACHINES_EVENTS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2509,7 +2509,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MEDIA_COLORS">
-            <EntityTypeMapping TypeName="ServerModel.MEDIA_COLORS">
+            <EntityTypeMapping TypeName="RemoteModel.MEDIA_COLORS">
               <MappingFragment StoreEntitySet="MEDIA_COLORS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2520,7 +2520,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MEDIA_CONDITIONS">
-            <EntityTypeMapping TypeName="ServerModel.MEDIA_CONDITIONS">
+            <EntityTypeMapping TypeName="RemoteModel.MEDIA_CONDITIONS">
               <MappingFragment StoreEntitySet="MEDIA_CONDITIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2532,7 +2532,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MEDIA_MATERIALS">
-            <EntityTypeMapping TypeName="ServerModel.MEDIA_MATERIALS">
+            <EntityTypeMapping TypeName="RemoteModel.MEDIA_MATERIALS">
               <MappingFragment StoreEntitySet="MEDIA_MATERIALS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2544,7 +2544,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="MEDIA_PURPOSES">
-            <EntityTypeMapping TypeName="ServerModel.MEDIA_PURPOSES">
+            <EntityTypeMapping TypeName="RemoteModel.MEDIA_PURPOSES">
               <MappingFragment StoreEntitySet="MEDIA_PURPOSES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2556,7 +2556,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="ORGANIZATIONS">
-            <EntityTypeMapping TypeName="ServerModel.ORGANIZATION">
+            <EntityTypeMapping TypeName="RemoteModel.ORGANIZATION">
               <MappingFragment StoreEntitySet="ORGANIZATIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2569,7 +2569,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="PERMISSIONS">
-            <EntityTypeMapping TypeName="ServerModel.PERMISSION">
+            <EntityTypeMapping TypeName="RemoteModel.PERMISSION">
               <MappingFragment StoreEntitySet="PERMISSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2581,7 +2581,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="RMLs">
-            <EntityTypeMapping TypeName="ServerModel.RML">
+            <EntityTypeMapping TypeName="RemoteModel.RML">
               <MappingFragment StoreEntitySet="RML">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2609,7 +2609,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="ROLES">
-            <EntityTypeMapping TypeName="ServerModel.ROLE">
+            <EntityTypeMapping TypeName="RemoteModel.ROLE">
               <MappingFragment StoreEntitySet="ROLES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2621,7 +2621,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="ROLES_PERMISSIONS">
-            <EntityTypeMapping TypeName="ServerModel.ROLES_PERMISSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.ROLES_PERMISSIONS">
               <MappingFragment StoreEntitySet="ROLES_PERMISSIONS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2633,7 +2633,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="USERS">
-            <EntityTypeMapping TypeName="ServerModel.USER">
+            <EntityTypeMapping TypeName="RemoteModel.USER">
               <MappingFragment StoreEntitySet="USERS">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -2648,7 +2648,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="USERS_ROLES">
-            <EntityTypeMapping TypeName="ServerModel.USERS_ROLES">
+            <EntityTypeMapping TypeName="RemoteModel.USERS_ROLES">
               <MappingFragment StoreEntitySet="USERS_ROLES">
                 <ScalarProperty Name="ID" ColumnName="ID" />
                 <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
new file mode 100644
index 000000000..7a0050ae1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
+ <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
+  <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
+    <!-- Diagram content (shape and connector positions) -->
+    <edmx:Diagrams>
+      <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
+        <EntityTypeShape EntityType="RemoteModel.ACTION" Width="1.5" PointX="14.25" PointY="38.25" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="7.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="8.25" PointY="12.375" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="15" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="8.25" PointY="17.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="8.25" PointY="20.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="10.5" PointY="6.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="15.75" PointY="8.125" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="2.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="13.5" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="23.25" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="26" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT" Width="1.5" PointX="11.25" PointY="3.25" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.EVENTS_ACTIONS" Width="1.5" PointX="16.5" PointY="3.25" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="15.75" PointY="15" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHESIS" Width="1.5" PointX="15.75" PointY="19.375" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="28.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="15.75" PointY="22.375" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="15.625" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID" Width="1.5" PointX="13.5" PointY="15.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUIDS_RML" Width="1.5" PointX="20.25" PointY="14.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="12" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="7.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="7.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="15.75" PointY="25.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="15.75" PointY="28.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="15.75" PointY="31.625" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="15.75" PointY="34.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="8" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="23.375" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="18" PointY="12.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="19.25" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="19.25" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="7.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="4.25" IsExpanded="true" />
+        <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_FIRMWARE_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_OS_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_SOFTWARE_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_MACHINES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINE_VERSIONS_CONFIGURATIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_CONTACTS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_USERS_CONTACTS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SYNTHESIS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_LIQUIDS_LIQUID_TYPES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_LIQUID_RML_LIQUIDS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_LIQUID_RML_RML" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINES_MACHINE_VERSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINE_EVENTS_MACHINES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINES_ORGANIZATIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_USERS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_COLORS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_CONDITIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_MATERIALS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_PURPOSES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_USERS_ORGANIZATIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_ROLES_PERMISSIONS_PERMISSIONS" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_ROLES_PERMISSIONS_ROLES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_ROLES" ManuallyRouted="false" />
+        <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_USERS" ManuallyRouted="false" />
+      </Diagram>
+    </edmx:Diagrams>
+  </edmx:Designer>
+</edmx:Edmx>
+\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.tt b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.tt
index b09ff06f5..97271473f 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.tt
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.tt
@@ -2,7 +2,7 @@
 <#@ include file="EF6.Utility.CS.ttinclude"#><#@ 
  output extension=".cs"#><#
 
-const string inputFile = @"ServerADO.edmx";
+const string inputFile = @"RemoteADO.edmx";
 var textTransform = DynamicTextTransformation.Create(this);
 var code = new CodeGenerationTools(this);
 var ef = new MetadataTools(this);
diff --git a/Software/Visual_Studio/Tango.DAL/Server/USER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
index 596a373aa..6307c9f9b 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/USER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/USER.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL/Server/USERS_ROLES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/USERS_ROLES.cs
index d9e18c2b5..30a5cf961 100644
--- a/Software/Visual_Studio/Tango.DAL/Server/USERS_ROLES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/USERS_ROLES.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.DAL.Server
+namespace Tango.DAL.Remote.DB
 {
     using System;
     using System.Collections.Generic;
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs b/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs
new file mode 100644
index 000000000..6fdd35983
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.DAL.Remote.DB
+{
+    public partial class RemoteDB : DbContext
+    {
+        public RemoteDB(String path, bool isFile) : base(ComposeConnectionString(path, isFile))
+        {
+
+        }
+
+        private static String ComposeConnectionString(String source, bool isFile)
+        {
+            if (!isFile)
+            {
+                return String.Format("metadata=res://*/DB.RemoteADO.csdl|res://*/DB.RemoteADO.ssdl|res://*/DB.RemoteADO.msl;provider=System.Data.SqlClient;provider connection string=\"data source={0};initial catalog=Tango;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework\"", source);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..14c18abcd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Tango - Remote Data Access Layer")]
+[assembly: ComVisible(false)]
+\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
new file mode 100644
index 000000000..74ad020fc
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -0,0 +1,225 @@
+<?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>{38197109-8610-4D3F-92B9-16D48DF94D7C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tango.DAL.Remote</RootNamespace>
+    <AssemblyName>Tango.DAL.Remote</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </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.Data.SQLite, Version=1.0.106.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.106.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.106.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.106.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.106.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <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="DB\ACTION.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\ADDRESS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\APPLICATION_DISPLAY_PANEL_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\APPLICATION_FIRMWARE_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\APPLICATION_OS_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\APPLICATION_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <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>
+    <Compile Include="DB\DISPENSER.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\EMBEDDED_FIRMWARE_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\EMBEDDED_SOFTWARE_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\EVENT.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\EVENTS_ACTIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\FIBER_SHAPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\FIBER_SYNTHESIS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\HARDWARE_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\LIQUID.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\LIQUIDS_RML.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\LIQUID_TYPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MACHINE.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MACHINES_EVENTS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MACHINE_VERSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MEDIA_COLORS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MEDIA_CONDITIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MEDIA_MATERIALS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\MEDIA_PURPOSES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\ORGANIZATION.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\PERMISSION.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RemoteADO.Context.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>RemoteADO.Context.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RemoteADO.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RemoteADO.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>RemoteADO.edmx</DependentUpon>
+    </Compile>
+    <Compile Include="DB\RML.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\ROLE.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\ROLES_PERMISSIONS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\USER.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\USERS_ROLES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Partials\RemoteDB.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <EntityDeploy Include="DB\RemoteADO.edmx">
+      <Generator>EntityModelCodeGenerator</Generator>
+      <LastGenOutput>RemoteADO.Designer.cs</LastGenOutput>
+    </EntityDeploy>
+    <None Include="DB\RemoteADO.edmx.diagram">
+      <DependentUpon>RemoteADO.edmx</DependentUpon>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="DB\RemoteADO.Context.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <DependentUpon>RemoteADO.edmx</DependentUpon>
+      <LastGenOutput>RemoteADO.Context.cs</LastGenOutput>
+    </Content>
+    <Content Include="DB\RemoteADO.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <DependentUpon>RemoteADO.edmx</DependentUpon>
+      <LastGenOutput>RemoteADO.cs</LastGenOutput>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets'))" />
+  </Target>
+</Project>
+\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/packages.config b/Software/Visual_Studio/Tango.DAL.Remote/packages.config
new file mode 100644
index 000000000..bee3cc627
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.0.0" targetFramework="net46" />
+  <package id="System.Data.SQLite" version="1.0.106.0" targetFramework="net46" />
+  <package id="System.Data.SQLite.Core" version="1.0.106.0" targetFramework="net46" />
+  <package id="System.Data.SQLite.EF6" version="1.0.106.0" targetFramework="net46" />
+  <package id="System.Data.SQLite.Linq" version="1.0.106.0" targetFramework="net46" />
+</packages>
+\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL/Class1.cs b/Software/Visual_Studio/Tango.DAL/Class1.cs
deleted file mode 100644
index fa0ec8e29..000000000
--- a/Software/Visual_Studio/Tango.DAL/Class1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.DAL
-{
-    public class Class1
-    {
-        public Class1()
-        {
-            Local.LocalDB db = new Local.LocalDB();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL/Partials/ServerDB.cs b/Software/Visual_Studio/Tango.DAL/Partials/ServerDB.cs
deleted file mode 100644
index fedbfd117..000000000
--- a/Software/Visual_Studio/Tango.DAL/Partials/ServerDB.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.DAL
-{
-    public class ServerDB : DbContext
-    {
-        public ServerDB(String path, bool isFile) : base(ComposeConnectionString(path, isFile))
-        {
-
-        }
-
-        private static String ComposeConnectionString(String path, bool isFile)
-        {
-            //TODO: implement file and server connection strings.
-            return null;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL/Server/ServerADO.edmx.diagram
deleted file mode 100644
index c03862854..000000000
--- a/Software/Visual_Studio/Tango.DAL/Server/ServerADO.edmx.diagram
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
- <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
-  <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
-    <!-- Diagram content (shape and connector positions) -->
-    <edmx:Diagrams>
-      <Diagram DiagramId="b4908168db4d45858569cad496064fb7" Name="Diagram1">
-        <EntityTypeShape EntityType="ServerModel.ACTION" Width="1.5" PointX="14.25" PointY="38.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.ADDRESS" Width="1.5" PointX="0.75" PointY="7.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="8.25" PointY="12.375" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="15" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="8.25" PointY="17.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.APPLICATION_VERSIONS" Width="1.5" PointX="8.25" PointY="20.5" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.CONFIGURATION" Width="1.5" PointX="10.5" PointY="6.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="15.75" PointY="8.125" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.CONTACT" Width="1.5" PointX="0.75" PointY="2.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.DISPENSER" Width="1.5" PointX="13.5" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="23.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="26" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.EVENT" Width="1.5" PointX="11.25" PointY="3.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.EVENTS_ACTIONS" Width="1.5" PointX="16.5" PointY="3.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.FIBER_SHAPES" Width="1.5" PointX="15.75" PointY="15" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.FIBER_SYNTHESIS" Width="1.5" PointX="15.75" PointY="19.375" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.HARDWARE_VERSIONS" Width="1.5" PointX="8.25" PointY="28.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="15.75" PointY="22.375" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="15.625" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.LIQUID" Width="1.5" PointX="13.5" PointY="15.5" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.LIQUIDS_RML" Width="1.5" PointX="20.25" PointY="14.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="12" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MACHINE" Width="1.5" PointX="5.25" PointY="7.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="7.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MEDIA_COLORS" Width="1.5" PointX="15.75" PointY="25.5" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MEDIA_CONDITIONS" Width="1.5" PointX="15.75" PointY="28.5" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MEDIA_MATERIALS" Width="1.5" PointX="15.75" PointY="31.625" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.MEDIA_PURPOSES" Width="1.5" PointX="15.75" PointY="34.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.ORGANIZATION" Width="1.5" PointX="3" PointY="8" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.PERMISSION" Width="1.5" PointX="11.25" PointY="23.375" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.RML" Width="1.5" PointX="18" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.ROLE" Width="1.5" PointX="11.25" PointY="19.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="19.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.USER" Width="1.5" PointX="8.25" PointY="7.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ServerModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="4.25" IsExpanded="true" />
-        <AssociationConnector Association="ServerModel.FK_EVENTS_ACTIONS_ACTIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_ORGANIZATIONS_ADDRESSES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_USERS_ADDRESSES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_APPLICATION_FIRMWARE_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_APPLICATION_OS_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_DISPENSERS_CONFIGURATIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_EMBEDDED_SOFTWARE_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_MACHINES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_MACHINE_VERSIONS_CONFIGURATIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_ORGANIZATIONS_CONTACTS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_USERS_CONTACTS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_EVENTS_ACTIONS_EVENTS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_MACHINES_EVENTS_EVENTS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_FIBER_SHAPES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_FIBER_SYNTHESIS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_LIQUIDS_LIQUID_TYPES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_LIQUID_RML_LIQUIDS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_LIQUID_RML_RML" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_MACHINES_MACHINE_VERSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_MACHINE_EVENTS_MACHINES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_MACHINES_ORGANIZATIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_MACHINES_EVENTS_USERS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_MEDIA_COLORS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_MEDIA_CONDITIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_MEDIA_MATERIALS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_RML_MEDIA_PURPOSES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_USERS_ORGANIZATIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_ROLES_PERMISSIONS_PERMISSIONS" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_ROLES_PERMISSIONS_ROLES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_USERS_ROLES_ROLES" ManuallyRouted="false" />
-        <AssociationConnector Association="ServerModel.FK_USERS_ROLES_USERS" ManuallyRouted="false" />
-      </Diagram>
-    </edmx:Diagrams>
-  </edmx:Designer>
-</edmx:Edmx>
-\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.UnitTesting/App.config b/Software/Visual_Studio/Tango.UnitTesting/App.config
new file mode 100644
index 000000000..901eeb586
--- /dev/null
+++ b/Software/Visual_Studio/Tango.UnitTesting/App.config
@@ -0,0 +1,20 @@
+<?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" />
+      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+    </providers>
+  </entityFramework>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SQLite.EF6" />
+      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
+    <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
+  </system.data>
+</configuration>
+\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs
new file mode 100644
index 000000000..b56f04c70
--- /dev/null
+++ b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs
@@ -0,0 +1,64 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tango.DAL;
+using System.Linq;
+
+namespace Tango.UnitTesting
+{
+    [TestClass]
+    [TestCategory("DAL")]
+    public class DAL_TST
+    {
+        [TestMethod]
+        public void Validate_Server_SQLServer_Connection()
+        {
+            Guid guid = Guid.NewGuid();
+
+            using (var db = new DAL.Remote.DB.RemoteDB("LOCALHOST\\SQLEXPRESS", false))
+            {
+                var action = new DAL.Remote.DB.ACTION();
+                action.CODE = 1;
+                action.NAME = "Action 1";
+                action.DESCRIPTION = "Description 1";
+                action.GUID = guid;
+                action.LAST_UPDATED = DateTime.Now;
+
+                db.ACTIONS.Add(action);
+                db.SaveChanges();
+            }
+
+            using (var db = new DAL.Remote.DB.RemoteDB("LOCALHOST\\SQLEXPRESS", false))
+            {
+                var action = db.ACTIONS.Single(x => x.GUID == guid);
+                db.ACTIONS.Remove(action);
+                db.SaveChanges();
+            }
+        }
+
+        [TestMethod]
+        public void Validate_Local_SQLite_Connection()
+        {
+            String guid = Guid.NewGuid().ToString();
+
+            using (var db = new DAL.Local.DB.LocalDB(Helper.GetSQLiteFilePath()))
+            {
+                var action = new DAL.Local.DB.ACTION();
+                action.CODE = 1;
+                action.NAME = "Action 1";
+                action.DESCRIPTION = "Description 1";
+                action.GUID = guid;
+
+                db.ACTIONS.Add(action);
+                db.SaveChanges();
+            }
+
+            using (var db = new DAL.Local.DB.LocalDB(Helper.GetSQLiteFilePath()))
+            {
+                var actions = db.ACTIONS.ToList();
+                var action = db.ACTIONS.Single(x => x.GUID == guid);
+                db.ACTIONS.Remove(action);
+                db.SaveChanges();
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Helper.cs b/Software/Visual_Studio/Tango.UnitTesting/Helper.cs
index ece74d3f3..21e36168c 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Helper.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/Helper.cs
@@ -35,6 +35,15 @@ namespace Tango.UnitTesting
         }
 
         /// <summary>
+        /// Gets the SQLite database file path in DB folder.
+        /// </summary>
+        /// <returns></returns>
+        public static String GetSQLiteFilePath()
+        {
+            return Path.GetFullPath(@"..\..\..\DB\Tango.db");
+        }
+
+        /// <summary>
         /// Initializes the logging manager.
         /// </summary>
         public static ConsoleLogger InitializeLogging(bool useConsole = false, [CallerMemberName] string testName = null)
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
index 02a500341..494981db1 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
+++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
@@ -40,6 +40,12 @@
     <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="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
@@ -53,7 +59,19 @@
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.SQLite, Version=1.0.106.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.106.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.106.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.106.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.106.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
@@ -62,8 +80,10 @@
     <Compile Include="Helper.cs" />
     <Compile Include="Protobuf_TST.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="DAL_TST.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -71,6 +91,14 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tango.DAL.Local\Tango.DAL.Local.csproj">
+      <Project>{0e0eef3e-8f4e-4f23-9d19-479fd8d76c12}</Project>
+      <Name>Tango.DAL.Local</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.Logging\Tango.Logging.csproj">
       <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
       <Name>Tango.Logging</Name>
@@ -96,6 +124,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
   <Import Project="..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets')" />
 </Project>
 \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.UnitTesting/packages.config b/Software/Visual_Studio/Tango.UnitTesting/packages.config
index d3cd9d043..3ffe10b39 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/packages.config
+++ b/Software/Visual_Studio/Tango.UnitTesting/packages.config
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EntityFramework" version="6.0.0" targetFramework="net46" />
   <package id="Google.Protobuf" version="3.4.1" targetFramework="net45" />
   <package id="MSTest.TestAdapter" version="1.1.11" targetFramework="net45" />
   <package id="MSTest.TestFramework" version="1.1.11" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="System.Data.SQLite" version="1.0.106.0" targetFramework="net46" />
+  <package id="System.Data.SQLite.Core" version="1.0.106.0" targetFramework="net46" />
+  <package id="System.Data.SQLite.EF6" version="1.0.106.0" targetFramework="net46" />
+  <package id="System.Data.SQLite.Linq" version="1.0.106.0" targetFramework="net46" />
 </packages>
 \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 8b5c7a8bf..2a706378f 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -57,7 +57,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Synchronization.UI",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.ShortcutGenerator.CLI", "Utilities\Tango.ShortcutGenerator.CLI\Tango.ShortcutGenerator.CLI.csproj", "{ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL", "Tango.DAL\Tango.DAL.csproj", "{5B78CAD8-1298-46EC-907F-89A73BEEF75E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL.Remote", "Tango.DAL.Remote\Tango.DAL.Remote.csproj", "{38197109-8610-4D3F-92B9-16D48DF94D7C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL.Local", "Tango.DAL.Local\Tango.DAL.Local.csproj", "{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -295,18 +297,30 @@ Global
 		{ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}.Release|x64.Build.0 = Release|Any CPU
 		{ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}.Release|x86.ActiveCfg = Release|Any CPU
 		{ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}.Release|x86.Build.0 = Release|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Debug|x64.Build.0 = Debug|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Debug|x86.Build.0 = Debug|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Release|x64.ActiveCfg = Release|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Release|x64.Build.0 = Release|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Release|x86.ActiveCfg = Release|Any CPU
-		{5B78CAD8-1298-46EC-907F-89A73BEEF75E}.Release|x86.Build.0 = Release|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Debug|x64.Build.0 = Debug|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Debug|x86.Build.0 = Debug|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Release|x64.ActiveCfg = Release|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Release|x64.Build.0 = Release|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Release|x86.ActiveCfg = Release|Any CPU
+		{38197109-8610-4D3F-92B9-16D48DF94D7C}.Release|x86.Build.0 = Release|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x64.Build.0 = Debug|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x64.ActiveCfg = Release|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x64.Build.0 = Release|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
author	Roy Ben-Shabat <Roy@Twine-s.com>	2017-11-27 20:35:08 +0200
committer	Roy Ben-Shabat <Roy@Twine-s.com>	2017-11-27 20:35:08 +0200
commit	7060dc80c707fc0441ff69fe4f899107cb3f6fc1 (patch)
tree	a72e2cf1be9fcce77e27446d93501bfc9b452265 /Software/Visual_Studio
parent	d1038a08bdf51b1310be4ef00ebe9e21b0e12f81 (diff)
download	Tango-7060dc80c707fc0441ff69fe4f899107cb3f6fc1.tar.gz Tango-7060dc80c707fc0441ff69fe4f899107cb3f6fc1.zip