Added DISPENSERS & SPOOLS tables.

Modified Observable Entities to have an On****Changed methods !

92 files changed, 6388 insertions, 1309 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs
index a8b008306..a6d3d549f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _eventtypesactions = value;
 
-                    EventTypesActionsChanged?.Invoke(this, value);
+                    OnEventTypesActionsChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypesActions)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the EventTypesActions has changed.
+        /// </summary>
+        protected virtual void OnEventTypesActionsChanged(SynchronizedObservableCollection<EventTypesAction> eventtypesactions)
+        {
+            EventTypesActionsChanged?.Invoke(this, eventtypesactions);
+            RaisePropertyChanged(nameof(EventTypesActions));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ActionType" /> class.
         /// </summary>
         public ActionType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Address.cs b/Software/Visual_Studio/Tango.BL/Entities/Address.cs
index 1f5f5edcb..1d93a21e3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Address.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Address.cs
@@ -66,9 +66,8 @@ namespace Tango.BL.Entities
                 {
                     _deleted = value;
 
-                    DeletedChanged?.Invoke(this, value);
+                    OnDeletedChanged(value);
 
-                    RaisePropertyChanged(nameof(Deleted)); 
                 }
             }
         }
@@ -94,9 +93,8 @@ namespace Tango.BL.Entities
                 {
                     _addressstring = value;
 
-                    AddressStringChanged?.Invoke(this, value);
+                    OnAddressStringChanged(value);
 
-                    RaisePropertyChanged(nameof(AddressString)); 
                 }
             }
         }
@@ -122,9 +120,8 @@ namespace Tango.BL.Entities
                 {
                     _locality = value;
 
-                    LocalityChanged?.Invoke(this, value);
+                    OnLocalityChanged(value);
 
-                    RaisePropertyChanged(nameof(Locality)); 
                 }
             }
         }
@@ -150,9 +147,8 @@ namespace Tango.BL.Entities
                 {
                     _country = value;
 
-                    CountryChanged?.Invoke(this, value);
+                    OnCountryChanged(value);
 
-                    RaisePropertyChanged(nameof(Country)); 
                 }
             }
         }
@@ -178,9 +174,8 @@ namespace Tango.BL.Entities
                 {
                     _city = value;
 
-                    CityChanged?.Invoke(this, value);
+                    OnCityChanged(value);
 
-                    RaisePropertyChanged(nameof(City)); 
                 }
             }
         }
@@ -206,9 +201,8 @@ namespace Tango.BL.Entities
                 {
                     _state = value;
 
-                    StateChanged?.Invoke(this, value);
+                    OnStateChanged(value);
 
-                    RaisePropertyChanged(nameof(State)); 
                 }
             }
         }
@@ -234,9 +228,8 @@ namespace Tango.BL.Entities
                 {
                     _countrycode = value;
 
-                    CountryCodeChanged?.Invoke(this, value);
+                    OnCountryCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(CountryCode)); 
                 }
             }
         }
@@ -262,9 +255,8 @@ namespace Tango.BL.Entities
                 {
                     _postalcode = value;
 
-                    PostalCodeChanged?.Invoke(this, value);
+                    OnPostalCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(PostalCode)); 
                 }
             }
         }
@@ -288,9 +280,8 @@ namespace Tango.BL.Entities
                 {
                     _organizations = value;
 
-                    OrganizationsChanged?.Invoke(this, value);
+                    OnOrganizationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Organizations)); 
                 }
             }
         }
@@ -314,14 +305,103 @@ namespace Tango.BL.Entities
                 {
                     _users = value;
 
-                    UsersChanged?.Invoke(this, value);
+                    OnUsersChanged(value);
 
-                    RaisePropertyChanged(nameof(Users)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Deleted has changed.
+        /// </summary>
+        protected virtual void OnDeletedChanged(Boolean deleted)
+        {
+            DeletedChanged?.Invoke(this, deleted);
+            RaisePropertyChanged(nameof(Deleted));
+        }
+
+        /// <summary>
+        /// Called when the AddressString has changed.
+        /// </summary>
+        protected virtual void OnAddressStringChanged(String addressstring)
+        {
+            AddressStringChanged?.Invoke(this, addressstring);
+            RaisePropertyChanged(nameof(AddressString));
+        }
+
+        /// <summary>
+        /// Called when the Locality has changed.
+        /// </summary>
+        protected virtual void OnLocalityChanged(String locality)
+        {
+            LocalityChanged?.Invoke(this, locality);
+            RaisePropertyChanged(nameof(Locality));
+        }
+
+        /// <summary>
+        /// Called when the Country has changed.
+        /// </summary>
+        protected virtual void OnCountryChanged(String country)
+        {
+            CountryChanged?.Invoke(this, country);
+            RaisePropertyChanged(nameof(Country));
+        }
+
+        /// <summary>
+        /// Called when the City has changed.
+        /// </summary>
+        protected virtual void OnCityChanged(String city)
+        {
+            CityChanged?.Invoke(this, city);
+            RaisePropertyChanged(nameof(City));
+        }
+
+        /// <summary>
+        /// Called when the State has changed.
+        /// </summary>
+        protected virtual void OnStateChanged(String state)
+        {
+            StateChanged?.Invoke(this, state);
+            RaisePropertyChanged(nameof(State));
+        }
+
+        /// <summary>
+        /// Called when the CountryCode has changed.
+        /// </summary>
+        protected virtual void OnCountryCodeChanged(String countrycode)
+        {
+            CountryCodeChanged?.Invoke(this, countrycode);
+            RaisePropertyChanged(nameof(CountryCode));
+        }
+
+        /// <summary>
+        /// Called when the PostalCode has changed.
+        /// </summary>
+        protected virtual void OnPostalCodeChanged(String postalcode)
+        {
+            PostalCodeChanged?.Invoke(this, postalcode);
+            RaisePropertyChanged(nameof(PostalCode));
+        }
+
+        /// <summary>
+        /// Called when the Organizations has changed.
+        /// </summary>
+        protected virtual void OnOrganizationsChanged(SynchronizedObservableCollection<Organization> organizations)
+        {
+            OrganizationsChanged?.Invoke(this, organizations);
+            RaisePropertyChanged(nameof(Organizations));
+        }
+
+        /// <summary>
+        /// Called when the Users has changed.
+        /// </summary>
+        protected virtual void OnUsersChanged(SynchronizedObservableCollection<User> users)
+        {
+            UsersChanged?.Invoke(this, users);
+            RaisePropertyChanged(nameof(Users));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Address" /> class.
         /// </summary>
         public Address() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs
index 54121e8a2..607efd1c4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _configurations = value;
 
-                    ConfigurationsChanged?.Invoke(this, value);
+                    OnConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Configurations)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Configurations has changed.
+        /// </summary>
+        protected virtual void OnConfigurationsChanged(SynchronizedObservableCollection<Configuration> configurations)
+        {
+            ConfigurationsChanged?.Invoke(this, configurations);
+            RaisePropertyChanged(nameof(Configurations));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationDisplayPanelVersion" /> class.
         /// </summary>
         public ApplicationDisplayPanelVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs
index 67dcd012e..7948410cc 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _configurations = value;
 
-                    ConfigurationsChanged?.Invoke(this, value);
+                    OnConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Configurations)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Configurations has changed.
+        /// </summary>
+        protected virtual void OnConfigurationsChanged(SynchronizedObservableCollection<Configuration> configurations)
+        {
+            ConfigurationsChanged?.Invoke(this, configurations);
+            RaisePropertyChanged(nameof(Configurations));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationFirmwareVersion" /> class.
         /// </summary>
         public ApplicationFirmwareVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs
index 2e3e9190d..68fd2b500 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _configurations = value;
 
-                    ConfigurationsChanged?.Invoke(this, value);
+                    OnConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Configurations)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Configurations has changed.
+        /// </summary>
+        protected virtual void OnConfigurationsChanged(SynchronizedObservableCollection<Configuration> configurations)
+        {
+            ConfigurationsChanged?.Invoke(this, configurations);
+            RaisePropertyChanged(nameof(Configurations));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationOsVersion" /> class.
         /// </summary>
         public ApplicationOsVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index 67e846aba..c305d6312 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -112,7 +112,6 @@ namespace Tango.BL.Entities
                 if (_segmentguid != value)
                 {
                     _segmentguid = value;
-                    RaisePropertyChanged(nameof(SegmentGuid)); 
                 }
             }
         }
@@ -138,7 +137,6 @@ namespace Tango.BL.Entities
                 if (_colorspaceguid != value)
                 {
                     _colorspaceguid = value;
-                    RaisePropertyChanged(nameof(ColorSpaceGuid)); 
                 }
             }
         }
@@ -164,9 +162,8 @@ namespace Tango.BL.Entities
                 {
                     _offsetpercent = value;
 
-                    OffsetPercentChanged?.Invoke(this, value);
+                    OnOffsetPercentChanged(value);
 
-                    RaisePropertyChanged(nameof(OffsetPercent)); 
                 }
             }
         }
@@ -192,9 +189,8 @@ namespace Tango.BL.Entities
                 {
                     _stopindex = value;
 
-                    StopIndexChanged?.Invoke(this, value);
+                    OnStopIndexChanged(value);
 
-                    RaisePropertyChanged(nameof(StopIndex)); 
                 }
             }
         }
@@ -220,9 +216,8 @@ namespace Tango.BL.Entities
                 {
                     _cyan = value;
 
-                    CyanChanged?.Invoke(this, value);
+                    OnCyanChanged(value);
 
-                    RaisePropertyChanged(nameof(Cyan)); 
                 }
             }
         }
@@ -248,9 +243,8 @@ namespace Tango.BL.Entities
                 {
                     _magenta = value;
 
-                    MagentaChanged?.Invoke(this, value);
+                    OnMagentaChanged(value);
 
-                    RaisePropertyChanged(nameof(Magenta)); 
                 }
             }
         }
@@ -276,9 +270,8 @@ namespace Tango.BL.Entities
                 {
                     _yellow = value;
 
-                    YellowChanged?.Invoke(this, value);
+                    OnYellowChanged(value);
 
-                    RaisePropertyChanged(nameof(Yellow)); 
                 }
             }
         }
@@ -304,9 +297,8 @@ namespace Tango.BL.Entities
                 {
                     _black = value;
 
-                    BlackChanged?.Invoke(this, value);
+                    OnBlackChanged(value);
 
-                    RaisePropertyChanged(nameof(Black)); 
                 }
             }
         }
@@ -332,9 +324,8 @@ namespace Tango.BL.Entities
                 {
                     _red = value;
 
-                    RedChanged?.Invoke(this, value);
+                    OnRedChanged(value);
 
-                    RaisePropertyChanged(nameof(Red)); 
                 }
             }
         }
@@ -360,9 +351,8 @@ namespace Tango.BL.Entities
                 {
                     _green = value;
 
-                    GreenChanged?.Invoke(this, value);
+                    OnGreenChanged(value);
 
-                    RaisePropertyChanged(nameof(Green)); 
                 }
             }
         }
@@ -388,9 +378,8 @@ namespace Tango.BL.Entities
                 {
                     _blue = value;
 
-                    BlueChanged?.Invoke(this, value);
+                    OnBlueChanged(value);
 
-                    RaisePropertyChanged(nameof(Blue)); 
                 }
             }
         }
@@ -416,9 +405,8 @@ namespace Tango.BL.Entities
                 {
                     _l = value;
 
-                    LChanged?.Invoke(this, value);
+                    OnLChanged(value);
 
-                    RaisePropertyChanged(nameof(L)); 
                 }
             }
         }
@@ -444,9 +432,8 @@ namespace Tango.BL.Entities
                 {
                     _a = value;
 
-                    AChanged?.Invoke(this, value);
+                    OnAChanged(value);
 
-                    RaisePropertyChanged(nameof(A)); 
                 }
             }
         }
@@ -472,9 +459,8 @@ namespace Tango.BL.Entities
                 {
                     _b = value;
 
-                    BChanged?.Invoke(this, value);
+                    OnBChanged(value);
 
-                    RaisePropertyChanged(nameof(B)); 
                 }
             }
         }
@@ -500,9 +486,8 @@ namespace Tango.BL.Entities
                 {
                     _v0 = value;
 
-                    V0Changed?.Invoke(this, value);
+                    OnV0Changed(value);
 
-                    RaisePropertyChanged(nameof(V0)); 
                 }
             }
         }
@@ -528,9 +513,8 @@ namespace Tango.BL.Entities
                 {
                     _v0div = value;
 
-                    V0DivChanged?.Invoke(this, value);
+                    OnV0DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V0Div)); 
                 }
             }
         }
@@ -556,9 +540,8 @@ namespace Tango.BL.Entities
                 {
                     _v1 = value;
 
-                    V1Changed?.Invoke(this, value);
+                    OnV1Changed(value);
 
-                    RaisePropertyChanged(nameof(V1)); 
                 }
             }
         }
@@ -584,9 +567,8 @@ namespace Tango.BL.Entities
                 {
                     _v1div = value;
 
-                    V1DivChanged?.Invoke(this, value);
+                    OnV1DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V1Div)); 
                 }
             }
         }
@@ -612,9 +594,8 @@ namespace Tango.BL.Entities
                 {
                     _v2 = value;
 
-                    V2Changed?.Invoke(this, value);
+                    OnV2Changed(value);
 
-                    RaisePropertyChanged(nameof(V2)); 
                 }
             }
         }
@@ -640,9 +621,8 @@ namespace Tango.BL.Entities
                 {
                     _v2div = value;
 
-                    V2DivChanged?.Invoke(this, value);
+                    OnV2DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V2Div)); 
                 }
             }
         }
@@ -668,9 +648,8 @@ namespace Tango.BL.Entities
                 {
                     _v3 = value;
 
-                    V3Changed?.Invoke(this, value);
+                    OnV3Changed(value);
 
-                    RaisePropertyChanged(nameof(V3)); 
                 }
             }
         }
@@ -696,9 +675,8 @@ namespace Tango.BL.Entities
                 {
                     _v3div = value;
 
-                    V3DivChanged?.Invoke(this, value);
+                    OnV3DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V3Div)); 
                 }
             }
         }
@@ -724,9 +702,8 @@ namespace Tango.BL.Entities
                 {
                     _v4 = value;
 
-                    V4Changed?.Invoke(this, value);
+                    OnV4Changed(value);
 
-                    RaisePropertyChanged(nameof(V4)); 
                 }
             }
         }
@@ -752,9 +729,8 @@ namespace Tango.BL.Entities
                 {
                     _v4div = value;
 
-                    V4DivChanged?.Invoke(this, value);
+                    OnV4DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V4Div)); 
                 }
             }
         }
@@ -780,9 +756,8 @@ namespace Tango.BL.Entities
                 {
                     _v5 = value;
 
-                    V5Changed?.Invoke(this, value);
+                    OnV5Changed(value);
 
-                    RaisePropertyChanged(nameof(V5)); 
                 }
             }
         }
@@ -808,9 +783,8 @@ namespace Tango.BL.Entities
                 {
                     _v5div = value;
 
-                    V5DivChanged?.Invoke(this, value);
+                    OnV5DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V5Div)); 
                 }
             }
         }
@@ -836,9 +810,8 @@ namespace Tango.BL.Entities
                 {
                     _v6 = value;
 
-                    V6Changed?.Invoke(this, value);
+                    OnV6Changed(value);
 
-                    RaisePropertyChanged(nameof(V6)); 
                 }
             }
         }
@@ -864,9 +837,8 @@ namespace Tango.BL.Entities
                 {
                     _v6div = value;
 
-                    V6DivChanged?.Invoke(this, value);
+                    OnV6DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V6Div)); 
                 }
             }
         }
@@ -892,9 +864,8 @@ namespace Tango.BL.Entities
                 {
                     _v7 = value;
 
-                    V7Changed?.Invoke(this, value);
+                    OnV7Changed(value);
 
-                    RaisePropertyChanged(nameof(V7)); 
                 }
             }
         }
@@ -920,9 +891,8 @@ namespace Tango.BL.Entities
                 {
                     _v7div = value;
 
-                    V7DivChanged?.Invoke(this, value);
+                    OnV7DivChanged(value);
 
-                    RaisePropertyChanged(nameof(V7Div)); 
                 }
             }
         }
@@ -948,9 +918,8 @@ namespace Tango.BL.Entities
                 {
                     _corrected = value;
 
-                    CorrectedChanged?.Invoke(this, value);
+                    OnCorrectedChanged(value);
 
-                    RaisePropertyChanged(nameof(Corrected)); 
                 }
             }
         }
@@ -976,7 +945,6 @@ namespace Tango.BL.Entities
                 if (_colorcatalogguid != value)
                 {
                     _colorcatalogguid = value;
-                    RaisePropertyChanged(nameof(ColorCatalogGuid)); 
                 }
             }
         }
@@ -1002,9 +970,8 @@ namespace Tango.BL.Entities
                 {
                     _colorcatalogcode = value;
 
-                    ColorCatalogCodeChanged?.Invoke(this, value);
+                    OnColorCatalogCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorCatalogCode)); 
                 }
             }
         }
@@ -1030,9 +997,8 @@ namespace Tango.BL.Entities
                 {
                     _colorcatalog = value;
 
-                    ColorCatalogChanged?.Invoke(this, value);
+                    OnColorCatalogChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorCatalog)); 
                 }
             }
         }
@@ -1058,9 +1024,8 @@ namespace Tango.BL.Entities
                 {
                     _colorspace = value;
 
-                    ColorSpaceChanged?.Invoke(this, value);
+                    OnColorSpaceChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorSpace)); 
                 }
             }
         }
@@ -1086,14 +1051,310 @@ namespace Tango.BL.Entities
                 {
                     _segment = value;
 
-                    SegmentChanged?.Invoke(this, value);
+                    OnSegmentChanged(value);
 
-                    RaisePropertyChanged(nameof(Segment)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the OffsetPercent has changed.
+        /// </summary>
+        protected virtual void OnOffsetPercentChanged(Double offsetpercent)
+        {
+            OffsetPercentChanged?.Invoke(this, offsetpercent);
+            RaisePropertyChanged(nameof(OffsetPercent));
+        }
+
+        /// <summary>
+        /// Called when the StopIndex has changed.
+        /// </summary>
+        protected virtual void OnStopIndexChanged(Int32 stopindex)
+        {
+            StopIndexChanged?.Invoke(this, stopindex);
+            RaisePropertyChanged(nameof(StopIndex));
+        }
+
+        /// <summary>
+        /// Called when the Cyan has changed.
+        /// </summary>
+        protected virtual void OnCyanChanged(Double cyan)
+        {
+            CyanChanged?.Invoke(this, cyan);
+            RaisePropertyChanged(nameof(Cyan));
+        }
+
+        /// <summary>
+        /// Called when the Magenta has changed.
+        /// </summary>
+        protected virtual void OnMagentaChanged(Double magenta)
+        {
+            MagentaChanged?.Invoke(this, magenta);
+            RaisePropertyChanged(nameof(Magenta));
+        }
+
+        /// <summary>
+        /// Called when the Yellow has changed.
+        /// </summary>
+        protected virtual void OnYellowChanged(Double yellow)
+        {
+            YellowChanged?.Invoke(this, yellow);
+            RaisePropertyChanged(nameof(Yellow));
+        }
+
+        /// <summary>
+        /// Called when the Black has changed.
+        /// </summary>
+        protected virtual void OnBlackChanged(Double black)
+        {
+            BlackChanged?.Invoke(this, black);
+            RaisePropertyChanged(nameof(Black));
+        }
+
+        /// <summary>
+        /// Called when the Red has changed.
+        /// </summary>
+        protected virtual void OnRedChanged(Int32 red)
+        {
+            RedChanged?.Invoke(this, red);
+            RaisePropertyChanged(nameof(Red));
+        }
+
+        /// <summary>
+        /// Called when the Green has changed.
+        /// </summary>
+        protected virtual void OnGreenChanged(Int32 green)
+        {
+            GreenChanged?.Invoke(this, green);
+            RaisePropertyChanged(nameof(Green));
+        }
+
+        /// <summary>
+        /// Called when the Blue has changed.
+        /// </summary>
+        protected virtual void OnBlueChanged(Int32 blue)
+        {
+            BlueChanged?.Invoke(this, blue);
+            RaisePropertyChanged(nameof(Blue));
+        }
+
+        /// <summary>
+        /// Called when the L has changed.
+        /// </summary>
+        protected virtual void OnLChanged(Double l)
+        {
+            LChanged?.Invoke(this, l);
+            RaisePropertyChanged(nameof(L));
+        }
+
+        /// <summary>
+        /// Called when the A has changed.
+        /// </summary>
+        protected virtual void OnAChanged(Double a)
+        {
+            AChanged?.Invoke(this, a);
+            RaisePropertyChanged(nameof(A));
+        }
+
+        /// <summary>
+        /// Called when the B has changed.
+        /// </summary>
+        protected virtual void OnBChanged(Double b)
+        {
+            BChanged?.Invoke(this, b);
+            RaisePropertyChanged(nameof(B));
+        }
+
+        /// <summary>
+        /// Called when the V0 has changed.
+        /// </summary>
+        protected virtual void OnV0Changed(Double v0)
+        {
+            V0Changed?.Invoke(this, v0);
+            RaisePropertyChanged(nameof(V0));
+        }
+
+        /// <summary>
+        /// Called when the V0Div has changed.
+        /// </summary>
+        protected virtual void OnV0DivChanged(Int32 v0div)
+        {
+            V0DivChanged?.Invoke(this, v0div);
+            RaisePropertyChanged(nameof(V0Div));
+        }
+
+        /// <summary>
+        /// Called when the V1 has changed.
+        /// </summary>
+        protected virtual void OnV1Changed(Double v1)
+        {
+            V1Changed?.Invoke(this, v1);
+            RaisePropertyChanged(nameof(V1));
+        }
+
+        /// <summary>
+        /// Called when the V1Div has changed.
+        /// </summary>
+        protected virtual void OnV1DivChanged(Int32 v1div)
+        {
+            V1DivChanged?.Invoke(this, v1div);
+            RaisePropertyChanged(nameof(V1Div));
+        }
+
+        /// <summary>
+        /// Called when the V2 has changed.
+        /// </summary>
+        protected virtual void OnV2Changed(Double v2)
+        {
+            V2Changed?.Invoke(this, v2);
+            RaisePropertyChanged(nameof(V2));
+        }
+
+        /// <summary>
+        /// Called when the V2Div has changed.
+        /// </summary>
+        protected virtual void OnV2DivChanged(Int32 v2div)
+        {
+            V2DivChanged?.Invoke(this, v2div);
+            RaisePropertyChanged(nameof(V2Div));
+        }
+
+        /// <summary>
+        /// Called when the V3 has changed.
+        /// </summary>
+        protected virtual void OnV3Changed(Double v3)
+        {
+            V3Changed?.Invoke(this, v3);
+            RaisePropertyChanged(nameof(V3));
+        }
+
+        /// <summary>
+        /// Called when the V3Div has changed.
+        /// </summary>
+        protected virtual void OnV3DivChanged(Int32 v3div)
+        {
+            V3DivChanged?.Invoke(this, v3div);
+            RaisePropertyChanged(nameof(V3Div));
+        }
+
+        /// <summary>
+        /// Called when the V4 has changed.
+        /// </summary>
+        protected virtual void OnV4Changed(Double v4)
+        {
+            V4Changed?.Invoke(this, v4);
+            RaisePropertyChanged(nameof(V4));
+        }
+
+        /// <summary>
+        /// Called when the V4Div has changed.
+        /// </summary>
+        protected virtual void OnV4DivChanged(Int32 v4div)
+        {
+            V4DivChanged?.Invoke(this, v4div);
+            RaisePropertyChanged(nameof(V4Div));
+        }
+
+        /// <summary>
+        /// Called when the V5 has changed.
+        /// </summary>
+        protected virtual void OnV5Changed(Double v5)
+        {
+            V5Changed?.Invoke(this, v5);
+            RaisePropertyChanged(nameof(V5));
+        }
+
+        /// <summary>
+        /// Called when the V5Div has changed.
+        /// </summary>
+        protected virtual void OnV5DivChanged(Int32 v5div)
+        {
+            V5DivChanged?.Invoke(this, v5div);
+            RaisePropertyChanged(nameof(V5Div));
+        }
+
+        /// <summary>
+        /// Called when the V6 has changed.
+        /// </summary>
+        protected virtual void OnV6Changed(Double v6)
+        {
+            V6Changed?.Invoke(this, v6);
+            RaisePropertyChanged(nameof(V6));
+        }
+
+        /// <summary>
+        /// Called when the V6Div has changed.
+        /// </summary>
+        protected virtual void OnV6DivChanged(Int32 v6div)
+        {
+            V6DivChanged?.Invoke(this, v6div);
+            RaisePropertyChanged(nameof(V6Div));
+        }
+
+        /// <summary>
+        /// Called when the V7 has changed.
+        /// </summary>
+        protected virtual void OnV7Changed(Double v7)
+        {
+            V7Changed?.Invoke(this, v7);
+            RaisePropertyChanged(nameof(V7));
+        }
+
+        /// <summary>
+        /// Called when the V7Div has changed.
+        /// </summary>
+        protected virtual void OnV7DivChanged(Int32 v7div)
+        {
+            V7DivChanged?.Invoke(this, v7div);
+            RaisePropertyChanged(nameof(V7Div));
+        }
+
+        /// <summary>
+        /// Called when the Corrected has changed.
+        /// </summary>
+        protected virtual void OnCorrectedChanged(Boolean corrected)
+        {
+            CorrectedChanged?.Invoke(this, corrected);
+            RaisePropertyChanged(nameof(Corrected));
+        }
+
+        /// <summary>
+        /// Called when the ColorCatalogCode has changed.
+        /// </summary>
+        protected virtual void OnColorCatalogCodeChanged(Int32 colorcatalogcode)
+        {
+            ColorCatalogCodeChanged?.Invoke(this, colorcatalogcode);
+            RaisePropertyChanged(nameof(ColorCatalogCode));
+        }
+
+        /// <summary>
+        /// Called when the ColorCatalog has changed.
+        /// </summary>
+        protected virtual void OnColorCatalogChanged(ColorCatalog colorcatalog)
+        {
+            ColorCatalogChanged?.Invoke(this, colorcatalog);
+            RaisePropertyChanged(nameof(ColorCatalog));
+        }
+
+        /// <summary>
+        /// Called when the ColorSpace has changed.
+        /// </summary>
+        protected virtual void OnColorSpaceChanged(ColorSpace colorspace)
+        {
+            ColorSpaceChanged?.Invoke(this, colorspace);
+            RaisePropertyChanged(nameof(ColorSpace));
+        }
+
+        /// <summary>
+        /// Called when the Segment has changed.
+        /// </summary>
+        protected virtual void OnSegmentChanged(Segment segment)
+        {
+            SegmentChanged?.Invoke(this, segment);
+            RaisePropertyChanged(nameof(Segment));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="BrushStop" /> class.
         /// </summary>
         public BrushStop() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs
index bc5a3e909..905dbe3cc 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _idspacks = value;
 
-                    IdsPacksChanged?.Invoke(this, value);
+                    OnIdsPacksChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPacks)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the IdsPacks has changed.
+        /// </summary>
+        protected virtual void OnIdsPacksChanged(SynchronizedObservableCollection<IdsPack> idspacks)
+        {
+            IdsPacksChanged?.Invoke(this, idspacks);
+            RaisePropertyChanged(nameof(IdsPacks));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="CartridgeType" /> class.
         /// </summary>
         public CartridgeType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Cat.cs b/Software/Visual_Studio/Tango.BL/Entities/Cat.cs
index 389910549..ed706cc8e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Cat.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Cat.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -84,7 +83,6 @@ namespace Tango.BL.Entities
                 if (_machineguid != value)
                 {
                     _machineguid = value;
-                    RaisePropertyChanged(nameof(MachineGuid)); 
                 }
             }
         }
@@ -110,7 +108,6 @@ namespace Tango.BL.Entities
                 if (_rmlguid != value)
                 {
                     _rmlguid = value;
-                    RaisePropertyChanged(nameof(RmlGuid)); 
                 }
             }
         }
@@ -136,7 +133,6 @@ namespace Tango.BL.Entities
                 if (_liquidtypeguid != value)
                 {
                     _liquidtypeguid = value;
-                    RaisePropertyChanged(nameof(LiquidTypeGuid)); 
                 }
             }
         }
@@ -162,9 +158,8 @@ namespace Tango.BL.Entities
                 {
                     _data = value;
 
-                    DataChanged?.Invoke(this, value);
+                    OnDataChanged(value);
 
-                    RaisePropertyChanged(nameof(Data)); 
                 }
             }
         }
@@ -190,9 +185,8 @@ namespace Tango.BL.Entities
                 {
                     _liquidtype = value;
 
-                    LiquidTypeChanged?.Invoke(this, value);
+                    OnLiquidTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(LiquidType)); 
                 }
             }
         }
@@ -218,9 +212,8 @@ namespace Tango.BL.Entities
                 {
                     _machine = value;
 
-                    MachineChanged?.Invoke(this, value);
+                    OnMachineChanged(value);
 
-                    RaisePropertyChanged(nameof(Machine)); 
                 }
             }
         }
@@ -246,14 +239,58 @@ namespace Tango.BL.Entities
                 {
                     _rml = value;
 
-                    RmlChanged?.Invoke(this, value);
+                    OnRmlChanged(value);
 
-                    RaisePropertyChanged(nameof(Rml)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Data has changed.
+        /// </summary>
+        protected virtual void OnDataChanged(Byte[] data)
+        {
+            DataChanged?.Invoke(this, data);
+            RaisePropertyChanged(nameof(Data));
+        }
+
+        /// <summary>
+        /// Called when the LiquidType has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypeChanged(LiquidType liquidtype)
+        {
+            LiquidTypeChanged?.Invoke(this, liquidtype);
+            RaisePropertyChanged(nameof(LiquidType));
+        }
+
+        /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
+        /// Called when the Rml has changed.
+        /// </summary>
+        protected virtual void OnRmlChanged(Rml rml)
+        {
+            RmlChanged?.Invoke(this, rml);
+            RaisePropertyChanged(nameof(Rml));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Cat" /> class.
         /// </summary>
         public Cat() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Cct.cs b/Software/Visual_Studio/Tango.BL/Entities/Cct.cs
index 339f334a5..2c902b210 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Cct.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Cct.cs
@@ -62,9 +62,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -90,9 +89,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -118,9 +116,8 @@ namespace Tango.BL.Entities
                 {
                     _forwardfilename = value;
 
-                    ForwardFileNameChanged?.Invoke(this, value);
+                    OnForwardFileNameChanged(value);
 
-                    RaisePropertyChanged(nameof(ForwardFileName)); 
                 }
             }
         }
@@ -146,9 +143,8 @@ namespace Tango.BL.Entities
                 {
                     _inversefilename = value;
 
-                    InverseFileNameChanged?.Invoke(this, value);
+                    OnInverseFileNameChanged(value);
 
-                    RaisePropertyChanged(nameof(InverseFileName)); 
                 }
             }
         }
@@ -174,9 +170,8 @@ namespace Tango.BL.Entities
                 {
                     _forwarddata = value;
 
-                    ForwardDataChanged?.Invoke(this, value);
+                    OnForwardDataChanged(value);
 
-                    RaisePropertyChanged(nameof(ForwardData)); 
                 }
             }
         }
@@ -202,9 +197,8 @@ namespace Tango.BL.Entities
                 {
                     _inversedata = value;
 
-                    InverseDataChanged?.Invoke(this, value);
+                    OnInverseDataChanged(value);
 
-                    RaisePropertyChanged(nameof(InverseData)); 
                 }
             }
         }
@@ -230,9 +224,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -258,7 +251,6 @@ namespace Tango.BL.Entities
                 if (_rmlguid != value)
                 {
                     _rmlguid = value;
-                    RaisePropertyChanged(nameof(RmlGuid)); 
                 }
             }
         }
@@ -284,14 +276,85 @@ namespace Tango.BL.Entities
                 {
                     _rml = value;
 
-                    RmlChanged?.Invoke(this, value);
+                    OnRmlChanged(value);
 
-                    RaisePropertyChanged(nameof(Rml)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the ForwardFileName has changed.
+        /// </summary>
+        protected virtual void OnForwardFileNameChanged(String forwardfilename)
+        {
+            ForwardFileNameChanged?.Invoke(this, forwardfilename);
+            RaisePropertyChanged(nameof(ForwardFileName));
+        }
+
+        /// <summary>
+        /// Called when the InverseFileName has changed.
+        /// </summary>
+        protected virtual void OnInverseFileNameChanged(String inversefilename)
+        {
+            InverseFileNameChanged?.Invoke(this, inversefilename);
+            RaisePropertyChanged(nameof(InverseFileName));
+        }
+
+        /// <summary>
+        /// Called when the ForwardData has changed.
+        /// </summary>
+        protected virtual void OnForwardDataChanged(Byte[] forwarddata)
+        {
+            ForwardDataChanged?.Invoke(this, forwarddata);
+            RaisePropertyChanged(nameof(ForwardData));
+        }
+
+        /// <summary>
+        /// Called when the InverseData has changed.
+        /// </summary>
+        protected virtual void OnInverseDataChanged(Byte[] inversedata)
+        {
+            InverseDataChanged?.Invoke(this, inversedata);
+            RaisePropertyChanged(nameof(InverseData));
+        }
+
+        /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Rml has changed.
+        /// </summary>
+        protected virtual void OnRmlChanged(Rml rml)
+        {
+            RmlChanged?.Invoke(this, rml);
+            RaisePropertyChanged(nameof(Rml));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Cct" /> class.
         /// </summary>
         public Cct() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
index c48de0c95..a09078de6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
@@ -78,7 +78,6 @@ namespace Tango.BL.Entities
                 if (_colorspaceguid != value)
                 {
                     _colorspaceguid = value;
-                    RaisePropertyChanged(nameof(ColorSpaceGuid)); 
                 }
             }
         }
@@ -104,9 +103,8 @@ namespace Tango.BL.Entities
                 {
                     _colorcode = value;
 
-                    ColorCodeChanged?.Invoke(this, value);
+                    OnColorCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorCode)); 
                 }
             }
         }
@@ -132,9 +130,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -160,9 +157,8 @@ namespace Tango.BL.Entities
                 {
                     _colorgroup = value;
 
-                    ColorGroupChanged?.Invoke(this, value);
+                    OnColorGroupChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorGroup)); 
                 }
             }
         }
@@ -188,9 +184,8 @@ namespace Tango.BL.Entities
                 {
                     _cyan = value;
 
-                    CyanChanged?.Invoke(this, value);
+                    OnCyanChanged(value);
 
-                    RaisePropertyChanged(nameof(Cyan)); 
                 }
             }
         }
@@ -216,9 +211,8 @@ namespace Tango.BL.Entities
                 {
                     _magenta = value;
 
-                    MagentaChanged?.Invoke(this, value);
+                    OnMagentaChanged(value);
 
-                    RaisePropertyChanged(nameof(Magenta)); 
                 }
             }
         }
@@ -244,9 +238,8 @@ namespace Tango.BL.Entities
                 {
                     _yellow = value;
 
-                    YellowChanged?.Invoke(this, value);
+                    OnYellowChanged(value);
 
-                    RaisePropertyChanged(nameof(Yellow)); 
                 }
             }
         }
@@ -272,9 +265,8 @@ namespace Tango.BL.Entities
                 {
                     _black = value;
 
-                    BlackChanged?.Invoke(this, value);
+                    OnBlackChanged(value);
 
-                    RaisePropertyChanged(nameof(Black)); 
                 }
             }
         }
@@ -300,9 +292,8 @@ namespace Tango.BL.Entities
                 {
                     _red = value;
 
-                    RedChanged?.Invoke(this, value);
+                    OnRedChanged(value);
 
-                    RaisePropertyChanged(nameof(Red)); 
                 }
             }
         }
@@ -328,9 +319,8 @@ namespace Tango.BL.Entities
                 {
                     _green = value;
 
-                    GreenChanged?.Invoke(this, value);
+                    OnGreenChanged(value);
 
-                    RaisePropertyChanged(nameof(Green)); 
                 }
             }
         }
@@ -356,9 +346,8 @@ namespace Tango.BL.Entities
                 {
                     _blue = value;
 
-                    BlueChanged?.Invoke(this, value);
+                    OnBlueChanged(value);
 
-                    RaisePropertyChanged(nameof(Blue)); 
                 }
             }
         }
@@ -384,9 +373,8 @@ namespace Tango.BL.Entities
                 {
                     _l = value;
 
-                    LChanged?.Invoke(this, value);
+                    OnLChanged(value);
 
-                    RaisePropertyChanged(nameof(L)); 
                 }
             }
         }
@@ -412,9 +400,8 @@ namespace Tango.BL.Entities
                 {
                     _a = value;
 
-                    AChanged?.Invoke(this, value);
+                    OnAChanged(value);
 
-                    RaisePropertyChanged(nameof(A)); 
                 }
             }
         }
@@ -440,9 +427,8 @@ namespace Tango.BL.Entities
                 {
                     _b = value;
 
-                    BChanged?.Invoke(this, value);
+                    OnBChanged(value);
 
-                    RaisePropertyChanged(nameof(B)); 
                 }
             }
         }
@@ -468,9 +454,8 @@ namespace Tango.BL.Entities
                 {
                     _processparameterstableindex = value;
 
-                    ProcessParametersTableIndexChanged?.Invoke(this, value);
+                    OnProcessParametersTableIndexChanged(value);
 
-                    RaisePropertyChanged(nameof(ProcessParametersTableIndex)); 
                 }
             }
         }
@@ -494,9 +479,8 @@ namespace Tango.BL.Entities
                 {
                     _brushstops = value;
 
-                    BrushStopsChanged?.Invoke(this, value);
+                    OnBrushStopsChanged(value);
 
-                    RaisePropertyChanged(nameof(BrushStops)); 
                 }
             }
         }
