MERGE

39 files changed, 179 insertions, 132 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
index fe9ebda26..46128c394 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs
index 41eab1c37..8fc5c0c07 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs
index be458136a..e2b345d59 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs
index 0814988ba..dcc980f33 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs
index 3cdd8acb7..f90f51d65 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs
index 6e25fe321..fbd1f6166 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs
index c8c6ba00b..d04b013d9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs
index 74a7e29eb..67988c73b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
@@ -16,6 +16,7 @@ namespace Tango.MachineStudio.DB.ViewModels
         public CatsViewVM(INotificationProvider notification) : base(notification)
         {
             SelectDataFileCommand = new RelayCommand(SelectDataFile);
+            
         }
 
         public RelayCommand SelectDataFileCommand { get; set; }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
index 02d7c351d..ebd360d76 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
index bdec4f91b..09010ec93 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs
index 848cb1187..fdd31b847 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 using SimpleValidator.Extensions;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index bc8d54ce9..62f768b9d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.DB.Managers;
 using Tango.SharedUI;
@@ -18,7 +18,7 @@ using System.ComponentModel;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
-    public abstract class DbTableViewModel<T> : ViewModel, IShutdownRequestBlocker where T : class, IObservableEntity
+    public abstract class DbTableViewModel<T> : ViewModel where T : class, IObservableEntity
     {
         protected INotificationProvider _notification;
 
@@ -140,7 +140,7 @@ namespace Tango.MachineStudio.DB.ViewModels
             base.OnValidating();
             ValidationErrors.Clear();
 
-            foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.PropertyType.IsGenericType && x.PropertyType.IsClass && !x.Name.Contains("Guid")))
+            foreach (var prop in typeof(T).GetPropertiesWithAttribute<EntityFieldNameAttribute>(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.PropertyType.IsGenericType && x.PropertyType.IsClass && !x.Name.Contains("Guid")))
             {
                 if (prop.GetValue(EditEntity) == null)
                 {
@@ -156,21 +156,12 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             using (_notification.PushTaskItem("Saving changes to database..."))
             {
-                var dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid();
-
-                if (dependenctEntities.Count > 0)
-                {
-                    _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, dependenctEntities.Select(x => x.Key + ", ID: " + x.Value)));
-                    return;
-                }
-
                 try
                 {
-                    await SelectedEntity.SoftDeleteAsync();
+                    await SelectedEntity.DeleteAsync(Adapter.Context);
                 }
                 catch (Exception ex)
                 {
-                    SelectedEntity.Deleted = false;
                     Adapter.Invalidate();
                     _notification.ShowError("Could not delete entity.");
                 }
@@ -227,12 +218,21 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             using (_notification.PushTaskItem("Saving changes to database..."))
             {
+                if (mode == DialogOpenMode.Adding)
+                {
+                    entity.Attach(Adapter.Context);
+                }
+
                 try
                 {
-                    await entity.SaveAsync();
+                    await entity.SaveAsync(Adapter.Context);
                 }
                 catch (DbUpdateException ex)
                 {
+                    if (mode == DialogOpenMode.Adding)
+                    {
+                        entity.Detach(Adapter.Context);
+                    }
                     Adapter.Invalidate();
                     _notification.ShowError("Could not save entity." + Environment.NewLine + ex.InnerException.InnerException != null ? ex.InnerException.InnerException.Message : ex.InnerException.Message);
                 }
@@ -299,13 +299,13 @@ namespace Tango.MachineStudio.DB.ViewModels
 
         private bool FilterEntity(T entity, String filter)
         {
-            foreach (var prop in entity.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsClass && x.PropertyType != typeof(String) && x.PropertyType != typeof(byte[]) && !x.PropertyType.IsGenericType))
+            foreach (var prop in entity.GetType().GetPropertiesWithAttribute<EntityFieldNameAttribute>(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsClass && x.PropertyType != typeof(String) && x.PropertyType != typeof(byte[]) && !x.PropertyType.IsGenericType))
             {
                 object obj = prop.GetValue(entity);
 
                 if (obj != null)
                 {
-                    foreach (var innerProp in obj.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.Name != "Deleted" && x.Name != "ID" && x.Name != "LastUpdated").Where(x => !x.PropertyType.IsGenericType && (x.PropertyType.IsClass || x.PropertyType == typeof(String))))
+                    foreach (var innerProp in obj.GetType().GetPropertiesWithAttribute<EntityFieldNameAttribute>(BindingFlags.Public | BindingFlags.Instance).Where(x => x.Name != "Deleted" && x.Name != "ID" && x.Name != "LastUpdated").Where(x => !x.PropertyType.IsGenericType && (x.PropertyType.IsClass || x.PropertyType == typeof(String))))
                     {
                         object value = innerProp.GetValue(obj);
 
@@ -323,7 +323,7 @@ namespace Tango.MachineStudio.DB.ViewModels
             return
               entity.
               GetType().
-              GetProperties(BindingFlags.Public | BindingFlags.Instance).
+              GetPropertiesWithAttribute<EntityFieldNameAttribute>(BindingFlags.Public | BindingFlags.Instance).
               Where(x => x.Name != "Deleted" && x.Name != "ID" && x.Name != "LastUpdated").
               Where(x => !x.PropertyType.IsGenericType && (x.PropertyType.IsClass || x.PropertyType == typeof(String))).
               Select(prop => prop.GetValue(entity).ToString()).
@@ -335,10 +335,5 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
 
         }
-
-        public Task<bool> OnShutdownRequest()
-        {
-            return Task.FromResult(true);
-        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs
index 5ffe0d58c..26167490f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
@@ -12,6 +12,7 @@ namespace Tango.MachineStudio.DB.ViewModels
     {
         public DispenserTypesViewVM(INotificationProvider notification) : base(notification)
         {
+            
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs
index a248d919a..e41ea34f1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs
index b6436203d..d06b81221 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
index 69e3c9ff6..f4b2af4d4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var actionType in SelectedActions)
             {
-                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionTypes == actionType.Entity && !x.Deleted))
+                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionType == actionType.Entity))
                 {
                     actionType.IsSelected = true;
                 }
@@ -49,26 +49,19 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, eventType);
 
+            Adapter.Context.EventTypesActions.RemoveRange(eventType.EventTypesActions);
+
             foreach (var actionType in SelectedActions)
             {
-                var userRole = eventType.EventTypesActions.SingleOrDefault(x => x.ActionTypes == actionType.Entity);
-
-                if (userRole != null)
-                {
-                    userRole.Deleted = !actionType.IsSelected;
-                }
-                else
+                if (actionType.IsSelected)
                 {
-                    if (actionType.IsSelected)
+                    eventType.EventTypesActions.Add(new EventTypesAction()
                     {
-                        eventType.EventTypesActions.Add(new EventTypesAction()
-                        {
-                            ActionTypes = actionType.Entity,
-                            EventTypes = eventType,
-                            ActionTypeGuid = actionType.Entity.Guid,
-                            EventTypeGuid = eventType.Guid
-                        });
-                    }
+                        ActionType = actionType.Entity,
+                        EventType = eventType,
+                        ActionTypeGuid = actionType.Entity.Guid,
+                        EventTypeGuid = eventType.Guid
+                    });
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs
index c4954f9b3..42c0d428d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs
index 6b157fc0d..739c23e55 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs
index 02c90c442..db30ad4cf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs
index 0242c1dc7..391c17d70 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs
@@ -3,16 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
-    public class DispensersViewVM : DbTableViewModel<Dispenser>
+    public class IdsPackFormulasViewVM : DbTableViewModel<IdsPackFormula>
     {
-        public DispensersViewVM(INotificationProvider notification) : base(notification)
+        public IdsPackFormulasViewVM(INotificationProvider notification) : base(notification)
         {
-            
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs
index 202dd959f..2accac011 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs
index 9ac38a7c4..9c3880293 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs
index 8db217013..6159e1297 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs
@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
-    public class CartridgesViewVM : DbTableViewModel<Cartridge>
+    public class LiquidTypesRmlsViewVM : DbTableViewModel<LiquidTypesRml>
     {
-        public CartridgesViewVM(INotificationProvider notification) : base(notification)
+        public LiquidTypesRmlsViewVM(INotificationProvider notification) : base(notification)
         {
             
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
index eaa482a41..b16b95ee4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var rml in SelectedRmls)
             {
-                if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity && !x.Deleted))
+                if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity))
                 {
                     rml.IsSelected = true;
                 }
@@ -49,26 +49,19 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, liquid);
 
+            Adapter.Context.LiquidTypesRmls.RemoveRange(liquid.LiquidTypesRmls);
+
             foreach (var rml in SelectedRmls)
             {
-                var liquidRml = liquid.LiquidTypesRmls.SingleOrDefault(x => x.Rml == rml.Entity);
-
-                if (liquidRml != null)
-                {
-                    liquidRml.Deleted = !rml.IsSelected;
-                }
-                else
+                if (rml.IsSelected)
                 {
-                    if (rml.IsSelected)
+                    liquid.LiquidTypesRmls.Add(new LiquidTypesRml()
                     {
-                        liquid.LiquidTypesRmls.Add(new LiquidTypesRml()
-                        {
-                            Rml = rml.Entity,
-                            LiquidTypes = liquid,
-                            RmlGuid = rml.Entity.Guid,
-                            LiquidTypeGuid = liquid.Guid
-                        });
-                    }
+                        Rml = rml.Entity,
+                        LiquidType = liquid,
+                        RmlGuid = rml.Entity.Guid,
+                        LiquidTypeGuid = liquid.Guid
+                    });
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs
index 6a24f7d4c..7eec73dc1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs
index 2349941fe..0f3ab8b04 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.SharedUI;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
index a0ce93a5a..27c4bc7a0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
@@ -1,18 +1,46 @@
-using System;
+using Microsoft.Practices.ServiceLocation;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using Tango.Integration.Observables;
+using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Common.StudioApplication;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
-    public class MainViewVM : ViewModel
+    public class MainViewVM : ViewModel, IModuleRequestListener
     {
         public MainViewVM() : base()
         {
 
         }
+
+        public void OnRequestModule(IStudioModule module, object args)
+        {
+            if (module is DBModule && args != null && args is IObservableEntity)
+            {
+                String vmName = args.GetType().Name + "sViewVM";
+                
+                Type vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName);
+
+                if (vmType == null)
+                {
+                    vmName = args.GetType().BaseType.Name + "sViewVM";
+                    vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName);
+                }
+
+                if (vmType != null)
+                {
+                    var vm = ServiceLocator.Current.GetInstance(vmType);
+                    vmType.GetProperty("SelectedEntity").SetValue(vm, args);
+                    vmType.GetMethod("OnEdit", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(vm, new object[] { });
+                }
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
index 4227cc27a..bc0736a43 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs
index 451e20ff0..167482bc8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs
index 534ebc0d8..9161ef3e9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs
index 4850f6316..6e6b74a32 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs
index 6203a8fe3..c9a82363e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs
index 0327557f1..d35a00a80 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs
index 9a2d1c24d..6dbab596e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs
new file mode 100644
index 000000000..87fdecec8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class ProcessParametersTablesGroupsViewVM : DbTableViewModel<ProcessParametersTablesGroup>
+    {
+        public ProcessParametersTablesGroupsViewVM(INotificationProvider notification) : base(notification)
+        {
+            
+        }
+
+        protected override void OnBeforeEntitySave(DialogOpenMode mode, ProcessParametersTablesGroup entity)
+        {
+            entity.SaveDate = DateTime.UtcNow;
+
+            if (entity.Rml != null && entity.Active)
+            {
+                foreach (var group in entity.Rml.ProcessParametersTablesGroups.Where(x => x != entity))
+                {
+                    group.Active = false;
+                }
+            }
+
+            base.OnBeforeEntitySave(mode, entity);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs
new file mode 100644
index 000000000..0716430ab
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class ProcessParametersTablesViewVM : DbTableViewModel<ProcessParametersTable>
+    {
+        public ProcessParametersTablesViewVM(INotificationProvider notification) : base(notification)
+        {
+            
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs
index 740a4969b..7145b9201 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 
 namespace Tango.MachineStudio.DB.ViewModels
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
index d09722ec9..049b4b6db 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.DB.ViewModels;
 
@@ -30,7 +30,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var permission in SelectedPermissions)
             {
-                if (SelectedEntity.RolesPermissions.ToList().Exists(x => x.Permission == permission.Entity && !x.Deleted))
+                if (SelectedEntity.RolesPermissions.ToList().Exists(x => x.Permission == permission.Entity))
                 {
                     permission.IsSelected = true;
                 }
@@ -50,26 +50,19 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, role);
 
+            Adapter.Context.RolesPermissions.RemoveRange(role.RolesPermissions);
+
             foreach (var permission in SelectedPermissions)
             {
-                var rolePermission = role.RolesPermissions.SingleOrDefault(x => x.Permission == permission.Entity);
-
-                if (rolePermission != null)
-                {
-                    rolePermission.Deleted = !permission.IsSelected;
-                }
-                else
+                if (permission.IsSelected)
                 {
-                    if (permission.IsSelected)
+                    role.RolesPermissions.Add(new RolesPermission()
                     {
-                        role.RolesPermissions.Add(new RolesPermission()
-                        {
-                            Permission = permission.Entity,
-                            Role = role,
-                            PermissionGuid = permission.Entity.Guid,
-                            RoleGuid = role.Guid
-                        });
-                    }
+                        Permission = permission.Entity,
+                        Role = role,
+                        PermissionGuid = permission.Entity.Guid,
+                        RoleGuid = role.Guid
+                    });
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
index 044b8a88a..3a09b27e6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Notifications;
 using SimpleValidator.Extensions;
 
@@ -50,26 +50,19 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, user);
 
+            Adapter.Context.UsersRoles.RemoveRange(user.UsersRoles);
+
             foreach (var role in SelectedRoles)
             {
-                var userRole = user.UsersRoles.SingleOrDefault(x => x.Role == role.Entity);
-
-                if (userRole != null)
-                {
-                    userRole.Deleted = !role.IsSelected;
-                }
-                else
+                if (role.IsSelected)
                 {
-                    if (role.IsSelected)
+                    user.UsersRoles.Add(new UsersRole()
                     {
-                        user.UsersRoles.Add(new UsersRole()
-                        {
-                            Role = role.Entity,
-                            User = user,
-                            RoleGuid = role.Entity.Guid,
-                            UserGuid = user.Guid
-                        });
-                    }
+                        Role = role.Entity,
+                        User = user,
+                        RoleGuid = role.Entity.Guid,
+                        UserGuid = user.Guid
+                    });
                 }
             }
         }
@@ -80,7 +73,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             if (EditEntity.Email != null)
             {
-                if (Adapter.Users.ToList().Exists(x => x != EditEntity && x.Email.ToLower() == EditEntity.Email.ToLower()))
+                if (Adapter.Users.ToList().Exists(x => x.Guid != EditEntity.Guid && x.Email.ToLower() == EditEntity.Email.ToLower()))
                 {
                     ValidationErrors.Add("Email already exist");
                 }