Moved ExtendedObject & RelayCommand to Core.

CodeGeneration EntityCodeFile working + cycle reference!

67 files changed, 5527 insertions, 43 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
new file mode 100644
index 000000000..a6512dbee
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    public class EntityCodeFile : Class
+    {
+        public String TableName { get; set; }
+
+        public List<EntityCodeFileField> Fields { get; set; }
+
+        public EntityCodeFile(String name) : base(name)
+        {
+            Fields = new List<EntityCodeFileField>();
+        }
+    }
+
+    public class EntityCodeFileField
+    {
+        public String Name { get; set; }
+        public String FieldName { get; set; }
+        public String Type { get; set; }
+        public String Description { get; set; }
+        public bool Construct { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/FilterGLCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/FilterGLCodeFile.cs
deleted file mode 100644
index f560711d0..000000000
--- a/Software/Visual_Studio/Tango.CodeGeneration/FilterGLCodeFile.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.CodeGeneration
-{
-    public class FilterGLCodeFile : Class
-    {
-        public FilterGLCodeFile(String name)
-            : base(name)
-        {
-
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Helper.cs b/Software/Visual_Studio/Tango.CodeGeneration/Helper.cs
index 0ca012be9..2e0e449f1 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Helper.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Helper.cs
@@ -30,12 +30,14 @@ namespace Tango.CodeGeneration
         public static String GetTemplate(String name)
         {
             var assembly = Assembly.GetAssembly(typeof(Helper));
-            var resourceName = "CodeGenerator.Templates." + name + ".cshtml";
+            var resourceName = typeof(Helper).Namespace + ".Templates." + name + ".cshtml";
 
             using (Stream stream = assembly.GetManifestResourceStream(resourceName))
-            using (StreamReader reader = new StreamReader(stream))
             {
-                return reader.ReadToEnd();
+                using (StreamReader reader = new StreamReader(stream))
+                {
+                    return reader.ReadToEnd();
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index 989cfdf8d..e9f1fd586 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -47,6 +47,9 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -61,7 +64,7 @@
     <Compile Include="CodeFile.cs" />
     <Compile Include="CodeObject.cs" />
     <Compile Include="DpProperty.cs" />
-    <Compile Include="FilterGLCodeFile.cs" />
+    <Compile Include="EntityCodeFile.cs" />
     <Compile Include="Helper.cs" />
     <Compile Include="ICodeObject.cs" />
     <Compile Include="Method.cs" />
@@ -89,6 +92,7 @@
   <ItemGroup>
     <None Include="packages.config" />
     <EmbeddedResource Include="Templates\Namespace.cshtml" />
+    <EmbeddedResource Include="Templates\EntityCodeFile.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
new file mode 100644
index 000000000..301b9f58c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class @(Model.Name) : ObservableEntity<@(Model.TableName)>
+    {
+        @foreach (var prop in Model.Fields)
+        {
+    <div>
+        private @(prop.Type) _@(prop.Name.ToLower());
+        /// <summary>
+        /// Gets or sets the @(Model.Name.ToLower()) @(prop.Description).
+        /// </summary>
+        [EntityFieldName("@(prop.FieldName)")]
+        public @(prop.Type) @(prop.Name)
+        {
+            get { return _@(prop.Name.ToLower()); }
+            set { _@(prop.Name.ToLower()) = value; RaisePropertyChanged(nameof(@(prop.Name))); }
+        }
+    </div>
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
+        /// </summary>
+        public @(Model.Name)() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public @(Model.Name)(@(Model.TableName) entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+            @foreach (var prop in Model.Fields)
+            {
+                if (prop.Construct)
+                { 
+                <div>
+                    @(prop.Name) = new @(prop.Type)();
+                </div>
+                }
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/packages.config b/Software/Visual_Studio/Tango.CodeGeneration/packages.config
index 341d85750..6de4c3ea0 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/packages.config
+++ b/Software/Visual_Studio/Tango.CodeGeneration/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="RazorEngine" version="3.10.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SharedUI/Commands/RelayCommand.cs b/Software/Visual_Studio/Tango.Core/Commands/RelayCommand.cs
index 39fe78352..f57a8699f 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Commands/RelayCommand.cs
+++ b/Software/Visual_Studio/Tango.Core/Commands/RelayCommand.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Tango.SharedUI.Commands
+namespace Tango.Core.Commands
 {
     /// <summary>
     /// RelayCommand is a very easy-to-use implementation of ICommand. You can use a RelayCommand to expose viewmodel functionality as a command, and
diff --git a/Software/Visual_Studio/Tango.SharedUI/ExtendedObject.cs b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
index 9068fc883..84a73bf7c 100644
--- a/Software/Visual_Studio/Tango.SharedUI/ExtendedObject.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 
-namespace Tango.SharedUI
+namespace Tango.Core
 {
     /// <summary>
     /// Represents an extension to the standard core object with support for property and relay commands changed event.
diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index 80804f02e..2f8f6a1a6 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -52,7 +52,9 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="ConcurrentList.cs" />
+    <Compile Include="ExtendedObject.cs" />
     <Compile Include="ExtensionMethods\DateTimeExtensions.cs" />
     <Compile Include="ExtensionMethods\DependencyObjectExtensions.cs" />
     <Compile Include="ExtensionMethods\EnumExtensions.cs" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/IObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Remote/IObservableEntity.cs
new file mode 100644
index 000000000..88c5df99e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/IObservableEntity.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Remote.ObservableEntities;
+
+namespace Tango.DAL.Remote
+{
+    public interface IObservableEntity
+    {
+        [EntityFieldName("ID")]
+        Int32 ID { get; set; }
+
+        [EntityFieldName("GUID")]
+        String Guid { get; set; }
+
+        [EntityFieldName("LAST_UPDATED")]
+        DateTime LastUpdated { get; set; }
+
+        [EntityFieldName("DELETED")]
+        bool Deleted { get; set; }
+
+        void Save();
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Action.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Action.cs
new file mode 100644
index 000000000..17126bb82
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Action.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Action : ObservableEntity<ACTION>
+    {
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the action code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the action name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private String _description;
+        /// <summary>
+        /// Gets or sets the action description.
+        /// </summary>
+        [EntityFieldName("DESCRIPTION")]
+        public String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        private ObservableCollection<EventsAction> _eventsactions;
+        /// <summary>
+        /// Gets or sets the action events actions.
+        /// </summary>
+        [EntityFieldName("EVENTS_ACTIONS")]
+        public ObservableCollection<EventsAction> EventsActions
+        {
+            get 
+            {
+                return _eventsactions; 
+            }
+
+            set 
+            {
+                _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Action" /> class.
+        /// </summary>
+        public Action() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Action" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Action(ACTION entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            EventsActions = new ObservableCollection<EventsAction>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Address.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Address.cs
new file mode 100644
index 000000000..36f69bcf9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Address.cs
@@ -0,0 +1,213 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Address : ObservableEntity<ADDRESS>
+    {
+
+        private String _address1;
+        /// <summary>
+        /// Gets or sets the address address1.
+        /// </summary>
+        [EntityFieldName("ADDRESS1")]
+        public String Address1
+        {
+            get 
+            {
+                return _address1; 
+            }
+
+            set 
+            {
+                _address1 = value; RaisePropertyChanged(nameof(Address1)); 
+            }
+
+        }
+
+        private String _locality;
+        /// <summary>
+        /// Gets or sets the address locality.
+        /// </summary>
+        [EntityFieldName("LOCALITY")]
+        public String Locality
+        {
+            get 
+            {
+                return _locality; 
+            }
+
+            set 
+            {
+                _locality = value; RaisePropertyChanged(nameof(Locality)); 
+            }
+
+        }
+
+        private String _country;
+        /// <summary>
+        /// Gets or sets the address country.
+        /// </summary>
+        [EntityFieldName("COUNTRY")]
+        public String Country
+        {
+            get 
+            {
+                return _country; 
+            }
+
+            set 
+            {
+                _country = value; RaisePropertyChanged(nameof(Country)); 
+            }
+
+        }
+
+        private String _city;
+        /// <summary>
+        /// Gets or sets the address city.
+        /// </summary>
+        [EntityFieldName("CITY")]
+        public String City
+        {
+            get 
+            {
+                return _city; 
+            }
+
+            set 
+            {
+                _city = value; RaisePropertyChanged(nameof(City)); 
+            }
+
+        }
+
+        private String _state;
+        /// <summary>
+        /// Gets or sets the address state.
+        /// </summary>
+        [EntityFieldName("STATE")]
+        public String State
+        {
+            get 
+            {
+                return _state; 
+            }
+
+            set 
+            {
+                _state = value; RaisePropertyChanged(nameof(State)); 
+            }
+
+        }
+
+        private String _countrycode;
+        /// <summary>
+        /// Gets or sets the address country code.
+        /// </summary>
+        [EntityFieldName("COUNTRY_CODE")]
+        public String CountryCode
+        {
+            get 
+            {
+                return _countrycode; 
+            }
+
+            set 
+            {
+                _countrycode = value; RaisePropertyChanged(nameof(CountryCode)); 
+            }
+
+        }
+
+        private String _postalcode;
+        /// <summary>
+        /// Gets or sets the address postal code.
+        /// </summary>
+        [EntityFieldName("POSTAL_CODE")]
+        public String PostalCode
+        {
+            get 
+            {
+                return _postalcode; 
+            }
+
+            set 
+            {
+                _postalcode = value; RaisePropertyChanged(nameof(PostalCode)); 
+            }
+
+        }
+
+        private ObservableCollection<Organization> _organizations;
+        /// <summary>
+        /// Gets or sets the address organizations.
+        /// </summary>
+        [EntityFieldName("ORGANIZATIONS")]
+        public ObservableCollection<Organization> Organizations
+        {
+            get 
+            {
+                return _organizations; 
+            }
+
+            set 
+            {
+                _organizations = value; RaisePropertyChanged(nameof(Organizations)); 
+            }
+
+        }
+
+        private ObservableCollection<User> _users;
+        /// <summary>
+        /// Gets or sets the address users.
+        /// </summary>
+        [EntityFieldName("USERS")]
+        public ObservableCollection<User> Users
+        {
+            get 
+            {
+                return _users; 
+            }
+
+            set 
+            {
+                _users = value; RaisePropertyChanged(nameof(Users)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Address" /> class.
+        /// </summary>
+        public Address() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Address" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Address(ADDRESS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Organizations = new ObservableCollection<Organization>();
+
+            Users = new ObservableCollection<User>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationDisplayPanelVersion.cs
new file mode 100644
index 000000000..451474310
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationDisplayPanelVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class ApplicationDisplayPanelVersion : ObservableEntity<APPLICATION_DISPLAY_PANEL_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the applicationdisplaypanelversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationDisplayPanelVersion" /> class.
+        /// </summary>
+        public ApplicationDisplayPanelVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationDisplayPanelVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public ApplicationDisplayPanelVersion(APPLICATION_DISPLAY_PANEL_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationFirmwareVersion.cs
new file mode 100644
index 000000000..dfe97e702
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationFirmwareVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class ApplicationFirmwareVersion : ObservableEntity<APPLICATION_FIRMWARE_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the applicationfirmwareversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationFirmwareVersion" /> class.
+        /// </summary>
+        public ApplicationFirmwareVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationFirmwareVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public ApplicationFirmwareVersion(APPLICATION_FIRMWARE_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationOsVersion.cs
new file mode 100644
index 000000000..86ebb4d5b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationOsVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class ApplicationOsVersion : ObservableEntity<APPLICATION_OS_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the applicationosversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationOsVersion" /> class.
+        /// </summary>
+        public ApplicationOsVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationOsVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public ApplicationOsVersion(APPLICATION_OS_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationVersion.cs
new file mode 100644
index 000000000..d824d2b43
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ApplicationVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class ApplicationVersion : ObservableEntity<APPLICATION_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the applicationversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationVersion" /> class.
+        /// </summary>
+        public ApplicationVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApplicationVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public ApplicationVersion(APPLICATION_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Cartridge.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Cartridge.cs
new file mode 100644
index 000000000..607c26b3f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Cartridge.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Cartridge : ObservableEntity<CARTRIDGE>
+    {
+
+        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        /// <summary>
+        /// Gets or sets the cartridge configurations dispensers.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
+        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        {
+            get 
+            {
+                return _configurationsdispensers; 
+            }
+
+            set 
+            {
+                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cartridge" /> class.
+        /// </summary>
+        public Cartridge() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cartridge" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Cartridge(CARTRIDGE entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Configuration.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Configuration.cs
new file mode 100644
index 000000000..bd35e24f7
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Configuration.cs
@@ -0,0 +1,400 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Configuration : ObservableEntity<CONFIGURATION>
+    {
+
+        private DateTime _creationdate;
+        /// <summary>
+        /// Gets or sets the configuration creation date.
+        /// </summary>
+        [EntityFieldName("CREATION_DATE")]
+        public DateTime CreationDate
+        {
+            get 
+            {
+                return _creationdate; 
+            }
+
+            set 
+            {
+                _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); 
+            }
+
+        }
+
+        private String _applicationversionguid;
+        /// <summary>
+        /// Gets or sets the configuration application version guid.
+        /// </summary>
+        [EntityFieldName("APPLICATION_VERSION_GUID")]
+        public String ApplicationVersionGuid
+        {
+            get 
+            {
+                return _applicationversionguid; 
+            }
+
+            set 
+            {
+                _applicationversionguid = value; RaisePropertyChanged(nameof(ApplicationVersionGuid)); 
+            }
+
+        }
+
+        private String _applicationosversionguid;
+        /// <summary>
+        /// Gets or sets the configuration application os version guid.
+        /// </summary>
+        [EntityFieldName("APPLICATION_OS_VERSION_GUID")]
+        public String ApplicationOsVersionGuid
+        {
+            get 
+            {
+                return _applicationosversionguid; 
+            }
+
+            set 
+            {
+                _applicationosversionguid = value; RaisePropertyChanged(nameof(ApplicationOsVersionGuid)); 
+            }
+
+        }
+
+        private String _applicationfirmwareversionguid;
+        /// <summary>
+        /// Gets or sets the configuration application firmware version guid.
+        /// </summary>
+        [EntityFieldName("APPLICATION_FIRMWARE_VERSION_GUID")]
+        public String ApplicationFirmwareVersionGuid
+        {
+            get 
+            {
+                return _applicationfirmwareversionguid; 
+            }
+
+            set 
+            {
+                _applicationfirmwareversionguid = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersionGuid)); 
+            }
+
+        }
+
+        private String _applicationdisplaypanelversionguid;
+        /// <summary>
+        /// Gets or sets the configuration application display panel version guid.
+        /// </summary>
+        [EntityFieldName("APPLICATION_DISPLAY_PANEL_VERSION_GUID")]
+        public String ApplicationDisplayPanelVersionGuid
+        {
+            get 
+            {
+                return _applicationdisplaypanelversionguid; 
+            }
+
+            set 
+            {
+                _applicationdisplaypanelversionguid = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionGuid)); 
+            }
+
+        }
+
+        private String _embeddedfirmwareversionguid;
+        /// <summary>
+        /// Gets or sets the configuration embedded firmware version guid.
+        /// </summary>
+        [EntityFieldName("EMBEDDED_FIRMWARE_VERSION_GUID")]
+        public String EmbeddedFirmwareVersionGuid
+        {
+            get 
+            {
+                return _embeddedfirmwareversionguid; 
+            }
+
+            set 
+            {
+                _embeddedfirmwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersionGuid)); 
+            }
+
+        }
+
+        private String _embeddedsoftwareversionguid;
+        /// <summary>
+        /// Gets or sets the configuration embedded software version guid.
+        /// </summary>
+        [EntityFieldName("EMBEDDED_SOFTWARE_VERSION_GUID")]
+        public String EmbeddedSoftwareVersionGuid
+        {
+            get 
+            {
+                return _embeddedsoftwareversionguid; 
+            }
+
+            set 
+            {
+                _embeddedsoftwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersionGuid)); 
+            }
+
+        }
+
+        private String _hardwareversionguid;
+        /// <summary>
+        /// Gets or sets the configuration hardware version guid.
+        /// </summary>
+        [EntityFieldName("HARDWARE_VERSION_GUID")]
+        public String HardwareVersionGuid
+        {
+            get 
+            {
+                return _hardwareversionguid; 
+            }
+
+            set 
+            {
+                _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); 
+            }
+
+        }
+
+        private ApplicationDisplayPanelVersion _applicationdisplaypanelversions;
+        /// <summary>
+        /// Gets or sets the configuration application display panel versions.
+        /// </summary>
+        [EntityFieldName("APPLICATION_DISPLAY_PANEL_VERSIONS")]
+        public ApplicationDisplayPanelVersion ApplicationDisplayPanelVersions
+        {
+            get 
+            {
+                return _applicationdisplaypanelversions; 
+            }
+
+            set 
+            {
+                _applicationdisplaypanelversions = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersions)); 
+            }
+
+        }
+
+        private ApplicationFirmwareVersion _applicationfirmwareversions;
+        /// <summary>
+        /// Gets or sets the configuration application firmware versions.
+        /// </summary>
+        [EntityFieldName("APPLICATION_FIRMWARE_VERSIONS")]
+        public ApplicationFirmwareVersion ApplicationFirmwareVersions
+        {
+            get 
+            {
+                return _applicationfirmwareversions; 
+            }
+
+            set 
+            {
+                _applicationfirmwareversions = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersions)); 
+            }
+
+        }
+
+        private ApplicationOsVersion _applicationosversions;
+        /// <summary>
+        /// Gets or sets the configuration application os versions.
+        /// </summary>
+        [EntityFieldName("APPLICATION_OS_VERSIONS")]
+        public ApplicationOsVersion ApplicationOsVersions
+        {
+            get 
+            {
+                return _applicationosversions; 
+            }
+
+            set 
+            {
+                _applicationosversions = value; RaisePropertyChanged(nameof(ApplicationOsVersions)); 
+            }
+
+        }
+
+        private ApplicationVersion _applicationversions;
+        /// <summary>
+        /// Gets or sets the configuration application versions.
+        /// </summary>
+        [EntityFieldName("APPLICATION_VERSIONS")]
+        public ApplicationVersion ApplicationVersions
+        {
+            get 
+            {
+                return _applicationversions; 
+            }
+
+            set 
+            {
+                _applicationversions = value; RaisePropertyChanged(nameof(ApplicationVersions)); 
+            }
+
+        }
+
+        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        /// <summary>
+        /// Gets or sets the configuration configurations dispensers.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
+        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        {
+            get 
+            {
+                return _configurationsdispensers; 
+            }
+
+            set 
+            {
+                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+            }
+
+        }
+
+        private EmbeddedFirmwareVersion _embeddedfirmwareversions;
+        /// <summary>
+        /// Gets or sets the configuration embedded firmware versions.
+        /// </summary>
+        [EntityFieldName("EMBEDDED_FIRMWARE_VERSIONS")]
+        public EmbeddedFirmwareVersion EmbeddedFirmwareVersions
+        {
+            get 
+            {
+                return _embeddedfirmwareversions; 
+            }
+
+            set 
+            {
+                _embeddedfirmwareversions = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersions)); 
+            }
+
+        }
+
+        private EmbeddedSoftwareVersion _embeddedsoftwareversions;
+        /// <summary>
+        /// Gets or sets the configuration embedded software versions.
+        /// </summary>
+        [EntityFieldName("EMBEDDED_SOFTWARE_VERSIONS")]
+        public EmbeddedSoftwareVersion EmbeddedSoftwareVersions
+        {
+            get 
+            {
+                return _embeddedsoftwareversions; 
+            }
+
+            set 
+            {
+                _embeddedsoftwareversions = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersions)); 
+            }
+
+        }
+
+        private HardwareVersion _hardwareversions;
+        /// <summary>
+        /// Gets or sets the configuration hardware versions.
+        /// </summary>
+        [EntityFieldName("HARDWARE_VERSIONS")]
+        public HardwareVersion HardwareVersions
+        {
+            get 
+            {
+                return _hardwareversions; 
+            }
+
+            set 
+            {
+                _hardwareversions = value; RaisePropertyChanged(nameof(HardwareVersions)); 
+            }
+
+        }
+
+        private ObservableCollection<MachineVersionsConfiguration> _machineversionsconfigurations;
+        /// <summary>
+        /// Gets or sets the configuration machine versions configurations.
+        /// </summary>
+        [EntityFieldName("MACHINE_VERSIONS_CONFIGURATIONS")]
+        public ObservableCollection<MachineVersionsConfiguration> MachineVersionsConfigurations
+        {
+            get 
+            {
+                return _machineversionsconfigurations; 
+            }
+
+            set 
+            {
+                _machineversionsconfigurations = value; RaisePropertyChanged(nameof(MachineVersionsConfigurations)); 
+            }
+
+        }
+
+        private ObservableCollection<MachinesConfiguration> _machinesconfigurations;
+        /// <summary>
+        /// Gets or sets the configuration machines configurations.
+        /// </summary>
+        [EntityFieldName("MACHINES_CONFIGURATIONS")]
+        public ObservableCollection<MachinesConfiguration> MachinesConfigurations
+        {
+            get 
+            {
+                return _machinesconfigurations; 
+            }
+
+            set 
+            {
+                _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Configuration" /> class.
+        /// </summary>
+        public Configuration() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Configuration" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Configuration(CONFIGURATION entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            ApplicationDisplayPanelVersions = new ApplicationDisplayPanelVersion();
+
+            ApplicationFirmwareVersions = new ApplicationFirmwareVersion();
+
+            ApplicationOsVersions = new ApplicationOsVersion();
+
+            ApplicationVersions = new ApplicationVersion();
+
+            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+
+            EmbeddedFirmwareVersions = new EmbeddedFirmwareVersion();
+
+            EmbeddedSoftwareVersions = new EmbeddedSoftwareVersion();
+
+            HardwareVersions = new HardwareVersion();
+
+            MachineVersionsConfigurations = new ObservableCollection<MachineVersionsConfiguration>();
+
+            MachinesConfigurations = new ObservableCollection<MachinesConfiguration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ConfigurationsDispenser.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ConfigurationsDispenser.cs
new file mode 100644
index 000000000..01bed7444
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/ConfigurationsDispenser.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class ConfigurationsDispenser : ObservableEntity<CONFIGURATIONS_DISPENSERS>
+    {
+
+        private String _configurationguid;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser configuration guid.
+        /// </summary>
+        [EntityFieldName("CONFIGURATION_GUID")]
+        public String ConfigurationGuid
+        {
+            get 
+            {
+                return _configurationguid; 
+            }
+
+            set 
+            {
+                _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); 
+            }
+
+        }
+
+        private String _dispenserguid;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser dispenser guid.
+        /// </summary>
+        [EntityFieldName("DISPENSER_GUID")]
+        public String DispenserGuid
+        {
+            get 
+            {
+                return _dispenserguid; 
+            }
+
+            set 
+            {
+                _dispenserguid = value; RaisePropertyChanged(nameof(DispenserGuid)); 
+            }
+
+        }
+
+        private String _liquidguid;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser liquid guid.
+        /// </summary>
+        [EntityFieldName("LIQUID_GUID")]
+        public String LiquidGuid
+        {
+            get 
+            {
+                return _liquidguid; 
+            }
+
+            set 
+            {
+                _liquidguid = value; RaisePropertyChanged(nameof(LiquidGuid)); 
+            }
+
+        }
+
+        private String _cartridgeguid;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser cartridge guid.
+        /// </summary>
+        [EntityFieldName("CARTRIDGE_GUID")]
+        public String CartridgeGuid
+        {
+            get 
+            {
+                return _cartridgeguid; 
+            }
+
+            set 
+            {
+                _cartridgeguid = value; RaisePropertyChanged(nameof(CartridgeGuid)); 
+            }
+
+        }
+
+        private Cartridge _cartridge;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser cartridge.
+        /// </summary>
+        [EntityFieldName("CARTRIDGE")]
+        public Cartridge Cartridge
+        {
+            get 
+            {
+                return _cartridge; 
+            }
+
+            set 
+            {
+                _cartridge = value; RaisePropertyChanged(nameof(Cartridge)); 
+            }
+
+        }
+
+        private Configuration _configuration;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser configuration.
+        /// </summary>
+        [EntityFieldName("CONFIGURATION")]
+        public Configuration Configuration
+        {
+            get 
+            {
+                return _configuration; 
+            }
+
+            set 
+            {
+                _configuration = value; RaisePropertyChanged(nameof(Configuration)); 
+            }
+
+        }
+
+        private Dispenser _dispenser;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser dispenser.
+        /// </summary>
+        [EntityFieldName("DISPENSER")]
+        public Dispenser Dispenser
+        {
+            get 
+            {
+                return _dispenser; 
+            }
+
+            set 
+            {
+                _dispenser = value; RaisePropertyChanged(nameof(Dispenser)); 
+            }
+
+        }
+
+        private Liquid _liquid;
+        /// <summary>
+        /// Gets or sets the configurationsdispenser liquid.
+        /// </summary>
+        [EntityFieldName("LIQUID")]
+        public Liquid Liquid
+        {
+            get 
+            {
+                return _liquid; 
+            }
+
+            set 
+            {
+                _liquid = value; RaisePropertyChanged(nameof(Liquid)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationsDispenser" /> class.
+        /// </summary>
+        public ConfigurationsDispenser() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationsDispenser" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public ConfigurationsDispenser(CONFIGURATIONS_DISPENSERS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Cartridge = new Cartridge();
+
+            Configuration = new Configuration();
+
+            Dispenser = new Dispenser();
+
+            Liquid = new Liquid();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Contact.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Contact.cs
new file mode 100644
index 000000000..aa93cff44
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Contact.cs
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Contact : ObservableEntity<CONTACT>
+    {
+
+        private String _firstname;
+        /// <summary>
+        /// Gets or sets the contact first name.
+        /// </summary>
+        [EntityFieldName("FIRST_NAME")]
+        public String FirstName
+        {
+            get 
+            {
+                return _firstname; 
+            }
+
+            set 
+            {
+                _firstname = value; RaisePropertyChanged(nameof(FirstName)); 
+            }
+
+        }
+
+        private String _lastname;
+        /// <summary>
+        /// Gets or sets the contact last name.
+        /// </summary>
+        [EntityFieldName("LAST_NAME")]
+        public String LastName
+        {
+            get 
+            {
+                return _lastname; 
+            }
+
+            set 
+            {
+                _lastname = value; RaisePropertyChanged(nameof(LastName)); 
+            }
+
+        }
+
+        private String _fullname;
+        /// <summary>
+        /// Gets or sets the contact full name.
+        /// </summary>
+        [EntityFieldName("FULL_NAME")]
+        public String FullName
+        {
+            get 
+            {
+                return _fullname; 
+            }
+
+            set 
+            {
+                _fullname = value; RaisePropertyChanged(nameof(FullName)); 
+            }
+
+        }
+
+        private String _email;
+        /// <summary>
+        /// Gets or sets the contact email.
+        /// </summary>
+        [EntityFieldName("EMAIL")]
+        public String Email
+        {
+            get 
+            {
+                return _email; 
+            }
+
+            set 
+            {
+                _email = value; RaisePropertyChanged(nameof(Email)); 
+            }
+
+        }
+
+        private String _phonenumber;
+        /// <summary>
+        /// Gets or sets the contact phone number.
+        /// </summary>
+        [EntityFieldName("PHONE_NUMBER")]
+        public String PhoneNumber
+        {
+            get 
+            {
+                return _phonenumber; 
+            }
+
+            set 
+            {
+                _phonenumber = value; RaisePropertyChanged(nameof(PhoneNumber)); 
+            }
+
+        }
+
+        private String _fax;
+        /// <summary>
+        /// Gets or sets the contact fax.
+        /// </summary>
+        [EntityFieldName("FAX")]
+        public String Fax
+        {
+            get 
+            {
+                return _fax; 
+            }
+
+            set 
+            {
+                _fax = value; RaisePropertyChanged(nameof(Fax)); 
+            }
+
+        }
+
+        private ObservableCollection<Organization> _organizations;
+        /// <summary>
+        /// Gets or sets the contact organizations.
+        /// </summary>
+        [EntityFieldName("ORGANIZATIONS")]
+        public ObservableCollection<Organization> Organizations
+        {
+            get 
+            {
+                return _organizations; 
+            }
+
+            set 
+            {
+                _organizations = value; RaisePropertyChanged(nameof(Organizations)); 
+            }
+
+        }
+
+        private ObservableCollection<User> _users;
+        /// <summary>
+        /// Gets or sets the contact users.
+        /// </summary>
+        [EntityFieldName("USERS")]
+        public ObservableCollection<User> Users
+        {
+            get 
+            {
+                return _users; 
+            }
+
+            set 
+            {
+                _users = value; RaisePropertyChanged(nameof(Users)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Contact" /> class.
+        /// </summary>
+        public Contact() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Contact" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Contact(CONTACT entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Organizations = new ObservableCollection<Organization>();
+
+            Users = new ObservableCollection<User>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Dispenser.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Dispenser.cs
new file mode 100644
index 000000000..64cd93106
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Dispenser.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Dispenser : ObservableEntity<DISPENSER>
+    {
+
+        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        /// <summary>
+        /// Gets or sets the dispenser configurations dispensers.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
+        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        {
+            get 
+            {
+                return _configurationsdispensers; 
+            }
+
+            set 
+            {
+                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Dispenser" /> class.
+        /// </summary>
+        public Dispenser() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Dispenser" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Dispenser(DISPENSER entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedFirmwareVersion.cs
new file mode 100644
index 000000000..4da78dabb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedFirmwareVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class EmbeddedFirmwareVersion : ObservableEntity<EMBEDDED_FIRMWARE_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the embeddedfirmwareversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmbeddedFirmwareVersion" /> class.
+        /// </summary>
+        public EmbeddedFirmwareVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmbeddedFirmwareVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public EmbeddedFirmwareVersion(EMBEDDED_FIRMWARE_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedSoftwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedSoftwareVersion.cs
new file mode 100644
index 000000000..c1e43c886
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EmbeddedSoftwareVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class EmbeddedSoftwareVersion : ObservableEntity<EMBEDDED_SOFTWARE_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the embeddedsoftwareversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmbeddedSoftwareVersion" /> class.
+        /// </summary>
+        public EmbeddedSoftwareVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmbeddedSoftwareVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public EmbeddedSoftwareVersion(EMBEDDED_SOFTWARE_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Event.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Event.cs
new file mode 100644
index 000000000..d2dbc2860
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Event.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Event : ObservableEntity<EVENT>
+    {
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the event code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the event name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private String _description;
+        /// <summary>
+        /// Gets or sets the event description.
+        /// </summary>
+        [EntityFieldName("DESCRIPTION")]
+        public String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        private ObservableCollection<EventsAction> _eventsactions;
+        /// <summary>
+        /// Gets or sets the event events actions.
+        /// </summary>
+        [EntityFieldName("EVENTS_ACTIONS")]
+        public ObservableCollection<EventsAction> EventsActions
+        {
+            get 
+            {
+                return _eventsactions; 
+            }
+
+            set 
+            {
+                _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); 
+            }
+
+        }
+
+        private ObservableCollection<MachinesEvent> _machinesevents;
+        /// <summary>
+        /// Gets or sets the event machines events.
+        /// </summary>
+        [EntityFieldName("MACHINES_EVENTS")]
+        public ObservableCollection<MachinesEvent> MachinesEvents
+        {
+            get 
+            {
+                return _machinesevents; 
+            }
+
+            set 
+            {
+                _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Event" /> class.
+        /// </summary>
+        public Event() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Event" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Event(EVENT entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            EventsActions = new ObservableCollection<EventsAction>();
+
+            MachinesEvents = new ObservableCollection<MachinesEvent>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EventsAction.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EventsAction.cs
new file mode 100644
index 000000000..697a9eacb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/EventsAction.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class EventsAction : ObservableEntity<EVENTS_ACTIONS>
+    {
+
+        private String _eventguid;
+        /// <summary>
+        /// Gets or sets the eventsaction event guid.
+        /// </summary>
+        [EntityFieldName("EVENT_GUID")]
+        public String EventGuid
+        {
+            get 
+            {
+                return _eventguid; 
+            }
+
+            set 
+            {
+                _eventguid = value; RaisePropertyChanged(nameof(EventGuid)); 
+            }
+
+        }
+
+        private String _actionguid;
+        /// <summary>
+        /// Gets or sets the eventsaction action guid.
+        /// </summary>
+        [EntityFieldName("ACTION_GUID")]
+        public String ActionGuid
+        {
+            get 
+            {
+                return _actionguid; 
+            }
+
+            set 
+            {
+                _actionguid = value; RaisePropertyChanged(nameof(ActionGuid)); 
+            }
+
+        }
+
+        private Action _action;
+        /// <summary>
+        /// Gets or sets the eventsaction action.
+        /// </summary>
+        [EntityFieldName("ACTION")]
+        public Action Action
+        {
+            get 
+            {
+                return _action; 
+            }
+
+            set 
+            {
+                _action = value; RaisePropertyChanged(nameof(Action)); 
+            }
+
+        }
+
+        private Event _event;
+        /// <summary>
+        /// Gets or sets the eventsaction event.
+        /// </summary>
+        [EntityFieldName("EVENT")]
+        public Event Event
+        {
+            get 
+            {
+                return _event; 
+            }
+
+            set 
+            {
+                _event = value; RaisePropertyChanged(nameof(Event)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventsAction" /> class.
+        /// </summary>
+        public EventsAction() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventsAction" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public EventsAction(EVENTS_ACTIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Action = new Action();
+
+            Event = new Event();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberShape.cs
new file mode 100644
index 000000000..9388e1a0f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberShape.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class FiberShape : ObservableEntity<FIBER_SHAPES>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the fibershape name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the fibershape code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the fibershape rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FiberShape" /> class.
+        /// </summary>
+        public FiberShape() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FiberShape" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public FiberShape(FIBER_SHAPES entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberSynthesi.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberSynthesi.cs
new file mode 100644
index 000000000..ac9c4dd5b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/FiberSynthesi.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class FiberSynthesi : ObservableEntity<FIBER_SYNTHESIS>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the fibersynthesi name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the fibersynthesi code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the fibersynthesi rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FiberSynthesi" /> class.
+        /// </summary>
+        public FiberSynthesi() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FiberSynthesi" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public FiberSynthesi(FIBER_SYNTHESIS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/HardwareVersion.cs
new file mode 100644
index 000000000..fb2bac943
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/HardwareVersion.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class HardwareVersion : ObservableEntity<HARDWARE_VERSIONS>
+    {
+
+        private ObservableCollection<Configuration> _configurations;
+        /// <summary>
+        /// Gets or sets the hardwareversion configurations.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS")]
+        public ObservableCollection<Configuration> Configurations
+        {
+            get 
+            {
+                return _configurations; 
+            }
+
+            set 
+            {
+                _configurations = value; RaisePropertyChanged(nameof(Configurations)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HardwareVersion" /> class.
+        /// </summary>
+        public HardwareVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HardwareVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public HardwareVersion(HARDWARE_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configurations = new ObservableCollection<Configuration>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LinearMassDensityUnit.cs
new file mode 100644
index 000000000..fce4a5795
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LinearMassDensityUnit.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class LinearMassDensityUnit : ObservableEntity<LINEAR_MASS_DENSITY_UNITS>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the linearmassdensityunit name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the linearmassdensityunit code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the linearmassdensityunit rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearMassDensityUnit" /> class.
+        /// </summary>
+        public LinearMassDensityUnit() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearMassDensityUnit" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public LinearMassDensityUnit(LINEAR_MASS_DENSITY_UNITS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Liquid.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Liquid.cs
new file mode 100644
index 000000000..820315615
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Liquid.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Liquid : ObservableEntity<LIQUID>
+    {
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the liquid code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the liquid name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Double _version;
+        /// <summary>
+        /// Gets or sets the liquid version.
+        /// </summary>
+        [EntityFieldName("VERSION")]
+        public Double Version
+        {
+            get 
+            {
+                return _version; 
+            }
+
+            set 
+            {
+                _version = value; RaisePropertyChanged(nameof(Version)); 
+            }
+
+        }
+
+        private ObservableCollection<ConfigurationsDispenser> _configurationsdispensers;
+        /// <summary>
+        /// Gets or sets the liquid configurations dispensers.
+        /// </summary>
+        [EntityFieldName("CONFIGURATIONS_DISPENSERS")]
+        public ObservableCollection<ConfigurationsDispenser> ConfigurationsDispensers
+        {
+            get 
+            {
+                return _configurationsdispensers; 
+            }
+
+            set 
+            {
+                _configurationsdispensers = value; RaisePropertyChanged(nameof(ConfigurationsDispensers)); 
+            }
+
+        }
+
+        private ObservableCollection<LiquidsRml> _liquidsrmls;
+        /// <summary>
+        /// Gets or sets the liquid liquids rmls.
+        /// </summary>
+        [EntityFieldName("LIQUIDS_RMLS")]
+        public ObservableCollection<LiquidsRml> LiquidsRmls
+        {
+            get 
+            {
+                return _liquidsrmls; 
+            }
+
+            set 
+            {
+                _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Liquid" /> class.
+        /// </summary>
+        public Liquid() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Liquid" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Liquid(LIQUID entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            ConfigurationsDispensers = new ObservableCollection<ConfigurationsDispenser>();
+
+            LiquidsRmls = new ObservableCollection<LiquidsRml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LiquidsRml.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LiquidsRml.cs
new file mode 100644
index 000000000..f99c1bc7a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/LiquidsRml.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class LiquidsRml : ObservableEntity<LIQUIDS_RMLS>
+    {
+
+        private String _liquidguid;
+        /// <summary>
+        /// Gets or sets the liquidsrml liquid guid.
+        /// </summary>
+        [EntityFieldName("LIQUID_GUID")]
+        public String LiquidGuid
+        {
+            get 
+            {
+                return _liquidguid; 
+            }
+
+            set 
+            {
+                _liquidguid = value; RaisePropertyChanged(nameof(LiquidGuid)); 
+            }
+
+        }
+
+        private String _rmlguid;
+        /// <summary>
+        /// Gets or sets the liquidsrml rml guid.
+        /// </summary>
+        [EntityFieldName("RML_GUID")]
+        public String RmlGuid
+        {
+            get 
+            {
+                return _rmlguid; 
+            }
+
+            set 
+            {
+                _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); 
+            }
+
+        }
+
+        private Liquid _liquid;
+        /// <summary>
+        /// Gets or sets the liquidsrml liquid.
+        /// </summary>
+        [EntityFieldName("LIQUID")]
+        public Liquid Liquid
+        {
+            get 
+            {
+                return _liquid; 
+            }
+
+            set 
+            {
+                _liquid = value; RaisePropertyChanged(nameof(Liquid)); 
+            }
+
+        }
+
+        private Rml _rml;
+        /// <summary>
+        /// Gets or sets the liquidsrml rml.
+        /// </summary>
+        [EntityFieldName("RML")]
+        public Rml Rml
+        {
+            get 
+            {
+                return _rml; 
+            }
+
+            set 
+            {
+                _rml = value; RaisePropertyChanged(nameof(Rml)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LiquidsRml" /> class.
+        /// </summary>
+        public LiquidsRml() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LiquidsRml" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public LiquidsRml(LIQUIDS_RMLS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Liquid = new Liquid();
+
+            Rml = new Rml();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Machine.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Machine.cs
new file mode 100644
index 000000000..db3b2e693
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Machine.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Machine : ObservableEntity<MACHINE>
+    {
+
+        private String _serialnumber;
+        /// <summary>
+        /// Gets or sets the machine serial number.
+        /// </summary>
+        [EntityFieldName("SERIAL_NUMBER")]
+        public String SerialNumber
+        {
+            get 
+            {
+                return _serialnumber; 
+            }
+
+            set 
+            {
+                _serialnumber = value; RaisePropertyChanged(nameof(SerialNumber)); 
+            }
+
+        }
+
+        private DateTime _productiondate;
+        /// <summary>
+        /// Gets or sets the machine production date.
+        /// </summary>
+        [EntityFieldName("PRODUCTION_DATE")]
+        public DateTime ProductionDate
+        {
+            get 
+            {
+                return _productiondate; 
+            }
+
+            set 
+            {
+                _productiondate = value; RaisePropertyChanged(nameof(ProductionDate)); 
+            }
+
+        }
+
+        private String _organizationguid;
+        /// <summary>
+        /// Gets or sets the machine organization guid.
+        /// </summary>
+        [EntityFieldName("ORGANIZATION_GUID")]
+        public String OrganizationGuid
+        {
+            get 
+            {
+                return _organizationguid; 
+            }
+
+            set 
+            {
+                _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); 
+            }
+
+        }
+
+        private String _machineversionguid;
+        /// <summary>
+        /// Gets or sets the machine machine version guid.
+        /// </summary>
+        [EntityFieldName("MACHINE_VERSION_GUID")]
+        public String MachineVersionGuid
+        {
+            get 
+            {
+                return _machineversionguid; 
+            }
+
+            set 
+            {
+                _machineversionguid = value; RaisePropertyChanged(nameof(MachineVersionGuid)); 
+            }
+
+        }
+
+        private MachineVersion _machineversions;
+        /// <summary>
+        /// Gets or sets the machine machine versions.
+        /// </summary>
+        [EntityFieldName("MACHINE_VERSIONS")]
+        public MachineVersion MachineVersions
+        {
+            get 
+            {
+                return _machineversions; 
+            }
+
+            set 
+            {
+                _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); 
+            }
+
+        }
+
+        private ObservableCollection<MachinesConfiguration> _machinesconfigurations;
+        /// <summary>
+        /// Gets or sets the machine machines configurations.
+        /// </summary>
+        [EntityFieldName("MACHINES_CONFIGURATIONS")]
+        public ObservableCollection<MachinesConfiguration> MachinesConfigurations
+        {
+            get 
+            {
+                return _machinesconfigurations; 
+            }
+
+            set 
+            {
+                _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); 
+            }
+
+        }
+
+        private ObservableCollection<MachinesEvent> _machinesevents;
+        /// <summary>
+        /// Gets or sets the machine machines events.
+        /// </summary>
+        [EntityFieldName("MACHINES_EVENTS")]
+        public ObservableCollection<MachinesEvent> MachinesEvents
+        {
+            get 
+            {
+                return _machinesevents; 
+            }
+
+            set 
+            {
+                _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); 
+            }
+
+        }
+
+        private Organization _organization;
+        /// <summary>
+        /// Gets or sets the machine organization.
+        /// </summary>
+        [EntityFieldName("ORGANIZATION")]
+        public Organization Organization
+        {
+            get 
+            {
+                return _organization; 
+            }
+
+            set 
+            {
+                _organization = value; RaisePropertyChanged(nameof(Organization)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Machine" /> class.
+        /// </summary>
+        public Machine() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Machine" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Machine(MACHINE entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            MachineVersions = new MachineVersion();
+
+            MachinesConfigurations = new ObservableCollection<MachinesConfiguration>();
+
+            MachinesEvents = new ObservableCollection<MachinesEvent>();
+
+            Organization = new Organization();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersion.cs
new file mode 100644
index 000000000..0efdcc78d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersion.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MachineVersion : ObservableEntity<MACHINE_VERSIONS>
+    {
+
+        private Double _version;
+        /// <summary>
+        /// Gets or sets the machineversion version.
+        /// </summary>
+        [EntityFieldName("VERSION")]
+        public Double Version
+        {
+            get 
+            {
+                return _version; 
+            }
+
+            set 
+            {
+                _version = value; RaisePropertyChanged(nameof(Version)); 
+            }
+
+        }
+
+        private ObservableCollection<MachineVersionsConfiguration> _machineversionsconfigurations;
+        /// <summary>
+        /// Gets or sets the machineversion machine versions configurations.
+        /// </summary>
+        [EntityFieldName("MACHINE_VERSIONS_CONFIGURATIONS")]
+        public ObservableCollection<MachineVersionsConfiguration> MachineVersionsConfigurations
+        {
+            get 
+            {
+                return _machineversionsconfigurations; 
+            }
+
+            set 
+            {
+                _machineversionsconfigurations = value; RaisePropertyChanged(nameof(MachineVersionsConfigurations)); 
+            }
+
+        }
+
+        private ObservableCollection<Machine> _machines;
+        /// <summary>
+        /// Gets or sets the machineversion machines.
+        /// </summary>
+        [EntityFieldName("MACHINES")]
+        public ObservableCollection<Machine> Machines
+        {
+            get 
+            {
+                return _machines; 
+            }
+
+            set 
+            {
+                _machines = value; RaisePropertyChanged(nameof(Machines)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineVersion" /> class.
+        /// </summary>
+        public MachineVersion() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineVersion" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MachineVersion(MACHINE_VERSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            MachineVersionsConfigurations = new ObservableCollection<MachineVersionsConfiguration>();
+
+            Machines = new ObservableCollection<Machine>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersionsConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersionsConfiguration.cs
new file mode 100644
index 000000000..a3fd5419e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachineVersionsConfiguration.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MachineVersionsConfiguration : ObservableEntity<MACHINE_VERSIONS_CONFIGURATIONS>
+    {
+
+        private String _machineversionguid;
+        /// <summary>
+        /// Gets or sets the machineversionsconfiguration machine version guid.
+        /// </summary>
+        [EntityFieldName("MACHINE_VERSION_GUID")]
+        public String MachineVersionGuid
+        {
+            get 
+            {
+                return _machineversionguid; 
+            }
+
+            set 
+            {
+                _machineversionguid = value; RaisePropertyChanged(nameof(MachineVersionGuid)); 
+            }
+
+        }
+
+        private String _configurationguid;
+        /// <summary>
+        /// Gets or sets the machineversionsconfiguration configuration guid.
+        /// </summary>
+        [EntityFieldName("CONFIGURATION_GUID")]
+        public String ConfigurationGuid
+        {
+            get 
+            {
+                return _configurationguid; 
+            }
+
+            set 
+            {
+                _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); 
+            }
+
+        }
+
+        private Configuration _configuration;
+        /// <summary>
+        /// Gets or sets the machineversionsconfiguration configuration.
+        /// </summary>
+        [EntityFieldName("CONFIGURATION")]
+        public Configuration Configuration
+        {
+            get 
+            {
+                return _configuration; 
+            }
+
+            set 
+            {
+                _configuration = value; RaisePropertyChanged(nameof(Configuration)); 
+            }
+
+        }
+
+        private MachineVersion _machineversions;
+        /// <summary>
+        /// Gets or sets the machineversionsconfiguration machine versions.
+        /// </summary>
+        [EntityFieldName("MACHINE_VERSIONS")]
+        public MachineVersion MachineVersions
+        {
+            get 
+            {
+                return _machineversions; 
+            }
+
+            set 
+            {
+                _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineVersionsConfiguration" /> class.
+        /// </summary>
+        public MachineVersionsConfiguration() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineVersionsConfiguration" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MachineVersionsConfiguration(MACHINE_VERSIONS_CONFIGURATIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configuration = new Configuration();
+
+            MachineVersions = new MachineVersion();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesConfiguration.cs
new file mode 100644
index 000000000..2573c7780
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesConfiguration.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MachinesConfiguration : ObservableEntity<MACHINES_CONFIGURATIONS>
+    {
+
+        private String _machineguid;
+        /// <summary>
+        /// Gets or sets the machinesconfiguration machine guid.
+        /// </summary>
+        [EntityFieldName("MACHINE_GUID")]
+        public String MachineGuid
+        {
+            get 
+            {
+                return _machineguid; 
+            }
+
+            set 
+            {
+                _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); 
+            }
+
+        }
+
+        private String _configurationguid;
+        /// <summary>
+        /// Gets or sets the machinesconfiguration configuration guid.
+        /// </summary>
+        [EntityFieldName("CONFIGURATION_GUID")]
+        public String ConfigurationGuid
+        {
+            get 
+            {
+                return _configurationguid; 
+            }
+
+            set 
+            {
+                _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); 
+            }
+
+        }
+
+        private Configuration _configuration;
+        /// <summary>
+        /// Gets or sets the machinesconfiguration configuration.
+        /// </summary>
+        [EntityFieldName("CONFIGURATION")]
+        public Configuration Configuration
+        {
+            get 
+            {
+                return _configuration; 
+            }
+
+            set 
+            {
+                _configuration = value; RaisePropertyChanged(nameof(Configuration)); 
+            }
+
+        }
+
+        private Machine _machine;
+        /// <summary>
+        /// Gets or sets the machinesconfiguration machine.
+        /// </summary>
+        [EntityFieldName("MACHINE")]
+        public Machine Machine
+        {
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                _machine = value; RaisePropertyChanged(nameof(Machine)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachinesConfiguration" /> class.
+        /// </summary>
+        public MachinesConfiguration() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachinesConfiguration" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MachinesConfiguration(MACHINES_CONFIGURATIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Configuration = new Configuration();
+
+            Machine = new Machine();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesEvent.cs
new file mode 100644
index 000000000..5617754b9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MachinesEvent.cs
@@ -0,0 +1,196 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MachinesEvent : ObservableEntity<MACHINES_EVENTS>
+    {
+
+        private String _machineguid;
+        /// <summary>
+        /// Gets or sets the machinesevent machine guid.
+        /// </summary>
+        [EntityFieldName("MACHINE_GUID")]
+        public String MachineGuid
+        {
+            get 
+            {
+                return _machineguid; 
+            }
+
+            set 
+            {
+                _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); 
+            }
+
+        }
+
+        private String _eventguid;
+        /// <summary>
+        /// Gets or sets the machinesevent event guid.
+        /// </summary>
+        [EntityFieldName("EVENT_GUID")]
+        public String EventGuid
+        {
+            get 
+            {
+                return _eventguid; 
+            }
+
+            set 
+            {
+                _eventguid = value; RaisePropertyChanged(nameof(EventGuid)); 
+            }
+
+        }
+
+        private String _userguid;
+        /// <summary>
+        /// Gets or sets the machinesevent user guid.
+        /// </summary>
+        [EntityFieldName("USER_GUID")]
+        public String UserGuid
+        {
+            get 
+            {
+                return _userguid; 
+            }
+
+            set 
+            {
+                _userguid = value; RaisePropertyChanged(nameof(UserGuid)); 
+            }
+
+        }
+
+        private DateTime _datetime;
+        /// <summary>
+        /// Gets or sets the machinesevent date time.
+        /// </summary>
+        [EntityFieldName("DATE_TIME")]
+        public DateTime DateTime
+        {
+            get 
+            {
+                return _datetime; 
+            }
+
+            set 
+            {
+                _datetime = value; RaisePropertyChanged(nameof(DateTime)); 
+            }
+
+        }
+
+        private String _description;
+        /// <summary>
+        /// Gets or sets the machinesevent description.
+        /// </summary>
+        [EntityFieldName("DESCRIPTION")]
+        public String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        private Event _event;
+        /// <summary>
+        /// Gets or sets the machinesevent event.
+        /// </summary>
+        [EntityFieldName("EVENT")]
+        public Event Event
+        {
+            get 
+            {
+                return _event; 
+            }
+
+            set 
+            {
+                _event = value; RaisePropertyChanged(nameof(Event)); 
+            }
+
+        }
+
+        private Machine _machine;
+        /// <summary>
+        /// Gets or sets the machinesevent machine.
+        /// </summary>
+        [EntityFieldName("MACHINE")]
+        public Machine Machine
+        {
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                _machine = value; RaisePropertyChanged(nameof(Machine)); 
+            }
+
+        }
+
+        private User _user;
+        /// <summary>
+        /// Gets or sets the machinesevent user.
+        /// </summary>
+        [EntityFieldName("USER")]
+        public User User
+        {
+            get 
+            {
+                return _user; 
+            }
+
+            set 
+            {
+                _user = value; RaisePropertyChanged(nameof(User)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachinesEvent" /> class.
+        /// </summary>
+        public MachinesEvent() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachinesEvent" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MachinesEvent(MACHINES_EVENTS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Event = new Event();
+
+            Machine = new Machine();
+
+            User = new User();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaColor.cs
new file mode 100644
index 000000000..ccda3cd96
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaColor.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MediaColor : ObservableEntity<MEDIA_COLORS>
+    {
+
+        private Int32 _color;
+        /// <summary>
+        /// Gets or sets the mediacolor color.
+        /// </summary>
+        [EntityFieldName("COLOR")]
+        public Int32 Color
+        {
+            get 
+            {
+                return _color; 
+            }
+
+            set 
+            {
+                _color = value; RaisePropertyChanged(nameof(Color)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the mediacolor rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaColor" /> class.
+        /// </summary>
+        public MediaColor() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaColor" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MediaColor(MEDIA_COLORS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaCondition.cs
new file mode 100644
index 000000000..a87fe2368
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaCondition.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MediaCondition : ObservableEntity<MEDIA_CONDITIONS>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the mediacondition name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the mediacondition code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the mediacondition rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaCondition" /> class.
+        /// </summary>
+        public MediaCondition() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaCondition" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MediaCondition(MEDIA_CONDITIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaMaterial.cs
new file mode 100644
index 000000000..21287f56e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaMaterial.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MediaMaterial : ObservableEntity<MEDIA_MATERIALS>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the mediamaterial name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the mediamaterial code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the mediamaterial rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaMaterial" /> class.
+        /// </summary>
+        public MediaMaterial() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaMaterial" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MediaMaterial(MEDIA_MATERIALS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaPurpos.cs
new file mode 100644
index 000000000..39bd5f27e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/MediaPurpos.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class MediaPurpos : ObservableEntity<MEDIA_PURPOSES>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the mediapurpos name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the mediapurpos code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private ObservableCollection<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the mediapurpos rmls.
+        /// </summary>
+        [EntityFieldName("RMLS")]
+        public ObservableCollection<Rml> Rmls
+        {
+            get 
+            {
+                return _rmls; 
+            }
+
+            set 
+            {
+                _rmls = value; RaisePropertyChanged(nameof(Rmls)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaPurpos" /> class.
+        /// </summary>
+        public MediaPurpos() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaPurpos" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public MediaPurpos(MEDIA_PURPOSES entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Rmls = new ObservableCollection<Rml>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Organization.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Organization.cs
new file mode 100644
index 000000000..041ad549f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Organization.cs
@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Organization : ObservableEntity<ORGANIZATION>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the organization name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private String _contactguid;
+        /// <summary>
+        /// Gets or sets the organization contact guid.
+        /// </summary>
+        [EntityFieldName("CONTACT_GUID")]
+        public String ContactGuid
+        {
+            get 
+            {
+                return _contactguid; 
+            }
+
+            set 
+            {
+                _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); 
+            }
+
+        }
+
+        private String _addressguid;
+        /// <summary>
+        /// Gets or sets the organization address guid.
+        /// </summary>
+        [EntityFieldName("ADDRESS_GUID")]
+        public String AddressGuid
+        {
+            get 
+            {
+                return _addressguid; 
+            }
+
+            set 
+            {
+                _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); 
+            }
+
+        }
+
+        private Address _address;
+        /// <summary>
+        /// Gets or sets the organization address.
+        /// </summary>
+        [EntityFieldName("ADDRESS")]
+        public Address Address
+        {
+            get 
+            {
+                return _address; 
+            }
+
+            set 
+            {
+                _address = value; RaisePropertyChanged(nameof(Address)); 
+            }
+
+        }
+
+        private Contact _contact;
+        /// <summary>
+        /// Gets or sets the organization contact.
+        /// </summary>
+        [EntityFieldName("CONTACT")]
+        public Contact Contact
+        {
+            get 
+            {
+                return _contact; 
+            }
+
+            set 
+            {
+                _contact = value; RaisePropertyChanged(nameof(Contact)); 
+            }
+
+        }
+
+        private ObservableCollection<Machine> _machines;
+        /// <summary>
+        /// Gets or sets the organization machines.
+        /// </summary>
+        [EntityFieldName("MACHINES")]
+        public ObservableCollection<Machine> Machines
+        {
+            get 
+            {
+                return _machines; 
+            }
+
+            set 
+            {
+                _machines = value; RaisePropertyChanged(nameof(Machines)); 
+            }
+
+        }
+
+        private ObservableCollection<User> _users;
+        /// <summary>
+        /// Gets or sets the organization users.
+        /// </summary>
+        [EntityFieldName("USERS")]
+        public ObservableCollection<User> Users
+        {
+            get 
+            {
+                return _users; 
+            }
+
+            set 
+            {
+                _users = value; RaisePropertyChanged(nameof(Users)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Organization" /> class.
+        /// </summary>
+        public Organization() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Organization" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Organization(ORGANIZATION entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Address = new Address();
+
+            Contact = new Contact();
+
+            Machines = new ObservableCollection<Machine>();
+
+            Users = new ObservableCollection<User>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Permission.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Permission.cs
new file mode 100644
index 000000000..b29a373fd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Permission.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Permission : ObservableEntity<PERMISSION>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the permission name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private String _description;
+        /// <summary>
+        /// Gets or sets the permission description.
+        /// </summary>
+        [EntityFieldName("DESCRIPTION")]
+        public String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        private ObservableCollection<RolesPermission> _rolespermissions;
+        /// <summary>
+        /// Gets or sets the permission roles permissions.
+        /// </summary>
+        [EntityFieldName("ROLES_PERMISSIONS")]
+        public ObservableCollection<RolesPermission> RolesPermissions
+        {
+            get 
+            {
+                return _rolespermissions; 
+            }
+
+            set 
+            {
+                _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Permission" /> class.
+        /// </summary>
+        public Permission() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Permission" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Permission(PERMISSION entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            RolesPermissions = new ObservableCollection<RolesPermission>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Rml.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Rml.cs
new file mode 100644
index 000000000..7f9a4152c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Rml.cs
@@ -0,0 +1,548 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Rml : ObservableEntity<RML>
+    {
+
+        private String _manufacturer;
+        /// <summary>
+        /// Gets or sets the rml manufacturer.
+        /// </summary>
+        [EntityFieldName("MANUFACTURER")]
+        public String Manufacturer
+        {
+            get 
+            {
+                return _manufacturer; 
+            }
+
+            set 
+            {
+                _manufacturer = value; RaisePropertyChanged(nameof(Manufacturer)); 
+            }
+
+        }
+
+        private String _materialguid;
+        /// <summary>
+        /// Gets or sets the rml material guid.
+        /// </summary>
+        [EntityFieldName("MATERIAL_GUID")]
+        public String MaterialGuid
+        {
+            get 
+            {
+                return _materialguid; 
+            }
+
+            set 
+            {
+                _materialguid = value; RaisePropertyChanged(nameof(MaterialGuid)); 
+            }
+
+        }
+
+        private String _colorguid;
+        /// <summary>
+        /// Gets or sets the rml color guid.
+        /// </summary>
+        [EntityFieldName("COLOR_GUID")]
+        public String ColorGuid
+        {
+            get 
+            {
+                return _colorguid; 
+            }
+
+            set 
+            {
+                _colorguid = value; RaisePropertyChanged(nameof(ColorGuid)); 
+            }
+
+        }
+
+        private String _purposeguid;
+        /// <summary>
+        /// Gets or sets the rml purpose guid.
+        /// </summary>
+        [EntityFieldName("PURPOSE_GUID")]
+        public String PurposeGuid
+        {
+            get 
+            {
+                return _purposeguid; 
+            }
+
+            set 
+            {
+                _purposeguid = value; RaisePropertyChanged(nameof(PurposeGuid)); 
+            }
+
+        }
+
+        private String _conditionguid;
+        /// <summary>
+        /// Gets or sets the rml condition guid.
+        /// </summary>
+        [EntityFieldName("CONDITION_GUID")]
+        public String ConditionGuid
+        {
+            get 
+            {
+                return _conditionguid; 
+            }
+
+            set 
+            {
+                _conditionguid = value; RaisePropertyChanged(nameof(ConditionGuid)); 
+            }
+
+        }
+
+        private String _linearmassdensityunitguid;
+        /// <summary>
+        /// Gets or sets the rml linear mass density unit guid.
+        /// </summary>
+        [EntityFieldName("LINEAR_MASS_DENSITY_UNIT_GUID")]
+        public String LinearMassDensityUnitGuid
+        {
+            get 
+            {
+                return _linearmassdensityunitguid; 
+            }
+
+            set 
+            {
+                _linearmassdensityunitguid = value; RaisePropertyChanged(nameof(LinearMassDensityUnitGuid)); 
+            }
+
+        }
+
+        private String _fibershapeguid;
+        /// <summary>
+        /// Gets or sets the rml fiber shape guid.
+        /// </summary>
+        [EntityFieldName("FIBER_SHAPE_GUID")]
+        public String FiberShapeGuid
+        {
+            get 
+            {
+                return _fibershapeguid; 
+            }
+
+            set 
+            {
+                _fibershapeguid = value; RaisePropertyChanged(nameof(FiberShapeGuid)); 
+            }
+
+        }
+
+        private String _fibersynthesisguid;
+        /// <summary>
+        /// Gets or sets the rml fiber synthesis guid.
+        /// </summary>
+        [EntityFieldName("FIBER_SYNTHESIS_GUID")]
+        public String FiberSynthesisGuid
+        {
+            get 
+            {
+                return _fibersynthesisguid; 
+            }
+
+            set 
+            {
+                _fibersynthesisguid = value; RaisePropertyChanged(nameof(FiberSynthesisGuid)); 
+            }
+
+        }
+
+        private Double _fibersize;
+        /// <summary>
+        /// Gets or sets the rml fiber size.
+        /// </summary>
+        [EntityFieldName("FIBER_SIZE")]
+        public Double FiberSize
+        {
+            get 
+            {
+                return _fibersize; 
+            }
+
+            set 
+            {
+                _fibersize = value; RaisePropertyChanged(nameof(FiberSize)); 
+            }
+
+        }
+
+        private Int32 _numberoffibers;
+        /// <summary>
+        /// Gets or sets the rml number of fibers.
+        /// </summary>
+        [EntityFieldName("NUMBER_OF_FIBERS")]
+        public Int32 NumberOfFibers
+        {
+            get 
+            {
+                return _numberoffibers; 
+            }
+
+            set 
+            {
+                _numberoffibers = value; RaisePropertyChanged(nameof(NumberOfFibers)); 
+            }
+
+        }
+
+        private Int32 _pliesperfiber;
+        /// <summary>
+        /// Gets or sets the rml plies per fiber.
+        /// </summary>
+        [EntityFieldName("PLIES_PER_FIBER")]
+        public Int32 PliesPerFiber
+        {
+            get 
+            {
+                return _pliesperfiber; 
+            }
+
+            set 
+            {
+                _pliesperfiber = value; RaisePropertyChanged(nameof(PliesPerFiber)); 
+            }
+
+        }
+
+        private Int32 _pliesperthread;
+        /// <summary>
+        /// Gets or sets the rml plies per thread.
+        /// </summary>
+        [EntityFieldName("PLIES_PER_THREAD")]
+        public Int32 PliesPerThread
+        {
+            get 
+            {
+                return _pliesperthread; 
+            }
+
+            set 
+            {
+                _pliesperthread = value; RaisePropertyChanged(nameof(PliesPerThread)); 
+            }
+
+        }
+
+        private Boolean _twisted;
+        /// <summary>
+        /// Gets or sets the rml twisted.
+        /// </summary>
+        [EntityFieldName("TWISTED")]
+        public Boolean Twisted
+        {
+            get 
+            {
+                return _twisted; 
+            }
+
+            set 
+            {
+                _twisted = value; RaisePropertyChanged(nameof(Twisted)); 
+            }
+
+        }
+
+        private Boolean _airentanglement;
+        /// <summary>
+        /// Gets or sets the rml air entanglement.
+        /// </summary>
+        [EntityFieldName("AIR_ENTANGLEMENT")]
+        public Boolean AirEntanglement
+        {
+            get 
+            {
+                return _airentanglement; 
+            }
+
+            set 
+            {
+                _airentanglement = value; RaisePropertyChanged(nameof(AirEntanglement)); 
+            }
+
+        }
+
+        private Boolean _lubricant;
+        /// <summary>
+        /// Gets or sets the rml lubricant.
+        /// </summary>
+        [EntityFieldName("LUBRICANT")]
+        public Boolean Lubricant
+        {
+            get 
+            {
+                return _lubricant; 
+            }
+
+            set 
+            {
+                _lubricant = value; RaisePropertyChanged(nameof(Lubricant)); 
+            }
+
+        }
+
+        private Double _tensilestrength;
+        /// <summary>
+        /// Gets or sets the rml tensile strength.
+        /// </summary>
+        [EntityFieldName("TENSILE_STRENGTH")]
+        public Double TensileStrength
+        {
+            get 
+            {
+                return _tensilestrength; 
+            }
+
+            set 
+            {
+                _tensilestrength = value; RaisePropertyChanged(nameof(TensileStrength)); 
+            }
+
+        }
+
+        private Double _elongationatbreakpercentage;
+        /// <summary>
+        /// Gets or sets the rml elongation at break percentage.
+        /// </summary>
+        [EntityFieldName("ELONGATION_AT_BREAK_PERCENTAGE")]
+        public Double ElongationAtBreakPercentage
+        {
+            get 
+            {
+                return _elongationatbreakpercentage; 
+            }
+
+            set 
+            {
+                _elongationatbreakpercentage = value; RaisePropertyChanged(nameof(ElongationAtBreakPercentage)); 
+            }
+
+        }
+
+        private Double _estimatedthreaddiameter;
+        /// <summary>
+        /// Gets or sets the rml estimated thread diameter.
+        /// </summary>
+        [EntityFieldName("ESTIMATED_THREAD_DIAMETER")]
+        public Double EstimatedThreadDiameter
+        {
+            get 
+            {
+                return _estimatedthreaddiameter; 
+            }
+
+            set 
+            {
+                _estimatedthreaddiameter = value; RaisePropertyChanged(nameof(EstimatedThreadDiameter)); 
+            }
+
+        }
+
+        private FiberShape _fibershapes;
+        /// <summary>
+        /// Gets or sets the rml fiber shapes.
+        /// </summary>
+        [EntityFieldName("FIBER_SHAPES")]
+        public FiberShape FiberShapes
+        {
+            get 
+            {
+                return _fibershapes; 
+            }
+
+            set 
+            {
+                _fibershapes = value; RaisePropertyChanged(nameof(FiberShapes)); 
+            }
+
+        }
+
+        private FiberSynthesi _fibersynthesis;
+        /// <summary>
+        /// Gets or sets the rml fiber synthesis.
+        /// </summary>
+        [EntityFieldName("FIBER_SYNTHESIS")]
+        public FiberSynthesi FiberSynthesis
+        {
+            get 
+            {
+                return _fibersynthesis; 
+            }
+
+            set 
+            {
+                _fibersynthesis = value; RaisePropertyChanged(nameof(FiberSynthesis)); 
+            }
+
+        }
+
+        private LinearMassDensityUnit _linearmassdensityunits;
+        /// <summary>
+        /// Gets or sets the rml linear mass density units.
+        /// </summary>
+        [EntityFieldName("LINEAR_MASS_DENSITY_UNITS")]
+        public LinearMassDensityUnit LinearMassDensityUnits
+        {
+            get 
+            {
+                return _linearmassdensityunits; 
+            }
+
+            set 
+            {
+                _linearmassdensityunits = value; RaisePropertyChanged(nameof(LinearMassDensityUnits)); 
+            }
+
+        }
+
+        private ObservableCollection<LiquidsRml> _liquidsrmls;
+        /// <summary>
+        /// Gets or sets the rml liquids rmls.
+        /// </summary>
+        [EntityFieldName("LIQUIDS_RMLS")]
+        public ObservableCollection<LiquidsRml> LiquidsRmls
+        {
+            get 
+            {
+                return _liquidsrmls; 
+            }
+
+            set 
+            {
+                _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); 
+            }
+
+        }
+
+        private MediaColor _mediacolors;
+        /// <summary>
+        /// Gets or sets the rml media colors.
+        /// </summary>
+        [EntityFieldName("MEDIA_COLORS")]
+        public MediaColor MediaColors
+        {
+            get 
+            {
+                return _mediacolors; 
+            }
+
+            set 
+            {
+                _mediacolors = value; RaisePropertyChanged(nameof(MediaColors)); 
+            }
+
+        }
+
+        private MediaCondition _mediaconditions;
+        /// <summary>
+        /// Gets or sets the rml media conditions.
+        /// </summary>
+        [EntityFieldName("MEDIA_CONDITIONS")]
+        public MediaCondition MediaConditions
+        {
+            get 
+            {
+                return _mediaconditions; 
+            }
+
+            set 
+            {
+                _mediaconditions = value; RaisePropertyChanged(nameof(MediaConditions)); 
+            }
+
+        }
+
+        private MediaMaterial _mediamaterials;
+        /// <summary>
+        /// Gets or sets the rml media materials.
+        /// </summary>
+        [EntityFieldName("MEDIA_MATERIALS")]
+        public MediaMaterial MediaMaterials
+        {
+            get 
+            {
+                return _mediamaterials; 
+            }
+
+            set 
+            {
+                _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); 
+            }
+
+        }
+
+        private MediaPurpos _mediapurposes;
+        /// <summary>
+        /// Gets or sets the rml media purposes.
+        /// </summary>
+        [EntityFieldName("MEDIA_PURPOSES")]
+        public MediaPurpos MediaPurposes
+        {
+            get 
+            {
+                return _mediapurposes; 
+            }
+
+            set 
+            {
+                _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rml" /> class.
+        /// </summary>
+        public Rml() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rml" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Rml(RML entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            FiberShapes = new FiberShape();
+
+            FiberSynthesis = new FiberSynthesi();
+
+            LinearMassDensityUnits = new LinearMassDensityUnit();
+
+            LiquidsRmls = new ObservableCollection<LiquidsRml>();
+
+            MediaColors = new MediaColor();
+
+            MediaConditions = new MediaCondition();
+
+            MediaMaterials = new MediaMaterial();
+
+            MediaPurposes = new MediaPurpos();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Role.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Role.cs
new file mode 100644
index 000000000..1c1697972
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/Role.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class Role : ObservableEntity<ROLE>
+    {
+
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the role code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the role name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private String _description;
+        /// <summary>
+        /// Gets or sets the role description.
+        /// </summary>
+        [EntityFieldName("DESCRIPTION")]
+        public String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        private ObservableCollection<RolesPermission> _rolespermissions;
+        /// <summary>
+        /// Gets or sets the role roles permissions.
+        /// </summary>
+        [EntityFieldName("ROLES_PERMISSIONS")]
+        public ObservableCollection<RolesPermission> RolesPermissions
+        {
+            get 
+            {
+                return _rolespermissions; 
+            }
+
+            set 
+            {
+                _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); 
+            }
+
+        }
+
+        private ObservableCollection<UsersRole> _usersroles;
+        /// <summary>
+        /// Gets or sets the role users roles.
+        /// </summary>
+        [EntityFieldName("USERS_ROLES")]
+        public ObservableCollection<UsersRole> UsersRoles
+        {
+            get 
+            {
+                return _usersroles; 
+            }
+
+            set 
+            {
+                _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Role" /> class.
+        /// </summary>
+        public Role() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Role" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Role(ROLE entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            RolesPermissions = new ObservableCollection<RolesPermission>();
+
+            UsersRoles = new ObservableCollection<UsersRole>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/RolesPermission.cs
new file mode 100644
index 000000000..d650219aa
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/RolesPermission.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class RolesPermission : ObservableEntity<ROLES_PERMISSIONS>
+    {
+
+        private String _roleguid;
+        /// <summary>
+        /// Gets or sets the rolespermission role guid.
+        /// </summary>
+        [EntityFieldName("ROLE_GUID")]
+        public String RoleGuid
+        {
+            get 
+            {
+                return _roleguid; 
+            }
+
+            set 
+            {
+                _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); 
+            }
+
+        }
+
+        private String _permissionguid;
+        /// <summary>
+        /// Gets or sets the rolespermission permission guid.
+        /// </summary>
+        [EntityFieldName("PERMISSION_GUID")]
+        public String PermissionGuid
+        {
+            get 
+            {
+                return _permissionguid; 
+            }
+
+            set 
+            {
+                _permissionguid = value; RaisePropertyChanged(nameof(PermissionGuid)); 
+            }
+
+        }
+
+        private Permission _permission;
+        /// <summary>
+        /// Gets or sets the rolespermission permission.
+        /// </summary>
+        [EntityFieldName("PERMISSION")]
+        public Permission Permission
+        {
+            get 
+            {
+                return _permission; 
+            }
+
+            set 
+            {
+                _permission = value; RaisePropertyChanged(nameof(Permission)); 
+            }
+
+        }
+
+        private Role _role;
+        /// <summary>
+        /// Gets or sets the rolespermission role.
+        /// </summary>
+        [EntityFieldName("ROLE")]
+        public Role Role
+        {
+            get 
+            {
+                return _role; 
+            }
+
+            set 
+            {
+                _role = value; RaisePropertyChanged(nameof(Role)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RolesPermission" /> class.
+        /// </summary>
+        public RolesPermission() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RolesPermission" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public RolesPermission(ROLES_PERMISSIONS entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Permission = new Permission();
+
+            Role = new Role();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/SyncConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/SyncConfiguration.cs
new file mode 100644
index 000000000..87785eeb6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/SyncConfiguration.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class SyncConfiguration : ObservableEntity<SYNC_CONFIGURATION>
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyncConfiguration" /> class.
+        /// </summary>
+        public SyncConfiguration() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyncConfiguration" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public SyncConfiguration(SYNC_CONFIGURATION entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/User.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/User.cs
new file mode 100644
index 000000000..31342cc54
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/User.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class User : ObservableEntity<USER>
+    {
+
+        private String _email;
+        /// <summary>
+        /// Gets or sets the user email.
+        /// </summary>
+        [EntityFieldName("EMAIL")]
+        public String Email
+        {
+            get 
+            {
+                return _email; 
+            }
+
+            set 
+            {
+                _email = value; RaisePropertyChanged(nameof(Email)); 
+            }
+
+        }
+
+        private String _password;
+        /// <summary>
+        /// Gets or sets the user password.
+        /// </summary>
+        [EntityFieldName("PASSWORD")]
+        public String Password
+        {
+            get 
+            {
+                return _password; 
+            }
+
+            set 
+            {
+                _password = value; RaisePropertyChanged(nameof(Password)); 
+            }
+
+        }
+
+        private String _organizationguid;
+        /// <summary>
+        /// Gets or sets the user organization guid.
+        /// </summary>
+        [EntityFieldName("ORGANIZATION_GUID")]
+        public String OrganizationGuid
+        {
+            get 
+            {
+                return _organizationguid; 
+            }
+
+            set 
+            {
+                _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); 
+            }
+
+        }
+
+        private String _contactguid;
+        /// <summary>
+        /// Gets or sets the user contact guid.
+        /// </summary>
+        [EntityFieldName("CONTACT_GUID")]
+        public String ContactGuid
+        {
+            get 
+            {
+                return _contactguid; 
+            }
+
+            set 
+            {
+                _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); 
+            }
+
+        }
+
+        private String _addressguid;
+        /// <summary>
+        /// Gets or sets the user address guid.
+        /// </summary>
+        [EntityFieldName("ADDRESS_GUID")]
+        public String AddressGuid
+        {
+            get 
+            {
+                return _addressguid; 
+            }
+
+            set 
+            {
+                _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); 
+            }
+
+        }
+
+        private Address _address;
+        /// <summary>
+        /// Gets or sets the user address.
+        /// </summary>
+        [EntityFieldName("ADDRESS")]
+        public Address Address
+        {
+            get 
+            {
+                return _address; 
+            }
+
+            set 
+            {
+                _address = value; RaisePropertyChanged(nameof(Address)); 
+            }
+
+        }
+
+        private Contact _contact;
+        /// <summary>
+        /// Gets or sets the user contact.
+        /// </summary>
+        [EntityFieldName("CONTACT")]
+        public Contact Contact
+        {
+            get 
+            {
+                return _contact; 
+            }
+
+            set 
+            {
+                _contact = value; RaisePropertyChanged(nameof(Contact)); 
+            }
+
+        }
+
+        private ObservableCollection<MachinesEvent> _machinesevents;
+        /// <summary>
+        /// Gets or sets the user machines events.
+        /// </summary>
+        [EntityFieldName("MACHINES_EVENTS")]
+        public ObservableCollection<MachinesEvent> MachinesEvents
+        {
+            get 
+            {
+                return _machinesevents; 
+            }
+
+            set 
+            {
+                _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); 
+            }
+
+        }
+
+        private Organization _organization;
+        /// <summary>
+        /// Gets or sets the user organization.
+        /// </summary>
+        [EntityFieldName("ORGANIZATION")]
+        public Organization Organization
+        {
+            get 
+            {
+                return _organization; 
+            }
+
+            set 
+            {
+                _organization = value; RaisePropertyChanged(nameof(Organization)); 
+            }
+
+        }
+
+        private ObservableCollection<UsersRole> _usersroles;
+        /// <summary>
+        /// Gets or sets the user users roles.
+        /// </summary>
+        [EntityFieldName("USERS_ROLES")]
+        public ObservableCollection<UsersRole> UsersRoles
+        {
+            get 
+            {
+                return _usersroles; 
+            }
+
+            set 
+            {
+                _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="User" /> class.
+        /// </summary>
+        public User() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="User" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public User(USER entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Address = new Address();
+
+            Contact = new Contact();
+
+            MachinesEvents = new ObservableCollection<MachinesEvent>();
+
+            Organization = new Organization();
+
+            UsersRoles = new ObservableCollection<UsersRole>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/UsersRole.cs
new file mode 100644
index 000000000..59a07f9ea
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/Entities/UsersRole.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class UsersRole : ObservableEntity<USERS_ROLES>
+    {
+
+        private String _userguid;
+        /// <summary>
+        /// Gets or sets the usersrole user guid.
+        /// </summary>
+        [EntityFieldName("USER_GUID")]
+        public String UserGuid
+        {
+            get 
+            {
+                return _userguid; 
+            }
+
+            set 
+            {
+                _userguid = value; RaisePropertyChanged(nameof(UserGuid)); 
+            }
+
+        }
+
+        private String _roleguid;
+        /// <summary>
+        /// Gets or sets the usersrole role guid.
+        /// </summary>
+        [EntityFieldName("ROLE_GUID")]
+        public String RoleGuid
+        {
+            get 
+            {
+                return _roleguid; 
+            }
+
+            set 
+            {
+                _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); 
+            }
+
+        }
+
+        private Role _role;
+        /// <summary>
+        /// Gets or sets the usersrole role.
+        /// </summary>
+        [EntityFieldName("ROLE")]
+        public Role Role
+        {
+            get 
+            {
+                return _role; 
+            }
+
+            set 
+            {
+                _role = value; RaisePropertyChanged(nameof(Role)); 
+            }
+
+        }
+
+        private User _user;
+        /// <summary>
+        /// Gets or sets the usersrole user.
+        /// </summary>
+        [EntityFieldName("USER")]
+        public User User
+        {
+            get 
+            {
+                return _user; 
+            }
+
+            set 
+            {
+                _user = value; RaisePropertyChanged(nameof(User)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UsersRole" /> class.
+        /// </summary>
+        public UsersRole() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UsersRole" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public UsersRole(USERS_ROLES entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+
+            Role = new Role();
+
+            User = new User();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/EntityFieldNameAttribute.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/EntityFieldNameAttribute.cs
new file mode 100644
index 000000000..bca969d5f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/EntityFieldNameAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    public class EntityFieldNameAttribute : Attribute
+    {
+        public String Name { get; set; }
+
+        public EntityFieldNameAttribute(String name)
+        {
+            Name = name;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/ObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/ObservableEntity.cs
new file mode 100644
index 000000000..ed753eac1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/ObservableEntities/ObservableEntity.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data.Entity;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.DAL.Remote.DB;
+using Tango.Settings;
+
+namespace Tango.DAL.Remote.ObservableEntities
+{
+    internal static class LoadedObjectsService
+    {
+        private static List<KeyValuePair<String, IObservableEntity>> LoadedObjects;
+
+        public static Object Get(String guid)
+        {
+            return LoadedObjects.SingleOrDefault(x => x.Key == guid).Value;
+        }
+
+        public static void Add(String guid, IObservableEntity observable)
+        {
+            if (!LoadedObjects.Exists(x => x.Key == guid))
+            {
+                LoadedObjects.Add(new KeyValuePair<string, IObservableEntity>(guid, observable));
+            }
+        }
+
+        static LoadedObjectsService()
+        {
+            LoadedObjects = new List<KeyValuePair<String, IObservableEntity>>();
+        }
+    }
+
+    public abstract class ObservableEntity<T> : ExtendedObject, IObservableEntity where T : class
+    {
+
+        private Regex regExDAL;
+        private bool _isNew;
+        protected T _entity;
+
+        private Int32 _id;
+        [EntityFieldName("ID")]
+        public Int32 ID
+        {
+            get { return _id; }
+            set { _id = value; RaisePropertyChanged(nameof(ID)); }
+        }
+
+        private String _guid;
+        [EntityFieldName("GUID")]
+        public String Guid
+        {
+            get { return _guid; }
+            set { _guid = value; RaisePropertyChanged(nameof(Guid)); }
+        }
+
+        private DateTime _lastUpdated;
+        [EntityFieldName("LAST_UPDATED")]
+        public DateTime LastUpdated
+        {
+            get { return _lastUpdated; }
+            set { _lastUpdated = value; RaisePropertyChanged(nameof(LastUpdated)); }
+        }
+
+        private bool _deleted;
+        [EntityFieldName("DELETED")]
+        public bool Deleted
+        {
+            get { return _deleted; }
+            set { _deleted = value; RaisePropertyChanged(nameof(Deleted)); }
+        }
+
+        public ObservableEntity()
+        {
+            _entity = Activator.CreateInstance<T>();
+            _isNew = true;
+        }
+
+        public ObservableEntity(T entity)
+        {
+            _entity = entity;
+
+            regExDAL = new Regex(@"
+                (?<=[A-Z])(?=[A-Z][a-z]) |
+                 (?<=[^A-Z])(?=[A-Z]) |
+                 (?<=[A-Za-z])(?=[^A-Za-z])", RegexOptions.IgnorePatternWhitespace);
+        }
+
+        public static void MapEntityToObservable(Object entity, IObservableEntity observable)
+        {
+            String guid = entity.GetType().GetProperty("GUID").GetValue(entity).ToString();
+            LoadedObjectsService.Add(guid, observable);
+
+            foreach (var prop in entity.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+            {
+                String name = prop.Name == "ID" ? "ID" : DalNameToStandardName(prop.Name);
+
+                if (prop.PropertyType.IsGenericType)
+                {
+                    object observableCollection = observable.GetType().GetProperty(name).GetValue(observable);
+                    Type genericType = observable.GetType().GetProperty(name).PropertyType.GenericTypeArguments.Single();
+
+                    foreach (var item in prop.GetValue(entity) as IEnumerable)
+                    {
+                        guid = item.GetType().GetProperty("GUID").GetValue(item).ToString();
+
+                        var loadedEntity = LoadedObjectsService.Get(guid);
+
+                        if (loadedEntity != null)
+                        {
+                            observableCollection.GetType().GetMethod("Add").Invoke(observableCollection, new object[] { loadedEntity });
+                        }
+                        else
+                        {
+                            IObservableEntity newObservable = Activator.CreateInstance(genericType, new object[] { item }) as IObservableEntity;
+                            LoadedObjectsService.Add(guid, newObservable);
+                            observableCollection.GetType().GetMethod("Add").Invoke(observableCollection, new object[] { newObservable });
+                        }
+                    }
+                }
+                else if (prop.PropertyType.IsClass && prop.PropertyType != typeof(String) && prop.PropertyType != typeof(DateTime))
+                {
+                    Type propType = observable.GetType().GetProperty(name).PropertyType;
+
+                    guid = prop.GetValue(entity).GetType().GetProperty("GUID").GetValue(prop.GetValue(entity)).ToString();
+
+                    var loadedEntity = LoadedObjectsService.Get(guid);
+
+                    if (loadedEntity != null)
+                    {
+                        observable.GetType().GetProperty(name).SetValue(observable, loadedEntity);
+                    }
+                    else
+                    {
+                        IObservableEntity newObservable = Activator.CreateInstance(propType, new object[] { prop.GetValue(entity) }) as IObservableEntity;
+                        LoadedObjectsService.Add(guid, newObservable);
+                        observable.GetType().GetProperty(name).SetValue(observable, newObservable);
+                    }
+                }
+                else
+                {
+                    observable.GetType().GetProperty(name).SetValue(observable, prop.GetValue(entity));
+                }
+            }
+        }
+
+        public void Save()
+        {
+            using (RemoteDB db = new RemoteDB(SettingsManager.Default.DataBase.SQLServerAddress, false))
+            {
+                foreach (var prop in this.GetType().GetProperties())
+                {
+                    String dalName = (prop.GetCustomAttributes(typeof(EntityFieldNameAttribute), false).SingleOrDefault() as EntityFieldNameAttribute).Name;
+                    typeof(T).GetProperty(dalName).SetValue(_entity, prop.GetValue(this));
+                }
+
+                if (_isNew)
+                {
+                    String tabelName = this.GetType().Name.ToUpper();
+                    DbSet<T> dbSet = typeof(RemoteDB).GetProperty(tabelName) as DbSet<T>;
+                    dbSet.Add(_entity);
+                }
+
+                db.SaveChanges();
+
+                MapEntityToObservable(_entity, this);
+
+                _isNew = false;
+            }
+        }
+
+        public static String DalNameToStandardName(String dalName)
+        {
+            return String.Join("", dalName.Split('_').Select(x => ToTitleCase(x)));
+        }
+
+        public static string ToTitleCase(string s)
+        {
+            return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(s.ToLower());
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 49e1c2025..7e1c4bf94 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -194,6 +194,47 @@
     <Compile Include="DB\USERS_ROLES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="IObservableEntity.cs" />
+    <Compile Include="ObservableEntities\Entities\Action.cs" />
+    <Compile Include="ObservableEntities\Entities\Address.cs" />
+    <Compile Include="ObservableEntities\Entities\ApplicationDisplayPanelVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\ApplicationFirmwareVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\ApplicationOsVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\ApplicationVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\Cartridge.cs" />
+    <Compile Include="ObservableEntities\Entities\Configuration.cs" />
+    <Compile Include="ObservableEntities\Entities\ConfigurationsDispenser.cs" />
+    <Compile Include="ObservableEntities\Entities\Contact.cs" />
+    <Compile Include="ObservableEntities\Entities\Dispenser.cs" />
+    <Compile Include="ObservableEntities\Entities\EmbeddedFirmwareVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\EmbeddedSoftwareVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\Event.cs" />
+    <Compile Include="ObservableEntities\Entities\EventsAction.cs" />
+    <Compile Include="ObservableEntities\Entities\FiberShape.cs" />
+    <Compile Include="ObservableEntities\Entities\FiberSynthesi.cs" />
+    <Compile Include="ObservableEntities\Entities\HardwareVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\LinearMassDensityUnit.cs" />
+    <Compile Include="ObservableEntities\Entities\Liquid.cs" />
+    <Compile Include="ObservableEntities\Entities\LiquidsRml.cs" />
+    <Compile Include="ObservableEntities\Entities\Machine.cs" />
+    <Compile Include="ObservableEntities\Entities\MachinesConfiguration.cs" />
+    <Compile Include="ObservableEntities\Entities\MachinesEvent.cs" />
+    <Compile Include="ObservableEntities\Entities\MachineVersion.cs" />
+    <Compile Include="ObservableEntities\Entities\MachineVersionsConfiguration.cs" />
+    <Compile Include="ObservableEntities\Entities\MediaColor.cs" />
+    <Compile Include="ObservableEntities\Entities\MediaCondition.cs" />
+    <Compile Include="ObservableEntities\Entities\MediaMaterial.cs" />
+    <Compile Include="ObservableEntities\Entities\MediaPurpos.cs" />
+    <Compile Include="ObservableEntities\Entities\Organization.cs" />
+    <Compile Include="ObservableEntities\Entities\Permission.cs" />
+    <Compile Include="ObservableEntities\Entities\Rml.cs" />
+    <Compile Include="ObservableEntities\Entities\Role.cs" />
+    <Compile Include="ObservableEntities\Entities\RolesPermission.cs" />
+    <Compile Include="ObservableEntities\Entities\SyncConfiguration.cs" />
+    <Compile Include="ObservableEntities\Entities\User.cs" />
+    <Compile Include="ObservableEntities\Entities\UsersRole.cs" />
+    <Compile Include="ObservableEntities\EntityFieldNameAttribute.cs" />
+    <Compile Include="ObservableEntities\ObservableEntity.cs" />
     <Compile Include="Partials\RemoteDB.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -223,6 +264,17 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <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">
diff --git a/Software/Visual_Studio/Tango.Emulations/EmulatorBase.cs b/Software/Visual_Studio/Tango.Emulations/EmulatorBase.cs
index 7309499ba..161277459 100644
--- a/Software/Visual_Studio/Tango.Emulations/EmulatorBase.cs
+++ b/Software/Visual_Studio/Tango.Emulations/EmulatorBase.cs
@@ -5,9 +5,9 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Logging;
 using Tango.PMR.Common;
-using Tango.SharedUI;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 using Tango.Transport;
+using Tango.Core;
 
 namespace Tango.Emulations
 {
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index c799adc93..7c418a8c7 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -12,7 +12,7 @@ using Tango.PMR;
 using Tango.PMR.Common;
 using Tango.PMR.Stubs;
 using Tango.SharedUI;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 using Tango.Transport;
 
 namespace Tango.Emulations.Emulators
diff --git a/Software/Visual_Studio/Tango.Emulations/IEmulator.cs b/Software/Visual_Studio/Tango.Emulations/IEmulator.cs
index 360087f96..9345c530d 100644
--- a/Software/Visual_Studio/Tango.Emulations/IEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/IEmulator.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 using Tango.Transport;
 
 namespace Tango.Emulations
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index 7e0a48288..83bf0515b 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -69,7 +69,6 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="Controls\MultiTransitionControl.xaml.cs">
       <DependentUpon>MultiTransitionControl.xaml</DependentUpon>
     </Compile>
@@ -95,7 +94,6 @@
     <Compile Include="Editors\ParameterizedEditor.xaml.cs">
       <DependentUpon>ParameterizedEditor.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ExtendedObject.cs" />
     <Compile Include="IView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewModel.cs" />
diff --git a/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs
new file mode 100644
index 000000000..b5240bd5f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs
@@ -0,0 +1,88 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tango.DAL.Remote.DB;
+using Tango.DAL.Remote.ObservableEntities;
+using Tango.Settings;
+using System.Linq;
+using System.Collections;
+using Tango.CodeGeneration;
+using System.Data.Entity;
+using System.Collections.Generic;
+using System.IO;
+using System.Data.Entity.Design.PluralizationServices;
+
+namespace Tango.UnitTesting
+{
+    [TestClass]
+    [TestCategory("Code Generation")]
+    public class CodeGeneration_TST
+    {
+        [TestMethod]
+        public void Generate_DAL_Observable_Entities()
+        {
+            String tempPath = Helper.GetTempFolderPath();
+
+            foreach (var table in typeof(RemoteDB).GetProperties().Where(x => typeof(IEnumerable).IsAssignableFrom(x.PropertyType)))
+            {
+                EntityCodeFile codeFile = new EntityCodeFile(Singularize(ObservableEntity<Object>.DalNameToStandardName(table.Name)))
+                {
+                    TableName = Singularize(table.Name)
+                };
+
+                foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(4))
+                {
+                    EntityCodeFileField codeField = new EntityCodeFileField();
+                    codeField.FieldName = field.Name;
+                    codeField.Name = ObservableEntity<Object>.DalNameToStandardName(field.Name);
+                    codeField.Description = field.Name.Replace("_", " ").ToLower();
+
+
+                    if (field.PropertyType.IsGenericType)
+                    {
+                        codeField.Type = String.Format("ObservableCollection<{0}>", Singularize(ObservableEntity<Object>.DalNameToStandardName(field.PropertyType.GenericTypeArguments.Single().Name)));
+                        codeField.Construct = true;
+                    }
+                    else
+                    {
+                        if (field.PropertyType.IsClass && field.PropertyType != typeof(String))
+                        {
+                            codeField.Type = Singularize(ObservableEntity<Object>.DalNameToStandardName(field.PropertyType.Name));
+                            codeField.Construct = true;
+                        }
+                        else
+                        {
+                            codeField.Type = field.PropertyType.Name;
+                        }
+                    }
+                    codeFile.Fields.Add(codeField);
+                }
+
+                String code = codeFile.GenerateCode();
+
+                File.WriteAllText(Path.Combine(tempPath, codeFile.Name + ".cs"), code);
+            }
+
+            Helper.ShowInExplorer(tempPath);
+        }
+
+        [TestMethod]
+        public void Load_Observable_Machines()
+        {
+            using (RemoteDB db = new RemoteDB(SettingsManager.Default.DataBase.SQLServerAddress, false))
+            {
+                List<Machine> machines = db.MACHINES.ToList().Select(x => new Machine(x)).ToList();
+
+                foreach (var machine in machines)
+                {
+
+                }
+            }
+        }
+
+        private String Singularize(String text)
+        {
+            var serv = PluralizationService.CreateService(new System.Globalization.CultureInfo("en-us"));
+            return serv.Singularize(text);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
index 79dab4c0d..f3f5a1abb 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
+++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
@@ -61,6 +61,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.Entity.Design" />
     <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>
@@ -82,12 +83,17 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DAL_TST.cs" />
     <Compile Include="Synchronization_TST.cs" />
+    <Compile Include="CodeGeneration_TST.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Tango.CodeGeneration\Tango.CodeGeneration.csproj">
+      <Project>{caedae94-11ed-473c-888a-268a6d38cd20}</Project>
+      <Name>Tango.CodeGeneration</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs
index 936f785d0..8c7efd67e 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs
@@ -6,11 +6,12 @@ using System.Threading.Tasks;
 using Tango.Emulations.Emulators;
 using Tango.Logging;
 using Tango.SharedUI;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 using Tango.Stubs;
 using Tango.Transport.Adapters;
 using Tango.Transport.Servers;
 using Tango.Transport.Transporters;
+using Tango.Core;
 
 namespace Tango.MachineEM.UI.ViewModels
 {
diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/MainWindow.xaml.cs
index f003f708f..d12a38c70 100644
--- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/MainWindow.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Tango.Emulations.Emulators;
 using Tango.Logging;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 using Tango.Transport.Adapters;
 using Tango.Transport.Transporters;
 
diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainViewVM.cs
index fdb751422..3b0cfea85 100644
--- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainViewVM.cs
@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
 using Tango.MobileEM.UI.Views;
 using Tango.SharedUI;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
 
 namespace Tango.MobileEM.UI.ViewModels
 {
diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainWindowVM.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainWindowVM.cs
index cd5c9bf93..beb35cbd9 100644
--- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainWindowVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/MainWindowVM.cs
@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Core.Commands;
 using Tango.Emulations.Emulators;
 using Tango.MobileEM.UI.Views;
 using Tango.SharedUI;
-using Tango.SharedUI.Commands;
 using Tango.Transport.Adapters;
 using Tango.Transport.Transporters;
 
diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubViewVM.cs
index 00bde6855..3bc92fe15 100644
--- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubViewVM.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Documents;
+using Tango.Core;
+using Tango.Core.Commands;
 using Tango.Logging;
-using Tango.SharedUI;
-using Tango.SharedUI.Commands;
 using Tango.Stubs;
 
 namespace Tango.MobileEM.UI.ViewModels
diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubsViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubsViewVM.cs
index dc17d5cdc..1a0f7ea61 100644
--- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubsViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/ViewModels/StubsViewVM.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
 using Tango.MobileEM.UI.Views;
 using Tango.SharedUI;
 using Tango.Stubs;
diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Views/MainView.xaml.cs
index c33fb0fe1..139c96a6a 100644
--- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Views/MainView.xaml.cs
@@ -12,7 +12,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Tango.SharedUI.Commands;
 
 namespace Tango.MobileEM.UI.Views
 {
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs
index a36292deb..d530b439c 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs
@@ -16,8 +16,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Core.Commands;
 using Tango.Protobuf.Compilers;
-using Tango.SharedUI.Commands;
 
 namespace Tango.Protobuf.UI
 {
diff --git a/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs
index 8d18e5ce7..174b408bc 100644
--- a/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs
@@ -8,9 +8,9 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using Tango.Core;
+using Tango.Core.Commands;
 using Tango.Logging;
-using Tango.SharedUI;
-using Tango.SharedUI.Commands;
 using Tango.Synchronization.Local;
 
 namespace Tango.Synchronization.UI.ViewModels
diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/ViewModels/MainViewVM.cs
index 8ef5eaa6b..5199717ad 100644
--- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/ViewModels/MainViewVM.cs
@@ -6,8 +6,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
-using Tango.SharedUI;
-using Tango.SharedUI.Commands;
+using Tango.Core.Commands;
+using Tango.Core;
 using Tango.Transport.Adapters;
 using Tango.Transport.Routing;
 using Tango.Transport.Servers;