@@ -522,14 +506,157 @@ namespace Tango.BL.Entities
                 {
                     _colorspace = value;
 
-                    ColorSpaceChanged?.Invoke(this, value);
+                    OnColorSpaceChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorSpace)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the ColorCode has changed.
+        /// </summary>
+        protected virtual void OnColorCodeChanged(Int32 colorcode)
+        {
+            ColorCodeChanged?.Invoke(this, colorcode);
+            RaisePropertyChanged(nameof(ColorCode));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the ColorGroup has changed.
+        /// </summary>
+        protected virtual void OnColorGroupChanged(String colorgroup)
+        {
+            ColorGroupChanged?.Invoke(this, colorgroup);
+            RaisePropertyChanged(nameof(ColorGroup));
+        }
+
+        /// <summary>
+        /// Called when the Cyan has changed.
+        /// </summary>
+        protected virtual void OnCyanChanged(Double cyan)
+        {
+            CyanChanged?.Invoke(this, cyan);
+            RaisePropertyChanged(nameof(Cyan));
+        }
+
+        /// <summary>
+        /// Called when the Magenta has changed.
+        /// </summary>
+        protected virtual void OnMagentaChanged(Double magenta)
+        {
+            MagentaChanged?.Invoke(this, magenta);
+            RaisePropertyChanged(nameof(Magenta));
+        }
+
+        /// <summary>
+        /// Called when the Yellow has changed.
+        /// </summary>
+        protected virtual void OnYellowChanged(Double yellow)
+        {
+            YellowChanged?.Invoke(this, yellow);
+            RaisePropertyChanged(nameof(Yellow));
+        }
+
+        /// <summary>
+        /// Called when the Black has changed.
+        /// </summary>
+        protected virtual void OnBlackChanged(Double black)
+        {
+            BlackChanged?.Invoke(this, black);
+            RaisePropertyChanged(nameof(Black));
+        }
+
+        /// <summary>
+        /// Called when the Red has changed.
+        /// </summary>
+        protected virtual void OnRedChanged(Int32 red)
+        {
+            RedChanged?.Invoke(this, red);
+            RaisePropertyChanged(nameof(Red));
+        }
+
+        /// <summary>
+        /// Called when the Green has changed.
+        /// </summary>
+        protected virtual void OnGreenChanged(Int32 green)
+        {
+            GreenChanged?.Invoke(this, green);
+            RaisePropertyChanged(nameof(Green));
+        }
+
+        /// <summary>
+        /// Called when the Blue has changed.
+        /// </summary>
+        protected virtual void OnBlueChanged(Int32 blue)
+        {
+            BlueChanged?.Invoke(this, blue);
+            RaisePropertyChanged(nameof(Blue));
+        }
+
+        /// <summary>
+        /// Called when the L has changed.
+        /// </summary>
+        protected virtual void OnLChanged(Double l)
+        {
+            LChanged?.Invoke(this, l);
+            RaisePropertyChanged(nameof(L));
+        }
+
+        /// <summary>
+        /// Called when the A has changed.
+        /// </summary>
+        protected virtual void OnAChanged(Double a)
+        {
+            AChanged?.Invoke(this, a);
+            RaisePropertyChanged(nameof(A));
+        }
+
+        /// <summary>
+        /// Called when the B has changed.
+        /// </summary>
+        protected virtual void OnBChanged(Double b)
+        {
+            BChanged?.Invoke(this, b);
+            RaisePropertyChanged(nameof(B));
+        }
+
+        /// <summary>
+        /// Called when the ProcessParametersTableIndex has changed.
+        /// </summary>
+        protected virtual void OnProcessParametersTableIndexChanged(Int32 processparameterstableindex)
+        {
+            ProcessParametersTableIndexChanged?.Invoke(this, processparameterstableindex);
+            RaisePropertyChanged(nameof(ProcessParametersTableIndex));
+        }
+
+        /// <summary>
+        /// Called when the BrushStops has changed.
+        /// </summary>
+        protected virtual void OnBrushStopsChanged(SynchronizedObservableCollection<BrushStop> brushstops)
+        {
+            BrushStopsChanged?.Invoke(this, brushstops);
+            RaisePropertyChanged(nameof(BrushStops));
+        }
+
+        /// <summary>
+        /// Called when the ColorSpace has changed.
+        /// </summary>
+        protected virtual void OnColorSpaceChanged(ColorSpace colorspace)
+        {
+            ColorSpaceChanged?.Invoke(this, colorspace);
+            RaisePropertyChanged(nameof(ColorSpace));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ColorCatalog" /> class.
         /// </summary>
         public ColorCatalog() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs
index 16e3b1ead..03b13d452 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs
@@ -33,6 +33,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> IsCatalogChanged;
 
+        public event EventHandler<Byte[]> ThumbnailChanged;
+
         public event EventHandler<SynchronizedObservableCollection<BrushStop>> BrushStopsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<ColorCatalog>> ColorCatalogsChanged;
@@ -62,9 +64,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -90,9 +91,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -118,9 +118,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -146,9 +145,35 @@ namespace Tango.BL.Entities
                 {
                     _iscatalog = value;
 
-                    IsCatalogChanged?.Invoke(this, value);
+                    OnIsCatalogChanged(value);
+
+                }
+            }
+        }
+
+        protected Byte[] _thumbnail;
+
+        /// <summary>
+        /// Gets or sets the colorspace thumbnail.
+        /// </summary>
+
+        [Column("THUMBNAIL")]
+
+        public  Byte[] Thumbnail
+        {
+            get 
+            {
+                return _thumbnail; 
+            }
+
+            set 
+            {
+                if (_thumbnail != value)
+                {
+                    _thumbnail = value;
+
+                    OnThumbnailChanged(value);
 
-                    RaisePropertyChanged(nameof(IsCatalog)); 
                 }
             }
         }
@@ -172,9 +197,8 @@ namespace Tango.BL.Entities
                 {
                     _brushstops = value;
 
-                    BrushStopsChanged?.Invoke(this, value);
+                    OnBrushStopsChanged(value);
 
-                    RaisePropertyChanged(nameof(BrushStops)); 
                 }
             }
         }
@@ -198,9 +222,8 @@ namespace Tango.BL.Entities
                 {
                     _colorcatalogs = value;
 
-                    ColorCatalogsChanged?.Invoke(this, value);
+                    OnColorCatalogsChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorCatalogs)); 
                 }
             }
         }
@@ -224,9 +247,8 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
@@ -250,14 +272,94 @@ namespace Tango.BL.Entities
                 {
                     _machines = value;
 
-                    MachinesChanged?.Invoke(this, value);
+                    OnMachinesChanged(value);
 
-                    RaisePropertyChanged(nameof(Machines)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the IsCatalog has changed.
+        /// </summary>
+        protected virtual void OnIsCatalogChanged(Boolean iscatalog)
+        {
+            IsCatalogChanged?.Invoke(this, iscatalog);
+            RaisePropertyChanged(nameof(IsCatalog));
+        }
+
+        /// <summary>
+        /// Called when the Thumbnail has changed.
+        /// </summary>
+        protected virtual void OnThumbnailChanged(Byte[] thumbnail)
+        {
+            ThumbnailChanged?.Invoke(this, thumbnail);
+            RaisePropertyChanged(nameof(Thumbnail));
+        }
+
+        /// <summary>
+        /// Called when the BrushStops has changed.
+        /// </summary>
+        protected virtual void OnBrushStopsChanged(SynchronizedObservableCollection<BrushStop> brushstops)
+        {
+            BrushStopsChanged?.Invoke(this, brushstops);
+            RaisePropertyChanged(nameof(BrushStops));
+        }
+
+        /// <summary>
+        /// Called when the ColorCatalogs has changed.
+        /// </summary>
+        protected virtual void OnColorCatalogsChanged(SynchronizedObservableCollection<ColorCatalog> colorcatalogs)
+        {
+            ColorCatalogsChanged?.Invoke(this, colorcatalogs);
+            RaisePropertyChanged(nameof(ColorCatalogs));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
+        /// Called when the Machines has changed.
+        /// </summary>
+        protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines)
+        {
+            MachinesChanged?.Invoke(this, machines);
+            RaisePropertyChanged(nameof(Machines));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ColorSpace" /> class.
         /// </summary>
         public ColorSpace() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
index 73d9a09be..5098c267a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
@@ -68,9 +68,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -96,9 +95,8 @@ namespace Tango.BL.Entities
                 {
                     _creationdate = value;
 
-                    CreationDateChanged?.Invoke(this, value);
+                    OnCreationDateChanged(value);
 
-                    RaisePropertyChanged(nameof(CreationDate)); 
                 }
             }
         }
@@ -124,7 +122,6 @@ namespace Tango.BL.Entities
                 if (_applicationosversionguid != value)
                 {
                     _applicationosversionguid = value;
-                    RaisePropertyChanged(nameof(ApplicationOsVersionGuid)); 
                 }
             }
         }
@@ -150,7 +147,6 @@ namespace Tango.BL.Entities
                 if (_applicationfirmwareversionguid != value)
                 {
                     _applicationfirmwareversionguid = value;
-                    RaisePropertyChanged(nameof(ApplicationFirmwareVersionGuid)); 
                 }
             }
         }
@@ -176,7 +172,6 @@ namespace Tango.BL.Entities
                 if (_applicationdisplaypanelversionguid != value)
                 {
                     _applicationdisplaypanelversionguid = value;
-                    RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionGuid)); 
                 }
             }
         }
@@ -202,7 +197,6 @@ namespace Tango.BL.Entities
                 if (_embeddedfirmwareversionguid != value)
                 {
                     _embeddedfirmwareversionguid = value;
-                    RaisePropertyChanged(nameof(EmbeddedFirmwareVersionGuid)); 
                 }
             }
         }
@@ -228,7 +222,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -254,9 +247,8 @@ namespace Tango.BL.Entities
                 {
                     _applicationdisplaypanelversion = value;
 
-                    ApplicationDisplayPanelVersionChanged?.Invoke(this, value);
+                    OnApplicationDisplayPanelVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(ApplicationDisplayPanelVersion)); 
                 }
             }
         }
@@ -282,9 +274,8 @@ namespace Tango.BL.Entities
                 {
                     _applicationfirmwareversion = value;
 
-                    ApplicationFirmwareVersionChanged?.Invoke(this, value);
+                    OnApplicationFirmwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(ApplicationFirmwareVersion)); 
                 }
             }
         }
@@ -310,9 +301,8 @@ namespace Tango.BL.Entities
                 {
                     _applicationosversion = value;
 
-                    ApplicationOsVersionChanged?.Invoke(this, value);
+                    OnApplicationOsVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(ApplicationOsVersion)); 
                 }
             }
         }
@@ -338,9 +328,8 @@ namespace Tango.BL.Entities
                 {
                     _embeddedfirmwareversion = value;
 
-                    EmbeddedFirmwareVersionChanged?.Invoke(this, value);
+                    OnEmbeddedFirmwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(EmbeddedFirmwareVersion)); 
                 }
             }
         }
@@ -366,9 +355,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
@@ -392,9 +380,8 @@ namespace Tango.BL.Entities
                 {
                     _idspacks = value;
 
-                    IdsPacksChanged?.Invoke(this, value);
+                    OnIdsPacksChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPacks)); 
                 }
             }
         }
@@ -418,9 +405,8 @@ namespace Tango.BL.Entities
                 {
                     _machineversions = value;
 
-                    MachineVersionsChanged?.Invoke(this, value);
+                    OnMachineVersionsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachineVersions)); 
                 }
             }
         }
@@ -444,9 +430,8 @@ namespace Tango.BL.Entities
                 {
                     _machines = value;
 
-                    MachinesChanged?.Invoke(this, value);
+                    OnMachinesChanged(value);
 
-                    RaisePropertyChanged(nameof(Machines)); 
                 }
             }
         }
@@ -470,14 +455,112 @@ namespace Tango.BL.Entities
                 {
                     _machinesconfigurations = value;
 
-                    MachinesConfigurationsChanged?.Invoke(this, value);
+                    OnMachinesConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachinesConfigurations)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the CreationDate has changed.
+        /// </summary>
+        protected virtual void OnCreationDateChanged(DateTime creationdate)
+        {
+            CreationDateChanged?.Invoke(this, creationdate);
+            RaisePropertyChanged(nameof(CreationDate));
+        }
+
+        /// <summary>
+        /// Called when the ApplicationDisplayPanelVersion has changed.
+        /// </summary>
+        protected virtual void OnApplicationDisplayPanelVersionChanged(ApplicationDisplayPanelVersion applicationdisplaypanelversion)
+        {
+            ApplicationDisplayPanelVersionChanged?.Invoke(this, applicationdisplaypanelversion);
+            RaisePropertyChanged(nameof(ApplicationDisplayPanelVersion));
+        }
+
+        /// <summary>
+        /// Called when the ApplicationFirmwareVersion has changed.
+        /// </summary>
+        protected virtual void OnApplicationFirmwareVersionChanged(ApplicationFirmwareVersion applicationfirmwareversion)
+        {
+            ApplicationFirmwareVersionChanged?.Invoke(this, applicationfirmwareversion);
+            RaisePropertyChanged(nameof(ApplicationFirmwareVersion));
+        }
+
+        /// <summary>
+        /// Called when the ApplicationOsVersion has changed.
+        /// </summary>
+        protected virtual void OnApplicationOsVersionChanged(ApplicationOsVersion applicationosversion)
+        {
+            ApplicationOsVersionChanged?.Invoke(this, applicationosversion);
+            RaisePropertyChanged(nameof(ApplicationOsVersion));
+        }
+
+        /// <summary>
+        /// Called when the EmbeddedFirmwareVersion has changed.
+        /// </summary>
+        protected virtual void OnEmbeddedFirmwareVersionChanged(EmbeddedFirmwareVersion embeddedfirmwareversion)
+        {
+            EmbeddedFirmwareVersionChanged?.Invoke(this, embeddedfirmwareversion);
+            RaisePropertyChanged(nameof(EmbeddedFirmwareVersion));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
+        /// Called when the IdsPacks has changed.
+        /// </summary>
+        protected virtual void OnIdsPacksChanged(SynchronizedObservableCollection<IdsPack> idspacks)
+        {
+            IdsPacksChanged?.Invoke(this, idspacks);
+            RaisePropertyChanged(nameof(IdsPacks));
+        }
+
+        /// <summary>
+        /// Called when the MachineVersions has changed.
+        /// </summary>
+        protected virtual void OnMachineVersionsChanged(SynchronizedObservableCollection<MachineVersion> machineversions)
+        {
+            MachineVersionsChanged?.Invoke(this, machineversions);
+            RaisePropertyChanged(nameof(MachineVersions));
+        }
+
+        /// <summary>
+        /// Called when the Machines has changed.
+        /// </summary>
+        protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines)
+        {
+            MachinesChanged?.Invoke(this, machines);
+            RaisePropertyChanged(nameof(Machines));
+        }
+
+        /// <summary>
+        /// Called when the MachinesConfigurations has changed.
+        /// </summary>
+        protected virtual void OnMachinesConfigurationsChanged(SynchronizedObservableCollection<MachinesConfiguration> machinesconfigurations)
+        {
+            MachinesConfigurationsChanged?.Invoke(this, machinesconfigurations);
+            RaisePropertyChanged(nameof(MachinesConfigurations));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Configuration" /> class.
         /// </summary>
         public Configuration() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Contact.cs b/Software/Visual_Studio/Tango.BL/Entities/Contact.cs
index 5fcf5510d..2100ee0e8 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Contact.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Contact.cs
@@ -64,9 +64,8 @@ namespace Tango.BL.Entities
                 {
                     _deleted = value;
 
-                    DeletedChanged?.Invoke(this, value);
+                    OnDeletedChanged(value);
 
-                    RaisePropertyChanged(nameof(Deleted)); 
                 }
             }
         }
@@ -92,9 +91,8 @@ namespace Tango.BL.Entities
                 {
                     _firstname = value;
 
-                    FirstNameChanged?.Invoke(this, value);
+                    OnFirstNameChanged(value);
 
-                    RaisePropertyChanged(nameof(FirstName)); 
                 }
             }
         }
@@ -120,9 +118,8 @@ namespace Tango.BL.Entities
                 {
                     _lastname = value;
 
-                    LastNameChanged?.Invoke(this, value);
+                    OnLastNameChanged(value);
 
-                    RaisePropertyChanged(nameof(LastName)); 
                 }
             }
         }
@@ -148,9 +145,8 @@ namespace Tango.BL.Entities
                 {
                     _fullname = value;
 
-                    FullNameChanged?.Invoke(this, value);
+                    OnFullNameChanged(value);
 
-                    RaisePropertyChanged(nameof(FullName)); 
                 }
             }
         }
@@ -176,9 +172,8 @@ namespace Tango.BL.Entities
                 {
                     _email = value;
 
-                    EmailChanged?.Invoke(this, value);
+                    OnEmailChanged(value);
 
-                    RaisePropertyChanged(nameof(Email)); 
                 }
             }
         }
@@ -204,9 +199,8 @@ namespace Tango.BL.Entities
                 {
                     _phonenumber = value;
 
-                    PhoneNumberChanged?.Invoke(this, value);
+                    OnPhoneNumberChanged(value);
 
-                    RaisePropertyChanged(nameof(PhoneNumber)); 
                 }
             }
         }
@@ -232,9 +226,8 @@ namespace Tango.BL.Entities
                 {
                     _fax = value;
 
-                    FaxChanged?.Invoke(this, value);
+                    OnFaxChanged(value);
 
-                    RaisePropertyChanged(nameof(Fax)); 
                 }
             }
         }
@@ -258,9 +251,8 @@ namespace Tango.BL.Entities
                 {
                     _organizations = value;
 
-                    OrganizationsChanged?.Invoke(this, value);
+                    OnOrganizationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Organizations)); 
                 }
             }
         }
@@ -284,14 +276,94 @@ namespace Tango.BL.Entities
                 {
                     _users = value;
 
-                    UsersChanged?.Invoke(this, value);
+                    OnUsersChanged(value);
 
-                    RaisePropertyChanged(nameof(Users)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Deleted has changed.
+        /// </summary>
+        protected virtual void OnDeletedChanged(Boolean deleted)
+        {
+            DeletedChanged?.Invoke(this, deleted);
+            RaisePropertyChanged(nameof(Deleted));
+        }
+
+        /// <summary>
+        /// Called when the FirstName has changed.
+        /// </summary>
+        protected virtual void OnFirstNameChanged(String firstname)
+        {
+            FirstNameChanged?.Invoke(this, firstname);
+            RaisePropertyChanged(nameof(FirstName));
+        }
+
+        /// <summary>
+        /// Called when the LastName has changed.
+        /// </summary>
+        protected virtual void OnLastNameChanged(String lastname)
+        {
+            LastNameChanged?.Invoke(this, lastname);
+            RaisePropertyChanged(nameof(LastName));
+        }
+
+        /// <summary>
+        /// Called when the FullName has changed.
+        /// </summary>
+        protected virtual void OnFullNameChanged(String fullname)
+        {
+            FullNameChanged?.Invoke(this, fullname);
+            RaisePropertyChanged(nameof(FullName));
+        }
+
+        /// <summary>
+        /// Called when the Email has changed.
+        /// </summary>
+        protected virtual void OnEmailChanged(String email)
+        {
+            EmailChanged?.Invoke(this, email);
+            RaisePropertyChanged(nameof(Email));
+        }
+
+        /// <summary>
+        /// Called when the PhoneNumber has changed.
+        /// </summary>
+        protected virtual void OnPhoneNumberChanged(String phonenumber)
+        {
+            PhoneNumberChanged?.Invoke(this, phonenumber);
+            RaisePropertyChanged(nameof(PhoneNumber));
+        }
+
+        /// <summary>
+        /// Called when the Fax has changed.
+        /// </summary>
+        protected virtual void OnFaxChanged(String fax)
+        {
+            FaxChanged?.Invoke(this, fax);
+            RaisePropertyChanged(nameof(Fax));
+        }
+
+        /// <summary>
+        /// Called when the Organizations has changed.
+        /// </summary>
+        protected virtual void OnOrganizationsChanged(SynchronizedObservableCollection<Organization> organizations)
+        {
+            OrganizationsChanged?.Invoke(this, organizations);
+            RaisePropertyChanged(nameof(Organizations));
+        }
+
+        /// <summary>
+        /// Called when the Users has changed.
+        /// </summary>
+        protected virtual void OnUsersChanged(SynchronizedObservableCollection<User> users)
+        {
+            UsersChanged?.Invoke(this, users);
+            RaisePropertyChanged(nameof(Users));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Contact" /> class.
         /// </summary>
         public Contact() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs
index 9b356dfc2..0281ffd8e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs
@@ -52,7 +52,6 @@ namespace Tango.BL.Entities
                 if (_organizationguid != value)
                 {
                     _organizationguid = value;
-                    RaisePropertyChanged(nameof(OrganizationGuid)); 
                 }
             }
         }
@@ -78,9 +77,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -106,9 +104,8 @@ namespace Tango.BL.Entities
                 {
                     _organization = value;
 
-                    OrganizationChanged?.Invoke(this, value);
+                    OnOrganizationChanged(value);
 
-                    RaisePropertyChanged(nameof(Organization)); 
                 }
             }
         }
@@ -132,14 +129,40 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Organization has changed.
+        /// </summary>
+        protected virtual void OnOrganizationChanged(Organization organization)
+        {
+            OrganizationChanged?.Invoke(this, organization);
+            RaisePropertyChanged(nameof(Organization));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Customer" /> class.
         /// </summary>
         public Customer() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Dispenser.cs b/Software/Visual_Studio/Tango.BL/Entities/Dispenser.cs
new file mode 100644
index 000000000..9a6da3adf
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/Dispenser.cs
@@ -0,0 +1,212 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+
+namespace Tango.BL.Entities
+{
+    [Table("DISPENSERS")]
+    public partial class Dispenser : ObservableEntity<Dispenser>
+    {
+
+        public event EventHandler<String> SerialNumberChanged;
+
+        public event EventHandler<Double> NlPerPulseChanged;
+
+        public event EventHandler<Byte[]> DataChanged;
+
+        public event EventHandler<DispenserType> DispenserTypeChanged;
+
+        protected String _serialnumber;
+
+        /// <summary>
+        /// Gets or sets the dispenser serial number.
+        /// </summary>
+
+        [Column("SERIAL_NUMBER")]
+
+        public  String SerialNumber
+        {
+            get 
+            {
+                return _serialnumber; 
+            }
+
+            set 
+            {
+                if (_serialnumber != value)
+                {
+                    _serialnumber = value;
+
+                    OnSerialNumberChanged(value);
+
+                }
+            }
+        }
+
+        protected String _dispensertypeguid;
+
+        /// <summary>
+        /// Gets or sets the dispenser dispenser type guid.
+        /// </summary>
+
+        [Column("DISPENSER_TYPE_GUID")]
+        [ForeignKey("DispenserType")]
+
+        public  String DispenserTypeGuid
+        {
+            get 
+            {
+                return _dispensertypeguid; 
+            }
+
+            set 
+            {
+                if (_dispensertypeguid != value)
+                {
+                    _dispensertypeguid = value;
+                }
+            }
+        }
+
+        protected Double _nlperpulse;
+
+        /// <summary>
+        /// Gets or sets the dispenser nl per pulse.
+        /// </summary>
+
+        [Column("NL_PER_PULSE")]
+
+        public  Double NlPerPulse
+        {
+            get 
+            {
+                return _nlperpulse; 
+            }
+
+            set 
+            {
+                if (_nlperpulse != value)
+                {
+                    _nlperpulse = value;
+
+                    OnNlPerPulseChanged(value);
+
+                }
+            }
+        }
+
+        protected Byte[] _data;
+
+        /// <summary>
+        /// Gets or sets the dispenser data.
+        /// </summary>
+
+        [Column("DATA")]
+
+        public  Byte[] Data
+        {
+            get 
+            {
+                return _data; 
+            }
+
+            set 
+            {
+                if (_data != value)
+                {
+                    _data = value;
+
+                    OnDataChanged(value);
+
+                }
+            }
+        }
+
+        protected DispenserType _dispensertype;
+
+        /// <summary>
+        /// Gets or sets the dispenser dispenser types.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual DispenserType DispenserType
+        {
+            get 
+            {
+                return _dispensertype; 
+            }
+
+            set 
+            {
+                if (_dispensertype != value)
+                {
+                    _dispensertype = value;
+
+                    OnDispenserTypeChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the SerialNumber has changed.
+        /// </summary>
+        protected virtual void OnSerialNumberChanged(String serialnumber)
+        {
+            SerialNumberChanged?.Invoke(this, serialnumber);
+            RaisePropertyChanged(nameof(SerialNumber));
+        }
+
+        /// <summary>
+        /// Called when the NlPerPulse has changed.
+        /// </summary>
+        protected virtual void OnNlPerPulseChanged(Double nlperpulse)
+        {
+            NlPerPulseChanged?.Invoke(this, nlperpulse);
+            RaisePropertyChanged(nameof(NlPerPulse));
+        }
+
+        /// <summary>
+        /// Called when the Data has changed.
+        /// </summary>
+        protected virtual void OnDataChanged(Byte[] data)
+        {
+            DataChanged?.Invoke(this, data);
+            RaisePropertyChanged(nameof(Data));
+        }
+
+        /// <summary>
+        /// Called when the DispenserType has changed.
+        /// </summary>
+        protected virtual void OnDispenserTypeChanged(DispenserType dispensertype)
+        {
+            DispenserTypeChanged?.Invoke(this, dispensertype);
+            RaisePropertyChanged(nameof(DispenserType));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Dispenser" /> class.
+        /// </summary>
+        public Dispenser() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs
index 5956456a4..fe97ceb50 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs
@@ -33,6 +33,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Double> CapacityChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<Dispenser>> DispensersChanged;
+
         public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged;
 
         protected Int32 _code;
@@ -56,9 +58,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -84,9 +85,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -112,9 +112,8 @@ namespace Tango.BL.Entities
                 {
                     _nlperpulse = value;
 
-                    NlPerPulseChanged?.Invoke(this, value);
+                    OnNlPerPulseChanged(value);
 
-                    RaisePropertyChanged(nameof(NlPerPulse)); 
                 }
             }
         }
@@ -140,9 +139,33 @@ namespace Tango.BL.Entities
                 {
                     _capacity = value;
 
-                    CapacityChanged?.Invoke(this, value);
+                    OnCapacityChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<Dispenser> _dispensers;
+
+        /// <summary>
+        /// Gets or sets the dispensertype dispensers.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<Dispenser> Dispensers
+        {
+            get 
+            {
+                return _dispensers; 
+            }
+
+            set 
+            {
+                if (_dispensers != value)
+                {
+                    _dispensers = value;
+
+                    OnDispensersChanged(value);
 
-                    RaisePropertyChanged(nameof(Capacity)); 
                 }
             }
         }
@@ -166,19 +189,74 @@ namespace Tango.BL.Entities
                 {
                     _idspacks = value;
 
-                    IdsPacksChanged?.Invoke(this, value);
+                    OnIdsPacksChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPacks)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the NlPerPulse has changed.
+        /// </summary>
+        protected virtual void OnNlPerPulseChanged(Double nlperpulse)
+        {
+            NlPerPulseChanged?.Invoke(this, nlperpulse);
+            RaisePropertyChanged(nameof(NlPerPulse));
+        }
+
+        /// <summary>
+        /// Called when the Capacity has changed.
+        /// </summary>
+        protected virtual void OnCapacityChanged(Double capacity)
+        {
+            CapacityChanged?.Invoke(this, capacity);
+            RaisePropertyChanged(nameof(Capacity));
+        }
+
+        /// <summary>
+        /// Called when the Dispensers has changed.
+        /// </summary>
+        protected virtual void OnDispensersChanged(SynchronizedObservableCollection<Dispenser> dispensers)
+        {
+            DispensersChanged?.Invoke(this, dispensers);
+            RaisePropertyChanged(nameof(Dispensers));
+        }
+
+        /// <summary>
+        /// Called when the IdsPacks has changed.
+        /// </summary>
+        protected virtual void OnIdsPacksChanged(SynchronizedObservableCollection<IdsPack> idspacks)
+        {
+            IdsPacksChanged?.Invoke(this, idspacks);
+            RaisePropertyChanged(nameof(IdsPacks));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="DispenserType" /> class.
         /// </summary>
         public DispenserType() : base()
         {
 
+            Dispensers = new SynchronizedObservableCollection<Dispenser>();
+
             IdsPacks = new SynchronizedObservableCollection<IdsPack>();
 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs
index 585a5a2d1..1cc45b75f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _configurations = value;
 
-                    ConfigurationsChanged?.Invoke(this, value);
+                    OnConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Configurations)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Configurations has changed.
+        /// </summary>
+        protected virtual void OnConfigurationsChanged(SynchronizedObservableCollection<Configuration> configurations)
+        {
+            ConfigurationsChanged?.Invoke(this, configurations);
+            RaisePropertyChanged(nameof(Configurations));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="EmbeddedFirmwareVersion" /> class.
         /// </summary>
         public EmbeddedFirmwareVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs
index 8f4ec9014..3b3117817 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs
@@ -66,9 +66,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -94,9 +93,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -122,9 +120,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -150,7 +147,6 @@ namespace Tango.BL.Entities
                 if (_eventtypescategoryguid != value)
                 {
                     _eventtypescategoryguid = value;
-                    RaisePropertyChanged(nameof(EventTypesCategoryGuid)); 
                 }
             }
         }
@@ -176,7 +172,6 @@ namespace Tango.BL.Entities
                 if (_eventtypesgroupguid != value)
                 {
                     _eventtypesgroupguid = value;
-                    RaisePropertyChanged(nameof(EventTypesGroupGuid)); 
                 }
             }
         }
@@ -202,9 +197,8 @@ namespace Tango.BL.Entities
                 {
                     _requiresuserintervention = value;
 
-                    RequiresUserInterventionChanged?.Invoke(this, value);
+                    OnRequiresUserInterventionChanged(value);
 
-                    RaisePropertyChanged(nameof(RequiresUserIntervention)); 
                 }
             }
         }
@@ -230,7 +224,6 @@ namespace Tango.BL.Entities
                 if (_htmlpageguid != value)
                 {
                     _htmlpageguid = value;
-                    RaisePropertyChanged(nameof(HtmlPageGuid)); 
                 }
             }
         }
@@ -256,9 +249,8 @@ namespace Tango.BL.Entities
                 {
                     _resolvable = value;
 
-                    ResolvableChanged?.Invoke(this, value);
+                    OnResolvableChanged(value);
 
-                    RaisePropertyChanged(nameof(Resolvable)); 
                 }
             }
         }
@@ -284,9 +276,8 @@ namespace Tango.BL.Entities
                 {
                     _eventtypesgroup = value;
 
-                    EventTypesGroupChanged?.Invoke(this, value);
+                    OnEventTypesGroupChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypesGroup)); 
                 }
             }
         }
@@ -312,9 +303,8 @@ namespace Tango.BL.Entities
                 {
                     _eventtypescategory = value;
 
-                    EventTypesCategoryChanged?.Invoke(this, value);
+                    OnEventTypesCategoryChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypesCategory)); 
                 }
             }
         }
@@ -340,9 +330,8 @@ namespace Tango.BL.Entities
                 {
                     _htmlpage = value;
 
-                    HtmlPageChanged?.Invoke(this, value);
+                    OnHtmlPageChanged(value);
 
-                    RaisePropertyChanged(nameof(HtmlPage)); 
                 }
             }
         }
@@ -366,9 +355,8 @@ namespace Tango.BL.Entities
                 {
                     _eventtypesactions = value;
 
-                    EventTypesActionsChanged?.Invoke(this, value);
+                    OnEventTypesActionsChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypesActions)); 
                 }
             }
         }
@@ -392,14 +380,103 @@ namespace Tango.BL.Entities
                 {
                     _machinesevents = value;
 
-                    MachinesEventsChanged?.Invoke(this, value);
+                    OnMachinesEventsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachinesEvents)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the RequiresUserIntervention has changed.
+        /// </summary>
+        protected virtual void OnRequiresUserInterventionChanged(Boolean requiresuserintervention)
+        {
+            RequiresUserInterventionChanged?.Invoke(this, requiresuserintervention);
+            RaisePropertyChanged(nameof(RequiresUserIntervention));
+        }
+
+        /// <summary>
+        /// Called when the Resolvable has changed.
+        /// </summary>
+        protected virtual void OnResolvableChanged(Boolean resolvable)
+        {
+            ResolvableChanged?.Invoke(this, resolvable);
+            RaisePropertyChanged(nameof(Resolvable));
+        }
+
+        /// <summary>
+        /// Called when the EventTypesGroup has changed.
+        /// </summary>
+        protected virtual void OnEventTypesGroupChanged(EventTypesGroup eventtypesgroup)
+        {
+            EventTypesGroupChanged?.Invoke(this, eventtypesgroup);
+            RaisePropertyChanged(nameof(EventTypesGroup));
+        }
+
+        /// <summary>
+        /// Called when the EventTypesCategory has changed.
+        /// </summary>
+        protected virtual void OnEventTypesCategoryChanged(EventTypesCategory eventtypescategory)
+        {
+            EventTypesCategoryChanged?.Invoke(this, eventtypescategory);
+            RaisePropertyChanged(nameof(EventTypesCategory));
+        }
+
+        /// <summary>
+        /// Called when the HtmlPage has changed.
+        /// </summary>
+        protected virtual void OnHtmlPageChanged(HtmlPage htmlpage)
+        {
+            HtmlPageChanged?.Invoke(this, htmlpage);
+            RaisePropertyChanged(nameof(HtmlPage));
+        }
+
+        /// <summary>
+        /// Called when the EventTypesActions has changed.
+        /// </summary>
+        protected virtual void OnEventTypesActionsChanged(SynchronizedObservableCollection<EventTypesAction> eventtypesactions)
+        {
+            EventTypesActionsChanged?.Invoke(this, eventtypesactions);
+            RaisePropertyChanged(nameof(EventTypesActions));
+        }
+
+        /// <summary>
+        /// Called when the MachinesEvents has changed.
+        /// </summary>
+        protected virtual void OnMachinesEventsChanged(SynchronizedObservableCollection<MachinesEvent> machinesevents)
+        {
+            MachinesEventsChanged?.Invoke(this, machinesevents);
+            RaisePropertyChanged(nameof(MachinesEvents));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="EventType" /> class.
         /// </summary>
         public EventType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs
index c1b667cbe..c606dfd0f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs
@@ -50,7 +50,6 @@ namespace Tango.BL.Entities
                 if (_eventtypeguid != value)
                 {
                     _eventtypeguid = value;
-                    RaisePropertyChanged(nameof(EventTypeGuid)); 
                 }
             }
         }
@@ -76,7 +75,6 @@ namespace Tango.BL.Entities
                 if (_actiontypeguid != value)
                 {
                     _actiontypeguid = value;
-                    RaisePropertyChanged(nameof(ActionTypeGuid)); 
                 }
             }
         }
@@ -102,9 +100,8 @@ namespace Tango.BL.Entities
                 {
                     _actiontype = value;
 
-                    ActionTypeChanged?.Invoke(this, value);
+                    OnActionTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(ActionType)); 
                 }
             }
         }
@@ -130,14 +127,31 @@ namespace Tango.BL.Entities
                 {
                     _eventtype = value;
 
-                    EventTypeChanged?.Invoke(this, value);
+                    OnEventTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(EventType)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the ActionType has changed.
+        /// </summary>
+        protected virtual void OnActionTypeChanged(ActionType actiontype)
+        {
+            ActionTypeChanged?.Invoke(this, actiontype);
+            RaisePropertyChanged(nameof(ActionType));
+        }
+
+        /// <summary>
+        /// Called when the EventType has changed.
+        /// </summary>
+        protected virtual void OnEventTypeChanged(EventType eventtype)
+        {
+            EventTypeChanged?.Invoke(this, eventtype);
+            RaisePropertyChanged(nameof(EventType));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="EventTypesAction" /> class.
         /// </summary>
         public EventTypesAction() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs
index f0a25335a..3098b09b9 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _eventtypes = value;
 
-                    EventTypesChanged?.Invoke(this, value);
+                    OnEventTypesChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypes)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the EventTypes has changed.
+        /// </summary>
+        protected virtual void OnEventTypesChanged(SynchronizedObservableCollection<EventType> eventtypes)
+        {
+            EventTypesChanged?.Invoke(this, eventtypes);
+            RaisePropertyChanged(nameof(EventTypes));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="EventTypesCategory" /> class.
         /// </summary>
         public EventTypesCategory() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs
index 36389e65b..c9dd320b4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _eventtypes = value;
 
-                    EventTypesChanged?.Invoke(this, value);
+                    OnEventTypesChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypes)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the EventTypes has changed.
+        /// </summary>
+        protected virtual void OnEventTypesChanged(SynchronizedObservableCollection<EventType> eventtypes)
+        {
+            EventTypesChanged?.Invoke(this, eventtypes);
+            RaisePropertyChanged(nameof(EventTypes));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="EventTypesGroup" /> class.
         /// </summary>
         public EventTypesGroup() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs
index 05fbb4dbf..eaa234e54 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="FiberShape" /> class.
         /// </summary>
         public FiberShape() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs
index 0a2964380..e920c3934 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="FiberSynth" /> class.
         /// </summary>
         public FiberSynth() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs
index 1f1404286..24e93df96 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs
@@ -58,7 +58,6 @@ namespace Tango.BL.Entities
                 if (_hardwareblowertypeguid != value)
                 {
                     _hardwareblowertypeguid = value;
-                    RaisePropertyChanged(nameof(HardwareBlowerTypeGuid)); 
                 }
             }
         }
@@ -84,7 +83,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _enabled = value;
 
-                    EnabledChanged?.Invoke(this, value);
+                    OnEnabledChanged(value);
 
-                    RaisePropertyChanged(nameof(Enabled)); 
                 }
             }
         }
@@ -138,9 +135,8 @@ namespace Tango.BL.Entities
                 {
                     _voltage = value;
 
-                    VoltageChanged?.Invoke(this, value);
+                    OnVoltageChanged(value);
 
-                    RaisePropertyChanged(nameof(Voltage)); 
                 }
             }
         }
@@ -166,9 +162,8 @@ namespace Tango.BL.Entities
                 {
                     _heatingvoltage = value;
 
-                    HeatingVoltageChanged?.Invoke(this, value);
+                    OnHeatingVoltageChanged(value);
 
-                    RaisePropertyChanged(nameof(HeatingVoltage)); 
                 }
             }
         }
@@ -194,9 +189,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -222,9 +216,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwareblowertype = value;
 
-                    HardwareBlowerTypeChanged?.Invoke(this, value);
+                    OnHardwareBlowerTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareBlowerType)); 
                 }
             }
         }
@@ -250,14 +243,67 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Enabled has changed.
+        /// </summary>
+        protected virtual void OnEnabledChanged(Boolean enabled)
+        {
+            EnabledChanged?.Invoke(this, enabled);
+            RaisePropertyChanged(nameof(Enabled));
+        }
+
+        /// <summary>
+        /// Called when the Voltage has changed.
+        /// </summary>
+        protected virtual void OnVoltageChanged(Double voltage)
+        {
+            VoltageChanged?.Invoke(this, voltage);
+            RaisePropertyChanged(nameof(Voltage));
+        }
+
+        /// <summary>
+        /// Called when the HeatingVoltage has changed.
+        /// </summary>
+        protected virtual void OnHeatingVoltageChanged(Double heatingvoltage)
+        {
+            HeatingVoltageChanged?.Invoke(this, heatingvoltage);
+            RaisePropertyChanged(nameof(HeatingVoltage));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwareBlowerType has changed.
+        /// </summary>
+        protected virtual void OnHardwareBlowerTypeChanged(HardwareBlowerType hardwareblowertype)
+        {
+            HardwareBlowerTypeChanged?.Invoke(this, hardwareblowertype);
+            RaisePropertyChanged(nameof(HardwareBlowerType));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareBlower" /> class.
         /// </summary>
         public HardwareBlower() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs
index c1aaa114a..75a948075 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwareblowers = value;
 
-                    HardwareBlowersChanged?.Invoke(this, value);
+                    OnHardwareBlowersChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareBlowers)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the HardwareBlowers has changed.
+        /// </summary>
+        protected virtual void OnHardwareBlowersChanged(SynchronizedObservableCollection<HardwareBlower> hardwareblowers)
+        {
+            HardwareBlowersChanged?.Invoke(this, hardwareblowers);
+            RaisePropertyChanged(nameof(HardwareBlowers));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareBlowerType" /> class.
         /// </summary>
         public HardwareBlowerType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs
index 9d08ac8b9..0ace70d71 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs
@@ -56,7 +56,6 @@ namespace Tango.BL.Entities
                 if (_hardwarebreaksensortypeguid != value)
                 {
                     _hardwarebreaksensortypeguid = value;
-                    RaisePropertyChanged(nameof(HardwareBreakSensorTypeGuid)); 
                 }
             }
         }
@@ -82,7 +81,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -108,9 +106,8 @@ namespace Tango.BL.Entities
                 {
                     _enabled = value;
 
-                    EnabledChanged?.Invoke(this, value);
+                    OnEnabledChanged(value);
 
-                    RaisePropertyChanged(nameof(Enabled)); 
                 }
             }
         }
@@ -136,9 +133,8 @@ namespace Tango.BL.Entities
                 {
                     _debouncetimemilli = value;
 
-                    DeBounceTimeMilliChanged?.Invoke(this, value);
+                    OnDeBounceTimeMilliChanged(value);
 
-                    RaisePropertyChanged(nameof(DeBounceTimeMilli)); 
                 }
             }
         }
@@ -164,9 +160,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -192,9 +187,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwarebreaksensortype = value;
 
-                    HardwareBreakSensorTypeChanged?.Invoke(this, value);
+                    OnHardwareBreakSensorTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareBreakSensorType)); 
                 }
             }
         }
@@ -220,14 +214,58 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Enabled has changed.
+        /// </summary>
+        protected virtual void OnEnabledChanged(Boolean enabled)
+        {
+            EnabledChanged?.Invoke(this, enabled);
+            RaisePropertyChanged(nameof(Enabled));
+        }
+
+        /// <summary>
+        /// Called when the DeBounceTimeMilli has changed.
+        /// </summary>
+        protected virtual void OnDeBounceTimeMilliChanged(Int32 debouncetimemilli)
+        {
+            DeBounceTimeMilliChanged?.Invoke(this, debouncetimemilli);
+            RaisePropertyChanged(nameof(DeBounceTimeMilli));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwareBreakSensorType has changed.
+        /// </summary>
+        protected virtual void OnHardwareBreakSensorTypeChanged(HardwareBreakSensorType hardwarebreaksensortype)
+        {
+            HardwareBreakSensorTypeChanged?.Invoke(this, hardwarebreaksensortype);
+            RaisePropertyChanged(nameof(HardwareBreakSensorType));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareBreakSensor" /> class.
         /// </summary>
         public HardwareBreakSensor() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs
index 634cf0f6a..e531c91d1 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwarebreaksensors = value;
 
-                    HardwareBreakSensorsChanged?.Invoke(this, value);
+                    OnHardwareBreakSensorsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareBreakSensors)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the HardwareBreakSensors has changed.
+        /// </summary>
+        protected virtual void OnHardwareBreakSensorsChanged(SynchronizedObservableCollection<HardwareBreakSensor> hardwarebreaksensors)
+        {
+            HardwareBreakSensorsChanged?.Invoke(this, hardwarebreaksensors);
+            RaisePropertyChanged(nameof(HardwareBreakSensors));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareBreakSensorType" /> class.
         /// </summary>
         public HardwareBreakSensorType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
index c5bff2270..f213a953b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
@@ -72,7 +72,6 @@ namespace Tango.BL.Entities
                 if (_hardwaredancertypeguid != value)
                 {
                     _hardwaredancertypeguid = value;
-                    RaisePropertyChanged(nameof(HardwareDancerTypeGuid)); 
                 }
             }
         }
@@ -98,7 +97,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -124,9 +122,8 @@ namespace Tango.BL.Entities
                 {
                     _gradual = value;
 
-                    GradualChanged?.Invoke(this, value);
+                    OnGradualChanged(value);
 
-                    RaisePropertyChanged(nameof(Gradual)); 
                 }
             }
         }
@@ -152,9 +149,8 @@ namespace Tango.BL.Entities
                 {
                     _k = value;
 
-                    KChanged?.Invoke(this, value);
+                    OnKChanged(value);
 
-                    RaisePropertyChanged(nameof(K)); 
                 }
             }
         }
@@ -180,9 +176,8 @@ namespace Tango.BL.Entities
                 {
                     _x = value;
 
-                    XChanged?.Invoke(this, value);
+                    OnXChanged(value);
 
-                    RaisePropertyChanged(nameof(X)); 
                 }
             }
         }
@@ -208,9 +203,8 @@ namespace Tango.BL.Entities
                 {
                     _pulsepermmspring = value;
 
-                    PulsePerMmSpringChanged?.Invoke(this, value);
+                    OnPulsePerMmSpringChanged(value);
 
-                    RaisePropertyChanged(nameof(PulsePerMmSpring)); 
                 }
             }
         }
@@ -236,9 +230,8 @@ namespace Tango.BL.Entities
                 {
                     _maximalmovementmm = value;
 
-                    MaximalMovementMmChanged?.Invoke(this, value);
+                    OnMaximalMovementMmChanged(value);
 
-                    RaisePropertyChanged(nameof(MaximalMovementMm)); 
                 }
             }
         }
@@ -264,9 +257,8 @@ namespace Tango.BL.Entities
                 {
                     _zeropoint = value;
 
-                    ZeroPointChanged?.Invoke(this, value);
+                    OnZeroPointChanged(value);
 
-                    RaisePropertyChanged(nameof(ZeroPoint)); 
                 }
             }
         }
@@ -292,9 +284,8 @@ namespace Tango.BL.Entities
                 {
                     _resolutionbits = value;
 
-                    ResolutionBitsChanged?.Invoke(this, value);
+                    OnResolutionBitsChanged(value);
 
-                    RaisePropertyChanged(nameof(ResolutionBits)); 
                 }
             }
         }
@@ -320,9 +311,8 @@ namespace Tango.BL.Entities
                 {
                     _armlength = value;
 
-                    ArmLengthChanged?.Invoke(this, value);
+                    OnArmLengthChanged(value);
 
-                    RaisePropertyChanged(nameof(ArmLength)); 
                 }
             }
         }
@@ -348,9 +338,8 @@ namespace Tango.BL.Entities
                 {
                     _assemblydirectionright = value;
 
-                    AssemblyDirectionRightChanged?.Invoke(this, value);
+                    OnAssemblyDirectionRightChanged(value);
 
-                    RaisePropertyChanged(nameof(AssemblyDirectionRight)); 
                 }
             }
         }
@@ -376,9 +365,8 @@ namespace Tango.BL.Entities
                 {
                     _accelerateontensionraise = value;
 
-                    AccelerateOnTensionRaiseChanged?.Invoke(this, value);
+                    OnAccelerateOnTensionRaiseChanged(value);
 
-                    RaisePropertyChanged(nameof(AccelerateOnTensionRaise)); 
                 }
             }
         }
@@ -404,9 +392,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -432,9 +419,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwaredancertype = value;
 
-                    HardwareDancerTypeChanged?.Invoke(this, value);
+                    OnHardwareDancerTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareDancerType)); 
                 }
             }
         }
@@ -460,14 +446,130 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Gradual has changed.
+        /// </summary>
+        protected virtual void OnGradualChanged(Boolean gradual)
+        {
+            GradualChanged?.Invoke(this, gradual);
+            RaisePropertyChanged(nameof(Gradual));
+        }
+
+        /// <summary>
+        /// Called when the K has changed.
+        /// </summary>
+        protected virtual void OnKChanged(Double k)
+        {
+            KChanged?.Invoke(this, k);
+            RaisePropertyChanged(nameof(K));
+        }
+
+        /// <summary>
+        /// Called when the X has changed.
+        /// </summary>
+        protected virtual void OnXChanged(Double x)
+        {
+            XChanged?.Invoke(this, x);
+            RaisePropertyChanged(nameof(X));
+        }
+
+        /// <summary>
+        /// Called when the PulsePerMmSpring has changed.
+        /// </summary>
+        protected virtual void OnPulsePerMmSpringChanged(Int32 pulsepermmspring)
+        {
+            PulsePerMmSpringChanged?.Invoke(this, pulsepermmspring);
+            RaisePropertyChanged(nameof(PulsePerMmSpring));
+        }
+
+        /// <summary>
+        /// Called when the MaximalMovementMm has changed.
+        /// </summary>
+        protected virtual void OnMaximalMovementMmChanged(Int32 maximalmovementmm)
+        {
+            MaximalMovementMmChanged?.Invoke(this, maximalmovementmm);
+            RaisePropertyChanged(nameof(MaximalMovementMm));
+        }
+
+        /// <summary>
+        /// Called when the ZeroPoint has changed.
+        /// </summary>
+        protected virtual void OnZeroPointChanged(Int32 zeropoint)
+        {
+            ZeroPointChanged?.Invoke(this, zeropoint);
+            RaisePropertyChanged(nameof(ZeroPoint));
+        }
+
+        /// <summary>
+        /// Called when the ResolutionBits has changed.
+        /// </summary>
+        protected virtual void OnResolutionBitsChanged(Int32 resolutionbits)
+        {
+            ResolutionBitsChanged?.Invoke(this, resolutionbits);
+            RaisePropertyChanged(nameof(ResolutionBits));
+        }
+
+        /// <summary>
+        /// Called when the ArmLength has changed.
+        /// </summary>
+        protected virtual void OnArmLengthChanged(Int32 armlength)
+        {
+            ArmLengthChanged?.Invoke(this, armlength);
+            RaisePropertyChanged(nameof(ArmLength));
+        }
+
+        /// <summary>
+        /// Called when the AssemblyDirectionRight has changed.
+        /// </summary>
+        protected virtual void OnAssemblyDirectionRightChanged(Boolean assemblydirectionright)
+        {
+            AssemblyDirectionRightChanged?.Invoke(this, assemblydirectionright);
+            RaisePropertyChanged(nameof(AssemblyDirectionRight));
+        }
+
+        /// <summary>
+        /// Called when the AccelerateOnTensionRaise has changed.
+        /// </summary>
+        protected virtual void OnAccelerateOnTensionRaiseChanged(Boolean accelerateontensionraise)
+        {
+            AccelerateOnTensionRaiseChanged?.Invoke(this, accelerateontensionraise);
+            RaisePropertyChanged(nameof(AccelerateOnTensionRaise));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwareDancerType has changed.
+        /// </summary>
+        protected virtual void OnHardwareDancerTypeChanged(HardwareDancerType hardwaredancertype)
+        {
+            HardwareDancerTypeChanged?.Invoke(this, hardwaredancertype);
+            RaisePropertyChanged(nameof(HardwareDancerType));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareDancer" /> class.
         /// </summary>
         public HardwareDancer() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs
index f9b6ca2f9..c0fc38816 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwaredancers = value;
 
-                    HardwareDancersChanged?.Invoke(this, value);
+                    OnHardwareDancersChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareDancers)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the HardwareDancers has changed.
+        /// </summary>
+        protected virtual void OnHardwareDancersChanged(SynchronizedObservableCollection<HardwareDancer> hardwaredancers)
+        {
+            HardwareDancersChanged?.Invoke(this, hardwaredancers);
+            RaisePropertyChanged(nameof(HardwareDancers));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareDancerType" /> class.
         /// </summary>
         public HardwareDancerType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs
index da4a34f49..0c459c883 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs
@@ -105,7 +105,6 @@ namespace Tango.BL.Entities
                 if (_hardwaremotortypeguid != value)
                 {
                     _hardwaremotortypeguid = value;
-                    RaisePropertyChanged(nameof(HardwareMotorTypeGuid)); 
                 }
             }
         }
@@ -131,7 +130,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -157,9 +155,8 @@ namespace Tango.BL.Entities
                 {
                     _minfrequency = value;
 
-                    MinFrequencyChanged?.Invoke(this, value);
+                    OnMinFrequencyChanged(value);
 
-                    RaisePropertyChanged(nameof(MinFrequency)); 
                 }
             }
         }
@@ -185,9 +182,8 @@ namespace Tango.BL.Entities
                 {
                     _maxfrequency = value;
 
-                    MaxFrequencyChanged?.Invoke(this, value);
+                    OnMaxFrequencyChanged(value);
 
-                    RaisePropertyChanged(nameof(MaxFrequency)); 
                 }
             }
         }
@@ -213,9 +209,8 @@ namespace Tango.BL.Entities
                 {
                     _setmicrostep = value;
 
-                    SetMicroStepChanged?.Invoke(this, value);
+                    OnSetMicroStepChanged(value);
 
-                    RaisePropertyChanged(nameof(SetMicroStep)); 
                 }
             }
         }
@@ -241,9 +236,8 @@ namespace Tango.BL.Entities
                 {
                     _microstep = value;
 
-                    MicroStepChanged?.Invoke(this, value);
+                    OnMicroStepChanged(value);
 
-                    RaisePropertyChanged(nameof(MicroStep)); 
                 }
             }
         }
@@ -269,9 +263,8 @@ namespace Tango.BL.Entities
                 {
                     _maxchangeslope = value;
 
-                    MaxChangeSlopeChanged?.Invoke(this, value);
+                    OnMaxChangeSlopeChanged(value);
 
-                    RaisePropertyChanged(nameof(MaxChangeSlope)); 
                 }
             }
         }
@@ -297,9 +290,8 @@ namespace Tango.BL.Entities
                 {
                     _highlengthmicrosecond = value;
 
-                    HighLengthMicroSecondChanged?.Invoke(this, value);
+                    OnHighLengthMicroSecondChanged(value);
 
-                    RaisePropertyChanged(nameof(HighLengthMicroSecond)); 
                 }
             }
         }
@@ -325,9 +317,8 @@ namespace Tango.BL.Entities
                 {
                     _speedmaster = value;
 
-                    SpeedMasterChanged?.Invoke(this, value);
+                    OnSpeedMasterChanged(value);
 
-                    RaisePropertyChanged(nameof(SpeedMaster)); 
                 }
             }
         }
@@ -353,9 +344,8 @@ namespace Tango.BL.Entities
                 {
                     _pulseperround = value;
 
-                    PulsePerRoundChanged?.Invoke(this, value);
+                    OnPulsePerRoundChanged(value);
 
-                    RaisePropertyChanged(nameof(PulsePerRound)); 
                 }
             }
         }
@@ -381,9 +371,8 @@ namespace Tango.BL.Entities
                 {
                     _pulleyradius = value;
 
-                    PulleyRadiusChanged?.Invoke(this, value);
+                    OnPulleyRadiusChanged(value);
 
-                    RaisePropertyChanged(nameof(PulleyRadius)); 
                 }
             }
         }
@@ -409,9 +398,8 @@ namespace Tango.BL.Entities
                 {
                     _configword = value;
 
-                    ConfigWordChanged?.Invoke(this, value);
+                    OnConfigWordChanged(value);
 
-                    RaisePropertyChanged(nameof(ConfigWord)); 
                 }
             }
         }
@@ -437,9 +425,8 @@ namespace Tango.BL.Entities
                 {
                     _directionthreadwize = value;
 
-                    DirectionThreadWizeChanged?.Invoke(this, value);
+                    OnDirectionThreadWizeChanged(value);
 
-                    RaisePropertyChanged(nameof(DirectionThreadWize)); 
                 }
             }
         }
@@ -465,9 +452,8 @@ namespace Tango.BL.Entities
                 {
                     _kvalhold = value;
 
-                    KvalHoldChanged?.Invoke(this, value);
+                    OnKvalHoldChanged(value);
 
-                    RaisePropertyChanged(nameof(KvalHold)); 
                 }
             }
         }
@@ -493,9 +479,8 @@ namespace Tango.BL.Entities
                 {
                     _kvalrun = value;
 
-                    KvalRunChanged?.Invoke(this, value);
+                    OnKvalRunChanged(value);
 
-                    RaisePropertyChanged(nameof(KvalRun)); 
                 }
             }
         }
@@ -521,9 +506,8 @@ namespace Tango.BL.Entities
                 {
                     _kvalacc = value;
 
-                    KvalAccChanged?.Invoke(this, value);
+                    OnKvalAccChanged(value);
 
-                    RaisePropertyChanged(nameof(KvalAcc)); 
                 }
             }
         }
@@ -549,9 +533,8 @@ namespace Tango.BL.Entities
                 {
                     _kvaldec = value;
 
-                    KvalDecChanged?.Invoke(this, value);
+                    OnKvalDecChanged(value);
 
-                    RaisePropertyChanged(nameof(KvalDec)); 
                 }
             }
         }
@@ -577,9 +560,8 @@ namespace Tango.BL.Entities
                 {
                     _overcurrentthreshold = value;
 
-                    OverCurrentThresholdChanged?.Invoke(this, value);
+                    OnOverCurrentThresholdChanged(value);
 
-                    RaisePropertyChanged(nameof(OverCurrentThreshold)); 
                 }
             }
         }
@@ -605,9 +587,8 @@ namespace Tango.BL.Entities
                 {
                     _stallthreshold = value;
 
-                    StallThresholdChanged?.Invoke(this, value);
+                    OnStallThresholdChanged(value);
 
-                    RaisePropertyChanged(nameof(StallThreshold)); 
                 }
             }
         }
@@ -633,9 +614,8 @@ namespace Tango.BL.Entities
                 {
                     _thermalcompensationfactor = value;
 
-                    ThermalCompensationFactorChanged?.Invoke(this, value);
+                    OnThermalCompensationFactorChanged(value);
 
-                    RaisePropertyChanged(nameof(ThermalCompensationFactor)); 
                 }
             }
         }
@@ -661,9 +641,8 @@ namespace Tango.BL.Entities
                 {
                     _lowspeedoptimization = value;
 
-                    LowSpeedOptimizationChanged?.Invoke(this, value);
+                    OnLowSpeedOptimizationChanged(value);
 
-                    RaisePropertyChanged(nameof(LowSpeedOptimization)); 
                 }
             }
         }
@@ -689,9 +668,8 @@ namespace Tango.BL.Entities
                 {
                     _stslp = value;
 
-                    StSlpChanged?.Invoke(this, value);
+                    OnStSlpChanged(value);
 
-                    RaisePropertyChanged(nameof(StSlp)); 
                 }
             }
         }
@@ -717,9 +695,8 @@ namespace Tango.BL.Entities
                 {
                     _intspd = value;
 
-                    IntSpdChanged?.Invoke(this, value);
+                    OnIntSpdChanged(value);
 
-                    RaisePropertyChanged(nameof(IntSpd)); 
                 }
             }
         }
@@ -745,9 +722,8 @@ namespace Tango.BL.Entities
                 {
                     _fnslpacc = value;
 
-                    FnSlpAccChanged?.Invoke(this, value);
+                    OnFnSlpAccChanged(value);
 
-                    RaisePropertyChanged(nameof(FnSlpAcc)); 
                 }
             }
         }
@@ -773,9 +749,8 @@ namespace Tango.BL.Entities
                 {
                     _fnslpdec = value;
 
-                    FnSlpDecChanged?.Invoke(this, value);
+                    OnFnSlpDecChanged(value);
 
-                    RaisePropertyChanged(nameof(FnSlpDec)); 
                 }
             }
         }
@@ -801,9 +776,8 @@ namespace Tango.BL.Entities
                 {
                     _fsspd = value;
 
-                    FsSpdChanged?.Invoke(this, value);
+                    OnFsSpdChanged(value);
 
-                    RaisePropertyChanged(nameof(FsSpd)); 
                 }
             }
         }
@@ -829,9 +803,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -857,9 +830,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwaremotortype = value;
 
-                    HardwareMotorTypeChanged?.Invoke(this, value);
+                    OnHardwareMotorTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareMotorType)); 
                 }
             }
         }
@@ -885,14 +857,256 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the MinFrequency has changed.
+        /// </summary>
+        protected virtual void OnMinFrequencyChanged(Int32 minfrequency)
+        {
+            MinFrequencyChanged?.Invoke(this, minfrequency);
+            RaisePropertyChanged(nameof(MinFrequency));
+        }
+
+        /// <summary>
+        /// Called when the MaxFrequency has changed.
+        /// </summary>
+        protected virtual void OnMaxFrequencyChanged(Int32 maxfrequency)
+        {
+            MaxFrequencyChanged?.Invoke(this, maxfrequency);
+            RaisePropertyChanged(nameof(MaxFrequency));
+        }
+
+        /// <summary>
+        /// Called when the SetMicroStep has changed.
+        /// </summary>
+        protected virtual void OnSetMicroStepChanged(Int32 setmicrostep)
+        {
+            SetMicroStepChanged?.Invoke(this, setmicrostep);
+            RaisePropertyChanged(nameof(SetMicroStep));
+        }
+
+        /// <summary>
+        /// Called when the MicroStep has changed.
+        /// </summary>
+        protected virtual void OnMicroStepChanged(Int32 microstep)
+        {
+            MicroStepChanged?.Invoke(this, microstep);
+            RaisePropertyChanged(nameof(MicroStep));
+        }
+
+        /// <summary>
+        /// Called when the MaxChangeSlope has changed.
+        /// </summary>
+        protected virtual void OnMaxChangeSlopeChanged(Double maxchangeslope)
+        {
+            MaxChangeSlopeChanged?.Invoke(this, maxchangeslope);
+            RaisePropertyChanged(nameof(MaxChangeSlope));
+        }
+
+        /// <summary>
+        /// Called when the HighLengthMicroSecond has changed.
+        /// </summary>
+        protected virtual void OnHighLengthMicroSecondChanged(Double highlengthmicrosecond)
+        {
+            HighLengthMicroSecondChanged?.Invoke(this, highlengthmicrosecond);
+            RaisePropertyChanged(nameof(HighLengthMicroSecond));
+        }
+
+        /// <summary>
+        /// Called when the SpeedMaster has changed.
+        /// </summary>
+        protected virtual void OnSpeedMasterChanged(Boolean speedmaster)
+        {
+            SpeedMasterChanged?.Invoke(this, speedmaster);
+            RaisePropertyChanged(nameof(SpeedMaster));
+        }
+
+        /// <summary>
+        /// Called when the PulsePerRound has changed.
+        /// </summary>
+        protected virtual void OnPulsePerRoundChanged(Int32 pulseperround)
+        {
+            PulsePerRoundChanged?.Invoke(this, pulseperround);
+            RaisePropertyChanged(nameof(PulsePerRound));
+        }
+
+        /// <summary>
+        /// Called when the PulleyRadius has changed.
+        /// </summary>
+        protected virtual void OnPulleyRadiusChanged(Double pulleyradius)
+        {
+            PulleyRadiusChanged?.Invoke(this, pulleyradius);
+            RaisePropertyChanged(nameof(PulleyRadius));
+        }
+
+        /// <summary>
+        /// Called when the ConfigWord has changed.
+        /// </summary>
+        protected virtual void OnConfigWordChanged(Int32 configword)
+        {
+            ConfigWordChanged?.Invoke(this, configword);
+            RaisePropertyChanged(nameof(ConfigWord));
+        }
+
+        /// <summary>
+        /// Called when the DirectionThreadWize has changed.
+        /// </summary>
+        protected virtual void OnDirectionThreadWizeChanged(Boolean directionthreadwize)
+        {
+            DirectionThreadWizeChanged?.Invoke(this, directionthreadwize);
+            RaisePropertyChanged(nameof(DirectionThreadWize));
+        }
+
+        /// <summary>
+        /// Called when the KvalHold has changed.
+        /// </summary>
+        protected virtual void OnKvalHoldChanged(Int32 kvalhold)
+        {
+            KvalHoldChanged?.Invoke(this, kvalhold);
+            RaisePropertyChanged(nameof(KvalHold));
+        }
+
+        /// <summary>
+        /// Called when the KvalRun has changed.
+        /// </summary>
+        protected virtual void OnKvalRunChanged(Int32 kvalrun)
+        {
+            KvalRunChanged?.Invoke(this, kvalrun);
+            RaisePropertyChanged(nameof(KvalRun));
+        }
+
+        /// <summary>
+        /// Called when the KvalAcc has changed.
+        /// </summary>
+        protected virtual void OnKvalAccChanged(Int32 kvalacc)
+        {
+            KvalAccChanged?.Invoke(this, kvalacc);
+            RaisePropertyChanged(nameof(KvalAcc));
+        }
+
+        /// <summary>
+        /// Called when the KvalDec has changed.
+        /// </summary>
+        protected virtual void OnKvalDecChanged(Int32 kvaldec)
+        {
+            KvalDecChanged?.Invoke(this, kvaldec);
+            RaisePropertyChanged(nameof(KvalDec));
+        }
+
+        /// <summary>
+        /// Called when the OverCurrentThreshold has changed.
+        /// </summary>
+        protected virtual void OnOverCurrentThresholdChanged(Int32 overcurrentthreshold)
+        {
+            OverCurrentThresholdChanged?.Invoke(this, overcurrentthreshold);
+            RaisePropertyChanged(nameof(OverCurrentThreshold));
+        }
+
+        /// <summary>
+        /// Called when the StallThreshold has changed.
+        /// </summary>
+        protected virtual void OnStallThresholdChanged(Int32 stallthreshold)
+        {
+            StallThresholdChanged?.Invoke(this, stallthreshold);
+            RaisePropertyChanged(nameof(StallThreshold));
+        }
+
+        /// <summary>
+        /// Called when the ThermalCompensationFactor has changed.
+        /// </summary>
+        protected virtual void OnThermalCompensationFactorChanged(Int32 thermalcompensationfactor)
+        {
+            ThermalCompensationFactorChanged?.Invoke(this, thermalcompensationfactor);
+            RaisePropertyChanged(nameof(ThermalCompensationFactor));
+        }
+
+        /// <summary>
+        /// Called when the LowSpeedOptimization has changed.
+        /// </summary>
+        protected virtual void OnLowSpeedOptimizationChanged(Boolean lowspeedoptimization)
+        {
+            LowSpeedOptimizationChanged?.Invoke(this, lowspeedoptimization);
+            RaisePropertyChanged(nameof(LowSpeedOptimization));
+        }
+
+        /// <summary>
+        /// Called when the StSlp has changed.
+        /// </summary>
+        protected virtual void OnStSlpChanged(Int32 stslp)
+        {
+            StSlpChanged?.Invoke(this, stslp);
+            RaisePropertyChanged(nameof(StSlp));
+        }
+
+        /// <summary>
+        /// Called when the IntSpd has changed.
+        /// </summary>
+        protected virtual void OnIntSpdChanged(Int32 intspd)
+        {
+            IntSpdChanged?.Invoke(this, intspd);
+            RaisePropertyChanged(nameof(IntSpd));
+        }
+
+        /// <summary>
+        /// Called when the FnSlpAcc has changed.
+        /// </summary>
+        protected virtual void OnFnSlpAccChanged(Int32 fnslpacc)
+        {
+            FnSlpAccChanged?.Invoke(this, fnslpacc);
+            RaisePropertyChanged(nameof(FnSlpAcc));
+        }
+
+        /// <summary>
+        /// Called when the FnSlpDec has changed.
+        /// </summary>
+        protected virtual void OnFnSlpDecChanged(Int32 fnslpdec)
+        {
+            FnSlpDecChanged?.Invoke(this, fnslpdec);
+            RaisePropertyChanged(nameof(FnSlpDec));
+        }
+
+        /// <summary>
+        /// Called when the FsSpd has changed.
+        /// </summary>
+        protected virtual void OnFsSpdChanged(Int32 fsspd)
+        {
+            FsSpdChanged?.Invoke(this, fsspd);
+            RaisePropertyChanged(nameof(FsSpd));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwareMotorType has changed.
+        /// </summary>
+        protected virtual void OnHardwareMotorTypeChanged(HardwareMotorType hardwaremotortype)
+        {
+            HardwareMotorTypeChanged?.Invoke(this, hardwaremotortype);
+            RaisePropertyChanged(nameof(HardwareMotorType));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareMotor" /> class.
         /// </summary>
         public HardwareMotor() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs
index 73a196a4c..49dccd60e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -112,9 +110,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -140,9 +137,8 @@ namespace Tango.BL.Entities
                 {
                     _supportshoming = value;
 
-                    SupportsHomingChanged?.Invoke(this, value);
+                    OnSupportsHomingChanged(value);
 
-                    RaisePropertyChanged(nameof(SupportsHoming)); 
                 }
             }
         }
@@ -166,14 +162,58 @@ namespace Tango.BL.Entities
                 {
                     _hardwaremotors = value;
 
-                    HardwareMotorsChanged?.Invoke(this, value);
+                    OnHardwareMotorsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareMotors)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the SupportsHoming has changed.
+        /// </summary>
+        protected virtual void OnSupportsHomingChanged(Boolean supportshoming)
+        {
+            SupportsHomingChanged?.Invoke(this, supportshoming);
+            RaisePropertyChanged(nameof(SupportsHoming));
+        }
+
+        /// <summary>
+        /// Called when the HardwareMotors has changed.
+        /// </summary>
+        protected virtual void OnHardwareMotorsChanged(SynchronizedObservableCollection<HardwareMotor> hardwaremotors)
+        {
+            HardwareMotorsChanged?.Invoke(this, hardwaremotors);
+            RaisePropertyChanged(nameof(HardwareMotors));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareMotorType" /> class.
         /// </summary>
         public HardwareMotorType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs
index a97a0f84e..865ec00bc 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs
@@ -90,7 +90,6 @@ namespace Tango.BL.Entities
                 if (_hardwarepidcontroltypeguid != value)
                 {
                     _hardwarepidcontroltypeguid = value;
-                    RaisePropertyChanged(nameof(HardwarePidControlTypeGuid)); 
                 }
             }
         }
@@ -116,7 +115,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -142,9 +140,8 @@ namespace Tango.BL.Entities
                 {
                     _outputproportionalpowerlimit = value;
 
-                    OutputProportionalPowerLimitChanged?.Invoke(this, value);
+                    OnOutputProportionalPowerLimitChanged(value);
 
-                    RaisePropertyChanged(nameof(OutputProportionalPowerLimit)); 
                 }
             }
         }
@@ -170,9 +167,8 @@ namespace Tango.BL.Entities
                 {
                     _outputproportionalband = value;
 
-                    OutputProportionalBandChanged?.Invoke(this, value);
+                    OnOutputProportionalBandChanged(value);
 
-                    RaisePropertyChanged(nameof(OutputProportionalBand)); 
                 }
             }
         }
@@ -198,9 +194,8 @@ namespace Tango.BL.Entities
                 {
                     _integraltime = value;
 
-                    IntegralTimeChanged?.Invoke(this, value);
+                    OnIntegralTimeChanged(value);
 
-                    RaisePropertyChanged(nameof(IntegralTime)); 
                 }
             }
         }
@@ -226,9 +221,8 @@ namespace Tango.BL.Entities
                 {
                     _derivativetime = value;
 
-                    DerivativeTimeChanged?.Invoke(this, value);
+                    OnDerivativeTimeChanged(value);
 
-                    RaisePropertyChanged(nameof(DerivativeTime)); 
                 }
             }
         }
@@ -254,9 +248,8 @@ namespace Tango.BL.Entities
                 {
                     _sensorcorrectionadjustment = value;
 
-                    SensorCorrectionAdjustmentChanged?.Invoke(this, value);
+                    OnSensorCorrectionAdjustmentChanged(value);
 
-                    RaisePropertyChanged(nameof(SensorCorrectionAdjustment)); 
                 }
             }
         }
@@ -282,9 +275,8 @@ namespace Tango.BL.Entities
                 {
                     _sensorminvalue = value;
 
-                    SensorMinValueChanged?.Invoke(this, value);
+                    OnSensorMinValueChanged(value);
 
-                    RaisePropertyChanged(nameof(SensorMinValue)); 
                 }
             }
         }
@@ -310,9 +302,8 @@ namespace Tango.BL.Entities
                 {
                     _sensormaxvalue = value;
 
-                    SensorMaxValueChanged?.Invoke(this, value);
+                    OnSensorMaxValueChanged(value);
 
-                    RaisePropertyChanged(nameof(SensorMaxValue)); 
                 }
             }
         }
@@ -338,9 +329,8 @@ namespace Tango.BL.Entities
                 {
                     _setpointramprateorsoftstartramp = value;
 
-                    SetPointRampRateorSoftStartRampChanged?.Invoke(this, value);
+                    OnSetPointRampRateorSoftStartRampChanged(value);
 
-                    RaisePropertyChanged(nameof(SetPointRampRateorSoftStartRamp)); 
                 }
             }
         }
@@ -366,9 +356,8 @@ namespace Tango.BL.Entities
                 {
                     _setpointcontroloutputrate = value;
 
-                    SetPointControlOutputRateChanged?.Invoke(this, value);
+                    OnSetPointControlOutputRateChanged(value);
 
-                    RaisePropertyChanged(nameof(SetPointControlOutputRate)); 
                 }
             }
         }
@@ -394,9 +383,8 @@ namespace Tango.BL.Entities
                 {
                     _controloutputtype = value;
 
-                    ControlOutputTypeChanged?.Invoke(this, value);
+                    OnControlOutputTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(ControlOutputType)); 
                 }
             }
         }
@@ -422,9 +410,8 @@ namespace Tango.BL.Entities
                 {
                     _ssrcontroloutputtype = value;
 
-                    SsrControlOutputTypeChanged?.Invoke(this, value);
+                    OnSsrControlOutputTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(SsrControlOutputType)); 
                 }
             }
         }
@@ -450,9 +437,8 @@ namespace Tango.BL.Entities
                 {
                     _outputonoffhysteresisvalue = value;
 
-                    OutputOnOffHysteresisValueChanged?.Invoke(this, value);
+                    OnOutputOnOffHysteresisValueChanged(value);
 
-                    RaisePropertyChanged(nameof(OutputOnOffHysteresisValue)); 
                 }
             }
         }
@@ -478,9 +464,8 @@ namespace Tango.BL.Entities
                 {
                     _processvariablesamplingrate = value;
 
-                    ProcessVariableSamplingRateChanged?.Invoke(this, value);
+                    OnProcessVariableSamplingRateChanged(value);
 
-                    RaisePropertyChanged(nameof(ProcessVariableSamplingRate)); 
                 }
             }
         }
@@ -506,9 +491,8 @@ namespace Tango.BL.Entities
                 {
                     _pvinputfilterfactormode = value;
 
-                    PvInputFilterFactorModeChanged?.Invoke(this, value);
+                    OnPvInputFilterFactorModeChanged(value);
 
-                    RaisePropertyChanged(nameof(PvInputFilterFactorMode)); 
                 }
             }
         }
@@ -534,9 +518,8 @@ namespace Tango.BL.Entities
                 {
                     _outputproportionalcycletime = value;
 
-                    OutputProportionalCycleTimeChanged?.Invoke(this, value);
+                    OnOutputProportionalCycleTimeChanged(value);
 
-                    RaisePropertyChanged(nameof(OutputProportionalCycleTime)); 
                 }
             }
         }
@@ -562,9 +545,8 @@ namespace Tango.BL.Entities
                 {
                     _acheatershalfcycletime = value;
 
-                    AcHeatersHalfCycleTimeChanged?.Invoke(this, value);
+                    OnAcHeatersHalfCycleTimeChanged(value);
 
-                    RaisePropertyChanged(nameof(AcHeatersHalfCycleTime)); 
                 }
             }
         }
@@ -590,9 +572,8 @@ namespace Tango.BL.Entities
                 {
                     _proportionalgain = value;
 
-                    ProportionalGainChanged?.Invoke(this, value);
+                    OnProportionalGainChanged(value);
 
-                    RaisePropertyChanged(nameof(ProportionalGain)); 
                 }
             }
         }
@@ -618,9 +599,8 @@ namespace Tango.BL.Entities
                 {
                     _pidactive = value;
 
-                    PidActiveChanged?.Invoke(this, value);
+                    OnPidActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(PidActive)); 
                 }
             }
         }
@@ -646,9 +626,8 @@ namespace Tango.BL.Entities
                 {
                     _epsilon = value;
 
-                    EpsilonChanged?.Invoke(this, value);
+                    OnEpsilonChanged(value);
 
-                    RaisePropertyChanged(nameof(Epsilon)); 
                 }
             }
         }
@@ -674,9 +653,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -702,9 +680,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwarepidcontroltype = value;
 
-                    HardwarePidControlTypeChanged?.Invoke(this, value);
+                    OnHardwarePidControlTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwarePidControlType)); 
                 }
             }
         }
@@ -730,14 +707,211 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the OutputProportionalPowerLimit has changed.
+        /// </summary>
+        protected virtual void OnOutputProportionalPowerLimitChanged(Double outputproportionalpowerlimit)
+        {
+            OutputProportionalPowerLimitChanged?.Invoke(this, outputproportionalpowerlimit);
+            RaisePropertyChanged(nameof(OutputProportionalPowerLimit));
+        }
+
+        /// <summary>
+        /// Called when the OutputProportionalBand has changed.
+        /// </summary>
+        protected virtual void OnOutputProportionalBandChanged(Double outputproportionalband)
+        {
+            OutputProportionalBandChanged?.Invoke(this, outputproportionalband);
+            RaisePropertyChanged(nameof(OutputProportionalBand));
+        }
+
+        /// <summary>
+        /// Called when the IntegralTime has changed.
+        /// </summary>
+        protected virtual void OnIntegralTimeChanged(Double integraltime)
+        {
+            IntegralTimeChanged?.Invoke(this, integraltime);
+            RaisePropertyChanged(nameof(IntegralTime));
+        }
+
+        /// <summary>
+        /// Called when the DerivativeTime has changed.
+        /// </summary>
+        protected virtual void OnDerivativeTimeChanged(Double derivativetime)
+        {
+            DerivativeTimeChanged?.Invoke(this, derivativetime);
+            RaisePropertyChanged(nameof(DerivativeTime));
+        }
+
+        /// <summary>
+        /// Called when the SensorCorrectionAdjustment has changed.
+        /// </summary>
+        protected virtual void OnSensorCorrectionAdjustmentChanged(Double sensorcorrectionadjustment)
+        {
+            SensorCorrectionAdjustmentChanged?.Invoke(this, sensorcorrectionadjustment);
+            RaisePropertyChanged(nameof(SensorCorrectionAdjustment));
+        }
+
+        /// <summary>
+        /// Called when the SensorMinValue has changed.
+        /// </summary>
+        protected virtual void OnSensorMinValueChanged(Double sensorminvalue)
+        {
+            SensorMinValueChanged?.Invoke(this, sensorminvalue);
+            RaisePropertyChanged(nameof(SensorMinValue));
+        }
+
+        /// <summary>
+        /// Called when the SensorMaxValue has changed.
+        /// </summary>
+        protected virtual void OnSensorMaxValueChanged(Double sensormaxvalue)
+        {
+            SensorMaxValueChanged?.Invoke(this, sensormaxvalue);
+            RaisePropertyChanged(nameof(SensorMaxValue));
+        }
+
+        /// <summary>
+        /// Called when the SetPointRampRateorSoftStartRamp has changed.
+        /// </summary>
+        protected virtual void OnSetPointRampRateorSoftStartRampChanged(Double setpointramprateorsoftstartramp)
+        {
+            SetPointRampRateorSoftStartRampChanged?.Invoke(this, setpointramprateorsoftstartramp);
+            RaisePropertyChanged(nameof(SetPointRampRateorSoftStartRamp));
+        }
+
+        /// <summary>
+        /// Called when the SetPointControlOutputRate has changed.
+        /// </summary>
+        protected virtual void OnSetPointControlOutputRateChanged(Double setpointcontroloutputrate)
+        {
+            SetPointControlOutputRateChanged?.Invoke(this, setpointcontroloutputrate);
+            RaisePropertyChanged(nameof(SetPointControlOutputRate));
+        }
+
+        /// <summary>
+        /// Called when the ControlOutputType has changed.
+        /// </summary>
+        protected virtual void OnControlOutputTypeChanged(Double controloutputtype)
+        {
+            ControlOutputTypeChanged?.Invoke(this, controloutputtype);
+            RaisePropertyChanged(nameof(ControlOutputType));
+        }
+
+        /// <summary>
+        /// Called when the SsrControlOutputType has changed.
+        /// </summary>
+        protected virtual void OnSsrControlOutputTypeChanged(Double ssrcontroloutputtype)
+        {
+            SsrControlOutputTypeChanged?.Invoke(this, ssrcontroloutputtype);
+            RaisePropertyChanged(nameof(SsrControlOutputType));
+        }
+
+        /// <summary>
+        /// Called when the OutputOnOffHysteresisValue has changed.
+        /// </summary>
+        protected virtual void OnOutputOnOffHysteresisValueChanged(Double outputonoffhysteresisvalue)
+        {
+            OutputOnOffHysteresisValueChanged?.Invoke(this, outputonoffhysteresisvalue);
+            RaisePropertyChanged(nameof(OutputOnOffHysteresisValue));
+        }
+
+        /// <summary>
+        /// Called when the ProcessVariableSamplingRate has changed.
+        /// </summary>
+        protected virtual void OnProcessVariableSamplingRateChanged(Double processvariablesamplingrate)
+        {
+            ProcessVariableSamplingRateChanged?.Invoke(this, processvariablesamplingrate);
+            RaisePropertyChanged(nameof(ProcessVariableSamplingRate));
+        }
+
+        /// <summary>
+        /// Called when the PvInputFilterFactorMode has changed.
+        /// </summary>
+        protected virtual void OnPvInputFilterFactorModeChanged(Double pvinputfilterfactormode)
+        {
+            PvInputFilterFactorModeChanged?.Invoke(this, pvinputfilterfactormode);
+            RaisePropertyChanged(nameof(PvInputFilterFactorMode));
+        }
+
+        /// <summary>
+        /// Called when the OutputProportionalCycleTime has changed.
+        /// </summary>
+        protected virtual void OnOutputProportionalCycleTimeChanged(Int32 outputproportionalcycletime)
+        {
+            OutputProportionalCycleTimeChanged?.Invoke(this, outputproportionalcycletime);
+            RaisePropertyChanged(nameof(OutputProportionalCycleTime));
+        }
+
+        /// <summary>
+        /// Called when the AcHeatersHalfCycleTime has changed.
+        /// </summary>
+        protected virtual void OnAcHeatersHalfCycleTimeChanged(Int32 acheatershalfcycletime)
+        {
+            AcHeatersHalfCycleTimeChanged?.Invoke(this, acheatershalfcycletime);
+            RaisePropertyChanged(nameof(AcHeatersHalfCycleTime));
+        }
+
+        /// <summary>
+        /// Called when the ProportionalGain has changed.
+        /// </summary>
+        protected virtual void OnProportionalGainChanged(Double proportionalgain)
+        {
+            ProportionalGainChanged?.Invoke(this, proportionalgain);
+            RaisePropertyChanged(nameof(ProportionalGain));
+        }
+
+        /// <summary>
+        /// Called when the PidActive has changed.
+        /// </summary>
+        protected virtual void OnPidActiveChanged(Boolean pidactive)
+        {
+            PidActiveChanged?.Invoke(this, pidactive);
+            RaisePropertyChanged(nameof(PidActive));
+        }
+
+        /// <summary>
+        /// Called when the Epsilon has changed.
+        /// </summary>
+        protected virtual void OnEpsilonChanged(Double epsilon)
+        {
+            EpsilonChanged?.Invoke(this, epsilon);
+            RaisePropertyChanged(nameof(Epsilon));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwarePidControlType has changed.
+        /// </summary>
+        protected virtual void OnHardwarePidControlTypeChanged(HardwarePidControlType hardwarepidcontroltype)
+        {
+            HardwarePidControlTypeChanged?.Invoke(this, hardwarepidcontroltype);
+            RaisePropertyChanged(nameof(HardwarePidControlType));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwarePidControl" /> class.
         /// </summary>
         public HardwarePidControl() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs
index 6b49f8967..a968ba355 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwarepidcontrols = value;
 
-                    HardwarePidControlsChanged?.Invoke(this, value);
+                    OnHardwarePidControlsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwarePidControls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the HardwarePidControls has changed.
+        /// </summary>
+        protected virtual void OnHardwarePidControlsChanged(SynchronizedObservableCollection<HardwarePidControl> hardwarepidcontrols)
+        {
+            HardwarePidControlsChanged?.Invoke(this, hardwarepidcontrols);
+            RaisePropertyChanged(nameof(HardwarePidControls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwarePidControlType" /> class.
         /// </summary>
         public HardwarePidControlType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
index 74c2a55d3..7c6550259 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
@@ -56,7 +56,6 @@ namespace Tango.BL.Entities
                 if (_hardwarespeedsensortypeguid != value)
                 {
                     _hardwarespeedsensortypeguid = value;
-                    RaisePropertyChanged(nameof(HardwareSpeedSensorTypeGuid)); 
                 }
             }
         }
@@ -82,7 +81,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -108,9 +106,8 @@ namespace Tango.BL.Entities
                 {
                     _resolutionbits = value;
 
-                    ResolutionBitsChanged?.Invoke(this, value);
+                    OnResolutionBitsChanged(value);
 
-                    RaisePropertyChanged(nameof(ResolutionBits)); 
                 }
             }
         }
@@ -136,9 +133,8 @@ namespace Tango.BL.Entities
                 {
                     _perimeter = value;
 
-                    PerimeterChanged?.Invoke(this, value);
+                    OnPerimeterChanged(value);
 
-                    RaisePropertyChanged(nameof(Perimeter)); 
                 }
             }
         }
@@ -164,9 +160,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -192,9 +187,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwarespeedsensortype = value;
 
-                    HardwareSpeedSensorTypeChanged?.Invoke(this, value);
+                    OnHardwareSpeedSensorTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareSpeedSensorType)); 
                 }
             }
         }
@@ -220,14 +214,58 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the ResolutionBits has changed.
+        /// </summary>
+        protected virtual void OnResolutionBitsChanged(Int32 resolutionbits)
+        {
+            ResolutionBitsChanged?.Invoke(this, resolutionbits);
+            RaisePropertyChanged(nameof(ResolutionBits));
+        }
+
+        /// <summary>
+        /// Called when the Perimeter has changed.
+        /// </summary>
+        protected virtual void OnPerimeterChanged(Double perimeter)
+        {
+            PerimeterChanged?.Invoke(this, perimeter);
+            RaisePropertyChanged(nameof(Perimeter));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwareSpeedSensorType has changed.
+        /// </summary>
+        protected virtual void OnHardwareSpeedSensorTypeChanged(HardwareSpeedSensorType hardwarespeedsensortype)
+        {
+            HardwareSpeedSensorTypeChanged?.Invoke(this, hardwarespeedsensortype);
+            RaisePropertyChanged(nameof(HardwareSpeedSensorType));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareSpeedSensor" /> class.
         /// </summary>
         public HardwareSpeedSensor() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
index 0f5c329fc..f3a231191 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwarespeedsensors = value;
 
-                    HardwareSpeedSensorsChanged?.Invoke(this, value);
+                    OnHardwareSpeedSensorsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareSpeedSensors)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the HardwareSpeedSensors has changed.
+        /// </summary>
+        protected virtual void OnHardwareSpeedSensorsChanged(SynchronizedObservableCollection<HardwareSpeedSensor> hardwarespeedsensors)
+        {
+            HardwareSpeedSensorsChanged?.Invoke(this, hardwarespeedsensors);
+            RaisePropertyChanged(nameof(HardwareSpeedSensors));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareSpeedSensorType" /> class.
         /// </summary>
         public HardwareSpeedSensorType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
index f3af7d91f..b9759e782 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
@@ -66,9 +66,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -94,9 +93,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -120,9 +118,8 @@ namespace Tango.BL.Entities
                 {
                     _configurations = value;
 
-                    ConfigurationsChanged?.Invoke(this, value);
+                    OnConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(Configurations)); 
                 }
             }
         }
@@ -146,9 +143,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwareblowers = value;
 
-                    HardwareBlowersChanged?.Invoke(this, value);
+                    OnHardwareBlowersChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareBlowers)); 
                 }
             }
         }
@@ -172,9 +168,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwarebreaksensors = value;
 
-                    HardwareBreakSensorsChanged?.Invoke(this, value);
+                    OnHardwareBreakSensorsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareBreakSensors)); 
                 }
             }
         }
@@ -198,9 +193,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwaredancers = value;
 
-                    HardwareDancersChanged?.Invoke(this, value);
+                    OnHardwareDancersChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareDancers)); 
                 }
             }
         }
@@ -224,9 +218,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwaremotors = value;
 
-                    HardwareMotorsChanged?.Invoke(this, value);
+                    OnHardwareMotorsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareMotors)); 
                 }
             }
         }
@@ -250,9 +243,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwarepidcontrols = value;
 
-                    HardwarePidControlsChanged?.Invoke(this, value);
+                    OnHardwarePidControlsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwarePidControls)); 
                 }
             }
         }
@@ -276,9 +268,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwarespeedsensors = value;
 
-                    HardwareSpeedSensorsChanged?.Invoke(this, value);
+                    OnHardwareSpeedSensorsChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareSpeedSensors)); 
                 }
             }
         }
@@ -302,14 +293,103 @@ namespace Tango.BL.Entities
                 {
                     _hardwarewinders = value;
 
-                    HardwareWindersChanged?.Invoke(this, value);
+                    OnHardwareWindersChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareWinders)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Configurations has changed.
+        /// </summary>
+        protected virtual void OnConfigurationsChanged(SynchronizedObservableCollection<Configuration> configurations)
+        {
+            ConfigurationsChanged?.Invoke(this, configurations);
+            RaisePropertyChanged(nameof(Configurations));
+        }
+
+        /// <summary>
+        /// Called when the HardwareBlowers has changed.
+        /// </summary>
+        protected virtual void OnHardwareBlowersChanged(SynchronizedObservableCollection<HardwareBlower> hardwareblowers)
+        {
+            HardwareBlowersChanged?.Invoke(this, hardwareblowers);
+            RaisePropertyChanged(nameof(HardwareBlowers));
+        }
+
+        /// <summary>
+        /// Called when the HardwareBreakSensors has changed.
+        /// </summary>
+        protected virtual void OnHardwareBreakSensorsChanged(SynchronizedObservableCollection<HardwareBreakSensor> hardwarebreaksensors)
+        {
+            HardwareBreakSensorsChanged?.Invoke(this, hardwarebreaksensors);
+            RaisePropertyChanged(nameof(HardwareBreakSensors));
+        }
+
+        /// <summary>
+        /// Called when the HardwareDancers has changed.
+        /// </summary>
+        protected virtual void OnHardwareDancersChanged(SynchronizedObservableCollection<HardwareDancer> hardwaredancers)
+        {
+            HardwareDancersChanged?.Invoke(this, hardwaredancers);
+            RaisePropertyChanged(nameof(HardwareDancers));
+        }
+
+        /// <summary>
+        /// Called when the HardwareMotors has changed.
+        /// </summary>
+        protected virtual void OnHardwareMotorsChanged(SynchronizedObservableCollection<HardwareMotor> hardwaremotors)
+        {
+            HardwareMotorsChanged?.Invoke(this, hardwaremotors);
+            RaisePropertyChanged(nameof(HardwareMotors));
+        }
+
+        /// <summary>
+        /// Called when the HardwarePidControls has changed.
+        /// </summary>
+        protected virtual void OnHardwarePidControlsChanged(SynchronizedObservableCollection<HardwarePidControl> hardwarepidcontrols)
+        {
+            HardwarePidControlsChanged?.Invoke(this, hardwarepidcontrols);
+            RaisePropertyChanged(nameof(HardwarePidControls));
+        }
+
+        /// <summary>
+        /// Called when the HardwareSpeedSensors has changed.
+        /// </summary>
+        protected virtual void OnHardwareSpeedSensorsChanged(SynchronizedObservableCollection<HardwareSpeedSensor> hardwarespeedsensors)
+        {
+            HardwareSpeedSensorsChanged?.Invoke(this, hardwarespeedsensors);
+            RaisePropertyChanged(nameof(HardwareSpeedSensors));
+        }
+
+        /// <summary>
+        /// Called when the HardwareWinders has changed.
+        /// </summary>
+        protected virtual void OnHardwareWindersChanged(SynchronizedObservableCollection<HardwareWinder> hardwarewinders)
+        {
+            HardwareWindersChanged?.Invoke(this, hardwarewinders);
+            RaisePropertyChanged(nameof(HardwareWinders));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareVersion" /> class.
         /// </summary>
         public HardwareVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs
index c6b7423c3..2d7050a10 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs
@@ -54,7 +54,6 @@ namespace Tango.BL.Entities
                 if (_hardwarewindertypeguid != value)
                 {
                     _hardwarewindertypeguid = value;
-                    RaisePropertyChanged(nameof(HardwareWinderTypeGuid)); 
                 }
             }
         }
@@ -80,7 +79,6 @@ namespace Tango.BL.Entities
                 if (_hardwareversionguid != value)
                 {
                     _hardwareversionguid = value;
-                    RaisePropertyChanged(nameof(HardwareVersionGuid)); 
                 }
             }
         }
@@ -106,9 +104,8 @@ namespace Tango.BL.Entities
                 {
                     _millimeterperrotation = value;
 
-                    MillimeterPerRotationChanged?.Invoke(this, value);
+                    OnMillimeterPerRotationChanged(value);
 
-                    RaisePropertyChanged(nameof(MillimeterPerRotation)); 
                 }
             }
         }
@@ -134,9 +131,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -162,9 +158,8 @@ namespace Tango.BL.Entities
                 {
                     _hardwareversion = value;
 
-                    HardwareVersionChanged?.Invoke(this, value);
+                    OnHardwareVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareVersion)); 
                 }
             }
         }
@@ -190,14 +185,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwarewindertype = value;
 
-                    HardwareWinderTypeChanged?.Invoke(this, value);
+                    OnHardwareWinderTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareWinderType)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the MillimeterPerRotation has changed.
+        /// </summary>
+        protected virtual void OnMillimeterPerRotationChanged(Int32 millimeterperrotation)
+        {
+            MillimeterPerRotationChanged?.Invoke(this, millimeterperrotation);
+            RaisePropertyChanged(nameof(MillimeterPerRotation));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the HardwareVersion has changed.
+        /// </summary>
+        protected virtual void OnHardwareVersionChanged(HardwareVersion hardwareversion)
+        {
+            HardwareVersionChanged?.Invoke(this, hardwareversion);
+            RaisePropertyChanged(nameof(HardwareVersion));
+        }
+
+        /// <summary>
+        /// Called when the HardwareWinderType has changed.
+        /// </summary>
+        protected virtual void OnHardwareWinderTypeChanged(HardwareWinderType hardwarewindertype)
+        {
+            HardwareWinderTypeChanged?.Invoke(this, hardwarewindertype);
+            RaisePropertyChanged(nameof(HardwareWinderType));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareWinder" /> class.
         /// </summary>
         public HardwareWinder() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs
index e1e4ec960..616ab40c5 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _hardwarewinders = value;
 
-                    HardwareWindersChanged?.Invoke(this, value);
+                    OnHardwareWindersChanged(value);
 
-                    RaisePropertyChanged(nameof(HardwareWinders)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the HardwareWinders has changed.
+        /// </summary>
+        protected virtual void OnHardwareWindersChanged(SynchronizedObservableCollection<HardwareWinder> hardwarewinders)
+        {
+            HardwareWindersChanged?.Invoke(this, hardwarewinders);
+            RaisePropertyChanged(nameof(HardwareWinders));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HardwareWinderType" /> class.
         /// </summary>
         public HardwareWinderType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs
index 0f630751e..b908bcf41 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -112,9 +110,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -140,9 +137,8 @@ namespace Tango.BL.Entities
                 {
                     _html = value;
 
-                    HtmlChanged?.Invoke(this, value);
+                    OnHtmlChanged(value);
 
-                    RaisePropertyChanged(nameof(Html)); 
                 }
             }
         }
@@ -166,14 +162,58 @@ namespace Tango.BL.Entities
                 {
                     _eventtypes = value;
 
-                    EventTypesChanged?.Invoke(this, value);
+                    OnEventTypesChanged(value);
 
-                    RaisePropertyChanged(nameof(EventTypes)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the Html has changed.
+        /// </summary>
+        protected virtual void OnHtmlChanged(String html)
+        {
+            HtmlChanged?.Invoke(this, html);
+            RaisePropertyChanged(nameof(Html));
+        }
+
+        /// <summary>
+        /// Called when the EventTypes has changed.
+        /// </summary>
+        protected virtual void OnEventTypesChanged(SynchronizedObservableCollection<EventType> eventtypes)
+        {
+            EventTypesChanged?.Invoke(this, eventtypes);
+            RaisePropertyChanged(nameof(EventTypes));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="HtmlPage" /> class.
         /// </summary>
         public HtmlPage() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs
index ffb7a9c3d..e6461e473 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs
@@ -64,7 +64,6 @@ namespace Tango.BL.Entities
                 if (_configurationguid != value)
                 {
                     _configurationguid = value;
-                    RaisePropertyChanged(nameof(ConfigurationGuid)); 
                 }
             }
         }
@@ -90,7 +89,6 @@ namespace Tango.BL.Entities
                 if (_dispensertypeguid != value)
                 {
                     _dispensertypeguid = value;
-                    RaisePropertyChanged(nameof(DispenserTypeGuid)); 
                 }
             }
         }
@@ -116,7 +114,6 @@ namespace Tango.BL.Entities
                 if (_liquidtypeguid != value)
                 {
                     _liquidtypeguid = value;
-                    RaisePropertyChanged(nameof(LiquidTypeGuid)); 
                 }
             }
         }
@@ -142,7 +139,6 @@ namespace Tango.BL.Entities
                 if (_cartridgetypeguid != value)
                 {
                     _cartridgetypeguid = value;
-                    RaisePropertyChanged(nameof(CartridgeTypeGuid)); 
                 }
             }
         }
@@ -168,7 +164,6 @@ namespace Tango.BL.Entities
                 if (_midtanktypeguid != value)
                 {
                     _midtanktypeguid = value;
-                    RaisePropertyChanged(nameof(MidTankTypeGuid)); 
                 }
             }
         }
@@ -194,7 +189,6 @@ namespace Tango.BL.Entities
                 if (_idspackformulaguid != value)
                 {
                     _idspackformulaguid = value;
-                    RaisePropertyChanged(nameof(IdsPackFormulaGuid)); 
                 }
             }
         }
@@ -220,9 +214,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -248,9 +241,8 @@ namespace Tango.BL.Entities
                 {
                     _packindex = value;
 
-                    PackIndexChanged?.Invoke(this, value);
+                    OnPackIndexChanged(value);
 
-                    RaisePropertyChanged(nameof(PackIndex)); 
                 }
             }
         }
@@ -276,9 +268,8 @@ namespace Tango.BL.Entities
                 {
                     _isempty = value;
 
-                    IsEmptyChanged?.Invoke(this, value);
+                    OnIsEmptyChanged(value);
 
-                    RaisePropertyChanged(nameof(IsEmpty)); 
                 }
             }
         }
@@ -304,9 +295,8 @@ namespace Tango.BL.Entities
                 {
                     _cartridgetype = value;
 
-                    CartridgeTypeChanged?.Invoke(this, value);
+                    OnCartridgeTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(CartridgeType)); 
                 }
             }
         }
@@ -332,9 +322,8 @@ namespace Tango.BL.Entities
                 {
                     _configuration = value;
 
-                    ConfigurationChanged?.Invoke(this, value);
+                    OnConfigurationChanged(value);
 
-                    RaisePropertyChanged(nameof(Configuration)); 
                 }
             }
         }
@@ -360,9 +349,8 @@ namespace Tango.BL.Entities
                 {
                     _dispensertype = value;
 
-                    DispenserTypeChanged?.Invoke(this, value);
+                    OnDispenserTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(DispenserType)); 
                 }
             }
         }
@@ -388,9 +376,8 @@ namespace Tango.BL.Entities
                 {
                     _idspackformula = value;
 
-                    IdsPackFormulaChanged?.Invoke(this, value);
+                    OnIdsPackFormulaChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPackFormula)); 
                 }
             }
         }
@@ -416,9 +403,8 @@ namespace Tango.BL.Entities
                 {
                     _liquidtype = value;
 
-                    LiquidTypeChanged?.Invoke(this, value);
+                    OnLiquidTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(LiquidType)); 
                 }
             }
         }
@@ -444,14 +430,94 @@ namespace Tango.BL.Entities
                 {
                     _midtanktype = value;
 
-                    MidTankTypeChanged?.Invoke(this, value);
+                    OnMidTankTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(MidTankType)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the PackIndex has changed.
+        /// </summary>
+        protected virtual void OnPackIndexChanged(Int32 packindex)
+        {
+            PackIndexChanged?.Invoke(this, packindex);
+            RaisePropertyChanged(nameof(PackIndex));
+        }
+
+        /// <summary>
+        /// Called when the IsEmpty has changed.
+        /// </summary>
+        protected virtual void OnIsEmptyChanged(Boolean isempty)
+        {
+            IsEmptyChanged?.Invoke(this, isempty);
+            RaisePropertyChanged(nameof(IsEmpty));
+        }
+
+        /// <summary>
+        /// Called when the CartridgeType has changed.
+        /// </summary>
+        protected virtual void OnCartridgeTypeChanged(CartridgeType cartridgetype)
+        {
+            CartridgeTypeChanged?.Invoke(this, cartridgetype);
+            RaisePropertyChanged(nameof(CartridgeType));
+        }
+
+        /// <summary>
+        /// Called when the Configuration has changed.
+        /// </summary>
+        protected virtual void OnConfigurationChanged(Configuration configuration)
+        {
+            ConfigurationChanged?.Invoke(this, configuration);
+            RaisePropertyChanged(nameof(Configuration));
+        }
+
+        /// <summary>
+        /// Called when the DispenserType has changed.
+        /// </summary>
+        protected virtual void OnDispenserTypeChanged(DispenserType dispensertype)
+        {
+            DispenserTypeChanged?.Invoke(this, dispensertype);
+            RaisePropertyChanged(nameof(DispenserType));
+        }
+
+        /// <summary>
+        /// Called when the IdsPackFormula has changed.
+        /// </summary>
+        protected virtual void OnIdsPackFormulaChanged(IdsPackFormula idspackformula)
+        {
+            IdsPackFormulaChanged?.Invoke(this, idspackformula);
+            RaisePropertyChanged(nameof(IdsPackFormula));
+        }
+
+        /// <summary>
+        /// Called when the LiquidType has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypeChanged(LiquidType liquidtype)
+        {
+            LiquidTypeChanged?.Invoke(this, liquidtype);
+            RaisePropertyChanged(nameof(LiquidType));
+        }
+
+        /// <summary>
+        /// Called when the MidTankType has changed.
+        /// </summary>
+        protected virtual void OnMidTankTypeChanged(MidTankType midtanktype)
+        {
+            MidTankTypeChanged?.Invoke(this, midtanktype);
+            RaisePropertyChanged(nameof(MidTankType));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="IdsPack" /> class.
         /// </summary>
         public IdsPack() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs
index 40b410190..100512710 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -112,9 +110,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -140,9 +137,8 @@ namespace Tango.BL.Entities
                 {
                     _autocalculated = value;
 
-                    AutoCalculatedChanged?.Invoke(this, value);
+                    OnAutoCalculatedChanged(value);
 
-                    RaisePropertyChanged(nameof(AutoCalculated)); 
                 }
             }
         }
@@ -166,14 +162,58 @@ namespace Tango.BL.Entities
                 {
                     _idspacks = value;
 
-                    IdsPacksChanged?.Invoke(this, value);
+                    OnIdsPacksChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPacks)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the AutoCalculated has changed.
+        /// </summary>
+        protected virtual void OnAutoCalculatedChanged(Boolean autocalculated)
+        {
+            AutoCalculatedChanged?.Invoke(this, autocalculated);
+            RaisePropertyChanged(nameof(AutoCalculated));
+        }
+
+        /// <summary>
+        /// Called when the IdsPacks has changed.
+        /// </summary>
+        protected virtual void OnIdsPacksChanged(SynchronizedObservableCollection<IdsPack> idspacks)
+        {
+            IdsPacksChanged?.Invoke(this, idspacks);
+            RaisePropertyChanged(nameof(IdsPacks));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="IdsPackFormula" /> class.
         /// </summary>
         public IdsPackFormula() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
index 23fb99119..89776a983 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
@@ -119,9 +119,8 @@ namespace Tango.BL.Entities
                 {
                     _creationdate = value;
 
-                    CreationDateChanged?.Invoke(this, value);
+                    OnCreationDateChanged(value);
 
-                    RaisePropertyChanged(nameof(CreationDate)); 
                 }
             }
         }
@@ -147,9 +146,8 @@ namespace Tango.BL.Entities
                 {
                     _lastrun = value;
 
-                    LastRunChanged?.Invoke(this, value);
+                    OnLastRunChanged(value);
 
-                    RaisePropertyChanged(nameof(LastRun)); 
                 }
             }
         }
@@ -175,7 +173,6 @@ namespace Tango.BL.Entities
                 if (_machineguid != value)
                 {
                     _machineguid = value;
-                    RaisePropertyChanged(nameof(MachineGuid)); 
                 }
             }
         }
@@ -201,7 +198,6 @@ namespace Tango.BL.Entities
                 if (_userguid != value)
                 {
                     _userguid = value;
-                    RaisePropertyChanged(nameof(UserGuid)); 
                 }
             }
         }
@@ -227,7 +223,6 @@ namespace Tango.BL.Entities
                 if (_rmlguid != value)
                 {
                     _rmlguid = value;
-                    RaisePropertyChanged(nameof(RmlGuid)); 
                 }
             }
         }
@@ -253,7 +248,6 @@ namespace Tango.BL.Entities
                 if (_windingmethodguid != value)
                 {
                     _windingmethodguid = value;
-                    RaisePropertyChanged(nameof(WindingMethodGuid)); 
                 }
             }
         }
@@ -279,7 +273,6 @@ namespace Tango.BL.Entities
                 if (_spooltypeguid != value)
                 {
                     _spooltypeguid = value;
-                    RaisePropertyChanged(nameof(SpoolTypeGuid)); 
                 }
             }
         }
@@ -305,9 +298,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -333,9 +325,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -361,9 +352,8 @@ namespace Tango.BL.Entities
                 {
                     _intersegmentlength = value;
 
-                    InterSegmentLengthChanged?.Invoke(this, value);
+                    OnInterSegmentLengthChanged(value);
 
-                    RaisePropertyChanged(nameof(InterSegmentLength)); 
                 }
             }
         }
@@ -389,9 +379,8 @@ namespace Tango.BL.Entities
                 {
                     _enableintersegment = value;
 
-                    EnableInterSegmentChanged?.Invoke(this, value);
+                    OnEnableInterSegmentChanged(value);
 
-                    RaisePropertyChanged(nameof(EnableInterSegment)); 
                 }
             }
         }
@@ -417,9 +406,8 @@ namespace Tango.BL.Entities
                 {
                     _enablelubrication = value;
 
-                    EnableLubricationChanged?.Invoke(this, value);
+                    OnEnableLubricationChanged(value);
 
-                    RaisePropertyChanged(nameof(EnableLubrication)); 
                 }
             }
         }
@@ -445,9 +433,8 @@ namespace Tango.BL.Entities
                 {
                     _jobindex = value;
 
-                    JobIndexChanged?.Invoke(this, value);
+                    OnJobIndexChanged(value);
 
-                    RaisePropertyChanged(nameof(JobIndex)); 
                 }
             }
         }
@@ -473,9 +460,8 @@ namespace Tango.BL.Entities
                 {
                     _estimateddurationmili = value;
 
-                    EstimatedDurationMiliChanged?.Invoke(this, value);
+                    OnEstimatedDurationMiliChanged(value);
 
-                    RaisePropertyChanged(nameof(EstimatedDurationMili)); 
                 }
             }
         }
@@ -501,9 +487,8 @@ namespace Tango.BL.Entities
                 {
                     _hasembroideryfile = value;
 
-                    HasEmbroideryFileChanged?.Invoke(this, value);
+                    OnHasEmbroideryFileChanged(value);
 
-                    RaisePropertyChanged(nameof(HasEmbroideryFile)); 
                 }
             }
         }
@@ -529,9 +514,8 @@ namespace Tango.BL.Entities
                 {
                     _embroideryfiledata = value;
 
-                    EmbroideryFileDataChanged?.Invoke(this, value);
+                    OnEmbroideryFileDataChanged(value);
 
-                    RaisePropertyChanged(nameof(EmbroideryFileData)); 
                 }
             }
         }
@@ -557,9 +541,8 @@ namespace Tango.BL.Entities
                 {
                     _embroideryfilename = value;
 
-                    EmbroideryFileNameChanged?.Invoke(this, value);
+                    OnEmbroideryFileNameChanged(value);
 
-                    RaisePropertyChanged(nameof(EmbroideryFileName)); 
                 }
             }
         }
@@ -585,9 +568,8 @@ namespace Tango.BL.Entities
                 {
                     _embroideryjpeg = value;
 
-                    EmbroideryJpegChanged?.Invoke(this, value);
+                    OnEmbroideryJpegChanged(value);
 
-                    RaisePropertyChanged(nameof(EmbroideryJpeg)); 
                 }
             }
         }
@@ -598,6 +580,7 @@ namespace Tango.BL.Entities
         /// 0 = Draft
         /// 1 = Completed
         /// 2 = Disrupted
+        /// 3 = Aborted
         /// </summary>
 
         [Column("STATUS")]
@@ -615,9 +598,8 @@ namespace Tango.BL.Entities
                 {
                     _status = value;
 
-                    StatusChanged?.Invoke(this, value);
+                    OnStatusChanged(value);
 
-                    RaisePropertyChanged(nameof(Status)); 
                 }
             }
         }
@@ -643,7 +625,6 @@ namespace Tango.BL.Entities
                 if (_colorspaceguid != value)
                 {
                     _colorspaceguid = value;
-                    RaisePropertyChanged(nameof(ColorSpaceGuid)); 
                 }
             }
         }
@@ -669,9 +650,8 @@ namespace Tango.BL.Entities
                 {
                     _numberofunits = value;
 
-                    NumberOfUnitsChanged?.Invoke(this, value);
+                    OnNumberOfUnitsChanged(value);
 
-                    RaisePropertyChanged(nameof(NumberOfUnits)); 
                 }
             }
         }
@@ -698,9 +678,8 @@ namespace Tango.BL.Entities
                 {
                     _type = value;
 
-                    TypeChanged?.Invoke(this, value);
+                    OnTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(Type)); 
                 }
             }
         }
@@ -726,7 +705,6 @@ namespace Tango.BL.Entities
                 if (_customerguid != value)
                 {
                     _customerguid = value;
-                    RaisePropertyChanged(nameof(CustomerGuid)); 
                 }
             }
         }
@@ -753,9 +731,8 @@ namespace Tango.BL.Entities
                 {
                     _spoolsdistribution = value;
 
-                    SpoolsDistributionChanged?.Invoke(this, value);
+                    OnSpoolsDistributionChanged(value);
 
-                    RaisePropertyChanged(nameof(SpoolsDistribution)); 
                 }
             }
         }
@@ -781,9 +758,8 @@ namespace Tango.BL.Entities
                 {
                     _numberofheads = value;
 
-                    NumberOfHeadsChanged?.Invoke(this, value);
+                    OnNumberOfHeadsChanged(value);
 
-                    RaisePropertyChanged(nameof(NumberOfHeads)); 
                 }
             }
         }
@@ -809,9 +785,8 @@ namespace Tango.BL.Entities
                 {
                     _sampleunitsormeters = value;
 
-                    SampleUnitsOrMetersChanged?.Invoke(this, value);
+                    OnSampleUnitsOrMetersChanged(value);
 
-                    RaisePropertyChanged(nameof(SampleUnitsOrMeters)); 
                 }
             }
         }
@@ -839,9 +814,8 @@ namespace Tango.BL.Entities
                 {
                     _finetuningstatus = value;
 
-                    FineTuningStatusChanged?.Invoke(this, value);
+                    OnFineTuningStatusChanged(value);
 
-                    RaisePropertyChanged(nameof(FineTuningStatus)); 
                 }
             }
         }
@@ -867,9 +841,8 @@ namespace Tango.BL.Entities
                 {
                     _finetuningapprovedate = value;
 
-                    FineTuningApproveDateChanged?.Invoke(this, value);
+                    OnFineTuningApproveDateChanged(value);
 
-                    RaisePropertyChanged(nameof(FineTuningApproveDate)); 
                 }
             }
         }
@@ -897,9 +870,8 @@ namespace Tango.BL.Entities
                 {
                     _sampledyestatus = value;
 
-                    SampleDyeStatusChanged?.Invoke(this, value);
+                    OnSampleDyeStatusChanged(value);
 
-                    RaisePropertyChanged(nameof(SampleDyeStatus)); 
                 }
             }
         }
@@ -925,9 +897,8 @@ namespace Tango.BL.Entities
                 {
                     _sampledyeapprovedate = value;
 
-                    SampleDyeApproveDateChanged?.Invoke(this, value);
+                    OnSampleDyeApproveDateChanged(value);
 
-                    RaisePropertyChanged(nameof(SampleDyeApproveDate)); 
                 }
             }
         }
@@ -955,9 +926,8 @@ namespace Tango.BL.Entities
                 {
                     _editingstate = value;
 
-                    EditingStateChanged?.Invoke(this, value);
+                    OnEditingStateChanged(value);
 
-                    RaisePropertyChanged(nameof(EditingState)); 
                 }
             }
         }
@@ -983,9 +953,8 @@ namespace Tango.BL.Entities
                 {
                     _lengthpercentagefactor = value;
 
-                    LengthPercentageFactorChanged?.Invoke(this, value);
+                    OnLengthPercentageFactorChanged(value);
 
-                    RaisePropertyChanged(nameof(LengthPercentageFactor)); 
                 }
             }
         }
@@ -1011,9 +980,8 @@ namespace Tango.BL.Entities
                 {
                     _colorspace = value;
 
-                    ColorSpaceChanged?.Invoke(this, value);
+                    OnColorSpaceChanged(value);
 
-                    RaisePropertyChanged(nameof(ColorSpace)); 
                 }
             }
         }
@@ -1039,9 +1007,8 @@ namespace Tango.BL.Entities
                 {
                     _customer = value;
 
-                    CustomerChanged?.Invoke(this, value);
+                    OnCustomerChanged(value);
 
-                    RaisePropertyChanged(nameof(Customer)); 
                 }
             }
         }
@@ -1065,9 +1032,8 @@ namespace Tango.BL.Entities
                 {
                     _jobruns = value;
 
-                    JobRunsChanged?.Invoke(this, value);
+                    OnJobRunsChanged(value);
 
-                    RaisePropertyChanged(nameof(JobRuns)); 
                 }
             }
         }
@@ -1093,9 +1059,8 @@ namespace Tango.BL.Entities
                 {
                     _machine = value;
 
-                    MachineChanged?.Invoke(this, value);
+                    OnMachineChanged(value);
 
-                    RaisePropertyChanged(nameof(Machine)); 
                 }
             }
         }
@@ -1121,9 +1086,8 @@ namespace Tango.BL.Entities
                 {
                     _rml = value;
 
-                    RmlChanged?.Invoke(this, value);
+                    OnRmlChanged(value);
 
-                    RaisePropertyChanged(nameof(Rml)); 
                 }
             }
         }
@@ -1149,9 +1113,8 @@ namespace Tango.BL.Entities
                 {
                     _spooltype = value;
 
-                    SpoolTypeChanged?.Invoke(this, value);
+                    OnSpoolTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(SpoolType)); 
                 }
             }
         }
@@ -1177,9 +1140,8 @@ namespace Tango.BL.Entities
                 {
                     _user = value;
 
-                    UserChanged?.Invoke(this, value);
+                    OnUserChanged(value);
 
-                    RaisePropertyChanged(nameof(User)); 
                 }
             }
         }
@@ -1205,9 +1167,8 @@ namespace Tango.BL.Entities
                 {
                     _windingmethod = value;
 
-                    WindingMethodChanged?.Invoke(this, value);
+                    OnWindingMethodChanged(value);
 
-                    RaisePropertyChanged(nameof(WindingMethod)); 
                 }
             }
         }
@@ -1231,14 +1192,319 @@ namespace Tango.BL.Entities
                 {
                     _segments = value;
 
-                    SegmentsChanged?.Invoke(this, value);
+                    OnSegmentsChanged(value);
 
-                    RaisePropertyChanged(nameof(Segments)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the CreationDate has changed.
+        /// </summary>
+        protected virtual void OnCreationDateChanged(DateTime creationdate)
+        {
+            CreationDateChanged?.Invoke(this, creationdate);
+            RaisePropertyChanged(nameof(CreationDate));
+        }
+
+        /// <summary>
+        /// Called when the LastRun has changed.
+        /// </summary>
+        protected virtual void OnLastRunChanged(Nullable<DateTime> lastrun)
+        {
+            LastRunChanged?.Invoke(this, lastrun);
+            RaisePropertyChanged(nameof(LastRun));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the InterSegmentLength has changed.
+        /// </summary>
+        protected virtual void OnInterSegmentLengthChanged(Double intersegmentlength)
+        {
+            InterSegmentLengthChanged?.Invoke(this, intersegmentlength);
+            RaisePropertyChanged(nameof(InterSegmentLength));
+        }
+
+        /// <summary>
+        /// Called when the EnableInterSegment has changed.
+        /// </summary>
+        protected virtual void OnEnableInterSegmentChanged(Boolean enableintersegment)
+        {
+            EnableInterSegmentChanged?.Invoke(this, enableintersegment);
+            RaisePropertyChanged(nameof(EnableInterSegment));
+        }
+
+        /// <summary>
+        /// Called when the EnableLubrication has changed.
+        /// </summary>
+        protected virtual void OnEnableLubricationChanged(Boolean enablelubrication)
+        {
+            EnableLubricationChanged?.Invoke(this, enablelubrication);
+            RaisePropertyChanged(nameof(EnableLubrication));
+        }
+
+        /// <summary>
+        /// Called when the JobIndex has changed.
+        /// </summary>
+        protected virtual void OnJobIndexChanged(Int32 jobindex)
+        {
+            JobIndexChanged?.Invoke(this, jobindex);
+            RaisePropertyChanged(nameof(JobIndex));
+        }
+
+        /// <summary>
+        /// Called when the EstimatedDurationMili has changed.
+        /// </summary>
+        protected virtual void OnEstimatedDurationMiliChanged(Int32 estimateddurationmili)
+        {
+            EstimatedDurationMiliChanged?.Invoke(this, estimateddurationmili);
+            RaisePropertyChanged(nameof(EstimatedDurationMili));
+        }
+
+        /// <summary>
+        /// Called when the HasEmbroideryFile has changed.
+        /// </summary>
+        protected virtual void OnHasEmbroideryFileChanged(Boolean hasembroideryfile)
+        {
+            HasEmbroideryFileChanged?.Invoke(this, hasembroideryfile);
+            RaisePropertyChanged(nameof(HasEmbroideryFile));
+        }
+
+        /// <summary>
+        /// Called when the EmbroideryFileData has changed.
+        /// </summary>
+        protected virtual void OnEmbroideryFileDataChanged(Byte[] embroideryfiledata)
+        {
+            EmbroideryFileDataChanged?.Invoke(this, embroideryfiledata);
+            RaisePropertyChanged(nameof(EmbroideryFileData));
+        }
+
+        /// <summary>
+        /// Called when the EmbroideryFileName has changed.
+        /// </summary>
+        protected virtual void OnEmbroideryFileNameChanged(String embroideryfilename)
+        {
+            EmbroideryFileNameChanged?.Invoke(this, embroideryfilename);
+            RaisePropertyChanged(nameof(EmbroideryFileName));
+        }
+
+        /// <summary>
+        /// Called when the EmbroideryJpeg has changed.
+        /// </summary>
+        protected virtual void OnEmbroideryJpegChanged(Byte[] embroideryjpeg)
+        {
+            EmbroideryJpegChanged?.Invoke(this, embroideryjpeg);
+            RaisePropertyChanged(nameof(EmbroideryJpeg));
+        }
+
+        /// <summary>
+        /// Called when the Status has changed.
+        /// </summary>
+        protected virtual void OnStatusChanged(Int32 status)
+        {
+            StatusChanged?.Invoke(this, status);
+            RaisePropertyChanged(nameof(Status));
+        }
+
+        /// <summary>
+        /// Called when the NumberOfUnits has changed.
+        /// </summary>
+        protected virtual void OnNumberOfUnitsChanged(Int32 numberofunits)
+        {
+            NumberOfUnitsChanged?.Invoke(this, numberofunits);
+            RaisePropertyChanged(nameof(NumberOfUnits));
+        }
+
+        /// <summary>
+        /// Called when the Type has changed.
+        /// </summary>
+        protected virtual void OnTypeChanged(Int32 type)
+        {
+            TypeChanged?.Invoke(this, type);
+            RaisePropertyChanged(nameof(Type));
+        }
+
+        /// <summary>
+        /// Called when the SpoolsDistribution has changed.
+        /// </summary>
+        protected virtual void OnSpoolsDistributionChanged(Int32 spoolsdistribution)
+        {
+            SpoolsDistributionChanged?.Invoke(this, spoolsdistribution);
+            RaisePropertyChanged(nameof(SpoolsDistribution));
+        }
+
+        /// <summary>
+        /// Called when the NumberOfHeads has changed.
+        /// </summary>
+        protected virtual void OnNumberOfHeadsChanged(Int32 numberofheads)
+        {
+            NumberOfHeadsChanged?.Invoke(this, numberofheads);
+            RaisePropertyChanged(nameof(NumberOfHeads));
+        }
+
+        /// <summary>
+        /// Called when the SampleUnitsOrMeters has changed.
+        /// </summary>
+        protected virtual void OnSampleUnitsOrMetersChanged(Int32 sampleunitsormeters)
+        {
+            SampleUnitsOrMetersChanged?.Invoke(this, sampleunitsormeters);
+            RaisePropertyChanged(nameof(SampleUnitsOrMeters));
+        }
+
+        /// <summary>
+        /// Called when the FineTuningStatus has changed.
+        /// </summary>
+        protected virtual void OnFineTuningStatusChanged(Int32 finetuningstatus)
+        {
+            FineTuningStatusChanged?.Invoke(this, finetuningstatus);
+            RaisePropertyChanged(nameof(FineTuningStatus));
+        }
+
+        /// <summary>
+        /// Called when the FineTuningApproveDate has changed.
+        /// </summary>
+        protected virtual void OnFineTuningApproveDateChanged(Nullable<DateTime> finetuningapprovedate)
+        {
+            FineTuningApproveDateChanged?.Invoke(this, finetuningapprovedate);
+            RaisePropertyChanged(nameof(FineTuningApproveDate));
+        }
+
+        /// <summary>
+        /// Called when the SampleDyeStatus has changed.
+        /// </summary>
+        protected virtual void OnSampleDyeStatusChanged(Int32 sampledyestatus)
+        {
+            SampleDyeStatusChanged?.Invoke(this, sampledyestatus);
+            RaisePropertyChanged(nameof(SampleDyeStatus));
+        }
+
+        /// <summary>
+        /// Called when the SampleDyeApproveDate has changed.
+        /// </summary>
+        protected virtual void OnSampleDyeApproveDateChanged(Nullable<DateTime> sampledyeapprovedate)
+        {
+            SampleDyeApproveDateChanged?.Invoke(this, sampledyeapprovedate);
+            RaisePropertyChanged(nameof(SampleDyeApproveDate));
+        }
+
+        /// <summary>
+        /// Called when the EditingState has changed.
+        /// </summary>
+        protected virtual void OnEditingStateChanged(Int32 editingstate)
+        {
+            EditingStateChanged?.Invoke(this, editingstate);
+            RaisePropertyChanged(nameof(EditingState));
+        }
+
+        /// <summary>
+        /// Called when the LengthPercentageFactor has changed.
+        /// </summary>
+        protected virtual void OnLengthPercentageFactorChanged(Double lengthpercentagefactor)
+        {
+            LengthPercentageFactorChanged?.Invoke(this, lengthpercentagefactor);
+            RaisePropertyChanged(nameof(LengthPercentageFactor));
+        }
+
+        /// <summary>
+        /// Called when the ColorSpace has changed.
+        /// </summary>
+        protected virtual void OnColorSpaceChanged(ColorSpace colorspace)
+        {
+            ColorSpaceChanged?.Invoke(this, colorspace);
+            RaisePropertyChanged(nameof(ColorSpace));
+        }
+
+        /// <summary>
+        /// Called when the Customer has changed.
+        /// </summary>
+        protected virtual void OnCustomerChanged(Customer customer)
+        {
+            CustomerChanged?.Invoke(this, customer);
+            RaisePropertyChanged(nameof(Customer));
+        }
+
+        /// <summary>
+        /// Called when the JobRuns has changed.
+        /// </summary>
+        protected virtual void OnJobRunsChanged(SynchronizedObservableCollection<JobRun> jobruns)
+        {
+            JobRunsChanged?.Invoke(this, jobruns);
+            RaisePropertyChanged(nameof(JobRuns));
+        }
+
+        /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
+        /// Called when the Rml has changed.
+        /// </summary>
+        protected virtual void OnRmlChanged(Rml rml)
+        {
+            RmlChanged?.Invoke(this, rml);
+            RaisePropertyChanged(nameof(Rml));
+        }
+
+        /// <summary>
+        /// Called when the SpoolType has changed.
+        /// </summary>
+        protected virtual void OnSpoolTypeChanged(SpoolType spooltype)
+        {
+            SpoolTypeChanged?.Invoke(this, spooltype);
+            RaisePropertyChanged(nameof(SpoolType));
+        }
+
+        /// <summary>
+        /// Called when the User has changed.
+        /// </summary>
+        protected virtual void OnUserChanged(User user)
+        {
+            UserChanged?.Invoke(this, user);
+            RaisePropertyChanged(nameof(User));
+        }
+
+        /// <summary>
+        /// Called when the WindingMethod has changed.
+        /// </summary>
+        protected virtual void OnWindingMethodChanged(WindingMethod windingmethod)
+        {
+            WindingMethodChanged?.Invoke(this, windingmethod);
+            RaisePropertyChanged(nameof(WindingMethod));
+        }
+
+        /// <summary>
+        /// Called when the Segments has changed.
+        /// </summary>
+        protected virtual void OnSegmentsChanged(SynchronizedObservableCollection<Segment> segments)
+        {
+            SegmentsChanged?.Invoke(this, segments);
+            RaisePropertyChanged(nameof(Segments));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Job" /> class.
         /// </summary>
         public Job() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
index da3b98951..67af396e1 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
@@ -63,7 +63,6 @@ namespace Tango.BL.Entities
                 if (_jobguid != value)
                 {
                     _jobguid = value;
-                    RaisePropertyChanged(nameof(JobGuid)); 
                 }
             }
         }
@@ -89,9 +88,8 @@ namespace Tango.BL.Entities
                 {
                     _startdate = value;
 
-                    StartDateChanged?.Invoke(this, value);
+                    OnStartDateChanged(value);
 
-                    RaisePropertyChanged(nameof(StartDate)); 
                 }
             }
         }
@@ -117,9 +115,8 @@ namespace Tango.BL.Entities
                 {
                     _enddate = value;
 
-                    EndDateChanged?.Invoke(this, value);
+                    OnEndDateChanged(value);
 
-                    RaisePropertyChanged(nameof(EndDate)); 
                 }
             }
         }
@@ -147,9 +144,8 @@ namespace Tango.BL.Entities
                 {
                     _status = value;
 
-                    StatusChanged?.Invoke(this, value);
+                    OnStatusChanged(value);
 
-                    RaisePropertyChanged(nameof(Status)); 
                 }
             }
         }
@@ -175,9 +171,8 @@ namespace Tango.BL.Entities
                 {
                     _endposition = value;
 
-                    EndPositionChanged?.Invoke(this, value);
+                    OnEndPositionChanged(value);
 
-                    RaisePropertyChanged(nameof(EndPosition)); 
                 }
             }
         }
@@ -203,9 +198,8 @@ namespace Tango.BL.Entities
                 {
                     _failedmessage = value;
 
-                    FailedMessageChanged?.Invoke(this, value);
+                    OnFailedMessageChanged(value);
 
-                    RaisePropertyChanged(nameof(FailedMessage)); 
                 }
             }
         }
@@ -231,14 +225,67 @@ namespace Tango.BL.Entities
                 {
                     _job = value;
 
-                    JobChanged?.Invoke(this, value);
+                    OnJobChanged(value);
 
-                    RaisePropertyChanged(nameof(Job)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the StartDate has changed.
+        /// </summary>
+        protected virtual void OnStartDateChanged(DateTime startdate)
+        {
+            StartDateChanged?.Invoke(this, startdate);
+            RaisePropertyChanged(nameof(StartDate));
+        }
+
+        /// <summary>
+        /// Called when the EndDate has changed.
+        /// </summary>
+        protected virtual void OnEndDateChanged(DateTime enddate)
+        {
+            EndDateChanged?.Invoke(this, enddate);
+            RaisePropertyChanged(nameof(EndDate));
+        }
+
+        /// <summary>
+        /// Called when the Status has changed.
+        /// </summary>
+        protected virtual void OnStatusChanged(Int32 status)
+        {
+            StatusChanged?.Invoke(this, status);
+            RaisePropertyChanged(nameof(Status));
+        }
+
+        /// <summary>
+        /// Called when the EndPosition has changed.
+        /// </summary>
+        protected virtual void OnEndPositionChanged(Double endposition)
+        {
+            EndPositionChanged?.Invoke(this, endposition);
+            RaisePropertyChanged(nameof(EndPosition));
+        }
+
+        /// <summary>
+        /// Called when the FailedMessage has changed.
+        /// </summary>
+        protected virtual void OnFailedMessageChanged(String failedmessage)
+        {
+            FailedMessageChanged?.Invoke(this, failedmessage);
+            RaisePropertyChanged(nameof(FailedMessage));
+        }
+
+        /// <summary>
+        /// Called when the Job has changed.
+        /// </summary>
+        protected virtual void OnJobChanged(Job job)
+        {
+            JobChanged?.Invoke(this, job);
+            RaisePropertyChanged(nameof(Job));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="JobRun" /> class.
         /// </summary>
         public JobRun() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs
index faf85d7e5..308f82a67 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="LinearMassDensityUnit" /> class.
         /// </summary>
         public LinearMassDensityUnit() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
index 886b83e09..c8b4658ef 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
@@ -60,9 +60,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -88,9 +87,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -116,9 +114,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -144,9 +141,8 @@ namespace Tango.BL.Entities
                 {
                     _color = value;
 
-                    ColorChanged?.Invoke(this, value);
+                    OnColorChanged(value);
 
-                    RaisePropertyChanged(nameof(Color)); 
                 }
             }
         }
@@ -170,9 +166,8 @@ namespace Tango.BL.Entities
                 {
                     _cats = value;
 
-                    CatsChanged?.Invoke(this, value);
+                    OnCatsChanged(value);
 
-                    RaisePropertyChanged(nameof(Cats)); 
                 }
             }
         }
@@ -196,9 +191,8 @@ namespace Tango.BL.Entities
                 {
                     _idspacks = value;
 
-                    IdsPacksChanged?.Invoke(this, value);
+                    OnIdsPacksChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPacks)); 
                 }
             }
         }
@@ -222,14 +216,76 @@ namespace Tango.BL.Entities
                 {
                     _liquidtypesrmls = value;
 
-                    LiquidTypesRmlsChanged?.Invoke(this, value);
+                    OnLiquidTypesRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(LiquidTypesRmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Color has changed.
+        /// </summary>
+        protected virtual void OnColorChanged(Int32 color)
+        {
+            ColorChanged?.Invoke(this, color);
+            RaisePropertyChanged(nameof(Color));
+        }
+
+        /// <summary>
+        /// Called when the Cats has changed.
+        /// </summary>
+        protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats)
+        {
+            CatsChanged?.Invoke(this, cats);
+            RaisePropertyChanged(nameof(Cats));
+        }
+
+        /// <summary>
+        /// Called when the IdsPacks has changed.
+        /// </summary>
+        protected virtual void OnIdsPacksChanged(SynchronizedObservableCollection<IdsPack> idspacks)
+        {
+            IdsPacksChanged?.Invoke(this, idspacks);
+            RaisePropertyChanged(nameof(IdsPacks));
+        }
+
+        /// <summary>
+        /// Called when the LiquidTypesRmls has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypesRmlsChanged(SynchronizedObservableCollection<LiquidTypesRml> liquidtypesrmls)
+        {
+            LiquidTypesRmlsChanged?.Invoke(this, liquidtypesrmls);
+            RaisePropertyChanged(nameof(LiquidTypesRmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="LiquidType" /> class.
         /// </summary>
         public LiquidType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs
index 6356a68cb..b217cee6b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs
@@ -54,7 +54,6 @@ namespace Tango.BL.Entities
                 if (_liquidtypeguid != value)
                 {
                     _liquidtypeguid = value;
-                    RaisePropertyChanged(nameof(LiquidTypeGuid)); 
                 }
             }
         }
@@ -80,7 +79,6 @@ namespace Tango.BL.Entities
                 if (_rmlguid != value)
                 {
                     _rmlguid = value;
-                    RaisePropertyChanged(nameof(RmlGuid)); 
                 }
             }
         }
@@ -106,9 +104,8 @@ namespace Tango.BL.Entities
                 {
                     _maxnlpercm = value;
 
-                    MaxNlPerCmChanged?.Invoke(this, value);
+                    OnMaxNlPerCmChanged(value);
 
-                    RaisePropertyChanged(nameof(MaxNlPerCm)); 
                 }
             }
         }
@@ -134,9 +131,8 @@ namespace Tango.BL.Entities
                 {
                     _defaultcatdata = value;
 
-                    DefaultCatDataChanged?.Invoke(this, value);
+                    OnDefaultCatDataChanged(value);
 
-                    RaisePropertyChanged(nameof(DefaultCatData)); 
                 }
             }
         }
@@ -162,9 +158,8 @@ namespace Tango.BL.Entities
                 {
                     _liquidtype = value;
 
-                    LiquidTypeChanged?.Invoke(this, value);
+                    OnLiquidTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(LiquidType)); 
                 }
             }
         }
@@ -190,14 +185,49 @@ namespace Tango.BL.Entities
                 {
                     _rml = value;
 
-                    RmlChanged?.Invoke(this, value);
+                    OnRmlChanged(value);
 
-                    RaisePropertyChanged(nameof(Rml)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the MaxNlPerCm has changed.
+        /// </summary>
+        protected virtual void OnMaxNlPerCmChanged(Double maxnlpercm)
+        {
+            MaxNlPerCmChanged?.Invoke(this, maxnlpercm);
+            RaisePropertyChanged(nameof(MaxNlPerCm));
+        }
+
+        /// <summary>
+        /// Called when the DefaultCatData has changed.
+        /// </summary>
+        protected virtual void OnDefaultCatDataChanged(Byte[] defaultcatdata)
+        {
+            DefaultCatDataChanged?.Invoke(this, defaultcatdata);
+            RaisePropertyChanged(nameof(DefaultCatData));
+        }
+
+        /// <summary>
+        /// Called when the LiquidType has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypeChanged(LiquidType liquidtype)
+        {
+            LiquidTypeChanged?.Invoke(this, liquidtype);
+            RaisePropertyChanged(nameof(LiquidType));
+        }
+
+        /// <summary>
+        /// Called when the Rml has changed.
+        /// </summary>
+        protected virtual void OnRmlChanged(Rml rml)
+        {
+            RmlChanged?.Invoke(this, rml);
+            RaisePropertyChanged(nameof(Rml));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="LiquidTypesRml" /> class.
         /// </summary>
         public LiquidTypesRml() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
index 8e5e9f204..b862b87b3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
@@ -98,9 +98,8 @@ namespace Tango.BL.Entities
                 {
                     _serialnumber = value;
 
-                    SerialNumberChanged?.Invoke(this, value);
+                    OnSerialNumberChanged(value);
 
-                    RaisePropertyChanged(nameof(SerialNumber)); 
                 }
             }
         }
@@ -126,9 +125,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -154,9 +152,8 @@ namespace Tango.BL.Entities
                 {
                     _productiondate = value;
 
-                    ProductionDateChanged?.Invoke(this, value);
+                    OnProductionDateChanged(value);
 
-                    RaisePropertyChanged(nameof(ProductionDate)); 
                 }
             }
         }
@@ -182,7 +179,6 @@ namespace Tango.BL.Entities
                 if (_organizationguid != value)
                 {
                     _organizationguid = value;
-                    RaisePropertyChanged(nameof(OrganizationGuid)); 
                 }
             }
         }
@@ -208,7 +204,6 @@ namespace Tango.BL.Entities
                 if (_machineversionguid != value)
                 {
                     _machineversionguid = value;
-                    RaisePropertyChanged(nameof(MachineVersionGuid)); 
                 }
             }
         }
@@ -234,7 +229,6 @@ namespace Tango.BL.Entities
                 if (_configurationguid != value)
                 {
                     _configurationguid = value;
-                    RaisePropertyChanged(nameof(ConfigurationGuid)); 
                 }
             }
         }
@@ -260,7 +254,6 @@ namespace Tango.BL.Entities
                 if (_defaultrmlguid != value)
                 {
                     _defaultrmlguid = value;
-                    RaisePropertyChanged(nameof(DefaultRmlGuid)); 
                 }
             }
         }
@@ -285,7 +278,6 @@ namespace Tango.BL.Entities
                 if (_loadedrmlguid != value)
                 {
                     _loadedrmlguid = value;
-                    RaisePropertyChanged(nameof(LoadedRmlGuid)); 
                 }
             }
         }
@@ -311,9 +303,8 @@ namespace Tango.BL.Entities
                 {
                     _targetjobtypes = value;
 
-                    TargetJobTypesChanged?.Invoke(this, value);
+                    OnTargetJobTypesChanged(value);
 
-                    RaisePropertyChanged(nameof(TargetJobTypes)); 
                 }
             }
         }
@@ -339,9 +330,8 @@ namespace Tango.BL.Entities
                 {
                     _targetcolorspacecodes = value;
 
-                    TargetColorSpaceCodesChanged?.Invoke(this, value);
+                    OnTargetColorSpaceCodesChanged(value);
 
-                    RaisePropertyChanged(nameof(TargetColorSpaceCodes)); 
                 }
             }
         }
@@ -367,7 +357,6 @@ namespace Tango.BL.Entities
                 if (_defaultcolorspaceguid != value)
                 {
                     _defaultcolorspaceguid = value;
-                    RaisePropertyChanged(nameof(DefaultColorSpaceGuid)); 
                 }
             }
         }
@@ -393,9 +382,8 @@ namespace Tango.BL.Entities
                 {
                     _defaultsegmentlength = value;
 
-                    DefaultSegmentLengthChanged?.Invoke(this, value);
+                    OnDefaultSegmentLengthChanged(value);
 
-                    RaisePropertyChanged(nameof(DefaultSegmentLength)); 
                 }
             }
         }
@@ -421,7 +409,6 @@ namespace Tango.BL.Entities
                 if (_defaultspooltypeguid != value)
                 {
                     _defaultspooltypeguid = value;
-                    RaisePropertyChanged(nameof(DefaultSpoolTypeGuid)); 
                 }
             }
         }
@@ -447,9 +434,8 @@ namespace Tango.BL.Entities
                 {
                     _synched = value;
 
-                    SynchedChanged?.Invoke(this, value);
+                    OnSynchedChanged(value);
 
-                    RaisePropertyChanged(nameof(Synched)); 
                 }
             }
         }
@@ -475,9 +461,8 @@ namespace Tango.BL.Entities
                 {
                     _oskey = value;
 
-                    OsKeyChanged?.Invoke(this, value);
+                    OnOsKeyChanged(value);
 
-                    RaisePropertyChanged(nameof(OsKey)); 
                 }
             }
         }
@@ -503,9 +488,8 @@ namespace Tango.BL.Entities
                 {
                     _autologin = value;
 
-                    AutoLoginChanged?.Invoke(this, value);
+                    OnAutoLoginChanged(value);
 
-                    RaisePropertyChanged(nameof(AutoLogin)); 
                 }
             }
         }
@@ -531,9 +515,8 @@ namespace Tango.BL.Entities
                 {
                     _autocheckforupdates = value;
 
-                    AutoCheckForUpdatesChanged?.Invoke(this, value);
+                    OnAutoCheckForUpdatesChanged(value);
 
-                    RaisePropertyChanged(nameof(AutoCheckForUpdates)); 
                 }
             }
         }
@@ -559,9 +542,8 @@ namespace Tango.BL.Entities
                 {
                     _setupactivation = value;
 
-                    SetupActivationChanged?.Invoke(this, value);
+                    OnSetupActivationChanged(value);
 
-                    RaisePropertyChanged(nameof(SetupActivation)); 
                 }
             }
         }
@@ -587,9 +569,8 @@ namespace Tango.BL.Entities
                 {
                     _setupremoteassistance = value;
 
-                    SetupRemoteAssistanceChanged?.Invoke(this, value);
+                    OnSetupRemoteAssistanceChanged(value);
 
-                    RaisePropertyChanged(nameof(SetupRemoteAssistance)); 
                 }
             }
         }
@@ -615,9 +596,8 @@ namespace Tango.BL.Entities
                 {
                     _setupuwf = value;
 
-                    SetupUwfChanged?.Invoke(this, value);
+                    OnSetupUwfChanged(value);
 
-                    RaisePropertyChanged(nameof(SetupUwf)); 
                 }
             }
         }
@@ -643,9 +623,8 @@ namespace Tango.BL.Entities
                 {
                     _setupfirmware = value;
 
-                    SetupFirmwareChanged?.Invoke(this, value);
+                    OnSetupFirmwareChanged(value);
 
-                    RaisePropertyChanged(nameof(SetupFirmware)); 
                 }
             }
         }
@@ -671,9 +650,8 @@ namespace Tango.BL.Entities
                 {
                     _setupfpga = value;
 
-                    SetupFpgaChanged?.Invoke(this, value);
+                    OnSetupFpgaChanged(value);
 
-                    RaisePropertyChanged(nameof(SetupFpga)); 
                 }
             }
         }
@@ -699,9 +677,8 @@ namespace Tango.BL.Entities
                 {
                     _isdemo = value;
 
-                    IsDemoChanged?.Invoke(this, value);
+                    OnIsDemoChanged(value);
 
-                    RaisePropertyChanged(nameof(IsDemo)); 
                 }
             }
         }
@@ -725,9 +702,8 @@ namespace Tango.BL.Entities
                 {
                     _cats = value;
 
-                    CatsChanged?.Invoke(this, value);
+                    OnCatsChanged(value);
 
-                    RaisePropertyChanged(nameof(Cats)); 
                 }
             }
         }
@@ -753,9 +729,8 @@ namespace Tango.BL.Entities
                 {
                     _defaultcolorspace = value;
 
-                    DefaultColorSpaceChanged?.Invoke(this, value);
+                    OnDefaultColorSpaceChanged(value);
 
-                    RaisePropertyChanged(nameof(DefaultColorSpace)); 
                 }
             }
         }
@@ -781,9 +756,8 @@ namespace Tango.BL.Entities
                 {
                     _configuration = value;
 
-                    ConfigurationChanged?.Invoke(this, value);
+                    OnConfigurationChanged(value);
 
-                    RaisePropertyChanged(nameof(Configuration)); 
                 }
             }
         }
@@ -807,9 +781,8 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
@@ -835,9 +808,8 @@ namespace Tango.BL.Entities
                 {
                     _machineversion = value;
 
-                    MachineVersionChanged?.Invoke(this, value);
+                    OnMachineVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(MachineVersion)); 
                 }
             }
         }
@@ -861,9 +833,8 @@ namespace Tango.BL.Entities
                 {
                     _machinesconfigurations = value;
 
-                    MachinesConfigurationsChanged?.Invoke(this, value);
+                    OnMachinesConfigurationsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachinesConfigurations)); 
                 }
             }
         }
@@ -887,9 +858,8 @@ namespace Tango.BL.Entities
                 {
                     _machinesevents = value;
 
-                    MachinesEventsChanged?.Invoke(this, value);
+                    OnMachinesEventsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachinesEvents)); 
                 }
             }
         }
@@ -915,9 +885,8 @@ namespace Tango.BL.Entities
                 {
                     _organization = value;
 
-                    OrganizationChanged?.Invoke(this, value);
+                    OnOrganizationChanged(value);
 
-                    RaisePropertyChanged(nameof(Organization)); 
                 }
             }
         }
@@ -943,9 +912,8 @@ namespace Tango.BL.Entities
                 {
                     _defaultrml = value;
 
-                    DefaultRmlChanged?.Invoke(this, value);
+                    OnDefaultRmlChanged(value);
 
-                    RaisePropertyChanged(nameof(DefaultRml)); 
                 }
             }
         }
@@ -971,14 +939,247 @@ namespace Tango.BL.Entities
                 {
                     _defaultspooltype = value;
 
-                    DefaultSpoolTypeChanged?.Invoke(this, value);
+                    OnDefaultSpoolTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(DefaultSpoolType)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the SerialNumber has changed.
+        /// </summary>
+        protected virtual void OnSerialNumberChanged(String serialnumber)
+        {
+            SerialNumberChanged?.Invoke(this, serialnumber);
+            RaisePropertyChanged(nameof(SerialNumber));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the ProductionDate has changed.
+        /// </summary>
+        protected virtual void OnProductionDateChanged(DateTime productiondate)
+        {
+            ProductionDateChanged?.Invoke(this, productiondate);
+            RaisePropertyChanged(nameof(ProductionDate));
+        }
+
+        /// <summary>
+        /// Called when the TargetJobTypes has changed.
+        /// </summary>
+        protected virtual void OnTargetJobTypesChanged(String targetjobtypes)
+        {
+            TargetJobTypesChanged?.Invoke(this, targetjobtypes);
+            RaisePropertyChanged(nameof(TargetJobTypes));
+        }
+
+        /// <summary>
+        /// Called when the TargetColorSpaceCodes has changed.
+        /// </summary>
+        protected virtual void OnTargetColorSpaceCodesChanged(String targetcolorspacecodes)
+        {
+            TargetColorSpaceCodesChanged?.Invoke(this, targetcolorspacecodes);
+            RaisePropertyChanged(nameof(TargetColorSpaceCodes));
+        }
+
+        /// <summary>
+        /// Called when the DefaultSegmentLength has changed.
+        /// </summary>
+        protected virtual void OnDefaultSegmentLengthChanged(Double defaultsegmentlength)
+        {
+            DefaultSegmentLengthChanged?.Invoke(this, defaultsegmentlength);
+            RaisePropertyChanged(nameof(DefaultSegmentLength));
+        }
+
+        /// <summary>
+        /// Called when the Synched has changed.
+        /// </summary>
+        protected virtual void OnSynchedChanged(Boolean synched)
+        {
+            SynchedChanged?.Invoke(this, synched);
+            RaisePropertyChanged(nameof(Synched));
+        }
+
+        /// <summary>
+        /// Called when the OsKey has changed.
+        /// </summary>
+        protected virtual void OnOsKeyChanged(String oskey)
+        {
+            OsKeyChanged?.Invoke(this, oskey);
+            RaisePropertyChanged(nameof(OsKey));
+        }
+
+        /// <summary>
+        /// Called when the AutoLogin has changed.
+        /// </summary>
+        protected virtual void OnAutoLoginChanged(Boolean autologin)
+        {
+            AutoLoginChanged?.Invoke(this, autologin);
+            RaisePropertyChanged(nameof(AutoLogin));
+        }
+
+        /// <summary>
+        /// Called when the AutoCheckForUpdates has changed.
+        /// </summary>
+        protected virtual void OnAutoCheckForUpdatesChanged(Boolean autocheckforupdates)
+        {
+            AutoCheckForUpdatesChanged?.Invoke(this, autocheckforupdates);
+            RaisePropertyChanged(nameof(AutoCheckForUpdates));
+        }
+
+        /// <summary>
+        /// Called when the SetupActivation has changed.
+        /// </summary>
+        protected virtual void OnSetupActivationChanged(Boolean setupactivation)
+        {
+            SetupActivationChanged?.Invoke(this, setupactivation);
+            RaisePropertyChanged(nameof(SetupActivation));
+        }
+
+        /// <summary>
+        /// Called when the SetupRemoteAssistance has changed.
+        /// </summary>
+        protected virtual void OnSetupRemoteAssistanceChanged(Boolean setupremoteassistance)
+        {
+            SetupRemoteAssistanceChanged?.Invoke(this, setupremoteassistance);
+            RaisePropertyChanged(nameof(SetupRemoteAssistance));
+        }
+
+        /// <summary>
+        /// Called when the SetupUwf has changed.
+        /// </summary>
+        protected virtual void OnSetupUwfChanged(Boolean setupuwf)
+        {
+            SetupUwfChanged?.Invoke(this, setupuwf);
+            RaisePropertyChanged(nameof(SetupUwf));
+        }
+
+        /// <summary>
+        /// Called when the SetupFirmware has changed.
+        /// </summary>
+        protected virtual void OnSetupFirmwareChanged(Boolean setupfirmware)
+        {
+            SetupFirmwareChanged?.Invoke(this, setupfirmware);
+            RaisePropertyChanged(nameof(SetupFirmware));
+        }
+
+        /// <summary>
+        /// Called when the SetupFpga has changed.
+        /// </summary>
+        protected virtual void OnSetupFpgaChanged(Boolean setupfpga)
+        {
+            SetupFpgaChanged?.Invoke(this, setupfpga);
+            RaisePropertyChanged(nameof(SetupFpga));
+        }
+
+        /// <summary>
+        /// Called when the IsDemo has changed.
+        /// </summary>
+        protected virtual void OnIsDemoChanged(Boolean isdemo)
+        {
+            IsDemoChanged?.Invoke(this, isdemo);
+            RaisePropertyChanged(nameof(IsDemo));
+        }
+
+        /// <summary>
+        /// Called when the Cats has changed.
+        /// </summary>
+        protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats)
+        {
+            CatsChanged?.Invoke(this, cats);
+            RaisePropertyChanged(nameof(Cats));
+        }
+
+        /// <summary>
+        /// Called when the DefaultColorSpace has changed.
+        /// </summary>
+        protected virtual void OnDefaultColorSpaceChanged(ColorSpace defaultcolorspace)
+        {
+            DefaultColorSpaceChanged?.Invoke(this, defaultcolorspace);
+            RaisePropertyChanged(nameof(DefaultColorSpace));
+        }
+
+        /// <summary>
+        /// Called when the Configuration has changed.
+        /// </summary>
+        protected virtual void OnConfigurationChanged(Configuration configuration)
+        {
+            ConfigurationChanged?.Invoke(this, configuration);
+            RaisePropertyChanged(nameof(Configuration));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
+        /// Called when the MachineVersion has changed.
+        /// </summary>
+        protected virtual void OnMachineVersionChanged(MachineVersion machineversion)
+        {
+            MachineVersionChanged?.Invoke(this, machineversion);
+            RaisePropertyChanged(nameof(MachineVersion));
+        }
+
+        /// <summary>
+        /// Called when the MachinesConfigurations has changed.
+        /// </summary>
+        protected virtual void OnMachinesConfigurationsChanged(SynchronizedObservableCollection<MachinesConfiguration> machinesconfigurations)
+        {
+            MachinesConfigurationsChanged?.Invoke(this, machinesconfigurations);
+            RaisePropertyChanged(nameof(MachinesConfigurations));
+        }
+
+        /// <summary>
+        /// Called when the MachinesEvents has changed.
+        /// </summary>
+        protected virtual void OnMachinesEventsChanged(SynchronizedObservableCollection<MachinesEvent> machinesevents)
+        {
+            MachinesEventsChanged?.Invoke(this, machinesevents);
+            RaisePropertyChanged(nameof(MachinesEvents));
+        }
+
+        /// <summary>
+        /// Called when the Organization has changed.
+        /// </summary>
+        protected virtual void OnOrganizationChanged(Organization organization)
+        {
+            OrganizationChanged?.Invoke(this, organization);
+            RaisePropertyChanged(nameof(Organization));
+        }
+
+        /// <summary>
+        /// Called when the DefaultRml has changed.
+        /// </summary>
+        protected virtual void OnDefaultRmlChanged(Rml defaultrml)
+        {
+            DefaultRmlChanged?.Invoke(this, defaultrml);
+            RaisePropertyChanged(nameof(DefaultRml));
+        }
+
+        /// <summary>
+        /// Called when the DefaultSpoolType has changed.
+        /// </summary>
+        protected virtual void OnDefaultSpoolTypeChanged(SpoolType defaultspooltype)
+        {
+            DefaultSpoolTypeChanged?.Invoke(this, defaultspooltype);
+            RaisePropertyChanged(nameof(DefaultSpoolType));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Machine" /> class.
         /// </summary>
         public Machine() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs
index cc1425529..3686f3a0a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs
@@ -58,9 +58,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -86,9 +85,8 @@ namespace Tango.BL.Entities
                 {
                     _blobname = value;
 
-                    BlobNameChanged?.Invoke(this, value);
+                    OnBlobNameChanged(value);
 
-                    RaisePropertyChanged(nameof(BlobName)); 
                 }
             }
         }
@@ -114,9 +112,8 @@ namespace Tango.BL.Entities
                 {
                     _comments = value;
 
-                    CommentsChanged?.Invoke(this, value);
+                    OnCommentsChanged(value);
 
-                    RaisePropertyChanged(nameof(Comments)); 
                 }
             }
         }
@@ -142,7 +139,6 @@ namespace Tango.BL.Entities
                 if (_userguid != value)
                 {
                     _userguid = value;
-                    RaisePropertyChanged(nameof(UserGuid)); 
                 }
             }
         }
@@ -168,9 +164,8 @@ namespace Tango.BL.Entities
                 {
                     _forceupdate = value;
 
-                    ForceUpdateChanged?.Invoke(this, value);
+                    OnForceUpdateChanged(value);
 
-                    RaisePropertyChanged(nameof(ForceUpdate)); 
                 }
             }
         }
@@ -196,9 +191,8 @@ namespace Tango.BL.Entities
                 {
                     _stable = value;
 
-                    StableChanged?.Invoke(this, value);
+                    OnStableChanged(value);
 
-                    RaisePropertyChanged(nameof(Stable)); 
                 }
             }
         }
@@ -224,14 +218,67 @@ namespace Tango.BL.Entities
                 {
                     _user = value;
 
-                    UserChanged?.Invoke(this, value);
+                    OnUserChanged(value);
 
-                    RaisePropertyChanged(nameof(User)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(String version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the BlobName has changed.
+        /// </summary>
+        protected virtual void OnBlobNameChanged(String blobname)
+        {
+            BlobNameChanged?.Invoke(this, blobname);
+            RaisePropertyChanged(nameof(BlobName));
+        }
+
+        /// <summary>
+        /// Called when the Comments has changed.
+        /// </summary>
+        protected virtual void OnCommentsChanged(String comments)
+        {
+            CommentsChanged?.Invoke(this, comments);
+            RaisePropertyChanged(nameof(Comments));
+        }
+
+        /// <summary>
+        /// Called when the ForceUpdate has changed.
+        /// </summary>
+        protected virtual void OnForceUpdateChanged(Boolean forceupdate)
+        {
+            ForceUpdateChanged?.Invoke(this, forceupdate);
+            RaisePropertyChanged(nameof(ForceUpdate));
+        }
+
+        /// <summary>
+        /// Called when the Stable has changed.
+        /// </summary>
+        protected virtual void OnStableChanged(Boolean stable)
+        {
+            StableChanged?.Invoke(this, stable);
+            RaisePropertyChanged(nameof(Stable));
+        }
+
+        /// <summary>
+        /// Called when the User has changed.
+        /// </summary>
+        protected virtual void OnUserChanged(User user)
+        {
+            UserChanged?.Invoke(this, user);
+            RaisePropertyChanged(nameof(User));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachineStudioVersion" /> class.
         /// </summary>
         public MachineStudioVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
index b58e56656..87eaa61a4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -112,7 +110,6 @@ namespace Tango.BL.Entities
                 if (_defaultconfigurationguid != value)
                 {
                     _defaultconfigurationguid = value;
-                    RaisePropertyChanged(nameof(DefaultConfigurationGuid)); 
                 }
             }
         }
@@ -138,9 +135,8 @@ namespace Tango.BL.Entities
                 {
                     _defaultconfiguration = value;
 
-                    DefaultConfigurationChanged?.Invoke(this, value);
+                    OnDefaultConfigurationChanged(value);
 
-                    RaisePropertyChanged(nameof(DefaultConfiguration)); 
                 }
             }
         }
@@ -164,9 +160,8 @@ namespace Tango.BL.Entities
                 {
                     _machines = value;
 
-                    MachinesChanged?.Invoke(this, value);
+                    OnMachinesChanged(value);
 
-                    RaisePropertyChanged(nameof(Machines)); 
                 }
             }
         }
@@ -190,14 +185,58 @@ namespace Tango.BL.Entities
                 {
                     _tangoversions = value;
 
-                    TangoVersionsChanged?.Invoke(this, value);
+                    OnTangoVersionsChanged(value);
 
-                    RaisePropertyChanged(nameof(TangoVersions)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(Double version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the DefaultConfiguration has changed.
+        /// </summary>
+        protected virtual void OnDefaultConfigurationChanged(Configuration defaultconfiguration)
+        {
+            DefaultConfigurationChanged?.Invoke(this, defaultconfiguration);
+            RaisePropertyChanged(nameof(DefaultConfiguration));
+        }
+
+        /// <summary>
+        /// Called when the Machines has changed.
+        /// </summary>
+        protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines)
+        {
+            MachinesChanged?.Invoke(this, machines);
+            RaisePropertyChanged(nameof(Machines));
+        }
+
+        /// <summary>
+        /// Called when the TangoVersions has changed.
+        /// </summary>
+        protected virtual void OnTangoVersionsChanged(SynchronizedObservableCollection<TangoVersion> tangoversions)
+        {
+            TangoVersionsChanged?.Invoke(this, tangoversions);
+            RaisePropertyChanged(nameof(TangoVersions));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachineVersion" /> class.
         /// </summary>
         public MachineVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs
index a7706fd57..4feacdbae 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs
@@ -50,7 +50,6 @@ namespace Tango.BL.Entities
                 if (_machineguid != value)
                 {
                     _machineguid = value;
-                    RaisePropertyChanged(nameof(MachineGuid)); 
                 }
             }
         }
@@ -76,7 +75,6 @@ namespace Tango.BL.Entities
                 if (_configurationguid != value)
                 {
                     _configurationguid = value;
-                    RaisePropertyChanged(nameof(ConfigurationGuid)); 
                 }
             }
         }
@@ -102,9 +100,8 @@ namespace Tango.BL.Entities
                 {
                     _configuration = value;
 
-                    ConfigurationChanged?.Invoke(this, value);
+                    OnConfigurationChanged(value);
 
-                    RaisePropertyChanged(nameof(Configuration)); 
                 }
             }
         }
@@ -130,14 +127,31 @@ namespace Tango.BL.Entities
                 {
                     _machine = value;
 
-                    MachineChanged?.Invoke(this, value);
+                    OnMachineChanged(value);
 
-                    RaisePropertyChanged(nameof(Machine)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Configuration has changed.
+        /// </summary>
+        protected virtual void OnConfigurationChanged(Configuration configuration)
+        {
+            ConfigurationChanged?.Invoke(this, configuration);
+            RaisePropertyChanged(nameof(Configuration));
+        }
+
+        /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachinesConfiguration" /> class.
         /// </summary>
         public MachinesConfiguration() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs
index c327677bf..f1485d998 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs
@@ -58,9 +58,8 @@ namespace Tango.BL.Entities
                 {
                     _hostname = value;
 
-                    HostNameChanged?.Invoke(this, value);
+                    OnHostNameChanged(value);
 
-                    RaisePropertyChanged(nameof(HostName)); 
                 }
             }
         }
@@ -86,7 +85,6 @@ namespace Tango.BL.Entities
                 if (_machineguid != value)
                 {
                     _machineguid = value;
-                    RaisePropertyChanged(nameof(MachineGuid)); 
                 }
             }
         }
@@ -112,7 +110,6 @@ namespace Tango.BL.Entities
                 if (_eventtypeguid != value)
                 {
                     _eventtypeguid = value;
-                    RaisePropertyChanged(nameof(EventTypeGuid)); 
                 }
             }
         }
@@ -138,7 +135,6 @@ namespace Tango.BL.Entities
                 if (_userguid != value)
                 {
                     _userguid = value;
-                    RaisePropertyChanged(nameof(UserGuid)); 
                 }
             }
         }
@@ -164,9 +160,8 @@ namespace Tango.BL.Entities
                 {
                     _datetime = value;
 
-                    DateTimeChanged?.Invoke(this, value);
+                    OnDateTimeChanged(value);
 
-                    RaisePropertyChanged(nameof(DateTime)); 
                 }
             }
         }
@@ -192,9 +187,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -220,9 +214,8 @@ namespace Tango.BL.Entities
                 {
                     _eventtype = value;
 
-                    EventTypeChanged?.Invoke(this, value);
+                    OnEventTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(EventType)); 
                 }
             }
         }
@@ -248,9 +241,8 @@ namespace Tango.BL.Entities
                 {
                     _machine = value;
 
-                    MachineChanged?.Invoke(this, value);
+                    OnMachineChanged(value);
 
-                    RaisePropertyChanged(nameof(Machine)); 
                 }
             }
         }
@@ -276,14 +268,67 @@ namespace Tango.BL.Entities
                 {
                     _user = value;
 
-                    UserChanged?.Invoke(this, value);
+                    OnUserChanged(value);
 
-                    RaisePropertyChanged(nameof(User)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the HostName has changed.
+        /// </summary>
+        protected virtual void OnHostNameChanged(String hostname)
+        {
+            HostNameChanged?.Invoke(this, hostname);
+            RaisePropertyChanged(nameof(HostName));
+        }
+
+        /// <summary>
+        /// Called when the DateTime has changed.
+        /// </summary>
+        protected virtual void OnDateTimeChanged(DateTime datetime)
+        {
+            DateTimeChanged?.Invoke(this, datetime);
+            RaisePropertyChanged(nameof(DateTime));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the EventType has changed.
+        /// </summary>
+        protected virtual void OnEventTypeChanged(EventType eventtype)
+        {
+            EventTypeChanged?.Invoke(this, eventtype);
+            RaisePropertyChanged(nameof(EventType));
+        }
+
+        /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
+        /// Called when the User has changed.
+        /// </summary>
+        protected virtual void OnUserChanged(User user)
+        {
+            UserChanged?.Invoke(this, user);
+            RaisePropertyChanged(nameof(User));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachinesEvent" /> class.
         /// </summary>
         public MachinesEvent() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs
index c09b606ae..f8dbd1041 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _l = value;
 
-                    LChanged?.Invoke(this, value);
+                    OnLChanged(value);
 
-                    RaisePropertyChanged(nameof(L)); 
                 }
             }
         }
@@ -112,9 +110,8 @@ namespace Tango.BL.Entities
                 {
                     _a = value;
 
-                    AChanged?.Invoke(this, value);
+                    OnAChanged(value);
 
-                    RaisePropertyChanged(nameof(A)); 
                 }
             }
         }
@@ -140,9 +137,8 @@ namespace Tango.BL.Entities
                 {
                     _b = value;
 
-                    BChanged?.Invoke(this, value);
+                    OnBChanged(value);
 
-                    RaisePropertyChanged(nameof(B)); 
                 }
             }
         }
@@ -166,14 +162,58 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the L has changed.
+        /// </summary>
+        protected virtual void OnLChanged(Double l)
+        {
+            LChanged?.Invoke(this, l);
+            RaisePropertyChanged(nameof(L));
+        }
+
+        /// <summary>
+        /// Called when the A has changed.
+        /// </summary>
+        protected virtual void OnAChanged(Double a)
+        {
+            AChanged?.Invoke(this, a);
+            RaisePropertyChanged(nameof(A));
+        }
+
+        /// <summary>
+        /// Called when the B has changed.
+        /// </summary>
+        protected virtual void OnBChanged(Double b)
+        {
+            BChanged?.Invoke(this, b);
+            RaisePropertyChanged(nameof(B));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MediaColor" /> class.
         /// </summary>
         public MediaColor() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs
index 6dcb5f972..5bddd398d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MediaCondition" /> class.
         /// </summary>
         public MediaCondition() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs
index c77d5fb27..8ea998ef3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MediaMaterial" /> class.
         /// </summary>
         public MediaMaterial() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs
index 6ddb194b4..a9f21821a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -106,14 +104,40 @@ namespace Tango.BL.Entities
                 {
                     _rmls = value;
 
-                    RmlsChanged?.Invoke(this, value);
+                    OnRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(Rmls)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Rmls has changed.
+        /// </summary>
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
+        {
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MediaPurpos" /> class.
         /// </summary>
         public MediaPurpos() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs b/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs
index a6e629c23..a0e44ef3e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _litercapacity = value;
 
-                    LiterCapacityChanged?.Invoke(this, value);
+                    OnLiterCapacityChanged(value);
 
-                    RaisePropertyChanged(nameof(LiterCapacity)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _idspacks = value;
 
-                    IdsPacksChanged?.Invoke(this, value);
+                    OnIdsPacksChanged(value);
 
-                    RaisePropertyChanged(nameof(IdsPacks)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the LiterCapacity has changed.
+        /// </summary>
+        protected virtual void OnLiterCapacityChanged(Double litercapacity)
+        {
+            LiterCapacityChanged?.Invoke(this, litercapacity);
+            RaisePropertyChanged(nameof(LiterCapacity));
+        }
+
+        /// <summary>
+        /// Called when the IdsPacks has changed.
+        /// </summary>
+        protected virtual void OnIdsPacksChanged(SynchronizedObservableCollection<IdsPack> idspacks)
+        {
+            IdsPacksChanged?.Invoke(this, idspacks);
+            RaisePropertyChanged(nameof(IdsPacks));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MidTankType" /> class.
         /// </summary>
         public MidTankType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs
index 43206dd51..ead112405 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs
@@ -58,9 +58,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -86,7 +85,6 @@ namespace Tango.BL.Entities
                 if (_contactguid != value)
                 {
                     _contactguid = value;
-                    RaisePropertyChanged(nameof(ContactGuid)); 
                 }
             }
         }
@@ -112,7 +110,6 @@ namespace Tango.BL.Entities
                 if (_addressguid != value)
                 {
                     _addressguid = value;
-                    RaisePropertyChanged(nameof(AddressGuid)); 
                 }
             }
         }
@@ -138,9 +135,8 @@ namespace Tango.BL.Entities
                 {
                     _address = value;
 
-                    AddressChanged?.Invoke(this, value);
+                    OnAddressChanged(value);
 
-                    RaisePropertyChanged(nameof(Address)); 
                 }
             }
         }
@@ -166,9 +162,8 @@ namespace Tango.BL.Entities
                 {
                     _contact = value;
 
-                    ContactChanged?.Invoke(this, value);
+                    OnContactChanged(value);
 
-                    RaisePropertyChanged(nameof(Contact)); 
                 }
             }
         }
@@ -192,9 +187,8 @@ namespace Tango.BL.Entities
                 {
                     _customers = value;
 
-                    CustomersChanged?.Invoke(this, value);
+                    OnCustomersChanged(value);
 
-                    RaisePropertyChanged(nameof(Customers)); 
                 }
             }
         }
@@ -218,9 +212,8 @@ namespace Tango.BL.Entities
                 {
                     _machines = value;
 
-                    MachinesChanged?.Invoke(this, value);
+                    OnMachinesChanged(value);
 
-                    RaisePropertyChanged(nameof(Machines)); 
                 }
             }
         }
@@ -244,14 +237,67 @@ namespace Tango.BL.Entities
                 {
                     _users = value;
 
-                    UsersChanged?.Invoke(this, value);
+                    OnUsersChanged(value);
 
-                    RaisePropertyChanged(nameof(Users)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Address has changed.
+        /// </summary>
+        protected virtual void OnAddressChanged(Address address)
+        {
+            AddressChanged?.Invoke(this, address);
+            RaisePropertyChanged(nameof(Address));
+        }
+
+        /// <summary>
+        /// Called when the Contact has changed.
+        /// </summary>
+        protected virtual void OnContactChanged(Contact contact)
+        {
+            ContactChanged?.Invoke(this, contact);
+            RaisePropertyChanged(nameof(Contact));
+        }
+
+        /// <summary>
+        /// Called when the Customers has changed.
+        /// </summary>
+        protected virtual void OnCustomersChanged(SynchronizedObservableCollection<Customer> customers)
+        {
+            CustomersChanged?.Invoke(this, customers);
+            RaisePropertyChanged(nameof(Customers));
+        }
+
+        /// <summary>
+        /// Called when the Machines has changed.
+        /// </summary>
+        protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines)
+        {
+            MachinesChanged?.Invoke(this, machines);
+            RaisePropertyChanged(nameof(Machines));
+        }
+
+        /// <summary>
+        /// Called when the Users has changed.
+        /// </summary>
+        protected virtual void OnUsersChanged(SynchronizedObservableCollection<User> users)
+        {
+            UsersChanged?.Invoke(this, users);
+            RaisePropertyChanged(nameof(Users));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Organization" /> class.
         /// </summary>
         public Organization() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Permission.cs b/Software/Visual_Studio/Tango.BL/Entities/Permission.cs
index 385186794..cef16afd2 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Permission.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Permission.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _rolespermissions = value;
 
-                    RolesPermissionsChanged?.Invoke(this, value);
+                    OnRolesPermissionsChanged(value);
 
-                    RaisePropertyChanged(nameof(RolesPermissions)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the RolesPermissions has changed.
+        /// </summary>
+        protected virtual void OnRolesPermissionsChanged(SynchronizedObservableCollection<RolesPermission> rolespermissions)
+        {
+            RolesPermissionsChanged?.Invoke(this, rolespermissions);
+            RaisePropertyChanged(nameof(RolesPermissions));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Permission" /> class.
         /// </summary>
         public Permission() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
index 42ce1a47d..4ad4d9790 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs
@@ -90,9 +90,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -118,9 +117,8 @@ namespace Tango.BL.Entities
                 {
                     _dyeingspeed = value;
 
-                    DyeingSpeedChanged?.Invoke(this, value);
+                    OnDyeingSpeedChanged(value);
 
-                    RaisePropertyChanged(nameof(DyeingSpeed)); 
                 }
             }
         }
@@ -146,9 +144,8 @@ namespace Tango.BL.Entities
                 {
                     _mininkuptake = value;
 
-                    MinInkUptakeChanged?.Invoke(this, value);
+                    OnMinInkUptakeChanged(value);
 
-                    RaisePropertyChanged(nameof(MinInkUptake)); 
                 }
             }
         }
@@ -174,9 +171,8 @@ namespace Tango.BL.Entities
                 {
                     _maxinkuptake = value;
 
-                    MaxInkUptakeChanged?.Invoke(this, value);
+                    OnMaxInkUptakeChanged(value);
 
-                    RaisePropertyChanged(nameof(MaxInkUptake)); 
                 }
             }
         }
@@ -202,9 +198,8 @@ namespace Tango.BL.Entities
                 {
                     _feedertension = value;
 
-                    FeederTensionChanged?.Invoke(this, value);
+                    OnFeederTensionChanged(value);
 
-                    RaisePropertyChanged(nameof(FeederTension)); 
                 }
             }
         }
@@ -230,9 +225,8 @@ namespace Tango.BL.Entities
                 {
                     _pullertension = value;
 
-                    PullerTensionChanged?.Invoke(this, value);
+                    OnPullerTensionChanged(value);
 
-                    RaisePropertyChanged(nameof(PullerTension)); 
                 }
             }
         }
@@ -258,9 +252,8 @@ namespace Tango.BL.Entities
                 {
                     _windertension = value;
 
-                    WinderTensionChanged?.Invoke(this, value);
+                    OnWinderTensionChanged(value);
 
-                    RaisePropertyChanged(nameof(WinderTension)); 
                 }
             }
         }
@@ -286,9 +279,8 @@ namespace Tango.BL.Entities
                 {
                     _mixertemp = value;
 
-                    MixerTempChanged?.Invoke(this, value);
+                    OnMixerTempChanged(value);
 
-                    RaisePropertyChanged(nameof(MixerTemp)); 
                 }
             }
         }
@@ -314,9 +306,8 @@ namespace Tango.BL.Entities
                 {
                     _headzone1temp = value;
 
-                    HeadZone1TempChanged?.Invoke(this, value);
+                    OnHeadZone1TempChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadZone1Temp)); 
                 }
             }
         }
@@ -342,9 +333,8 @@ namespace Tango.BL.Entities
                 {
                     _headzone2temp = value;
 
-                    HeadZone2TempChanged?.Invoke(this, value);
+                    OnHeadZone2TempChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadZone2Temp)); 
                 }
             }
         }
@@ -370,9 +360,8 @@ namespace Tango.BL.Entities
                 {
                     _headzone3temp = value;
 
-                    HeadZone3TempChanged?.Invoke(this, value);
+                    OnHeadZone3TempChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadZone3Temp)); 
                 }
             }
         }
@@ -398,9 +387,8 @@ namespace Tango.BL.Entities
                 {
                     _headzone4temp = value;
 
-                    HeadZone4TempChanged?.Invoke(this, value);
+                    OnHeadZone4TempChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadZone4Temp)); 
                 }
             }
         }
@@ -426,9 +414,8 @@ namespace Tango.BL.Entities
                 {
                     _headzone5temp = value;
 
-                    HeadZone5TempChanged?.Invoke(this, value);
+                    OnHeadZone5TempChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadZone5Temp)); 
                 }
             }
         }
@@ -454,9 +441,8 @@ namespace Tango.BL.Entities
                 {
                     _headzone6temp = value;
 
-                    HeadZone6TempChanged?.Invoke(this, value);
+                    OnHeadZone6TempChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadZone6Temp)); 
                 }
             }
         }
@@ -482,9 +468,8 @@ namespace Tango.BL.Entities
                 {
                     _dryerairflow = value;
 
-                    DryerAirFlowChanged?.Invoke(this, value);
+                    OnDryerAirFlowChanged(value);
 
-                    RaisePropertyChanged(nameof(DryerAirFlow)); 
                 }
             }
         }
@@ -510,9 +495,8 @@ namespace Tango.BL.Entities
                 {
                     _dryerzone1temp = value;
 
-                    DryerZone1TempChanged?.Invoke(this, value);
+                    OnDryerZone1TempChanged(value);
 
-                    RaisePropertyChanged(nameof(DryerZone1Temp)); 
                 }
             }
         }
@@ -538,9 +522,8 @@ namespace Tango.BL.Entities
                 {
                     _dryerzone2temp = value;
 
-                    DryerZone2TempChanged?.Invoke(this, value);
+                    OnDryerZone2TempChanged(value);
 
-                    RaisePropertyChanged(nameof(DryerZone2Temp)); 
                 }
             }
         }
@@ -566,9 +549,8 @@ namespace Tango.BL.Entities
                 {
                     _dryerzone3temp = value;
 
-                    DryerZone3TempChanged?.Invoke(this, value);
+                    OnDryerZone3TempChanged(value);
 
-                    RaisePropertyChanged(nameof(DryerZone3Temp)); 
                 }
             }
         }
@@ -594,9 +576,8 @@ namespace Tango.BL.Entities
                 {
                     _dryerbufferlength = value;
 
-                    DryerBufferLengthChanged?.Invoke(this, value);
+                    OnDryerBufferLengthChanged(value);
 
-                    RaisePropertyChanged(nameof(DryerBufferLength)); 
                 }
             }
         }
@@ -622,9 +603,8 @@ namespace Tango.BL.Entities
                 {
                     _headairflow = value;
 
-                    HeadAirFlowChanged?.Invoke(this, value);
+                    OnHeadAirFlowChanged(value);
 
-                    RaisePropertyChanged(nameof(HeadAirFlow)); 
                 }
             }
         }
@@ -650,7 +630,6 @@ namespace Tango.BL.Entities
                 if (_processparameterstablesgroupguid != value)
                 {
                     _processparameterstablesgroupguid = value;
-                    RaisePropertyChanged(nameof(ProcessParametersTablesGroupGuid)); 
                 }
             }
         }
@@ -676,9 +655,8 @@ namespace Tango.BL.Entities
                 {
                     _tableindex = value;
 
-                    TableIndexChanged?.Invoke(this, value);
+                    OnTableIndexChanged(value);
 
-                    RaisePropertyChanged(nameof(TableIndex)); 
                 }
             }
         }
@@ -704,14 +682,211 @@ namespace Tango.BL.Entities
                 {
                     _processparameterstablesgroup = value;
 
-                    ProcessParametersTablesGroupChanged?.Invoke(this, value);
+                    OnProcessParametersTablesGroupChanged(value);
 
-                    RaisePropertyChanged(nameof(ProcessParametersTablesGroup)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the DyeingSpeed has changed.
+        /// </summary>
+        protected virtual void OnDyeingSpeedChanged(Double dyeingspeed)
+        {
+            DyeingSpeedChanged?.Invoke(this, dyeingspeed);
+            RaisePropertyChanged(nameof(DyeingSpeed));
+        }
+
+        /// <summary>
+        /// Called when the MinInkUptake has changed.
+        /// </summary>
+        protected virtual void OnMinInkUptakeChanged(Double mininkuptake)
+        {
+            MinInkUptakeChanged?.Invoke(this, mininkuptake);
+            RaisePropertyChanged(nameof(MinInkUptake));
+        }
+
+        /// <summary>
+        /// Called when the MaxInkUptake has changed.
+        /// </summary>
+        protected virtual void OnMaxInkUptakeChanged(Double maxinkuptake)
+        {
+            MaxInkUptakeChanged?.Invoke(this, maxinkuptake);
+            RaisePropertyChanged(nameof(MaxInkUptake));
+        }
+
+        /// <summary>
+        /// Called when the FeederTension has changed.
+        /// </summary>
+        protected virtual void OnFeederTensionChanged(Double feedertension)
+        {
+            FeederTensionChanged?.Invoke(this, feedertension);
+            RaisePropertyChanged(nameof(FeederTension));
+        }
+
+        /// <summary>
+        /// Called when the PullerTension has changed.
+        /// </summary>
+        protected virtual void OnPullerTensionChanged(Double pullertension)
+        {
+            PullerTensionChanged?.Invoke(this, pullertension);
+            RaisePropertyChanged(nameof(PullerTension));
+        }
+
+        /// <summary>
+        /// Called when the WinderTension has changed.
+        /// </summary>
+        protected virtual void OnWinderTensionChanged(Double windertension)
+        {
+            WinderTensionChanged?.Invoke(this, windertension);
+            RaisePropertyChanged(nameof(WinderTension));
+        }
+
+        /// <summary>
+        /// Called when the MixerTemp has changed.
+        /// </summary>
+        protected virtual void OnMixerTempChanged(Double mixertemp)
+        {
+            MixerTempChanged?.Invoke(this, mixertemp);
+            RaisePropertyChanged(nameof(MixerTemp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone1Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone1TempChanged(Double headzone1temp)
+        {
+            HeadZone1TempChanged?.Invoke(this, headzone1temp);
+            RaisePropertyChanged(nameof(HeadZone1Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone2Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone2TempChanged(Double headzone2temp)
+        {
+            HeadZone2TempChanged?.Invoke(this, headzone2temp);
+            RaisePropertyChanged(nameof(HeadZone2Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone3Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone3TempChanged(Double headzone3temp)
+        {
+            HeadZone3TempChanged?.Invoke(this, headzone3temp);
+            RaisePropertyChanged(nameof(HeadZone3Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone4Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone4TempChanged(Double headzone4temp)
+        {
+            HeadZone4TempChanged?.Invoke(this, headzone4temp);
+            RaisePropertyChanged(nameof(HeadZone4Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone5Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone5TempChanged(Double headzone5temp)
+        {
+            HeadZone5TempChanged?.Invoke(this, headzone5temp);
+            RaisePropertyChanged(nameof(HeadZone5Temp));
+        }
+
+        /// <summary>
+        /// Called when the HeadZone6Temp has changed.
+        /// </summary>
+        protected virtual void OnHeadZone6TempChanged(Double headzone6temp)
+        {
+            HeadZone6TempChanged?.Invoke(this, headzone6temp);
+            RaisePropertyChanged(nameof(HeadZone6Temp));
+        }
+
+        /// <summary>
+        /// Called when the DryerAirFlow has changed.
+        /// </summary>
+        protected virtual void OnDryerAirFlowChanged(Double dryerairflow)
+        {
+            DryerAirFlowChanged?.Invoke(this, dryerairflow);
+            RaisePropertyChanged(nameof(DryerAirFlow));
+        }
+
+        /// <summary>
+        /// Called when the DryerZone1Temp has changed.
+        /// </summary>
+        protected virtual void OnDryerZone1TempChanged(Double dryerzone1temp)
+        {
+            DryerZone1TempChanged?.Invoke(this, dryerzone1temp);
+            RaisePropertyChanged(nameof(DryerZone1Temp));
+        }
+
+        /// <summary>
+        /// Called when the DryerZone2Temp has changed.
+        /// </summary>
+        protected virtual void OnDryerZone2TempChanged(Double dryerzone2temp)
+        {
+            DryerZone2TempChanged?.Invoke(this, dryerzone2temp);
+            RaisePropertyChanged(nameof(DryerZone2Temp));
+        }
+
+        /// <summary>
+        /// Called when the DryerZone3Temp has changed.
+        /// </summary>
+        protected virtual void OnDryerZone3TempChanged(Double dryerzone3temp)
+        {
+            DryerZone3TempChanged?.Invoke(this, dryerzone3temp);
+            RaisePropertyChanged(nameof(DryerZone3Temp));
+        }
+
+        /// <summary>
+        /// Called when the DryerBufferLength has changed.
+        /// </summary>
+        protected virtual void OnDryerBufferLengthChanged(Double dryerbufferlength)
+        {
+            DryerBufferLengthChanged?.Invoke(this, dryerbufferlength);
+            RaisePropertyChanged(nameof(DryerBufferLength));
+        }
+
+        /// <summary>
+        /// Called when the HeadAirFlow has changed.
+        /// </summary>
+        protected virtual void OnHeadAirFlowChanged(Double headairflow)
+        {
+            HeadAirFlowChanged?.Invoke(this, headairflow);
+            RaisePropertyChanged(nameof(HeadAirFlow));
+        }
+
+        /// <summary>
+        /// Called when the TableIndex has changed.
+        /// </summary>
+        protected virtual void OnTableIndexChanged(Int32 tableindex)
+        {
+            TableIndexChanged?.Invoke(this, tableindex);
+            RaisePropertyChanged(nameof(TableIndex));
+        }
+
+        /// <summary>
+        /// Called when the ProcessParametersTablesGroup has changed.
+        /// </summary>
+        protected virtual void OnProcessParametersTablesGroupChanged(ProcessParametersTablesGroup processparameterstablesgroup)
+        {
+            ProcessParametersTablesGroupChanged?.Invoke(this, processparameterstablesgroup);
+            RaisePropertyChanged(nameof(ProcessParametersTablesGroup));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ProcessParametersTable" /> class.
         /// </summary>
         public ProcessParametersTable() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs
index 62ef66e82..be4c0d7a6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs
@@ -56,7 +56,6 @@ namespace Tango.BL.Entities
                 if (_rmlguid != value)
                 {
                     _rmlguid = value;
-                    RaisePropertyChanged(nameof(RmlGuid)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _active = value;
 
-                    ActiveChanged?.Invoke(this, value);
+                    OnActiveChanged(value);
 
-                    RaisePropertyChanged(nameof(Active)); 
                 }
             }
         }
@@ -138,9 +135,8 @@ namespace Tango.BL.Entities
                 {
                     _savedate = value;
 
-                    SaveDateChanged?.Invoke(this, value);
+                    OnSaveDateChanged(value);
 
-                    RaisePropertyChanged(nameof(SaveDate)); 
                 }
             }
         }
@@ -164,9 +160,8 @@ namespace Tango.BL.Entities
                 {
                     _processparameterstables = value;
 
-                    ProcessParametersTablesChanged?.Invoke(this, value);
+                    OnProcessParametersTablesChanged(value);
 
-                    RaisePropertyChanged(nameof(ProcessParametersTables)); 
                 }
             }
         }
@@ -192,14 +187,58 @@ namespace Tango.BL.Entities
                 {
                     _rml = value;
 
-                    RmlChanged?.Invoke(this, value);
+                    OnRmlChanged(value);
 
-                    RaisePropertyChanged(nameof(Rml)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Active has changed.
+        /// </summary>
+        protected virtual void OnActiveChanged(Boolean active)
+        {
+            ActiveChanged?.Invoke(this, active);
+            RaisePropertyChanged(nameof(Active));
+        }
+
+        /// <summary>
+        /// Called when the SaveDate has changed.
+        /// </summary>
+        protected virtual void OnSaveDateChanged(DateTime savedate)
+        {
+            SaveDateChanged?.Invoke(this, savedate);
+            RaisePropertyChanged(nameof(SaveDate));
+        }
+
+        /// <summary>
+        /// Called when the ProcessParametersTables has changed.
+        /// </summary>
+        protected virtual void OnProcessParametersTablesChanged(SynchronizedObservableCollection<ProcessParametersTable> processparameterstables)
+        {
+            ProcessParametersTablesChanged?.Invoke(this, processparameterstables);
+            RaisePropertyChanged(nameof(ProcessParametersTables));
+        }
+
+        /// <summary>
+        /// Called when the Rml has changed.
+        /// </summary>
+        protected virtual void OnRmlChanged(Rml rml)
+        {
+            RmlChanged?.Invoke(this, rml);
+            RaisePropertyChanged(nameof(Rml));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ProcessParametersTablesGroup" /> class.
         /// </summary>
         public ProcessParametersTablesGroup() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 3bbdd3fab..cd95815ad 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -102,9 +102,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -130,9 +129,8 @@ namespace Tango.BL.Entities
                 {
                     _manufacturer = value;
 
-                    ManufacturerChanged?.Invoke(this, value);
+                    OnManufacturerChanged(value);
 
-                    RaisePropertyChanged(nameof(Manufacturer)); 
                 }
             }
         }
@@ -158,9 +156,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -186,7 +183,6 @@ namespace Tango.BL.Entities
                 if (_mediamaterialguid != value)
                 {
                     _mediamaterialguid = value;
-                    RaisePropertyChanged(nameof(MediaMaterialGuid)); 
                 }
             }
         }
@@ -212,7 +208,6 @@ namespace Tango.BL.Entities
                 if (_mediacolorguid != value)
                 {
                     _mediacolorguid = value;
-                    RaisePropertyChanged(nameof(MediaColorGuid)); 
                 }
             }
         }
@@ -238,7 +233,6 @@ namespace Tango.BL.Entities
                 if (_mediapurposeguid != value)
                 {
                     _mediapurposeguid = value;
-                    RaisePropertyChanged(nameof(MediaPurposeGuid)); 
                 }
             }
         }
@@ -264,7 +258,6 @@ namespace Tango.BL.Entities
                 if (_mediaconditionguid != value)
                 {
                     _mediaconditionguid = value;
-                    RaisePropertyChanged(nameof(MediaConditionGuid)); 
                 }
             }
         }
@@ -290,7 +283,6 @@ namespace Tango.BL.Entities
                 if (_linearmassdensityunitguid != value)
                 {
                     _linearmassdensityunitguid = value;
-                    RaisePropertyChanged(nameof(LinearMassDensityUnitGuid)); 
                 }
             }
         }
@@ -316,7 +308,6 @@ namespace Tango.BL.Entities
                 if (_fibershapeguid != value)
                 {
                     _fibershapeguid = value;
-                    RaisePropertyChanged(nameof(FiberShapeGuid)); 
                 }
             }
         }
@@ -342,7 +333,6 @@ namespace Tango.BL.Entities
                 if (_fibersynthguid != value)
                 {
                     _fibersynthguid = value;
-                    RaisePropertyChanged(nameof(FiberSynthGuid)); 
                 }
             }
         }
@@ -368,9 +358,8 @@ namespace Tango.BL.Entities
                 {
                     _fibersize = value;
 
-                    FiberSizeChanged?.Invoke(this, value);
+                    OnFiberSizeChanged(value);
 
-                    RaisePropertyChanged(nameof(FiberSize)); 
                 }
             }
         }
@@ -396,9 +385,8 @@ namespace Tango.BL.Entities
                 {
                     _numberoffibers = value;
 
-                    NumberOfFibersChanged?.Invoke(this, value);
+                    OnNumberOfFibersChanged(value);
 
-                    RaisePropertyChanged(nameof(NumberOfFibers)); 
                 }
             }
         }
@@ -424,9 +412,8 @@ namespace Tango.BL.Entities
                 {
                     _pliesperfiber = value;
 
-                    PliesPerFiberChanged?.Invoke(this, value);
+                    OnPliesPerFiberChanged(value);
 
-                    RaisePropertyChanged(nameof(PliesPerFiber)); 
                 }
             }
         }
@@ -452,9 +439,8 @@ namespace Tango.BL.Entities
                 {
                     _pliesperthread = value;
 
-                    PliesPerThreadChanged?.Invoke(this, value);
+                    OnPliesPerThreadChanged(value);
 
-                    RaisePropertyChanged(nameof(PliesPerThread)); 
                 }
             }
         }
@@ -480,9 +466,8 @@ namespace Tango.BL.Entities
                 {
                     _twisted = value;
 
-                    TwistedChanged?.Invoke(this, value);
+                    OnTwistedChanged(value);
 
-                    RaisePropertyChanged(nameof(Twisted)); 
                 }
             }
         }
@@ -508,9 +493,8 @@ namespace Tango.BL.Entities
                 {
                     _airentanglement = value;
 
-                    AirEntanglementChanged?.Invoke(this, value);
+                    OnAirEntanglementChanged(value);
 
-                    RaisePropertyChanged(nameof(AirEntanglement)); 
                 }
             }
         }
@@ -536,9 +520,8 @@ namespace Tango.BL.Entities
                 {
                     _lubricant = value;
 
-                    LubricantChanged?.Invoke(this, value);
+                    OnLubricantChanged(value);
 
-                    RaisePropertyChanged(nameof(Lubricant)); 
                 }
             }
         }
@@ -564,9 +547,8 @@ namespace Tango.BL.Entities
                 {
                     _tensilestrength = value;
 
-                    TensileStrengthChanged?.Invoke(this, value);
+                    OnTensileStrengthChanged(value);
 
-                    RaisePropertyChanged(nameof(TensileStrength)); 
                 }
             }
         }
@@ -592,9 +574,8 @@ namespace Tango.BL.Entities
                 {
                     _elongationatbreakpercentage = value;
 
-                    ElongationAtBreakPercentageChanged?.Invoke(this, value);
+                    OnElongationAtBreakPercentageChanged(value);
 
-                    RaisePropertyChanged(nameof(ElongationAtBreakPercentage)); 
                 }
             }
         }
@@ -620,9 +601,8 @@ namespace Tango.BL.Entities
                 {
                     _estimatedthreaddiameter = value;
 
-                    EstimatedThreadDiameterChanged?.Invoke(this, value);
+                    OnEstimatedThreadDiameterChanged(value);
 
-                    RaisePropertyChanged(nameof(EstimatedThreadDiameter)); 
                 }
             }
         }
@@ -648,9 +628,8 @@ namespace Tango.BL.Entities
                 {
                     _rank = value;
 
-                    RankChanged?.Invoke(this, value);
+                    OnRankChanged(value);
 
-                    RaisePropertyChanged(nameof(Rank)); 
                 }
             }
         }
@@ -676,9 +655,8 @@ namespace Tango.BL.Entities
                 {
                     _thumbnail = value;
 
-                    ThumbnailChanged?.Invoke(this, value);
+                    OnThumbnailChanged(value);
 
-                    RaisePropertyChanged(nameof(Thumbnail)); 
                 }
             }
         }
@@ -702,9 +680,8 @@ namespace Tango.BL.Entities
                 {
                     _cats = value;
 
-                    CatsChanged?.Invoke(this, value);
+                    OnCatsChanged(value);
 
-                    RaisePropertyChanged(nameof(Cats)); 
                 }
             }
         }
@@ -728,9 +705,8 @@ namespace Tango.BL.Entities
                 {
                     _ccts = value;
 
-                    CctsChanged?.Invoke(this, value);
+                    OnCctsChanged(value);
 
-                    RaisePropertyChanged(nameof(Ccts)); 
                 }
             }
         }
@@ -756,9 +732,8 @@ namespace Tango.BL.Entities
                 {
                     _fibershape = value;
 
-                    FiberShapeChanged?.Invoke(this, value);
+                    OnFiberShapeChanged(value);
 
-                    RaisePropertyChanged(nameof(FiberShape)); 
                 }
             }
         }
@@ -784,9 +759,8 @@ namespace Tango.BL.Entities
                 {
                     _fibersynth = value;
 
-                    FiberSynthChanged?.Invoke(this, value);
+                    OnFiberSynthChanged(value);
 
-                    RaisePropertyChanged(nameof(FiberSynth)); 
                 }
             }
         }
@@ -810,9 +784,8 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
@@ -838,9 +811,8 @@ namespace Tango.BL.Entities
                 {
                     _linearmassdensityunit = value;
 
-                    LinearMassDensityUnitChanged?.Invoke(this, value);
+                    OnLinearMassDensityUnitChanged(value);
 
-                    RaisePropertyChanged(nameof(LinearMassDensityUnit)); 
                 }
             }
         }
@@ -864,9 +836,8 @@ namespace Tango.BL.Entities
                 {
                     _liquidtypesrmls = value;
 
-                    LiquidTypesRmlsChanged?.Invoke(this, value);
+                    OnLiquidTypesRmlsChanged(value);
 
-                    RaisePropertyChanged(nameof(LiquidTypesRmls)); 
                 }
             }
         }
@@ -890,9 +861,8 @@ namespace Tango.BL.Entities
                 {
                     _machines = value;
 
-                    MachinesChanged?.Invoke(this, value);
+                    OnMachinesChanged(value);
 
-                    RaisePropertyChanged(nameof(Machines)); 
                 }
             }
         }
@@ -918,9 +888,8 @@ namespace Tango.BL.Entities
                 {
                     _mediacolor = value;
 
-                    MediaColorChanged?.Invoke(this, value);
+                    OnMediaColorChanged(value);
 
-                    RaisePropertyChanged(nameof(MediaColor)); 
                 }
             }
         }
@@ -946,9 +915,8 @@ namespace Tango.BL.Entities
                 {
                     _mediacondition = value;
 
-                    MediaConditionChanged?.Invoke(this, value);
+                    OnMediaConditionChanged(value);
 
-                    RaisePropertyChanged(nameof(MediaCondition)); 
                 }
             }
         }
@@ -974,9 +942,8 @@ namespace Tango.BL.Entities
                 {
                     _mediamaterial = value;
 
-                    MediaMaterialChanged?.Invoke(this, value);
+                    OnMediaMaterialChanged(value);
 
-                    RaisePropertyChanged(nameof(MediaMaterial)); 
                 }
             }
         }
@@ -1002,9 +969,8 @@ namespace Tango.BL.Entities
                 {
                     _mediapurpose = value;
 
-                    MediaPurposeChanged?.Invoke(this, value);
+                    OnMediaPurposeChanged(value);
 
-                    RaisePropertyChanged(nameof(MediaPurpose)); 
                 }
             }
         }
@@ -1028,14 +994,265 @@ namespace Tango.BL.Entities
                 {
                     _processparameterstablesgroups = value;
 
-                    ProcessParametersTablesGroupsChanged?.Invoke(this, value);
+                    OnProcessParametersTablesGroupsChanged(value);
 
-                    RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Manufacturer has changed.
+        /// </summary>
+        protected virtual void OnManufacturerChanged(String manufacturer)
+        {
+            ManufacturerChanged?.Invoke(this, manufacturer);
+            RaisePropertyChanged(nameof(Manufacturer));
+        }
+
+        /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the FiberSize has changed.
+        /// </summary>
+        protected virtual void OnFiberSizeChanged(Double fibersize)
+        {
+            FiberSizeChanged?.Invoke(this, fibersize);
+            RaisePropertyChanged(nameof(FiberSize));
+        }
+
+        /// <summary>
+        /// Called when the NumberOfFibers has changed.
+        /// </summary>
+        protected virtual void OnNumberOfFibersChanged(Int32 numberoffibers)
+        {
+            NumberOfFibersChanged?.Invoke(this, numberoffibers);
+            RaisePropertyChanged(nameof(NumberOfFibers));
+        }
+
+        /// <summary>
+        /// Called when the PliesPerFiber has changed.
+        /// </summary>
+        protected virtual void OnPliesPerFiberChanged(Int32 pliesperfiber)
+        {
+            PliesPerFiberChanged?.Invoke(this, pliesperfiber);
+            RaisePropertyChanged(nameof(PliesPerFiber));
+        }
+
+        /// <summary>
+        /// Called when the PliesPerThread has changed.
+        /// </summary>
+        protected virtual void OnPliesPerThreadChanged(Int32 pliesperthread)
+        {
+            PliesPerThreadChanged?.Invoke(this, pliesperthread);
+            RaisePropertyChanged(nameof(PliesPerThread));
+        }
+
+        /// <summary>
+        /// Called when the Twisted has changed.
+        /// </summary>
+        protected virtual void OnTwistedChanged(Boolean twisted)
+        {
+            TwistedChanged?.Invoke(this, twisted);
+            RaisePropertyChanged(nameof(Twisted));
+        }
+
+        /// <summary>
+        /// Called when the AirEntanglement has changed.
+        /// </summary>
+        protected virtual void OnAirEntanglementChanged(Boolean airentanglement)
+        {
+            AirEntanglementChanged?.Invoke(this, airentanglement);
+            RaisePropertyChanged(nameof(AirEntanglement));
+        }
+
+        /// <summary>
+        /// Called when the Lubricant has changed.
+        /// </summary>
+        protected virtual void OnLubricantChanged(Boolean lubricant)
+        {
+            LubricantChanged?.Invoke(this, lubricant);
+            RaisePropertyChanged(nameof(Lubricant));
+        }
+
+        /// <summary>
+        /// Called when the TensileStrength has changed.
+        /// </summary>
+        protected virtual void OnTensileStrengthChanged(Double tensilestrength)
+        {
+            TensileStrengthChanged?.Invoke(this, tensilestrength);
+            RaisePropertyChanged(nameof(TensileStrength));
+        }
+
+        /// <summary>
+        /// Called when the ElongationAtBreakPercentage has changed.
+        /// </summary>
+        protected virtual void OnElongationAtBreakPercentageChanged(Double elongationatbreakpercentage)
+        {
+            ElongationAtBreakPercentageChanged?.Invoke(this, elongationatbreakpercentage);
+            RaisePropertyChanged(nameof(ElongationAtBreakPercentage));
+        }
+
+        /// <summary>
+        /// Called when the EstimatedThreadDiameter has changed.
+        /// </summary>
+        protected virtual void OnEstimatedThreadDiameterChanged(Double estimatedthreaddiameter)
+        {
+            EstimatedThreadDiameterChanged?.Invoke(this, estimatedthreaddiameter);
+            RaisePropertyChanged(nameof(EstimatedThreadDiameter));
+        }
+
+        /// <summary>
+        /// Called when the Rank has changed.
+        /// </summary>
+        protected virtual void OnRankChanged(Int32 rank)
+        {
+            RankChanged?.Invoke(this, rank);
+            RaisePropertyChanged(nameof(Rank));
+        }
+
+        /// <summary>
+        /// Called when the Thumbnail has changed.
+        /// </summary>
+        protected virtual void OnThumbnailChanged(Byte[] thumbnail)
+        {
+            ThumbnailChanged?.Invoke(this, thumbnail);
+            RaisePropertyChanged(nameof(Thumbnail));
+        }
+
+        /// <summary>
+        /// Called when the Cats has changed.
+        /// </summary>
+        protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats)
+        {
+            CatsChanged?.Invoke(this, cats);
+            RaisePropertyChanged(nameof(Cats));
+        }
+
+        /// <summary>
+        /// Called when the Ccts has changed.
+        /// </summary>
+        protected virtual void OnCctsChanged(SynchronizedObservableCollection<Cct> ccts)
+        {
+            CctsChanged?.Invoke(this, ccts);
+            RaisePropertyChanged(nameof(Ccts));
+        }
+
+        /// <summary>
+        /// Called when the FiberShape has changed.
+        /// </summary>
+        protected virtual void OnFiberShapeChanged(FiberShape fibershape)
+        {
+            FiberShapeChanged?.Invoke(this, fibershape);
+            RaisePropertyChanged(nameof(FiberShape));
+        }
+
+        /// <summary>
+        /// Called when the FiberSynth has changed.
+        /// </summary>
+        protected virtual void OnFiberSynthChanged(FiberSynth fibersynth)
+        {
+            FiberSynthChanged?.Invoke(this, fibersynth);
+            RaisePropertyChanged(nameof(FiberSynth));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
+        /// Called when the LinearMassDensityUnit has changed.
+        /// </summary>
+        protected virtual void OnLinearMassDensityUnitChanged(LinearMassDensityUnit linearmassdensityunit)
+        {
+            LinearMassDensityUnitChanged?.Invoke(this, linearmassdensityunit);
+            RaisePropertyChanged(nameof(LinearMassDensityUnit));
+        }
+
+        /// <summary>
+        /// Called when the LiquidTypesRmls has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypesRmlsChanged(SynchronizedObservableCollection<LiquidTypesRml> liquidtypesrmls)
+        {
+            LiquidTypesRmlsChanged?.Invoke(this, liquidtypesrmls);
+            RaisePropertyChanged(nameof(LiquidTypesRmls));
+        }
+
+        /// <summary>
+        /// Called when the Machines has changed.
+        /// </summary>
+        protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines)
+        {
+            MachinesChanged?.Invoke(this, machines);
+            RaisePropertyChanged(nameof(Machines));
+        }
+
+        /// <summary>
+        /// Called when the MediaColor has changed.
+        /// </summary>
+        protected virtual void OnMediaColorChanged(MediaColor mediacolor)
+        {
+            MediaColorChanged?.Invoke(this, mediacolor);
+            RaisePropertyChanged(nameof(MediaColor));
+        }
+
+        /// <summary>
+        /// Called when the MediaCondition has changed.
+        /// </summary>
+        protected virtual void OnMediaConditionChanged(MediaCondition mediacondition)
+        {
+            MediaConditionChanged?.Invoke(this, mediacondition);
+            RaisePropertyChanged(nameof(MediaCondition));
+        }
+
+        /// <summary>
+        /// Called when the MediaMaterial has changed.
+        /// </summary>
+        protected virtual void OnMediaMaterialChanged(MediaMaterial mediamaterial)
+        {
+            MediaMaterialChanged?.Invoke(this, mediamaterial);
+            RaisePropertyChanged(nameof(MediaMaterial));
+        }
+
+        /// <summary>
+        /// Called when the MediaPurpose has changed.
+        /// </summary>
+        protected virtual void OnMediaPurposeChanged(MediaPurpos mediapurpose)
+        {
+            MediaPurposeChanged?.Invoke(this, mediapurpose);
+            RaisePropertyChanged(nameof(MediaPurpose));
+        }
+
+        /// <summary>
+        /// Called when the ProcessParametersTablesGroups has changed.
+        /// </summary>
+        protected virtual void OnProcessParametersTablesGroupsChanged(SynchronizedObservableCollection<ProcessParametersTablesGroup> processparameterstablesgroups)
+        {
+            ProcessParametersTablesGroupsChanged?.Invoke(this, processparameterstablesgroups);
+            RaisePropertyChanged(nameof(ProcessParametersTablesGroups));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Rml" /> class.
         /// </summary>
         public Rml() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Role.cs b/Software/Visual_Studio/Tango.BL/Entities/Role.cs
index 1de50ce21..18516e623 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Role.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Role.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -112,9 +110,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -138,9 +135,8 @@ namespace Tango.BL.Entities
                 {
                     _rolespermissions = value;
 
-                    RolesPermissionsChanged?.Invoke(this, value);
+                    OnRolesPermissionsChanged(value);
 
-                    RaisePropertyChanged(nameof(RolesPermissions)); 
                 }
             }
         }
@@ -164,14 +160,58 @@ namespace Tango.BL.Entities
                 {
                     _usersroles = value;
 
-                    UsersRolesChanged?.Invoke(this, value);
+                    OnUsersRolesChanged(value);
 
-                    RaisePropertyChanged(nameof(UsersRoles)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the RolesPermissions has changed.
+        /// </summary>
+        protected virtual void OnRolesPermissionsChanged(SynchronizedObservableCollection<RolesPermission> rolespermissions)
+        {
+            RolesPermissionsChanged?.Invoke(this, rolespermissions);
+            RaisePropertyChanged(nameof(RolesPermissions));
+        }
+
+        /// <summary>
+        /// Called when the UsersRoles has changed.
+        /// </summary>
+        protected virtual void OnUsersRolesChanged(SynchronizedObservableCollection<UsersRole> usersroles)
+        {
+            UsersRolesChanged?.Invoke(this, usersroles);
+            RaisePropertyChanged(nameof(UsersRoles));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Role" /> class.
         /// </summary>
         public Role() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs
index 91bd9d7a1..add86faa3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs
@@ -50,7 +50,6 @@ namespace Tango.BL.Entities
                 if (_roleguid != value)
                 {
                     _roleguid = value;
-                    RaisePropertyChanged(nameof(RoleGuid)); 
                 }
             }
         }
@@ -76,7 +75,6 @@ namespace Tango.BL.Entities
                 if (_permissionguid != value)
                 {
                     _permissionguid = value;
-                    RaisePropertyChanged(nameof(PermissionGuid)); 
                 }
             }
         }
@@ -102,9 +100,8 @@ namespace Tango.BL.Entities
                 {
                     _permission = value;
 
-                    PermissionChanged?.Invoke(this, value);
+                    OnPermissionChanged(value);
 
-                    RaisePropertyChanged(nameof(Permission)); 
                 }
             }
         }
@@ -130,14 +127,31 @@ namespace Tango.BL.Entities
                 {
                     _role = value;
 
-                    RoleChanged?.Invoke(this, value);
+                    OnRoleChanged(value);
 
-                    RaisePropertyChanged(nameof(Role)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Permission has changed.
+        /// </summary>
+        protected virtual void OnPermissionChanged(Permission permission)
+        {
+            PermissionChanged?.Invoke(this, permission);
+            RaisePropertyChanged(nameof(Permission));
+        }
+
+        /// <summary>
+        /// Called when the Role has changed.
+        /// </summary>
+        protected virtual void OnRoleChanged(Role role)
+        {
+            RoleChanged?.Invoke(this, role);
+            RaisePropertyChanged(nameof(Role));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="RolesPermission" /> class.
         /// </summary>
         public RolesPermission() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs
index 962610749..f214e73b9 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -84,7 +83,6 @@ namespace Tango.BL.Entities
                 if (_jobguid != value)
                 {
                     _jobguid = value;
-                    RaisePropertyChanged(nameof(JobGuid)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _length = value;
 
-                    LengthChanged?.Invoke(this, value);
+                    OnLengthChanged(value);
 
-                    RaisePropertyChanged(nameof(Length)); 
                 }
             }
         }
@@ -138,9 +135,8 @@ namespace Tango.BL.Entities
                 {
                     _segmentindex = value;
 
-                    SegmentIndexChanged?.Invoke(this, value);
+                    OnSegmentIndexChanged(value);
 
-                    RaisePropertyChanged(nameof(SegmentIndex)); 
                 }
             }
         }
@@ -164,9 +160,8 @@ namespace Tango.BL.Entities
                 {
                     _brushstops = value;
 
-                    BrushStopsChanged?.Invoke(this, value);
+                    OnBrushStopsChanged(value);
 
-                    RaisePropertyChanged(nameof(BrushStops)); 
                 }
             }
         }
@@ -192,14 +187,58 @@ namespace Tango.BL.Entities
                 {
                     _job = value;
 
-                    JobChanged?.Invoke(this, value);
+                    OnJobChanged(value);
 
-                    RaisePropertyChanged(nameof(Job)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Length has changed.
+        /// </summary>
+        protected virtual void OnLengthChanged(Double length)
+        {
+            LengthChanged?.Invoke(this, length);
+            RaisePropertyChanged(nameof(Length));
+        }
+
+        /// <summary>
+        /// Called when the SegmentIndex has changed.
+        /// </summary>
+        protected virtual void OnSegmentIndexChanged(Int32 segmentindex)
+        {
+            SegmentIndexChanged?.Invoke(this, segmentindex);
+            RaisePropertyChanged(nameof(SegmentIndex));
+        }
+
+        /// <summary>
+        /// Called when the BrushStops has changed.
+        /// </summary>
+        protected virtual void OnBrushStopsChanged(SynchronizedObservableCollection<BrushStop> brushstops)
+        {
+            BrushStopsChanged?.Invoke(this, brushstops);
+            RaisePropertyChanged(nameof(BrushStops));
+        }
+
+        /// <summary>
+        /// Called when the Job has changed.
+        /// </summary>
+        protected virtual void OnJobChanged(Job job)
+        {
+            JobChanged?.Invoke(this, job);
+            RaisePropertyChanged(nameof(Job));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Segment" /> class.
         /// </summary>
         public Segment() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Spool.cs b/Software/Visual_Studio/Tango.BL/Entities/Spool.cs
new file mode 100644
index 000000000..4d6c6ac01
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/Spool.cs
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+
+namespace Tango.BL.Entities
+{
+    [Table("SPOOLS")]
+    public partial class Spool : ObservableEntity<Spool>
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Spool" /> class.
+        /// </summary>
+        public Spool() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
index c81a28b02..d44ee2fef 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
@@ -70,9 +70,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -98,9 +97,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -126,9 +124,8 @@ namespace Tango.BL.Entities
                 {
                     _length = value;
 
-                    LengthChanged?.Invoke(this, value);
+                    OnLengthChanged(value);
 
-                    RaisePropertyChanged(nameof(Length)); 
                 }
             }
         }
@@ -154,9 +151,8 @@ namespace Tango.BL.Entities
                 {
                     _weight = value;
 
-                    WeightChanged?.Invoke(this, value);
+                    OnWeightChanged(value);
 
-                    RaisePropertyChanged(nameof(Weight)); 
                 }
             }
         }
@@ -182,9 +178,8 @@ namespace Tango.BL.Entities
                 {
                     _diameter = value;
 
-                    DiameterChanged?.Invoke(this, value);
+                    OnDiameterChanged(value);
 
-                    RaisePropertyChanged(nameof(Diameter)); 
                 }
             }
         }
@@ -210,9 +205,8 @@ namespace Tango.BL.Entities
                 {
                     _startoffsetpulses = value;
 
-                    StartOffsetPulsesChanged?.Invoke(this, value);
+                    OnStartOffsetPulsesChanged(value);
 
-                    RaisePropertyChanged(nameof(StartOffsetPulses)); 
                 }
             }
         }
@@ -238,9 +232,8 @@ namespace Tango.BL.Entities
                 {
                     _backingrate = value;
 
-                    BackingRateChanged?.Invoke(this, value);
+                    OnBackingRateChanged(value);
 
-                    RaisePropertyChanged(nameof(BackingRate)); 
                 }
             }
         }
@@ -266,9 +259,8 @@ namespace Tango.BL.Entities
                 {
                     _segmentoffsetpulses = value;
 
-                    SegmentOffsetPulsesChanged?.Invoke(this, value);
+                    OnSegmentOffsetPulsesChanged(value);
 
-                    RaisePropertyChanged(nameof(SegmentOffsetPulses)); 
                 }
             }
         }
@@ -294,9 +286,8 @@ namespace Tango.BL.Entities
                 {
                     _bottombackingrate = value;
 
-                    BottomBackingRateChanged?.Invoke(this, value);
+                    OnBottomBackingRateChanged(value);
 
-                    RaisePropertyChanged(nameof(BottomBackingRate)); 
                 }
             }
         }
@@ -322,9 +313,8 @@ namespace Tango.BL.Entities
                 {
                     _rotationsperpassage = value;
 
-                    RotationsPerPassageChanged?.Invoke(this, value);
+                    OnRotationsPerPassageChanged(value);
 
-                    RaisePropertyChanged(nameof(RotationsPerPassage)); 
                 }
             }
         }
@@ -348,9 +338,8 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
@@ -374,14 +363,121 @@ namespace Tango.BL.Entities
                 {
                     _machines = value;
 
-                    MachinesChanged?.Invoke(this, value);
+                    OnMachinesChanged(value);
 
-                    RaisePropertyChanged(nameof(Machines)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Length has changed.
+        /// </summary>
+        protected virtual void OnLengthChanged(Double length)
+        {
+            LengthChanged?.Invoke(this, length);
+            RaisePropertyChanged(nameof(Length));
+        }
+
+        /// <summary>
+        /// Called when the Weight has changed.
+        /// </summary>
+        protected virtual void OnWeightChanged(Double weight)
+        {
+            WeightChanged?.Invoke(this, weight);
+            RaisePropertyChanged(nameof(Weight));
+        }
+
+        /// <summary>
+        /// Called when the Diameter has changed.
+        /// </summary>
+        protected virtual void OnDiameterChanged(Double diameter)
+        {
+            DiameterChanged?.Invoke(this, diameter);
+            RaisePropertyChanged(nameof(Diameter));
+        }
+
+        /// <summary>
+        /// Called when the StartOffsetPulses has changed.
+        /// </summary>
+        protected virtual void OnStartOffsetPulsesChanged(Int32 startoffsetpulses)
+        {
+            StartOffsetPulsesChanged?.Invoke(this, startoffsetpulses);
+            RaisePropertyChanged(nameof(StartOffsetPulses));
+        }
+
+        /// <summary>
+        /// Called when the BackingRate has changed.
+        /// </summary>
+        protected virtual void OnBackingRateChanged(Int32 backingrate)
+        {
+            BackingRateChanged?.Invoke(this, backingrate);
+            RaisePropertyChanged(nameof(BackingRate));
+        }
+
+        /// <summary>
+        /// Called when the SegmentOffsetPulses has changed.
+        /// </summary>
+        protected virtual void OnSegmentOffsetPulsesChanged(Int32 segmentoffsetpulses)
+        {
+            SegmentOffsetPulsesChanged?.Invoke(this, segmentoffsetpulses);
+            RaisePropertyChanged(nameof(SegmentOffsetPulses));
+        }
+
+        /// <summary>
+        /// Called when the BottomBackingRate has changed.
+        /// </summary>
+        protected virtual void OnBottomBackingRateChanged(Int32 bottombackingrate)
+        {
+            BottomBackingRateChanged?.Invoke(this, bottombackingrate);
+            RaisePropertyChanged(nameof(BottomBackingRate));
+        }
+
+        /// <summary>
+        /// Called when the RotationsPerPassage has changed.
+        /// </summary>
+        protected virtual void OnRotationsPerPassageChanged(Double rotationsperpassage)
+        {
+            RotationsPerPassageChanged?.Invoke(this, rotationsperpassage);
+            RaisePropertyChanged(nameof(RotationsPerPassage));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
+        /// Called when the Machines has changed.
+        /// </summary>
+        protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines)
+        {
+            MachinesChanged?.Invoke(this, machines);
+            RaisePropertyChanged(nameof(Machines));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="SpoolType" /> class.
         /// </summary>
         public SpoolType() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs b/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs
index 3fbf6d876..4ff0afb6d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs
@@ -48,9 +48,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -76,14 +75,31 @@ namespace Tango.BL.Entities
                 {
                     _definition = value;
 
-                    DefinitionChanged?.Invoke(this, value);
+                    OnDefinitionChanged(value);
 
-                    RaisePropertyChanged(nameof(Definition)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(SynchronizedObservableCollection<Int32> version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the Definition has changed.
+        /// </summary>
+        protected virtual void OnDefinitionChanged(Byte[] definition)
+        {
+            DefinitionChanged?.Invoke(this, definition);
+            RaisePropertyChanged(nameof(Definition));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Sysdiagram" /> class.
         /// </summary>
         public Sysdiagram() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs
index 2682cd7de..d89d5fa59 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs
@@ -56,9 +56,8 @@ namespace Tango.BL.Entities
                 {
                     _version = value;
 
-                    VersionChanged?.Invoke(this, value);
+                    OnVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(Version)); 
                 }
             }
         }
@@ -84,9 +83,8 @@ namespace Tango.BL.Entities
                 {
                     _blobname = value;
 
-                    BlobNameChanged?.Invoke(this, value);
+                    OnBlobNameChanged(value);
 
-                    RaisePropertyChanged(nameof(BlobName)); 
                 }
             }
         }
@@ -112,9 +110,8 @@ namespace Tango.BL.Entities
                 {
                     _comments = value;
 
-                    CommentsChanged?.Invoke(this, value);
+                    OnCommentsChanged(value);
 
-                    RaisePropertyChanged(nameof(Comments)); 
                 }
             }
         }
@@ -140,7 +137,6 @@ namespace Tango.BL.Entities
                 if (_userguid != value)
                 {
                     _userguid = value;
-                    RaisePropertyChanged(nameof(UserGuid)); 
                 }
             }
         }
@@ -166,7 +162,6 @@ namespace Tango.BL.Entities
                 if (_machineversionguid != value)
                 {
                     _machineversionguid = value;
-                    RaisePropertyChanged(nameof(MachineVersionGuid)); 
                 }
             }
         }
@@ -192,9 +187,8 @@ namespace Tango.BL.Entities
                 {
                     _machineversion = value;
 
-                    MachineVersionChanged?.Invoke(this, value);
+                    OnMachineVersionChanged(value);
 
-                    RaisePropertyChanged(nameof(MachineVersion)); 
                 }
             }
         }
@@ -220,14 +214,58 @@ namespace Tango.BL.Entities
                 {
                     _user = value;
 
-                    UserChanged?.Invoke(this, value);
+                    OnUserChanged(value);
 
-                    RaisePropertyChanged(nameof(User)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Version has changed.
+        /// </summary>
+        protected virtual void OnVersionChanged(String version)
+        {
+            VersionChanged?.Invoke(this, version);
+            RaisePropertyChanged(nameof(Version));
+        }
+
+        /// <summary>
+        /// Called when the BlobName has changed.
+        /// </summary>
+        protected virtual void OnBlobNameChanged(String blobname)
+        {
+            BlobNameChanged?.Invoke(this, blobname);
+            RaisePropertyChanged(nameof(BlobName));
+        }
+
+        /// <summary>
+        /// Called when the Comments has changed.
+        /// </summary>
+        protected virtual void OnCommentsChanged(String comments)
+        {
+            CommentsChanged?.Invoke(this, comments);
+            RaisePropertyChanged(nameof(Comments));
+        }
+
+        /// <summary>
+        /// Called when the MachineVersion has changed.
+        /// </summary>
+        protected virtual void OnMachineVersionChanged(MachineVersion machineversion)
+        {
+            MachineVersionChanged?.Invoke(this, machineversion);
+            RaisePropertyChanged(nameof(MachineVersion));
+        }
+
+        /// <summary>
+        /// Called when the User has changed.
+        /// </summary>
+        protected virtual void OnUserChanged(User user)
+        {
+            UserChanged?.Invoke(this, user);
+            RaisePropertyChanged(nameof(User));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TangoVersion" /> class.
         /// </summary>
         public TangoVersion() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechController.cs b/Software/Visual_Studio/Tango.BL/Entities/TechController.cs
index bc217c58a..b87cdadca 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechController.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechController.cs
@@ -58,9 +58,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -86,9 +85,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -114,9 +112,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -142,9 +139,8 @@ namespace Tango.BL.Entities
                 {
                     _min = value;
 
-                    MinChanged?.Invoke(this, value);
+                    OnMinChanged(value);
 
-                    RaisePropertyChanged(nameof(Min)); 
                 }
             }
         }
@@ -170,9 +166,8 @@ namespace Tango.BL.Entities
                 {
                     _max = value;
 
-                    MaxChanged?.Invoke(this, value);
+                    OnMaxChanged(value);
 
-                    RaisePropertyChanged(nameof(Max)); 
                 }
             }
         }
@@ -198,14 +193,67 @@ namespace Tango.BL.Entities
                 {
                     _units = value;
 
-                    UnitsChanged?.Invoke(this, value);
+                    OnUnitsChanged(value);
 
-                    RaisePropertyChanged(nameof(Units)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the Min has changed.
+        /// </summary>
+        protected virtual void OnMinChanged(Double min)
+        {
+            MinChanged?.Invoke(this, min);
+            RaisePropertyChanged(nameof(Min));
+        }
+
+        /// <summary>
+        /// Called when the Max has changed.
+        /// </summary>
+        protected virtual void OnMaxChanged(Double max)
+        {
+            MaxChanged?.Invoke(this, max);
+            RaisePropertyChanged(nameof(Max));
+        }
+
+        /// <summary>
+        /// Called when the Units has changed.
+        /// </summary>
+        protected virtual void OnUnitsChanged(String units)
+        {
+            UnitsChanged?.Invoke(this, units);
+            RaisePropertyChanged(nameof(Units));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TechController" /> class.
         /// </summary>
         public TechController() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs b/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs
index e027dfc5c..f83f2dc65 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -108,14 +106,40 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TechDispenser" /> class.
         /// </summary>
         public TechDispenser() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs b/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs
index 0a428f758..2912868de 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -80,9 +79,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -108,14 +106,40 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TechHeater" /> class.
         /// </summary>
         public TechHeater() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs b/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs
index ba745d7bd..bca52d5f0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs
@@ -68,9 +68,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -96,9 +95,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -124,9 +122,8 @@ namespace Tango.BL.Entities
                 {
                     _type = value;
 
-                    TypeChanged?.Invoke(this, value);
+                    OnTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(Type)); 
                 }
             }
         }
@@ -152,9 +149,8 @@ namespace Tango.BL.Entities
                 {
                     _designator = value;
 
-                    DesignatorChanged?.Invoke(this, value);
+                    OnDesignatorChanged(value);
 
-                    RaisePropertyChanged(nameof(Designator)); 
                 }
             }
         }
@@ -180,9 +176,8 @@ namespace Tango.BL.Entities
                 {
                     _asm = value;
 
-                    AsmChanged?.Invoke(this, value);
+                    OnAsmChanged(value);
 
-                    RaisePropertyChanged(nameof(Asm)); 
                 }
             }
         }
@@ -208,9 +203,8 @@ namespace Tango.BL.Entities
                 {
                     _interfacename = value;
 
-                    InterfaceNameChanged?.Invoke(this, value);
+                    OnInterfaceNameChanged(value);
 
-                    RaisePropertyChanged(nameof(InterfaceName)); 
                 }
             }
         }
@@ -236,9 +230,8 @@ namespace Tango.BL.Entities
                 {
                     _sensor = value;
 
-                    SensorChanged?.Invoke(this, value);
+                    OnSensorChanged(value);
 
-                    RaisePropertyChanged(nameof(Sensor)); 
                 }
             }
         }
@@ -264,9 +257,8 @@ namespace Tango.BL.Entities
                 {
                     _initvalue = value;
 
-                    InitValueChanged?.Invoke(this, value);
+                    OnInitValueChanged(value);
 
-                    RaisePropertyChanged(nameof(InitValue)); 
                 }
             }
         }
@@ -292,9 +284,8 @@ namespace Tango.BL.Entities
                 {
                     _averaging = value;
 
-                    AveragingChanged?.Invoke(this, value);
+                    OnAveragingChanged(value);
 
-                    RaisePropertyChanged(nameof(Averaging)); 
                 }
             }
         }
@@ -320,9 +311,8 @@ namespace Tango.BL.Entities
                 {
                     _min = value;
 
-                    MinChanged?.Invoke(this, value);
+                    OnMinChanged(value);
 
-                    RaisePropertyChanged(nameof(Min)); 
                 }
             }
         }
@@ -348,14 +338,112 @@ namespace Tango.BL.Entities
                 {
                     _max = value;
 
-                    MaxChanged?.Invoke(this, value);
+                    OnMaxChanged(value);
 
-                    RaisePropertyChanged(nameof(Max)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Type has changed.
+        /// </summary>
+        protected virtual void OnTypeChanged(Int32 type)
+        {
+            TypeChanged?.Invoke(this, type);
+            RaisePropertyChanged(nameof(Type));
+        }
+
+        /// <summary>
+        /// Called when the Designator has changed.
+        /// </summary>
+        protected virtual void OnDesignatorChanged(String designator)
+        {
+            DesignatorChanged?.Invoke(this, designator);
+            RaisePropertyChanged(nameof(Designator));
+        }
+
+        /// <summary>
+        /// Called when the Asm has changed.
+        /// </summary>
+        protected virtual void OnAsmChanged(String asm)
+        {
+            AsmChanged?.Invoke(this, asm);
+            RaisePropertyChanged(nameof(Asm));
+        }
+
+        /// <summary>
+        /// Called when the InterfaceName has changed.
+        /// </summary>
+        protected virtual void OnInterfaceNameChanged(String interfacename)
+        {
+            InterfaceNameChanged?.Invoke(this, interfacename);
+            RaisePropertyChanged(nameof(InterfaceName));
+        }
+
+        /// <summary>
+        /// Called when the Sensor has changed.
+        /// </summary>
+        protected virtual void OnSensorChanged(String sensor)
+        {
+            SensorChanged?.Invoke(this, sensor);
+            RaisePropertyChanged(nameof(Sensor));
+        }
+
+        /// <summary>
+        /// Called when the InitValue has changed.
+        /// </summary>
+        protected virtual void OnInitValueChanged(Double initvalue)
+        {
+            InitValueChanged?.Invoke(this, initvalue);
+            RaisePropertyChanged(nameof(InitValue));
+        }
+
+        /// <summary>
+        /// Called when the Averaging has changed.
+        /// </summary>
+        protected virtual void OnAveragingChanged(Int32 averaging)
+        {
+            AveragingChanged?.Invoke(this, averaging);
+            RaisePropertyChanged(nameof(Averaging));
+        }
+
+        /// <summary>
+        /// Called when the Min has changed.
+        /// </summary>
+        protected virtual void OnMinChanged(Double min)
+        {
+            MinChanged?.Invoke(this, min);
+            RaisePropertyChanged(nameof(Min));
+        }
+
+        /// <summary>
+        /// Called when the Max has changed.
+        /// </summary>
+        protected virtual void OnMaxChanged(Double max)
+        {
+            MaxChanged?.Invoke(this, max);
+            RaisePropertyChanged(nameof(Max));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TechIo" /> class.
         /// </summary>
         public TechIo() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs b/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs
index 2e6d39770..4a36e4360 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs
@@ -64,9 +64,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -92,9 +91,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -120,9 +118,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -148,9 +145,8 @@ namespace Tango.BL.Entities
                 {
                     _min = value;
 
-                    MinChanged?.Invoke(this, value);
+                    OnMinChanged(value);
 
-                    RaisePropertyChanged(nameof(Min)); 
                 }
             }
         }
@@ -176,9 +172,8 @@ namespace Tango.BL.Entities
                 {
                     _max = value;
 
-                    MaxChanged?.Invoke(this, value);
+                    OnMaxChanged(value);
 
-                    RaisePropertyChanged(nameof(Max)); 
                 }
             }
         }
@@ -204,9 +199,8 @@ namespace Tango.BL.Entities
                 {
                     _units = value;
 
-                    UnitsChanged?.Invoke(this, value);
+                    OnUnitsChanged(value);
 
-                    RaisePropertyChanged(nameof(Units)); 
                 }
             }
         }
@@ -232,9 +226,8 @@ namespace Tango.BL.Entities
                 {
                     _pointsperframe = value;
 
-                    PointsPerFrameChanged?.Invoke(this, value);
+                    OnPointsPerFrameChanged(value);
 
-                    RaisePropertyChanged(nameof(PointsPerFrame)); 
                 }
             }
         }
@@ -260,9 +253,8 @@ namespace Tango.BL.Entities
                 {
                     _multichannel = value;
 
-                    MultiChannelChanged?.Invoke(this, value);
+                    OnMultiChannelChanged(value);
 
-                    RaisePropertyChanged(nameof(MultiChannel)); 
                 }
             }
         }
@@ -288,14 +280,94 @@ namespace Tango.BL.Entities
                 {
                     _channelcount = value;
 
-                    ChannelCountChanged?.Invoke(this, value);
+                    OnChannelCountChanged(value);
 
-                    RaisePropertyChanged(nameof(ChannelCount)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the Min has changed.
+        /// </summary>
+        protected virtual void OnMinChanged(Double min)
+        {
+            MinChanged?.Invoke(this, min);
+            RaisePropertyChanged(nameof(Min));
+        }
+
+        /// <summary>
+        /// Called when the Max has changed.
+        /// </summary>
+        protected virtual void OnMaxChanged(Double max)
+        {
+            MaxChanged?.Invoke(this, max);
+            RaisePropertyChanged(nameof(Max));
+        }
+
+        /// <summary>
+        /// Called when the Units has changed.
+        /// </summary>
+        protected virtual void OnUnitsChanged(String units)
+        {
+            UnitsChanged?.Invoke(this, units);
+            RaisePropertyChanged(nameof(Units));
+        }
+
+        /// <summary>
+        /// Called when the PointsPerFrame has changed.
+        /// </summary>
+        protected virtual void OnPointsPerFrameChanged(Int32 pointsperframe)
+        {
+            PointsPerFrameChanged?.Invoke(this, pointsperframe);
+            RaisePropertyChanged(nameof(PointsPerFrame));
+        }
+
+        /// <summary>
+        /// Called when the MultiChannel has changed.
+        /// </summary>
+        protected virtual void OnMultiChannelChanged(Boolean multichannel)
+        {
+            MultiChannelChanged?.Invoke(this, multichannel);
+            RaisePropertyChanged(nameof(MultiChannel));
+        }
+
+        /// <summary>
+        /// Called when the ChannelCount has changed.
+        /// </summary>
+        protected virtual void OnChannelCountChanged(Int32 channelcount)
+        {
+            ChannelCountChanged?.Invoke(this, channelcount);
+            RaisePropertyChanged(nameof(ChannelCount));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TechMonitor" /> class.
         /// </summary>
         public TechMonitor() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs b/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs
index 091e495cb..a357853d7 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs
@@ -63,9 +63,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -91,9 +90,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -119,9 +117,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -148,9 +145,8 @@ namespace Tango.BL.Entities
                 {
                     _type = value;
 
-                    TypeChanged?.Invoke(this, value);
+                    OnTypeChanged(value);
 
-                    RaisePropertyChanged(nameof(Type)); 
                 }
             }
         }
@@ -176,9 +172,8 @@ namespace Tango.BL.Entities
                 {
                     _state1 = value;
 
-                    State1Changed?.Invoke(this, value);
+                    OnState1Changed(value);
 
-                    RaisePropertyChanged(nameof(State1)); 
                 }
             }
         }
@@ -204,14 +199,67 @@ namespace Tango.BL.Entities
                 {
                     _state2 = value;
 
-                    State2Changed?.Invoke(this, value);
+                    OnState2Changed(value);
 
-                    RaisePropertyChanged(nameof(State2)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the Type has changed.
+        /// </summary>
+        protected virtual void OnTypeChanged(Int32 type)
+        {
+            TypeChanged?.Invoke(this, type);
+            RaisePropertyChanged(nameof(Type));
+        }
+
+        /// <summary>
+        /// Called when the State1 has changed.
+        /// </summary>
+        protected virtual void OnState1Changed(String state1)
+        {
+            State1Changed?.Invoke(this, state1);
+            RaisePropertyChanged(nameof(State1));
+        }
+
+        /// <summary>
+        /// Called when the State2 has changed.
+        /// </summary>
+        protected virtual void OnState2Changed(String state2)
+        {
+            State2Changed?.Invoke(this, state2);
+            RaisePropertyChanged(nameof(State2));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="TechValve" /> class.
         /// </summary>
         public TechValve() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/User.cs b/Software/Visual_Studio/Tango.BL/Entities/User.cs
index 3929e7e47..c85dc2bf6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/User.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/User.cs
@@ -70,9 +70,8 @@ namespace Tango.BL.Entities
                 {
                     _deleted = value;
 
-                    DeletedChanged?.Invoke(this, value);
+                    OnDeletedChanged(value);
 
-                    RaisePropertyChanged(nameof(Deleted)); 
                 }
             }
         }
@@ -98,9 +97,8 @@ namespace Tango.BL.Entities
                 {
                     _email = value;
 
-                    EmailChanged?.Invoke(this, value);
+                    OnEmailChanged(value);
 
-                    RaisePropertyChanged(nameof(Email)); 
                 }
             }
         }
@@ -126,9 +124,8 @@ namespace Tango.BL.Entities
                 {
                     _password = value;
 
-                    PasswordChanged?.Invoke(this, value);
+                    OnPasswordChanged(value);
 
-                    RaisePropertyChanged(nameof(Password)); 
                 }
             }
         }
@@ -154,7 +151,6 @@ namespace Tango.BL.Entities
                 if (_organizationguid != value)
                 {
                     _organizationguid = value;
-                    RaisePropertyChanged(nameof(OrganizationGuid)); 
                 }
             }
         }
@@ -180,7 +176,6 @@ namespace Tango.BL.Entities
                 if (_contactguid != value)
                 {
                     _contactguid = value;
-                    RaisePropertyChanged(nameof(ContactGuid)); 
                 }
             }
         }
@@ -206,7 +201,6 @@ namespace Tango.BL.Entities
                 if (_addressguid != value)
                 {
                     _addressguid = value;
-                    RaisePropertyChanged(nameof(AddressGuid)); 
                 }
             }
         }
@@ -232,9 +226,8 @@ namespace Tango.BL.Entities
                 {
                     _lastlogin = value;
 
-                    LastLoginChanged?.Invoke(this, value);
+                    OnLastLoginChanged(value);
 
-                    RaisePropertyChanged(nameof(LastLogin)); 
                 }
             }
         }
@@ -260,9 +253,8 @@ namespace Tango.BL.Entities
                 {
                     _address = value;
 
-                    AddressChanged?.Invoke(this, value);
+                    OnAddressChanged(value);
 
-                    RaisePropertyChanged(nameof(Address)); 
                 }
             }
         }
@@ -288,9 +280,8 @@ namespace Tango.BL.Entities
                 {
                     _contact = value;
 
-                    ContactChanged?.Invoke(this, value);
+                    OnContactChanged(value);
 
-                    RaisePropertyChanged(nameof(Contact)); 
                 }
             }
         }
@@ -314,9 +305,8 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
@@ -340,9 +330,8 @@ namespace Tango.BL.Entities
                 {
                     _machinestudioversions = value;
 
-                    MachineStudioVersionsChanged?.Invoke(this, value);
+                    OnMachineStudioVersionsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachineStudioVersions)); 
                 }
             }
         }
@@ -366,9 +355,8 @@ namespace Tango.BL.Entities
                 {
                     _machinesevents = value;
 
-                    MachinesEventsChanged?.Invoke(this, value);
+                    OnMachinesEventsChanged(value);
 
-                    RaisePropertyChanged(nameof(MachinesEvents)); 
                 }
             }
         }
@@ -394,9 +382,8 @@ namespace Tango.BL.Entities
                 {
                     _organization = value;
 
-                    OrganizationChanged?.Invoke(this, value);
+                    OnOrganizationChanged(value);
 
-                    RaisePropertyChanged(nameof(Organization)); 
                 }
             }
         }
@@ -420,9 +407,8 @@ namespace Tango.BL.Entities
                 {
                     _tangoversions = value;
 
-                    TangoVersionsChanged?.Invoke(this, value);
+                    OnTangoVersionsChanged(value);
 
-                    RaisePropertyChanged(nameof(TangoVersions)); 
                 }
             }
         }
@@ -446,14 +432,121 @@ namespace Tango.BL.Entities
                 {
                     _usersroles = value;
 
-                    UsersRolesChanged?.Invoke(this, value);
+                    OnUsersRolesChanged(value);
 
-                    RaisePropertyChanged(nameof(UsersRoles)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Deleted has changed.
+        /// </summary>
+        protected virtual void OnDeletedChanged(Boolean deleted)
+        {
+            DeletedChanged?.Invoke(this, deleted);
+            RaisePropertyChanged(nameof(Deleted));
+        }
+
+        /// <summary>
+        /// Called when the Email has changed.
+        /// </summary>
+        protected virtual void OnEmailChanged(String email)
+        {
+            EmailChanged?.Invoke(this, email);
+            RaisePropertyChanged(nameof(Email));
+        }
+
+        /// <summary>
+        /// Called when the Password has changed.
+        /// </summary>
+        protected virtual void OnPasswordChanged(String password)
+        {
+            PasswordChanged?.Invoke(this, password);
+            RaisePropertyChanged(nameof(Password));
+        }
+
+        /// <summary>
+        /// Called when the LastLogin has changed.
+        /// </summary>
+        protected virtual void OnLastLoginChanged(Nullable<DateTime> lastlogin)
+        {
+            LastLoginChanged?.Invoke(this, lastlogin);
+            RaisePropertyChanged(nameof(LastLogin));
+        }
+
+        /// <summary>
+        /// Called when the Address has changed.
+        /// </summary>
+        protected virtual void OnAddressChanged(Address address)
+        {
+            AddressChanged?.Invoke(this, address);
+            RaisePropertyChanged(nameof(Address));
+        }
+
+        /// <summary>
+        /// Called when the Contact has changed.
+        /// </summary>
+        protected virtual void OnContactChanged(Contact contact)
+        {
+            ContactChanged?.Invoke(this, contact);
+            RaisePropertyChanged(nameof(Contact));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
+        /// Called when the MachineStudioVersions has changed.
+        /// </summary>
+        protected virtual void OnMachineStudioVersionsChanged(SynchronizedObservableCollection<MachineStudioVersion> machinestudioversions)
+        {
+            MachineStudioVersionsChanged?.Invoke(this, machinestudioversions);
+            RaisePropertyChanged(nameof(MachineStudioVersions));
+        }
+
+        /// <summary>
+        /// Called when the MachinesEvents has changed.
+        /// </summary>
+        protected virtual void OnMachinesEventsChanged(SynchronizedObservableCollection<MachinesEvent> machinesevents)
+        {
+            MachinesEventsChanged?.Invoke(this, machinesevents);
+            RaisePropertyChanged(nameof(MachinesEvents));
+        }
+
+        /// <summary>
+        /// Called when the Organization has changed.
+        /// </summary>
+        protected virtual void OnOrganizationChanged(Organization organization)
+        {
+            OrganizationChanged?.Invoke(this, organization);
+            RaisePropertyChanged(nameof(Organization));
+        }
+
+        /// <summary>
+        /// Called when the TangoVersions has changed.
+        /// </summary>
+        protected virtual void OnTangoVersionsChanged(SynchronizedObservableCollection<TangoVersion> tangoversions)
+        {
+            TangoVersionsChanged?.Invoke(this, tangoversions);
+            RaisePropertyChanged(nameof(TangoVersions));
+        }
+
+        /// <summary>
+        /// Called when the UsersRoles has changed.
+        /// </summary>
+        protected virtual void OnUsersRolesChanged(SynchronizedObservableCollection<UsersRole> usersroles)
+        {
+            UsersRolesChanged?.Invoke(this, usersroles);
+            RaisePropertyChanged(nameof(UsersRoles));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
         public User() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs
index 10a6d774f..ba8cd146c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs
@@ -52,9 +52,8 @@ namespace Tango.BL.Entities
                 {
                     _deleted = value;
 
-                    DeletedChanged?.Invoke(this, value);
+                    OnDeletedChanged(value);
 
-                    RaisePropertyChanged(nameof(Deleted)); 
                 }
             }
         }
@@ -80,7 +79,6 @@ namespace Tango.BL.Entities
                 if (_userguid != value)
                 {
                     _userguid = value;
-                    RaisePropertyChanged(nameof(UserGuid)); 
                 }
             }
         }
@@ -106,7 +104,6 @@ namespace Tango.BL.Entities
                 if (_roleguid != value)
                 {
                     _roleguid = value;
-                    RaisePropertyChanged(nameof(RoleGuid)); 
                 }
             }
         }
@@ -132,9 +129,8 @@ namespace Tango.BL.Entities
                 {
                     _role = value;
 
-                    RoleChanged?.Invoke(this, value);
+                    OnRoleChanged(value);
 
-                    RaisePropertyChanged(nameof(Role)); 
                 }
             }
         }
@@ -160,14 +156,40 @@ namespace Tango.BL.Entities
                 {
                     _user = value;
 
-                    UserChanged?.Invoke(this, value);
+                    OnUserChanged(value);
 
-                    RaisePropertyChanged(nameof(User)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Deleted has changed.
+        /// </summary>
+        protected virtual void OnDeletedChanged(Boolean deleted)
+        {
+            DeletedChanged?.Invoke(this, deleted);
+            RaisePropertyChanged(nameof(Deleted));
+        }
+
+        /// <summary>
+        /// Called when the Role has changed.
+        /// </summary>
+        protected virtual void OnRoleChanged(Role role)
+        {
+            RoleChanged?.Invoke(this, role);
+            RaisePropertyChanged(nameof(Role));
+        }
+
+        /// <summary>
+        /// Called when the User has changed.
+        /// </summary>
+        protected virtual void OnUserChanged(User user)
+        {
+            UserChanged?.Invoke(this, user);
+            RaisePropertyChanged(nameof(User));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="UsersRole" /> class.
         /// </summary>
         public UsersRole() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs b/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs
index 9de13f11d..0f261568b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs
@@ -54,9 +54,8 @@ namespace Tango.BL.Entities
                 {
                     _code = value;
 
-                    CodeChanged?.Invoke(this, value);
+                    OnCodeChanged(value);
 
-                    RaisePropertyChanged(nameof(Code)); 
                 }
             }
         }
@@ -82,9 +81,8 @@ namespace Tango.BL.Entities
                 {
                     _name = value;
 
-                    NameChanged?.Invoke(this, value);
+                    OnNameChanged(value);
 
-                    RaisePropertyChanged(nameof(Name)); 
                 }
             }
         }
@@ -110,9 +108,8 @@ namespace Tango.BL.Entities
                 {
                     _description = value;
 
-                    DescriptionChanged?.Invoke(this, value);
+                    OnDescriptionChanged(value);
 
-                    RaisePropertyChanged(nameof(Description)); 
                 }
             }
         }
@@ -136,14 +133,49 @@ namespace Tango.BL.Entities
                 {
                     _jobs = value;
 
-                    JobsChanged?.Invoke(this, value);
+                    OnJobsChanged(value);
 
-                    RaisePropertyChanged(nameof(Jobs)); 
                 }
             }
         }
 
         /// <summary>
+        /// Called when the Code has changed.
+        /// </summary>
+        protected virtual void OnCodeChanged(Int32 code)
+        {
+            CodeChanged?.Invoke(this, code);
+            RaisePropertyChanged(nameof(Code));
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the Jobs has changed.
+        /// </summary>
+        protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs)
+        {
+            JobsChanged?.Invoke(this, jobs);
+            RaisePropertyChanged(nameof(Jobs));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="WindingMethod" /> class.
         /// </summary>
         public WindingMethod() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
index 721057ad0..d7cd58949 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
@@ -128,24 +128,6 @@ namespace Tango.BL.Enumerations
         RunHardwareVersionsModule = 19,
 
         /// <summary>
-        /// (Grants access to the development environment.)
-        /// </summary>
-        [Description("Grants access to the development environment.")]
-        AccessDevelopmentDataSource = 20,
-
-        /// <summary>
-        /// (Grants access to the test environment.)
-        /// </summary>
-        [Description("Grants access to the test environment.")]
-        AccessTestDataSource = 21,
-
-        /// <summary>
-        /// (Grants access to the production environment.)
-        /// </summary>
-        [Description("Grants access to the production environment.")]
-        AccessProductionDataSource = 22,
-
-        /// <summary>
         /// (Allows publishing of new PPC application versions.)
         /// </summary>
         [Description("Allows publishing of new PPC application versions.")]
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index bc42859dc..08892d274 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -151,6 +151,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the Dispensers.
+        /// </summary>
+        public DbSet<Dispenser> Dispensers 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the EmbeddedFirmwareVersions.
         /// </summary>
         public DbSet<EmbeddedFirmwareVersion> EmbeddedFirmwareVersions 
@@ -543,6 +551,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the Spools.
+        /// </summary>
+        public DbSet<Spool> Spools 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the Sysdiagrams.
         /// </summary>
         public DbSet<Sysdiagram> Sysdiagrams 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index 20dde55b7..20d6252b0 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -593,6 +593,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<Dispenser> _dispensers;
+        /// <summary>
+        /// Gets or sets the Dispensers.
+        /// </summary>
+        public ObservableCollection<Dispenser> Dispensers
+        {
+            get 
+            {
+                return _dispensers; 
+            }
+
+            set 
+            {
+                _dispensers = value; RaisePropertyChanged(nameof(Dispensers)); 
+            }
+
+        }
+
+        private ICollectionView _dispensersViewSource;
+        /// <summary>
+        /// Gets or sets the Dispensers View Source.
+        ///</summary>
+        public ICollectionView DispensersViewSource
+        {
+            get 
+            {
+                return _dispensersViewSource; 
+            }
+
+            set 
+            {
+                _dispensersViewSource = value; RaisePropertyChanged(nameof(DispensersViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<EmbeddedFirmwareVersion> _embeddedfirmwareversions;
         /// <summary>
         /// Gets or sets the EmbeddedFirmwareVersions.
@@ -2357,6 +2393,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<Spool> _spools;
+        /// <summary>
+        /// Gets or sets the Spools.
+        /// </summary>
+        public ObservableCollection<Spool> Spools
+        {
+            get 
+            {
+                return _spools; 
+            }
+
+            set 
+            {
+                _spools = value; RaisePropertyChanged(nameof(Spools)); 
+            }
+
+        }
+
+        private ICollectionView _spoolsViewSource;
+        /// <summary>
+        /// Gets or sets the Spools View Source.
+        ///</summary>
+        public ICollectionView SpoolsViewSource
+        {
+            get 
+            {
+                return _spoolsViewSource; 
+            }
+
+            set 
+            {
+                _spoolsViewSource = value; RaisePropertyChanged(nameof(SpoolsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Sysdiagram> _sysdiagrams;
         /// <summary>
         /// Gets or sets the Sysdiagrams.
@@ -2791,6 +2863,8 @@ namespace Tango.BL
 
             DispenserTypesViewSource = CreateCollectionView(DispenserTypes);
 
+            DispensersViewSource = CreateCollectionView(Dispensers);
+
             EmbeddedFirmwareVersionsViewSource = CreateCollectionView(EmbeddedFirmwareVersions);
 
             EventTypesViewSource = CreateCollectionView(EventTypes);
@@ -2889,6 +2963,8 @@ namespace Tango.BL
 
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
 
+            SpoolsViewSource = CreateCollectionView(Spools);
+
             SysdiagramsViewSource = CreateCollectionView(Sysdiagrams);
 
             TangoVersionsViewSource = CreateCollectionView(TangoVersions);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index 086094ecc..55ea29159 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -593,6 +593,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<Dispenser> _dispensers;
+        /// <summary>
+        /// Gets or sets the Dispensers.
+        /// </summary>
+        public ObservableCollection<Dispenser> Dispensers
+        {
+            get 
+            {
+                return _dispensers; 
+            }
+
+            set 
+            {
+                _dispensers = value; RaisePropertyChanged(nameof(Dispensers)); 
+            }
+
+        }
+
+        private ICollectionView _dispensersViewSource;
+        /// <summary>
+        /// Gets or sets the Dispensers View Source.
+        ///</summary>
+        public ICollectionView DispensersViewSource
+        {
+            get 
+            {
+                return _dispensersViewSource; 
+            }
+
+            set 
+            {
+                _dispensersViewSource = value; RaisePropertyChanged(nameof(DispensersViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<EmbeddedFirmwareVersion> _embeddedfirmwareversions;
         /// <summary>
         /// Gets or sets the EmbeddedFirmwareVersions.
@@ -2357,6 +2393,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<Spool> _spools;
+        /// <summary>
+        /// Gets or sets the Spools.
+        /// </summary>
+        public ObservableCollection<Spool> Spools
+        {
+            get 
+            {
+                return _spools; 
+            }
+
+            set 
+            {
+                _spools = value; RaisePropertyChanged(nameof(Spools)); 
+            }
+
+        }
+
+        private ICollectionView _spoolsViewSource;
+        /// <summary>
+        /// Gets or sets the Spools View Source.
+        ///</summary>
+        public ICollectionView SpoolsViewSource
+        {
+            get 
+            {
+                return _spoolsViewSource; 
+            }
+
+            set 
+            {
+                _spoolsViewSource = value; RaisePropertyChanged(nameof(SpoolsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Sysdiagram> _sysdiagrams;
         /// <summary>
         /// Gets or sets the Sysdiagrams.
@@ -2791,6 +2863,8 @@ namespace Tango.BL
 
             DispenserTypesViewSource = CreateCollectionView(DispenserTypes);
 
+            DispensersViewSource = CreateCollectionView(Dispensers);
+
             EmbeddedFirmwareVersionsViewSource = CreateCollectionView(EmbeddedFirmwareVersions);
 
             EventTypesViewSource = CreateCollectionView(EventTypes);
@@ -2889,6 +2963,8 @@ namespace Tango.BL
 
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
 
+            SpoolsViewSource = CreateCollectionView(Spools);
+
             SysdiagramsViewSource = CreateCollectionView(Sysdiagrams);
 
             TangoVersionsViewSource = CreateCollectionView(TangoVersions);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index e5f187de6..862c23b51 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -119,6 +119,7 @@
     <Compile Include="EntitiesExtensions\MachineEvent.cs" />
     <Compile Include="EntitiesExtensions\ProcessParametersTablesGroup.cs" />
     <Compile Include="Entities\Customer.cs" />
+    <Compile Include="Entities\Dispenser.cs" />
     <Compile Include="Entities\EventTypesCategory.cs" />
     <Compile Include="Entities\EventTypesGroup.cs" />
     <Compile Include="Entities\HardwareBlower.cs" />
@@ -128,6 +129,7 @@
     <Compile Include="Entities\HardwareSpeedSensor.cs" />
     <Compile Include="Entities\HardwareSpeedSensorType.cs" />
     <Compile Include="Entities\HtmlPage.cs" />
+    <Compile Include="Entities\Spool.cs" />
     <Compile Include="Entities\Sysdiagram.cs" />
     <Compile Include="Entities\TangoVersion.cs" />
     <Compile Include="Entities\TechController.cs" />
@@ -351,7 +353,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index daa4e7d51..dfcceb1dd 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -77,15 +77,32 @@ namespace Tango.BL.Entities
                     @if (!prop.Name.EndsWith("Guid"))
                     {
                         <div>
-                            @(prop.Name)Changed?.Invoke(this, value);
+                            On@(prop.Name)Changed(value);
                         </div>
-                    }
-                    RaisePropertyChanged(nameof(@(prop.Name))); 
+                    } 
                 }
             }
         }
     </div>
         }
+        
+
+        @foreach (var prop in Model.Fields)
+        {
+            if (!prop.Name.EndsWith("Guid"))
+            {
+                <div>
+                    /// <summary>
+                    /// Called when the @(prop.Name) has changed.
+                    /// </summary>
+                    protected virtual void On@(prop.Name)Changed(@(prop.Type) @(prop.Name.ToLower()))
+                    {
+                        @(prop.Name)Changed?.Invoke(this, @(prop.Name.ToLower()));
+                        RaisePropertyChanged(nameof(@(prop.Name)));
+                    }
+                </div>
+            }
+        }    
 
         /// <summary>
         /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs
index 9689d7003..0a4683b20 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs
@@ -30,6 +30,7 @@ namespace Tango.DAL.Remote.DB
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
         public bool IS_CATALOG { get; set; }
+        public byte[] THUMBNAIL { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<BRUSH_STOPS> BRUSH_STOPS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
new file mode 100644
index 000000000..e6427b03c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DISPENSER
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string SERIAL_NUMBER { get; set; }
+        public string DISPENSER_TYPE_GUID { get; set; }
+        public double NL_PER_PULSE { get; set; }
+        public byte[] DATA { get; set; }
+    
+        public virtual DISPENSER_TYPES DISPENSER_TYPES { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
index efe9286f2..0985d838f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public DISPENSER_TYPES()
         {
+            this.DISPENSERS = new HashSet<DISPENSER>();
             this.IDS_PACKS = new HashSet<IDS_PACKS>();
         }
     
@@ -29,6 +30,8 @@ namespace Tango.DAL.Remote.DB
         public double CAPACITY { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<DISPENSER> DISPENSERS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index a20e01387..20b252f96 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -41,6 +41,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<CUSTOMER> CUSTOMERS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; }
+        public virtual DbSet<DISPENSER> DISPENSERS { get; set; }
         public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; }
         public virtual DbSet<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; }
@@ -90,6 +91,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
         public virtual DbSet<SEGMENT> SEGMENTS { get; set; }
         public virtual DbSet<SPOOL_TYPES> SPOOL_TYPES { get; set; }
+        public virtual DbSet<SPOOL> SPOOLS { get; set; }
         public virtual DbSet<sysdiagram> sysdiagrams { get; set; }
         public virtual DbSet<TANGO_VERSIONS> TANGO_VERSIONS { get; set; }
         public virtual DbSet<TECH_CONTROLLERS> TECH_CONTROLLERS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
index 17bc2683d..d26e67908 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
+// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 6eba91c41..00e034831 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -176,6 +176,7 @@
           <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" />
           <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
           <Property Name="IS_CATALOG" Type="bit" Nullable="false" />
+          <Property Name="THUMBNAIL" Type="image" />
         </EntityType>
         <EntityType Name="CONFIGURATIONS">
           <Key>
@@ -229,6 +230,18 @@
           <Property Name="NL_PER_PULSE" Type="float" Nullable="false" />
           <Property Name="CAPACITY" Type="float" Nullable="false" />
         </EntityType>
+        <EntityType Name="DISPENSERS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="SERIAL_NUMBER" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="DISPENSER_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="NL_PER_PULSE" Type="float" Nullable="false" />
+          <Property Name="DATA" Type="image" />
+        </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -940,6 +953,14 @@
           <Property Name="BOTTOM_BACKING_RATE" Type="int" Nullable="false" />
           <Property Name="ROTATIONS_PER_PASSAGE" Type="float" Nullable="false" />
         </EntityType>
+        <EntityType Name="SPOOLS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+        </EntityType>
         <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
@@ -1286,6 +1307,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_DISPENSERS_DISPENSER_TYPES">
+          <End Role="DISPENSER_TYPES" Type="Self.DISPENSER_TYPES" Multiplicity="1" />
+          <End Role="DISPENSERS" Type="Self.DISPENSERS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="DISPENSER_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="DISPENSERS">
+              <PropertyRef Name="DISPENSER_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES">
           <End Role="EVENT_TYPES_GROUPS" Type="Self.EVENT_TYPES_GROUPS" Multiplicity="1" />
           <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="*" />
@@ -2184,6 +2217,7 @@
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CUSTOMERS" EntityType="Self.CUSTOMERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="Self.EVENT_TYPES_ACTIONS" Schema="dbo" store:Type="Tables" />
@@ -2233,6 +2267,7 @@
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SEGMENTS" EntityType="Self.SEGMENTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOL_TYPES" EntityType="Self.SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="SPOOLS" EntityType="Self.SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="sysdiagrams" EntityType="Self.sysdiagrams" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="TANGO_VERSIONS" EntityType="Self.TANGO_VERSIONS" Schema="dbo" store:Type="Tables" />
@@ -2305,6 +2340,10 @@
             <End Role="ORGANIZATIONS" EntitySet="ORGANIZATIONS" />
             <End Role="CUSTOMERS" EntitySet="CUSTOMERS" />
           </AssociationSet>
+          <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="Self.FK_DISPENSERS_DISPENSER_TYPES">
+            <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
+            <End Role="DISPENSERS" EntitySet="DISPENSERS" />
+          </AssociationSet>
           <AssociationSet Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" Association="Self.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES">
             <End Role="EVENT_TYPES_GROUPS" EntitySet="EVENT_TYPES_GROUPS" />
             <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" />
@@ -2599,6 +2638,7 @@
           <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" />
           <EntitySet Name="CUSTOMERS" EntityType="RemoteModel.CUSTOMER" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="RemoteModel.DISPENSER_TYPES" />
+          <EntitySet Name="DISPENSERS" EntityType="RemoteModel.DISPENSER" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" />
           <EntitySet Name="EVENT_TYPES" EntityType="RemoteModel.EVENT_TYPES" />
           <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="RemoteModel.EVENT_TYPES_ACTIONS" />
@@ -2648,6 +2688,7 @@
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="RemoteModel.ROLES_PERMISSIONS" />
           <EntitySet Name="SEGMENTS" EntityType="RemoteModel.SEGMENT" />
           <EntitySet Name="SPOOL_TYPES" EntityType="RemoteModel.SPOOL_TYPES" />
+          <EntitySet Name="SPOOLS" EntityType="RemoteModel.SPOOL" />
           <EntitySet Name="sysdiagrams" EntityType="RemoteModel.sysdiagram" />
           <EntitySet Name="TANGO_VERSIONS" EntityType="RemoteModel.TANGO_VERSIONS" />
           <EntitySet Name="TECH_CONTROLLERS" EntityType="RemoteModel.TECH_CONTROLLERS" />
@@ -2767,6 +2808,10 @@
             <End Role="CUSTOMER" EntitySet="CUSTOMERS" />
             <End Role="JOB" EntitySet="JOBS" />
           </AssociationSet>
+          <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES">
+            <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
+            <End Role="DISPENSER" EntitySet="DISPENSERS" />
+          </AssociationSet>
           <AssociationSet Name="FK_IDS_PACKS_DISPENSER_TYPES" Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES">
             <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" />
             <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
@@ -3187,6 +3232,7 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="IS_CATALOG" Type="Boolean" Nullable="false" />
+          <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" />
           <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="BRUSH_STOPS" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_COLOR_CATALOGS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="JOB" />
@@ -3256,8 +3302,22 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="NL_PER_PULSE" Type="Double" Nullable="false" />
           <Property Name="CAPACITY" Type="Double" Nullable="false" />
+          <NavigationProperty Name="DISPENSERS" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER_TYPES" ToRole="DISPENSER" />
           <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" FromRole="DISPENSER_TYPES" ToRole="IDS_PACKS" />
         </EntityType>
+        <EntityType Name="DISPENSER">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="NL_PER_PULSE" Type="Double" Nullable="false" />
+          <Property Name="DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <NavigationProperty Name="DISPENSER_TYPES" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER" ToRole="DISPENSER_TYPES" />
+        </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4088,6 +4148,14 @@
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="JOB" />
           <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="MACHINE" />
         </EntityType>
+        <EntityType Name="SPOOL">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+        </EntityType>
         <EntityType Name="sysdiagram">
           <Key>
             <PropertyRef Name="diagram_id" />
@@ -4597,6 +4665,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_DISPENSERS_DISPENSER_TYPES">
+          <End Type="RemoteModel.DISPENSER_TYPES" Role="DISPENSER_TYPES" Multiplicity="1" />
+          <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="DISPENSER_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="DISPENSER">
+              <PropertyRef Name="DISPENSER_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_IDS_PACKS_DISPENSER_TYPES">
           <End Type="RemoteModel.DISPENSER_TYPES" Role="DISPENSER_TYPES" Multiplicity="0..1" />
           <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" />
@@ -5509,6 +5589,7 @@
           <EntitySetMapping Name="COLOR_SPACES">
             <EntityTypeMapping TypeName="RemoteModel.COLOR_SPACES">
               <MappingFragment StoreEntitySet="COLOR_SPACES">
+                <ScalarProperty Name="THUMBNAIL" ColumnName="THUMBNAIL" />
                 <ScalarProperty Name="IS_CATALOG" ColumnName="IS_CATALOG" />
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
@@ -5575,6 +5656,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="DISPENSERS">
+            <EntityTypeMapping TypeName="RemoteModel.DISPENSER">
+              <MappingFragment StoreEntitySet="DISPENSERS">
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="NL_PER_PULSE" ColumnName="NL_PER_PULSE" />
+                <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" />
+                <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="EMBEDDED_FIRMWARE_VERSIONS">
             <EntityTypeMapping TypeName="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS">
@@ -6335,6 +6429,15 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="SPOOLS">
+            <EntityTypeMapping TypeName="RemoteModel.SPOOL">
+              <MappingFragment StoreEntitySet="SPOOLS">
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="sysdiagrams">
             <EntityTypeMapping TypeName="RemoteModel.sysdiagram">
               <MappingFragment StoreEntitySet="sysdiagrams">
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 68da85ad2..03bc9bf5e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,81 +5,83 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="16.25" PointY="41.875" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="5.75" PointY="61.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="5.75" PointY="11.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="5.75" PointY="39.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="5.75" PointY="42.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="9.75" PointY="32.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="13.25" PointY="40.875" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="12.5" PointY="22.375" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="53.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="7.5" PointY="50.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="8" PointY="15.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="8" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="5.75" PointY="57.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="3" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="13.25" PointY="30.25" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="5.75" PointY="8.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="13.25" PointY="5.875" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="18.5" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="11" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="11" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="19.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="12.75" PointY="27" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="15" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="5.75" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="8" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="13.75" PointY="44" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="16" PointY="14.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="13.75" PointY="33.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="16" PointY="6.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="15.75" PointY="48" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="18" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="16.75" PointY="38" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="19" PointY="15.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="5.75" PointY="15.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="16.75" PointY="34" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="19" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="11" PointY="14.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="13.25" PointY="37.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="15.5" PointY="1.25" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="32.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="10.25" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="15.5" PointY="52.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="8" PointY="47" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="10.25" PointY="18.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.5" PointY="19.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="15.5" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="30.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="27.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="13.25" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="8" PointY="59.75" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="19.25" PointY="4.375" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="20.25" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="19.25" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="21.5" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="35.75" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="8" PointY="42.375" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.5" PointY="30.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="2.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="0.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="2.75" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="13.25" PointY="13.25" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="21.5" PointY="14.25" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="12.25" PointY="48.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="54.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="44.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="38.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="51.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="12" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="12" PointY="60.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="10.5" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="45.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9.75" PointY="34.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="43.5" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="58.5" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="5.25" PointY="16.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="12" PointY="3.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="14.25" PointY="3" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="41.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="10.25" PointY="7.875" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="14.5" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="8" PointY="8.875" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="8" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="0.75" PointY="66.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="60.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6" PointY="41.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="0.75" PointY="62.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3" PointY="37.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.75" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="10" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.75" PointY="57.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="12" PointY="41.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="5.75" PointY="56.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="8" PointY="45.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="47" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="41.375" />
+        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="8" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="12" PointY="57.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="14.25" PointY="29.625" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="9.75" PointY="26.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="7.5" PointY="19.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="35.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="8" PointY="15.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="10.25" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="7.5" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="13.5" PointY="22.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="12.5" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="26.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="32.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="12" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="56.5" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10.25" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="5.25" PointY="12.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.5" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="9.75" PointY="30.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="0.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="10.5" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="4.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="6.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="12.75" PointY="14.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="14.75" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="14.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="16.75" PointY="2.375" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="5.25" PointY="28.75" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="7.5" PointY="33.625" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="5.25" PointY="33.875" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -107,6 +109,7 @@
         <AssociationConnector Association="RemoteModel.FK_USERS_CONTACTS" />
         <AssociationConnector Association="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" />
         <AssociationConnector Association="RemoteModel.FK_JOBS_CUSTOMERS" />
+        <AssociationConnector Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" />
         <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs
new file mode 100644
index 000000000..16fd9eef9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL.cs
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class SPOOL
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index fe487a427..d3ed5f49a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -108,6 +108,9 @@
     <Compile Include="DB\CUSTOMER.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\DISPENSER.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\DISPENSER_TYPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -270,6 +273,9 @@
     <Compile Include="DB\SEGMENT.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\SPOOL.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\SPOOL_TYPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -359,7 +365,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file