Index: dam engine/branches/Initial Source/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r282 -r303
--- dam engine/branches/Initial Source/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 282)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 303)
@@ -1,12 +1,23 @@
-//-----------------------------------------------------------------------
-// <copyright file="Location.cs" company="Deltares">
-//  Copyright (c) 2010 Deltares. All rights reserved.
-// </copyright>
-// <author>B.S.T.I.M. The</author>
-// <email>tom.the@deltares.nl</email>
-// <date>18-05-2010</date>
-// <summary>Location data</summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the DAM Engine.
+//
+// The DAM Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
 using System;
 using System.Collections;
@@ -19,6 +30,7 @@
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General.Gauges;
 using Deltares.DamEngine.Data.General.PlLines;
+using Deltares.DamEngine.Data.General.Sensors;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Probabilistic;
@@ -276,7 +288,6 @@
             }
         }
 
-        [Browsable(false)]
         public virtual SensorLocation SensorData
         {
             get
@@ -290,7 +301,6 @@
             }
         }
 
-        [Browsable(false)]
         public virtual bool AreLocalXZObjectsCreated
         {
             get
@@ -299,16 +309,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "AreLocalXZObjectsCreated");
-                areLocalXZObjectsCreated = value;
-                DataEventPublisher.AfterChange(this, "AreLocalXZObjectsCreated");
+                areLocalXZObjectsCreated = value;                
             }
         }
 
-        [Label("Name")]
-        [PropertyOrder(0, 1)]
-        [ReadOnly(true)]
-        [Category(AllCategory)]
         public virtual string Name
         {
             get
@@ -317,15 +321,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "Name");
-                name = value;
-                DataEventPublisher.AfterChange(this, "Name");
+                name = value;                
             }
         }
 
-        [Label("Description")]
-        [Category(DikeCategory)]
-        [PropertyOrder(1, 10)]
         public virtual string Description
         {
             get
@@ -334,19 +333,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "Description");
-                description = value;
-                DataEventPublisher.AfterChange(this, "Description");
+                description = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("X location (RDS)")]
-        [Description("Location according to Rijksdriehoekstelsel")]
-        [Format("F3")]
-        [ReadOnly(true)]
-        [PropertyOrder(1, 1)]
-        [Category(AllCategory)]
         public virtual double XRd
         {
             get
@@ -355,19 +345,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "XRd");
-                xrd = value;
-                DataEventPublisher.AfterChange(this, "XRd");
+                xrd = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Y location (RDS)")]
-        [Description("Location according to Rijksdriehoekstelsel")]
-        [Format("F3")]
-        [ReadOnly(true)]
-        [PropertyOrder(1, 1)]
-        [Category(AllCategory)]
         public virtual double YRd
         {
             get
@@ -376,9 +357,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "YRd");
                 yrd = value;
-                DataEventPublisher.AfterChange(this, "YRd");
             }
         }
 
@@ -390,11 +369,10 @@
             }
             set
             {
-                this.SetAndNotify2(out xRdDikeLine, value, x => x.XRdDikeLine);
+                xRdDikeLine = value;
             }
         }
 
-        [Browsable(false)]
         public virtual double GrassQuality
         {
             get
@@ -403,13 +381,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "GrassQuality");
-                grassQuality = value;
-                DataEventPublisher.AfterChange(this, "GrassQuality");
+                grassQuality = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual double Direction
         {
             get
@@ -418,13 +393,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "Direction");
-                direction = value;
-                DataEventPublisher.AfterChange(this, "Direction");
+                direction = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual double XSoilGeometry2DOrigin
         {
             get
@@ -433,18 +405,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "XSoilGeometry2DOrigin");
-                xSoilGeometry2DOrigin = value;
-                DataEventPublisher.AfterChange(this, "XSoilGeometry2DOrigin");
+                xSoilGeometry2DOrigin = value;                
             }
         }
 
-        [Unit(UnitType.PressurePerLength)]
-        [Label("Traffic load")]
-        [Description("Traffic load")]
-        [Format("F3")]
-        [Category(DikeCategory)]
-        [PropertyOrder(1, 20)]
         public virtual double TrafficLoad
         {
             get
@@ -453,18 +417,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "TrafficLoad");
-                trafficLoad = value;
-                DataEventPublisher.AfterChange(this, "TrafficLoad");
+                trafficLoad = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Dredging depth")]
-        [Description("Dredging depth in storage basin")]
-        [Format("F3")]
-        [Category(DikeCategory)]
-        [PropertyOrder(4, 1)]
         public virtual double DredgingDepth
         {
             get
@@ -473,17 +429,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DredgingDepth");
-                dredgingDepth = value;
-                DataEventPublisher.AfterChange(this, "DredgingDepth");
+                dredgingDepth = value;                
             }
         }
 
-        [Unit(UnitType.None)]
-        [Label("Dike material type")]
-        [Category(DikeCategory)]
-        [Description("Dike material type")]
-        [PropertyOrder(1, 6)]
         public virtual SoilType DikeMaterialType
         {
             get
@@ -492,13 +441,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "dikeMaterialType");
-                dikeMaterialType = value;
-                DataEventPublisher.AfterChange(this, "dikeMaterialType");
+                dikeMaterialType = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual GeometryPoint SheetPilePoint
         {
             get
@@ -507,13 +453,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "SheetPilePoint");
-                sheetPilePoint = value;
-                DataEventPublisher.AfterChange(this, "SheetPilePoint");
+                sheetPilePoint = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual double SheetPilePointX
         {
             get
@@ -526,7 +469,6 @@
             }
         }
 
-        [Browsable(false)]
         public virtual double SheetPilePointY
         {
             get
@@ -539,8 +481,7 @@
             }
         }
 
-        [Browsable(false)]
-        public virtual double SheetPilePointZ
+        [Browsable(false)]public virtual double SheetPilePointZ
         {
             get
             {
@@ -552,12 +493,6 @@
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Sheet pile length")]
-        [Description("Sheet pile length")]
-        [Format("F2")]
-        [PropertyOrder(4, 2)]
-        [Category(DikeCategory)]
         public virtual double SheetPileLength
         {
             get
@@ -566,18 +501,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "SheetPileLength");
-                sheetPileLength = value;
-                DataEventPublisher.AfterChange(this, "SheetPileLength");
+                sheetPileLength = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Sheet pile bottom level")]
-        [Description("Sheet pile bottom level")]
-        [Format("F2")]
-        [PropertyOrder(4, 3)]
-        [Category(DikeCategory)]
         public virtual double RwBankProtectionBottomLevel
         {
             get
@@ -586,13 +513,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, this.GetMemberName(x => x.RwBankProtectionBottomLevel));
-                rwBankProtectionBottomLevel = value;
-                DataEventPublisher.AfterChange(this, this.GetMemberName(x => x.RwBankProtectionBottomLevel));
+                rwBankProtectionBottomLevel = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual bool IsUseOriginalPLLineAssignments
         {
             get
@@ -601,13 +525,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "IsUseOriginalPLLineAssignments");
-                isUseOriginalPLLineAssignments = value;
-                DataEventPublisher.AfterChange(this, "IsUseOriginalPLLineAssignments");
+                isUseOriginalPLLineAssignments = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual PL1Line PL1Line
         {
             get
@@ -616,13 +537,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PL1Line");
-                pL1Line = value;
-                DataEventPublisher.AfterChange(this, "PL1Line");
+                pL1Line = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual PL1Line LocalXZPL1Line
         {
             get
@@ -631,17 +549,14 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "LocalXZPL1Line");
-                localXZPL1Line = value;
-                DataEventPublisher.AfterChange(this, "LocalXZPL1Line");
+                localXZPL1Line = value;                
             }
         }
 
         /// <summary>
         /// TODO
         /// </summary>
         /// <remarks>Composite relationship.</remarks>
-        [Browsable(false)]
         [Validate]
         public virtual SurfaceLine2 LocalXZSurfaceLine2
         {
@@ -651,11 +566,10 @@
             }
             set
             {
-                this.SetAndNotify2(out localXzSurfaceLine, value, l => l.LocalXZSurfaceLine2);
+                localXzSurfaceLine = value;
             }
         }
 
-        [Browsable(false)]
         public virtual GeometryPoint LocalXZSheetPilePoint
         {
             get
@@ -664,25 +578,18 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "LocalXZSheetPilePoint");
-                localXZSheetPilePoint = value;
-                DataEventPublisher.AfterChange(this, "LocalXZSheetPilePoint");
+                localXZSheetPilePoint = value;                
             }
         }
 
         /// <summary>
         /// Gets or sets the Segment
         /// </summary>
-        [PropertyOrder(1, 6)]
-        [Label("Segment")]
-        [Category(DikeCategory)]
-        [ReadOnly(true)]
         public virtual string SegmentId { get; set; }
 
         /// <summary>
         /// Gets or sets the Segment
         /// </summary>
-        [Browsable(false)]
         public virtual Segment Segment
         {
             get
@@ -691,16 +598,13 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "Segment");
                 segment = value;
-                DataEventPublisher.AfterChange(this, "Segment");
             }
         }
 
         /// <summary>
         /// Gets or sets the surface line 
         /// </summary>
-        [Browsable(false)]
         public virtual SurfaceLine2 SurfaceLine2
         {
             get
@@ -709,20 +613,13 @@
             }
             set
             {
-                this.SetAndNotify2(out surfaceLine2, value, l => l.SurfaceLine2);
+                surfaceLine2 = value;
             }
         }
 
         /// <summary>
         /// 
         /// </summary>
-        [Unit(UnitType.Length)]
-        [Label("Minimum circle depth")]
-        [Format("F2")]
-        [PropertyOrder(4, 4)]
-        [Minimum(0)]
-        [Maximum(10000)]
-        [Category(DikeCategory)]
         public virtual double MinimalCircleDepth
         {
             get
@@ -731,17 +628,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "MinimalCircleDepth");
-                minimalCircleDepth = value;
-                DataEventPublisher.AfterChange(this, "MinimalCircleDepth");
+                minimalCircleDepth = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Level reduction inside")]
-        [Format("F2")]
-        [PropertyOrder(4, 5)]
-        [Category(WaterCategory)]
         public virtual double LevelReductionInside
         {
             get
@@ -750,17 +640,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "LevelReductionInside");
-                levelReductionInside = value;
-                DataEventPublisher.AfterChange(this, "LevelReductionInside");
+                levelReductionInside = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Level reduction outside")]
-        [Format("F2")]
-        [PropertyOrder(4, 6)]
-        [Category(WaterCategory)]
         public virtual double LevelReductionOutside
         {
             get
@@ -769,13 +652,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "LevelReductionOutside");
-                levelReductionOutside = value;
-                DataEventPublisher.AfterChange(this, "LevelReductionOutside");
+                levelReductionOutside = value;                
             }
         }
 
-        [Browsable(false)]
         public virtual ModelFactors ModelFactors
         {
             get
@@ -784,19 +664,11 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "ModelFactors");
-                modelFactors = value;
-                DataEventPublisher.AfterChange(this, "ModelFactors");
+                modelFactors = value;                
             }
         }
 
         [XmlIgnore]
-        [Label("Uplift criterion stability")]
-        [Description("Uplift criterion that is used in stability calulation")]
-        [Unit(UnitType.None)]
-        [Format("F3")]
-        [PropertyOrder(6, 1)]
-        [Category(WaterCategory)]
         public virtual double? UpliftCriterionStability
         {
             get
@@ -810,12 +682,6 @@
         }
 
         [XmlIgnore]
-        [Label("Uplift criterion piping")]
-        [Description("Uplift criterion that is used in piping calulation")]
-        [Unit(UnitType.None)]
-        [Format("F3")]
-        [PropertyOrder(6, 2)]
-        [Category(WaterCategory)]
         public virtual double? UpliftCriterionPiping
         {
             get
@@ -828,9 +694,6 @@
             }
         }
 
-        [Label("Layer height distribution")]
-        [Category(AllCategory)]
-        [PropertyOrder(4, 7)]
         public virtual DistributionType LayerHeightDistribution
         {
             get
@@ -839,16 +702,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "LayerHeightDistribution");
-                layerHeightDistribution = value;
-                DataEventPublisher.AfterChange(this, "LayerHeightDistribution");
+                layerHeightDistribution = value;                
             }
         }
 
-        [Label("Layer height deviation")]
-        [Category(AllCategory)]
-        [PropertyOrder(4, 8)]
-        [Format("F2")]
         public virtual double LayerHeightDeviation
         {
             get
@@ -857,17 +714,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "LayerHeightDeviation");
-                layerHeightDeviation = value;
-                DataEventPublisher.AfterChange(this, "LayerHeightDeviation");
+                layerHeightDeviation = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Distance to Entrypoint")]
-        [Description("Distance from toe of dike to entry point of river in deep sandlayer")]
-        [Format("F2")]
-        [PropertyOrder(2, 12)]
         public virtual double DistanceToEntryPoint
         {
             get
@@ -876,17 +726,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DistanceToEntryPoint");
-                distanceToEntryPoint = value;
-                DataEventPublisher.AfterChange(this, "DistanceToEntryPoint");
+                distanceToEntryPoint = value;                
             }
         }
 
-        [Label("Detriment factor")]
-        [Description("Detriment factor")]
-        [Format("F3")]
-        [Category(DikeCategory)]
-        [PropertyOrder(1, 9)]
         public virtual double DetrimentFactor
         {
             get
@@ -895,17 +738,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DetrimentFactor");
-                detrimentFactor = value;
-                DataEventPublisher.AfterChange(this, "DetrimentFactor");
+                detrimentFactor = value;                
             }
         }
 
-        [Label("Slope damping factor")]
-        [Description("The tangent of the slope damping for piezometric height polderSide (for PL3 and PL4)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 14)]
         public virtual double SlopeDampingPiezometricHeightPolderSide
         {
             get
@@ -914,16 +750,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "SlopeDampingPiezometricHeightPolderSide");
-                slopeDampingPiezometricHeightPolderSide = value;
-                DataEventPublisher.AfterChange(this, "SlopeDampingPiezometricHeightPolderSide");
+                slopeDampingPiezometricHeightPolderSide = value;                
             }
         }
 
-        [Label("Dike table height")]
-        [Category(DikeCategory)]
-        [Description("Dike table height")]
-        [Format("F3")]
         public virtual double DikeTableHeight
         {
             get
@@ -932,16 +762,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DikeTableHeight");
-                dikeTableHeight = value;
-                DataEventPublisher.AfterChange(this, "DikeTableHeight");
+                dikeTableHeight = value;                
             }
         }
 
-        [Label("Dike type")]
-        [ReadOnly(true)]
-        [Category(DikeCategory)]
-        [PropertyOrder(1, 5)]
         public DamType DamType
         {
             get
@@ -954,10 +778,6 @@
             }
         }
 
-        [Label("Dike")]
-        [ReadOnly(true)]
-        [Category(DikeCategory)]
-        [PropertyOrder(1, 4)]
         public string DikeRingId
         {
             get
@@ -970,7 +790,6 @@
             }
         }
 
-        [Browsable(false)]
         public string SurfaceLineId
         {
             get
@@ -983,7 +802,6 @@
             }
         }
 
-        [Browsable(false)]
         public string SoildatabaseName
         {
             get
@@ -996,24 +814,9 @@
             }
         }
 
-        [Browsable(false)]
         public SoilList SoilList { get; set; }
 
-        [Browsable(false)]
-        [XmlIgnore]
-        public SoilbaseDB SoilbaseDB
-        {
-            get
-            {
-                if (SoildatabaseName == null || !File.Exists(SoildatabaseName))
-                {
-                    throw new DikeException(String.Format("The soil database '{0}' cannot be found", SoildatabaseName));
-                }
-                return SoilbaseDB.Create(SoildatabaseName);
-            }
-        }
 
-        [Browsable(false)]
         public string MapForSoilGeometries2D
         {
             get
@@ -1026,7 +829,6 @@
             }
         }
 
-        [Browsable(false)]
         public virtual IList<Gauge> Gauges
         {
             get
@@ -1039,7 +841,6 @@
             }
         }
 
-        [Browsable(false)]
         public virtual IList<GaugePLLine> GaugePLLines
         {
             get
@@ -1052,7 +853,6 @@
             }
         }
 
-        [Browsable(false)]
         public bool UsesGauges
         {
             get
@@ -1061,12 +861,8 @@
             }
         }
 
-        [Browsable(false)]
         public double GaugeMissVal { get; set; }
         
-        [Label("Redesign dike height")]
-        [PropertyOrder(7, 1)]
-        [Category(DesignCategory)]
         public bool RedesignDikeHeight
         {
             get
@@ -1075,15 +871,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "RedesignDikeHeight");
-                redesignDikeHeight = value;
-                DataEventPublisher.AfterChange(this, "RedesignDikeHeight");
+                redesignDikeHeight = value;                
             }
         }
 
-        [Label("Redesign dike shoulder")]
-        [PropertyOrder(7, 2)]
-        [Category(DesignCategory)]
         public bool RedesignDikeShoulder
         {
             get
@@ -1092,15 +883,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "RedesignDikeShoulder");
-                redesignDikeShoulder = value;
-                DataEventPublisher.AfterChange(this, "RedesignDikeShoulder");
+                redesignDikeShoulder = value;                
             }
         }
 
-        [Label("Stability design method")]
-        [PropertyOrder(7, 3)]
-        [Category(DesignCategory)]
         public StabilityDesignMethod StabilityDesignMethod
         {
             get
@@ -1109,16 +895,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "StabilityDesignMethod");
-                stabilityDesignMethod = value;
-                DataEventPublisher.AfterChange(this, "StabilityDesignMethod");
+                stabilityDesignMethod = value;                
             }
         }
 
-        [Label("Start value for design of slope")]
-        [PropertyOrder(7, 4)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double SlopeAdaptionStartCotangent
         {
             get
@@ -1127,16 +907,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "SlopeAdaptionStartCotangent");
-                slopeAdaptionStartCotangent = value;
-                DataEventPublisher.AfterChange(this, "SlopeAdaptionStartCotangent");
+                slopeAdaptionStartCotangent = value;                
             }
         }
 
-        [Label("End value for design of slope")]
-        [PropertyOrder(7, 5)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double SlopeAdaptionEndCotangent
         {
             get
@@ -1145,16 +919,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "SlopeAdaptionEndCotangent");
-                slopeAdaptionEndCotangent = value;
-                DataEventPublisher.AfterChange(this, "SlopeAdaptionEndCotangent");
+                slopeAdaptionEndCotangent = value;                
             }
         }
 
-        [Label("Step value for design of slope")]
-        [PropertyOrder(7, 6)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double SlopeAdaptionStepCotangent
         {
             get
@@ -1163,16 +931,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "SlopeAdaptionStepCotangent");
-                slopeAdaptionStepCotangent = value;
-                DataEventPublisher.AfterChange(this, "SlopeAdaptionStepCotangent");
+                slopeAdaptionStepCotangent = value;                
             }
         }
 
-        [Description("Use the value for new width of dike top")]
-        [PropertyOrder(7, 7)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewDikeTopWidth
         {
             get
@@ -1181,16 +943,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewDikeTopWidth");
-                useNewDikeTopWidth = value;
-                DataEventPublisher.AfterChange(this, "UseNewDikeTopWidth");
+                useNewDikeTopWidth = value;                
             }
         }
 
-        [Description("Value for new width of dike top")]
-        [PropertyOrder(7, 8)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewDikeTopWidth
         {
             get
@@ -1199,16 +955,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewDikeTopWidth");
-                newDikeTopWidth = value;
-                DataEventPublisher.AfterChange(this, "NewDikeTopWidth");
+                newDikeTopWidth = value;                
             }
         }
 
-        [Description("Use the value for new angle of the inside slope")]
-        [PropertyOrder(7, 9)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewDikeSlopeInside
         {
             get
@@ -1217,16 +967,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewDikeSlopeInside");
-                useNewDikeSlopeInside = value;
-                DataEventPublisher.AfterChange(this, "UseNewDikeSlopeInside");
+                useNewDikeSlopeInside = value;                
             }
         }
 
-        [Description("Value for new angle of the inside slope")]
-        [PropertyOrder(7, 10)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewDikeSlopeInside
         {
             get
@@ -1235,16 +979,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewDikeSlopeInside");
-                newDikeSlopeInside = value;
-                DataEventPublisher.AfterChange(this, "NewDikeSlopeInside");
+                newDikeSlopeInside = value;                
             }
         }
 
-        [Description("Use the value for new angle of the outside slope")]
-        [PropertyOrder(7, 11)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewDikeSlopeOutside
         {
             get
@@ -1253,16 +991,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewDikeSlopeOutside");
-                useNewDikeSlopeOutside = value;
-                DataEventPublisher.AfterChange(this, "UseNewDikeSlopeOutside");
+                useNewDikeSlopeOutside = value;                
             }
         }
 
-        [Description("Value for new angle of the outside slope")]
-        [PropertyOrder(7, 12)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewDikeSlopeOutside
         {
             get
@@ -1271,16 +1003,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewDikeSlopeOutside");
-                newDikeSlopeOutside = value;
-                DataEventPublisher.AfterChange(this, "NewDikeSlopeOutside");
+                newDikeSlopeOutside = value;                
             }
         }
 
-        [Description("Use the value for new angle of the top slope of shoulder")]
-        [PropertyOrder(7, 13)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewShoulderTopSlope
         {
             get
@@ -1289,16 +1015,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewShoulderTopSlope");
-                useNewShoulderTopSlope = value;
-                DataEventPublisher.AfterChange(this, "UseNewShoulderTopSlope");
+                useNewShoulderTopSlope = value;                
             }
         }
 
-        [Description("Value for new angle of the top slope of shoulder")]
-        [PropertyOrder(7, 14)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewShoulderTopSlope
         {
             get
@@ -1307,16 +1027,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewShoulderTopSlope");
-                newShoulderTopSlope = value;
-                DataEventPublisher.AfterChange(this, "NewShoulderTopSlope");
+                newShoulderTopSlope = value;                
             }
         }
 
-        [Description("Use the value for new angle of the base slope of shoulder")]
-        [PropertyOrder(7, 15)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewShoulderBaseSlope
         {
             get
@@ -1325,16 +1039,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewShoulderBaseSlope");
-                useNewShoulderBaseSlope = value;
-                DataEventPublisher.AfterChange(this, "UseNewShoulderBaseSlope");
+                useNewShoulderBaseSlope = value;                
             }
         }
 
-        [Description("Value for new angle of the base slope of shoulder")]
-        [PropertyOrder(7, 16)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewShoulderBaseSlope
         {
             get
@@ -1343,16 +1051,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewShoulderBaseSlope");
-                newShoulderBaseSlope = value;
-                DataEventPublisher.AfterChange(this, "NewShoulderBaseSlope");
+                newShoulderBaseSlope = value;                
             }
         }
 
-        [Label("Use the value for new allowed height of shoulder as fraction of dike height")]
-        [PropertyOrder(7, 17)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewMaxHeightShoulderAsFraction
         {
             get
@@ -1361,16 +1063,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewMaxHeightShoulderAsFraction");
-                useNewMaxHeightShoulderAsFraction = value;
-                DataEventPublisher.AfterChange(this, "UseNewMaxHeightShoulderAsFraction");
+                useNewMaxHeightShoulderAsFraction = value;                
             }
         }
 
-        [Description("Value for new allowed height of shoulder as fraction of dike height")]
-        [PropertyOrder(7, 18)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewMaxHeightShoulderAsFraction
         {
             get
@@ -1379,16 +1075,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewMaxHeightShoulderAsFraction");
-                newMaxHeightShoulderAsFraction = value;
-                DataEventPublisher.AfterChange(this, "NewMaxHeightShoulderAsFraction");
+                newMaxHeightShoulderAsFraction = value;                
             }
         }
 
-        [Description("Use the value for new minimum distance dike toe - start ditch")]
-        [PropertyOrder(7, 19)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewMinDistanceDikeToeStartDitch
         {
             get
@@ -1397,16 +1087,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewMinDistanceDikeToeStartDitch");
                 useNewMinDistanceDikeToeStartDitch = value;
-                DataEventPublisher.AfterChange(this, "UseNewMinDistanceDikeToeStartDitch");
             }
         }
 
-        [Description("Value for new minimum distance dike toe - start ditch")]
-        [PropertyOrder(7, 20)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewMinDistanceDikeToeStartDitch
         {
             get
@@ -1415,16 +1099,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewMinDistanceDikeToeStartDitch");
-                newMinDistanceDikeToeStartDitch = value;
-                DataEventPublisher.AfterChange(this, "NewMinDistanceDikeToeStartDitch");
+                newMinDistanceDikeToeStartDitch = value;                
             }
         }
 
-        [Description("Use the values for new ditch definition")]
-        [PropertyOrder(7, 21)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public bool UseNewDitchDefinition
         {
             get
@@ -1433,16 +1111,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "UseNewDitchDefinition");
-                useNewDitchDefinition = value;
-                DataEventPublisher.AfterChange(this, "UseNewDitchDefinition");
+                useNewDitchDefinition = value;                
             }
         }
 
-        [Description("Value for new width of ditch bottom")]
-        [PropertyOrder(7, 22)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewWidthDitchBottom
         {
             get
@@ -1451,16 +1123,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewWidthDitchBottom");
-                newWidthDitchBottom = value;
-                DataEventPublisher.AfterChange(this, "NewWidthDitchBottom");
+                newWidthDitchBottom = value;                
             }
         }
 
-        [Description("Value for new angle of ditch slopes")]
-        [PropertyOrder(7, 23)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewSlopeAngleDitch
         {
             get
@@ -1469,16 +1135,11 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "newSlopeAngleDitch");
                 newSlopeAngleDitch = value;
-                DataEventPublisher.AfterChange(this, "newSlopeAngleDitch");
+                
             }
         }
 
-        [Description("Value for new depth of ditch bottom")]
-        [PropertyOrder(7, 24)]
-        [Format("F2")]
-        [Category(DesignCategory)]
         public double NewDepthDitch
         {
             get
@@ -1487,13 +1148,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "NewDepthDitch");
-                newDepthDitch = value;
-                DataEventPublisher.AfterChange(this, "NewDepthDitch");
+                newDepthDitch = value;                
             }
         }
 
-        [ReadOnly(true)]
         [Validate]
         public List<Scenario> Scenarios
         {
@@ -1503,7 +1161,6 @@
             }
         }
 
-        [Browsable(false)]
         [XmlIgnore]
         public static DamProjectType DamProjectType
         {
@@ -1519,10 +1176,6 @@
 
         #region IGeographic Members
 
-        [Label("Zone type")]
-        [Description("Type of zone to be used in stability calculations")]
-        [PropertyOrder(4, 10)]
-        [Category(AllCategory)]
         public MStabZonesType StabilityZoneType
         {
             get
@@ -1531,20 +1184,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "StabilityZoneType");
-                stabilityZoneType = value;
-                DataEventPublisher.AfterChange(this, "StabilityZoneType");
+                stabilityZoneType = value;                
             }
         }
 
-        [Label("Forbidden Zone Factor")]
-        [Description("Factor of zone to be used in stability calculations")]
-        [Format("F2")]
-        [Unit(UnitType.None)]
-        [Minimum(0.0)]
-        [Maximum(1.0)]
-        [PropertyOrder(4, 11)]
-        [Category(AllCategory)]
         public double ForbiddenZoneFactor
         {
             get
@@ -1553,19 +1196,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "ForbiddenZoneFactor");
-                forbiddenZoneFactor = value;
-                DataEventPublisher.AfterChange(this, "ForbiddenZoneFactor");
+                forbiddenZoneFactor = value;                
             }
         }
 
-        [Label("Zone Area Rest Slope Crest Width")]
-        [Description("Zone Area Rest Slope Crest Width")]
-        [Format("F2")]
-        [Unit(UnitType.Length)]
-        [Minimum(0.1)]
-        [PropertyOrder(4, 12)]
-        [Category(AllCategory)]
         public double ZoneAreaRestSlopeCrestWidth
         {
             get
@@ -1574,14 +1208,11 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "ZoneAreaRestSlopeCrestWidth");
-                zoneAreaRestSlopeCrestWidth = value;
-                DataEventPublisher.AfterChange(this, "ZoneAreaRestSlopeCrestWidth");
+                zoneAreaRestSlopeCrestWidth = value;                
             }
         }
 
         [XmlIgnore]
-        [Browsable(false)]
         public double X
         {
             get
@@ -1595,7 +1226,6 @@
         }
 
         [XmlIgnore]
-        [Browsable(false)]
         public double Y
         {
             get
@@ -1641,9 +1271,8 @@
                         {
                             return new[]
                             {
-                                new ValidationResult(ValidationResultType.Error,
-                                                     LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesScenario"),
-                                                     scenario, "StabilityZoneType", "ZoneTypeSafety", null)
+                                new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(
+                                    this, "NoRequiredSafetyForZonesScenario"), scenario)
                             };
                         }
                     }
@@ -1654,9 +1283,8 @@
                     {
                         return new[]
                         {
-                            new ValidationResult(ValidationResultType.Error,
-                                                 LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZones"),
-                                                 this, "StabilityZoneType", "ZoneTypeSafety", (IRepairer) this)
+                            new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(
+                                this, "NoRequiredSafetyForZones"), this)
                         };
                     }
                 }
@@ -1671,9 +1299,8 @@
             {
                 return new[]
                 {
-                    new ValidationResult(ValidationResultType.Error,
-                                         LocalizationManager.GetTranslatedText(this, "NoDikeEmbankmentMaterial"),
-                                         this)
+                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(
+                        this, "NoDikeEmbankmentMaterial"), this)
                 };
             }
             else
@@ -1691,8 +1318,9 @@
                 {
                     return new[]
                     {
-                        new ValidationResult(ValidationResultType.Error,
-                                             String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), newDikeTopWidthMinValue), this, "NewDikeTopWidth", "AssignMinValue", this)
+                        new ValidationResult(ValidationResultType.Error, String.Format(
+                            LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), 
+                            newDikeTopWidthMinValue), this)
                     };
                 }
             }
@@ -1708,8 +1336,9 @@
                 {
                     return new[]
                     {
-                        new ValidationResult(ValidationResultType.Error,
-                                             String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), newDikeSlopeInsideMinValue), this, "NewDikeSlopeInside", "AssignMinValue", this)
+                        new ValidationResult(ValidationResultType.Error, String.Format(
+                            LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), 
+                            newDikeSlopeInsideMinValue), this)
                     };
                 }
             }
@@ -1726,8 +1355,9 @@
                 {
                     return new[]
                     {
-                        new ValidationResult(ValidationResultType.Error,
-                                             String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), newDikeSlopeOutsideMinValue), this, "NewDikeSlopeOutside", "AssignMinValue", this)
+                        new ValidationResult(ValidationResultType.Error, String.Format(LocalizationManager.
+                        GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), 
+                        newDikeSlopeOutsideMinValue), this)
                     };
                 }
             }
@@ -1751,7 +1381,9 @@
                     {
                         return new[]
                         {
-                            new ValidationResult(ValidationResultType.Error, String.Format(LocalizationManager.GetTranslatedText(this, "UseOfPenetrationLengthError"), penetrationLenghtMinValue), this, "PenetrationLength", "AssignMinValue", this)
+                            new ValidationResult(ValidationResultType.Error, String.Format(
+                                LocalizationManager.GetTranslatedText(this, "UseOfPenetrationLengthError"), 
+                                penetrationLenghtMinValue), this)
                         };
                     }
                 }
@@ -1766,7 +1398,8 @@
             {
                 return new[]
                 {
-                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "NewDikeTopWidth"), this)
+                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(
+                        this, "NewDikeTopWidth"), this)
                 };
             }
             else
@@ -1871,7 +1504,7 @@
                         {
                             new ValidationResult(ValidationResultType.Error,
                                                  LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooSmall"),
-                                                 this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMinValue", (IRepairer) this)
+                                                 this)
                         };
                 }
                 if (PlLineOffsetFactorBelowShoulderCrest.Value > DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue)
@@ -1880,7 +1513,7 @@
                         {
                             new ValidationResult(ValidationResultType.Error,
                                                  LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooLarge"),
-                                                 this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMaxValue", (IRepairer) this)
+                                                 this)
                         };
                 }
             }
@@ -1929,10 +1562,6 @@
 
         #region Design parameters
 
-        [Label("Dike emb. material")]
-        [Description("Dike embankment material")]
-        [Category(AllCategory)]
-        [PropertyOrder(5, 1)]
         public virtual string DikeEmbankmentMaterial
         {
             get
@@ -1941,16 +1570,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DikeEmbankmentMaterial");
-                dikeEmbankmentMaterial = value;
-                DataEventPublisher.AfterChange(this, "DikeEmbankmentMaterial");
+                dikeEmbankmentMaterial = value;                
             }
         }
 
-        [Label("Shoulder emb. material")]
-        [Description("Shoulder embankment material")]
-        [Category(DesignCategory)]
-        [PropertyOrder(5, 2)]
         public virtual string ShoulderEmbankmentMaterial
         {
             get
@@ -1959,18 +1582,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "ShoulderEmbankmentMaterial");
-                shoulderEmbankmentMaterial = value;
-                DataEventPublisher.AfterChange(this, "ShoulderEmbankmentMaterial");
+                shoulderEmbankmentMaterial = value;                
             }
         }
 
-        [Unit(UnitType.None)]
-        [Label("Shoulder growth slope")]
-        [Description("Shoulder growth slope for stability design")]
-        [Format("F4")]
-        [Category(DesignCategory)]
-        [PropertyOrder(5, 3)]
         public virtual double StabilityShoulderGrowSlope
         {
             get
@@ -1979,18 +1594,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "StabilityShoulderGrowSlope");
-                stabilityShoulderGrowSlope = value;
-                DataEventPublisher.AfterChange(this, "StabilityShoulderGrowSlope");
+                stabilityShoulderGrowSlope = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Shoulder growth delta X")]
-        [Description("Shoulder growth delta X for stability design")]
-        [Format("F2")]
-        [Category(DesignCategory)]
-        [PropertyOrder(5, 4)]
         public virtual double StabilityShoulderGrowDeltaX
         {
             get
@@ -1999,19 +1606,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "StabilityShoulderGrowDeltaX");
-                stabilityShoulderGrowDeltaX = value
-                    ;
-                DataEventPublisher.AfterChange(this, "StabilityShoulderGrowDeltaX");
+                stabilityShoulderGrowDeltaX = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Slope adaption delta X")]
-        [Description("Slope adaption delta X for stability design")]
-        [Format("F2")]
-        [Category(DesignCategory)]
-        [PropertyOrder(5, 5)]
         public virtual double StabilitySlopeAdaptionDeltaX
         {
             get
@@ -2020,9 +1618,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "StabilitySlopeAdaptionDeltaX");
-                stabilitySlopeAdaptionDeltaX = value;
-                DataEventPublisher.AfterChange(this, "StabilitySlopeAdaptionDeltaX");
+                stabilitySlopeAdaptionDeltaX = value;                
             }
         }
 
@@ -2036,12 +1632,6 @@
         /// <value>
         /// The pl line creation method.
         /// </value>
-        [Unit(UnitType.None)]
-        [Label("PL-Line creation")]
-        [Description("PL-Line creation method")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 1)]
         public virtual PLLineCreationMethod PLLineCreationMethod
         {
             get
@@ -2050,9 +1640,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PLLineCreationMethod");
-                pLLineCreationMethod = value;
-                DataEventPublisher.AfterChange(this, "PLLineCreationMethod");
+                pLLineCreationMethod = value;                
             }
         }
 
@@ -2062,13 +1650,6 @@
         /// <value>
         /// The head pl 2.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("Head PL2")]
-        [Description("Head level for PL2")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 8)]
-        [Clearable]
         public virtual double? HeadPL2
         {
             get
@@ -2077,9 +1658,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "HeadPL2");
-                headPL2 = value;
-                DataEventPublisher.AfterChange(this, "HeadPL2");
+                headPL2 = value;                
             }
         }
 
@@ -2089,14 +1668,6 @@
         /// <value>
         /// The head PL3.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("Head PL3")]
-        [Description("Head level for PL3")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 9)]
-        [Clearable]
-        [XmlOldName("HeadPL3")]
         public virtual double? HeadPl3
         {
             get
@@ -2105,9 +1676,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "HeadPl3");
-                headPL3 = value;
-                DataEventPublisher.AfterChange(this, "HeadPl3");
+                headPL3 = value;                
             }
         }
 
@@ -2117,14 +1686,6 @@
         /// <value>
         /// The head PL4.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("Head PL4")]
-        [Description("Head level for PL4")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 10)]
-        [Clearable]
-        [XmlOldName("HeadPL4")]
         public virtual double? HeadPl4
         {
             get
@@ -2133,9 +1694,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "HeadPl4");
-                headPL4 = value;
-                DataEventPublisher.AfterChange(this, "HeadPl4");
+                headPL4 = value;                
             }
         }
 
@@ -2145,14 +1704,6 @@
         /// <value>
         /// The damping factor pl 3.
         /// </value>
-        [Unit(UnitType.None)]
-        [Label("Damping factor PL3")]
-        [Description("Damping factor PL3")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 11)]
-        [Minimum(0.0)]
-        [Maximum(1.0)]
         public virtual double DampingFactorPL3
         {
             get
@@ -2161,9 +1712,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DampingFactorPL3");
-                dampingFactorPL3 = value;
-                DataEventPublisher.AfterChange(this, "DampingFactorPL3");
+                dampingFactorPL3 = value;                
             }
         }
 
@@ -2173,14 +1722,6 @@
         /// <value>
         /// The damping factor pl 4.
         /// </value>
-        [Unit(UnitType.None)]
-        [Label("Damping factor PL4")]
-        [Description("Damping factor PL4")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 12)]
-        [Minimum(0.0)]
-        [Maximum(1.0)]
         public virtual double DampingFactorPL4
         {
             get
@@ -2189,9 +1730,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "DampingFactorPL4");
-                dampingFactorPL4 = value;
-                DataEventPublisher.AfterChange(this, "DampingFactorPL4");
+                dampingFactorPL4 = value;                
             }
         }
 
@@ -2201,13 +1740,6 @@
         /// <value>
         /// The length of the penetration.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("Penetration length")]
-        [Description("Penetration Length (for PL4)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [Minimum(0.0)]
-        [PropertyOrder(2, 13)]
         public virtual double PenetrationLength
         {
             get
@@ -2216,9 +1748,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PenetrationLength");
-                penetrationLength = value;
-                DataEventPublisher.AfterChange(this, "PenetrationLength");
+                penetrationLength = value;                
             }
         }
 
@@ -2228,13 +1758,6 @@
         /// <value>
         /// The pl line offset below dike top at river.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below top dike (river)")]
-        [Description("PL1 below top dike (riverside)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 2)]
-        [XmlOldName("PLLineOffsetBelowDikeTopAtRiver")]
         public virtual double PlLineOffsetBelowDikeTopAtRiver
         {
             get
@@ -2243,9 +1766,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowDikeTopAtRiver");
-                pLLineOffsetBelowDikeTopAtRiver = value;
-                DataEventPublisher.AfterChange(this, "PlLineOffsetBelowDikeTopAtRiver");
+                pLLineOffsetBelowDikeTopAtRiver = value;                
             }
         }
 
@@ -2255,13 +1776,6 @@
         /// <value>
         /// The pl line offset below dike top at polder.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below top dike (polder)")]
-        [Description("PL1 below top dike (polderside)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 3)]
-        [XmlOldName("PLLineOffsetBelowDikeTopAtPolder")]
         public virtual double PlLineOffsetBelowDikeTopAtPolder
         {
             get
@@ -2270,9 +1784,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowDikeTopAtPolder");
-                pLLineOffsetBelowDikeTopAtPolder = value;
-                DataEventPublisher.AfterChange(this, "PlLineOffsetBelowDikeTopAtPolder");
+                pLLineOffsetBelowDikeTopAtPolder = value;                
             }
         }
 
@@ -2282,13 +1794,6 @@
         /// <value>
         /// The pl line offset below shoulder base inside.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below shoulder base (polder)")]
-        [Description("PL1 below shoulder base (polderside)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 4)]
-        [XmlOldName("PLLineOffsetBelowShoulderBaseInside")]
         public virtual double PlLineOffsetBelowShoulderBaseInside
         {
             get
@@ -2297,9 +1802,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowShoulderBaseInside");
-                pLLineOffsetBelowShoulderBaseInside = value;
-                DataEventPublisher.AfterChange(this, "PlLineOffsetBelowShoulderBaseInside");
+                pLLineOffsetBelowShoulderBaseInside = value;                
             }
         }
 
@@ -2309,13 +1812,6 @@
         /// <value>
         /// The pl line offset below dike toe at polder.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below toe of dike (polder)")]
-        [Description("PL1 below toe of dike (polderside)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 5)]
-        [XmlOldName("PLLineOffsetBelowDikeToeAtPolder")]
         public virtual double PlLineOffsetBelowDikeToeAtPolder
         {
             get
@@ -2324,9 +1820,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowDikeToeAtPolder");
-                pLLineOffsetBelowDikeToeAtPolder = value;
-                DataEventPublisher.AfterChange(this, "PlLineOffsetBelowDikeToeAtPolder");
+                pLLineOffsetBelowDikeToeAtPolder = value;                
             }
         }
 
@@ -2336,12 +1830,6 @@
         /// <value>
         /// The pl line offset dry below dike top at river.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below top dike (river) in dry situation")]
-        [Description("PL1 below top dike (riverside) in dry situation")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 6)]
         public virtual double PLLineOffsetDryBelowDikeTopAtRiver
         {
             get
@@ -2350,9 +1838,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PLLineOffsetDryBelowDikeTopAtRiver");
-                pLLineOffsetDryBelowDikeTopAtRiver = value;
-                DataEventPublisher.AfterChange(this, "PLLineOffsetDryBelowDikeTopAtRiver");
+                pLLineOffsetDryBelowDikeTopAtRiver = value;                
             }
         }
 
@@ -2362,12 +1848,6 @@
         /// <value>
         /// The pl line offset dry below dike top at polder.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below top dike (polder) in dry situation")]
-        [Description("PL1 below top dike (polderside) in dry situation")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 7)]
         public virtual double PLLineOffsetDryBelowDikeTopAtPolder
         {
             get
@@ -2376,9 +1856,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PLLineOffsetDryBelowDikeTopAtPolder");
-                pLLineOffsetDryBelowDikeTopAtPolder = value;
-                DataEventPublisher.AfterChange(this, "PLLineOffsetDryBelowDikeTopAtPolder");
+                pLLineOffsetDryBelowDikeTopAtPolder = value;                
             }
         }
 
@@ -2388,12 +1866,6 @@
         /// <value>
         /// The pl line offset dry below shoulder base inside.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below shoulder base (polder) in dry situation")]
-        [Description("PL1 below shoulder base (polderside) in dry situation")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 8)]
         public virtual double PLLineOffsetDryBelowShoulderBaseInside
         {
             get
@@ -2402,9 +1874,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PLLineOffsetDryBelowShoulderBaseInside");
-                pLLineOffsetDryBelowShoulderBaseInside = value;
-                DataEventPublisher.AfterChange(this, "PLLineOffsetDryBelowShoulderBaseInside");
+                pLLineOffsetDryBelowShoulderBaseInside = value;                
             }
         }
 
@@ -2414,12 +1884,6 @@
         /// <value>
         /// The pl line offset dry below dike toe at polder.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Label("PL1 below toe of dike (polder) in dry situation")]
-        [Description("PL1 below toe of dike (polderside) in dry situation")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 9)]
         public virtual double PLLineOffsetDryBelowDikeToeAtPolder
         {
             get
@@ -2428,9 +1892,7 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PLLineOffsetDryBelowDikeToeAtPolder");
-                pLLineOffsetDryBelowDikeToeAtPolder = value;
-                DataEventPublisher.AfterChange(this, "PLLineOffsetDryBelowDikeToeAtPolder");
+                pLLineOffsetDryBelowDikeToeAtPolder = value;                
             }
         }
 
@@ -2440,10 +1902,6 @@
         /// <value>
         /// The use pl line offset below dike crest middle.
         /// </value>
-        [Unit(UnitType.None)]
-        [Category(WaterCategory)]
-        [Clearable]
-        [PropertyOrder(3, 10)]
         public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; }
 
         /// <summary>
@@ -2452,18 +1910,12 @@
         /// <value>
         /// The pl line offset below dike crest middle.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Format("F2")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 11)]
         public double? PlLineOffsetBelowDikeCrestMiddle
         {
             get { return plLineOffsetBelowDikeCrestMiddle; }
             set
             {
-                DataEventPublisher.BeforeChange(this, x => x.PlLineOffsetBelowDikeCrestMiddle);
-                plLineOffsetBelowDikeCrestMiddle = value;
-                DataEventPublisher.AfterChange(this, x => x.PlLineOffsetBelowDikeCrestMiddle);
+                plLineOffsetBelowDikeCrestMiddle = value;                
             }
         }
 
@@ -2473,10 +1925,6 @@
         /// <value>
         /// The use pl line offset factor below shoulder crest.
         /// </value>
-        [Unit(UnitType.None)]
-        [Category(WaterCategory)]
-        [Clearable]
-        [PropertyOrder(3, 12)]
         public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; }
 
         /// <summary>
@@ -2485,18 +1933,12 @@
         /// <value>
         /// The pl line offset factor below shoulder crest.
         /// </value>
-        [Unit(UnitType.Fractions)]
-        [Format("F2")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 13)]
         public double? PlLineOffsetFactorBelowShoulderCrest 
         {
             get { return plLineOffsetFactorBelowShoulderCrest; }
             set
             {
-                DataEventPublisher.BeforeChange(this, x => x.PlLineOffsetFactorBelowShoulderCrest);
-                plLineOffsetFactorBelowShoulderCrest = value;
-                DataEventPublisher.AfterChange(this, x => x.PlLineOffsetFactorBelowShoulderCrest);
+                plLineOffsetFactorBelowShoulderCrest = value;                
             } 
         }
 
@@ -2506,10 +1948,6 @@
         /// <value>
         /// The use pl line offset dry below dike crest middle.
         /// </value>
-        [Unit(UnitType.None)]
-        [Category(WaterCategory)]
-        [Clearable]
-        [PropertyOrder(3, 14)]
         public bool? UsePlLineOffsetDryBelowDikeCrestMiddle { get; set; }
 
         /// <summary>
@@ -2518,18 +1956,12 @@
         /// <value>
         /// The pl line offset dry below dike crest middle.
         /// </value>
-        [Unit(UnitType.Length)]
-        [Format("F2")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 15)]
         public double? PlLineOffsetDryBelowDikeCrestMiddle
         {
             get { return plLineOffsetDryBelowDikeCrestMiddle; }
             set
             {
-                DataEventPublisher.BeforeChange(this, x => x.PlLineOffsetDryBelowDikeCrestMiddle);
-                plLineOffsetDryBelowDikeCrestMiddle = value;
-                DataEventPublisher.AfterChange(this, x => x.PlLineOffsetDryBelowDikeCrestMiddle);
+                plLineOffsetDryBelowDikeCrestMiddle = value;                
             }
         }
 
@@ -2539,10 +1971,6 @@
         /// <value>
         /// The use pl line offset dry factor below shoulder crest.
         /// </value>
-        [Unit(UnitType.None)]
-        [Category(WaterCategory)]
-        [Clearable]
-        [PropertyOrder(3, 16)]
         public bool? UsePlLineOffsetDryFactorBelowShoulderCrest { get; set; }
 
         /// <summary>
@@ -2551,18 +1979,12 @@
         /// <value>
         /// The pl line offset dry factor below shoulder crest.
         /// </value>
-        [Unit(UnitType.Fractions)]
-        [Format("F2")]
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 17)]
         public double? PlLineOffsetDryFactorBelowShoulderCrest
         {
             get { return plLineOffsetDryFactorBelowShoulderCrest; }
             set
             {
-                DataEventPublisher.BeforeChange(this, x => x.PlLineOffsetDryFactorBelowShoulderCrest);
-                plLineOffsetDryFactorBelowShoulderCrest = value;
-                DataEventPublisher.AfterChange(this, x => x.PlLineOffsetDryFactorBelowShoulderCrest);
+                plLineOffsetDryFactorBelowShoulderCrest = value;                
             }
         }
 
@@ -2572,29 +1994,18 @@
         /// <value>
         /// The intrusion vertical water pressure.
         /// </value>
-        [Category(WaterCategory)]
-        [PropertyOrder(3, 18)]
         public IntrusionVerticalWaterPressureType? IntrusionVerticalWaterPressure
         {
             get { return intrusionVerticalWaterPressure; }
             set
             {
-                DataEventPublisher.BeforeChange(this, x => x.IntrusionVerticalWaterPressure);
-                intrusionVerticalWaterPressure = value;
-                DataEventPublisher.AfterChange(this, x => x.IntrusionVerticalWaterPressure);
+                intrusionVerticalWaterPressure = value;                
             }
         }
         #endregion
 
         #region Waterlevels
 
-        [Unit(UnitType.Length)]
-        [Label("BP-TP")]
-        [Description("Normative storage basin level")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 1)]
-        [XmlOldName("BoezemLevelNormative")]
         public virtual double BoezemLevelTp
         {
             get
@@ -2603,19 +2014,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "BoezemLevelTp");
-                boezemLevelTp = value;
-                DataEventPublisher.AfterChange(this, "BoezemLevelTp");
+                boezemLevelTp = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("BP-HBP")]
-        [Description("High storage basin water level (exceedance probability 1/yr)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 2)]
-        [XmlOldName("BoezemLevelGws")]
         public virtual double BoezemLevelHbp
         {
             get
@@ -2624,19 +2026,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "BoezemLevelHbp");
-                boezemLevelHbp = value;
-                DataEventPublisher.AfterChange(this, "BoezemLevelHbp");
+                boezemLevelHbp = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("BP-LBP")]
-        [Description("Low storage basin water level")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 3)]
-        [XmlOldName("BoezemLevelGlw")]
         public virtual double BoezemLevelLbp
         {
             get
@@ -2645,18 +2038,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "BoezemLevelLbp");
-                boezemLevelLbp = value;
-                DataEventPublisher.AfterChange(this, "BoezemLevelLbp");
+                boezemLevelLbp = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Polder level")]
-        [Description("Water level in polder")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 4)]
         public virtual double PolderLevel
         {
             get
@@ -2665,18 +2050,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PolderLevel");
-                polderLevel = value;
-                DataEventPublisher.AfterChange(this, "PolderLevel");
+                polderLevel = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("Polder level low")]
-        [Description("Water level in polder (summer)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 5)]
         public virtual double PolderLevelLow
         {
             get
@@ -2685,18 +2062,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "PolderLevelLow");
-                polderLevelLow = value;
-                DataEventPublisher.AfterChange(this, "PolderLevelLow");
+                polderLevelLow = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("River level")]
-        [Description("Water level in river")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 6)]
         public virtual double RiverLevel
         {
             get
@@ -2705,35 +2074,10 @@
             }
             set
             {
-                DataEventPublisher.BeforeChange(this, "RiverLevel");
-                scenarioRiverLevel = value;
-                DataEventPublisher.AfterChange(this, "RiverLevel");
+                scenarioRiverLevel = value;                
             }
         }
 
-        [Unit(UnitType.Length)]
-        [Label("River level low")]
-        [Description("Water level in river (summer)")]
-        [Format("F3")]
-        [Category(WaterCategory)]
-        [PropertyOrder(2, 7)]
-        [Clearable]
-        [Browsable(false)]
-        [Obsolete]
-        public virtual double? ScenarioRiverLevelLow
-        {
-            get
-            {
-                return scenarioRiverLevelLow;
-            }
-            set
-            {
-                DataEventPublisher.BeforeChange(this, "ScenarioRiverLevelLow");
-                scenarioRiverLevelLow = value;
-                DataEventPublisher.AfterChange(this, "ScenarioRiverLevelLow");
-            }
-        }
-
         #endregion
 
         /// <summary>
@@ -2956,12 +2300,6 @@
             }
         }
 
-        public void AddNewSensorData()
-        {
-            var factory = new SensorFactory();
-            SensorData = factory.CreateSensorLocation(this);
-        }
-
         [Validate]
         public ValidationResult[] AscendingLocalXZSurfaceLine()
         {
@@ -3014,10 +2352,10 @@
         /// <returns>The soil profile</returns>
         public SoilProfile1D GetMostProbableProfile(FailureMechanismSystemType? segmentFailureMechanismType)
         {
-            if (Segment == null)
-            {
-                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
-            }
+//            if (Segment == null)
+//            {
+//                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+//            }
 
             return Segment.GetMostProbableProfile(segmentFailureMechanismType);
         }
@@ -3029,20 +2367,20 @@
         /// <returns>The soil profile</returns>
         public string GetMostProbableGeometry2DName(FailureMechanismSystemType? segmentFailureMechanismType)
         {
-            if (Segment == null)
-            {
-                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
-            }
+//            if (Segment == null)
+//            {
+//                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+//            }
 
             return Segment.GetMostProbableGeometry2DName(segmentFailureMechanismType);
         }
 
         public double? GetSoilProfileProbability(SoilProfile1D soilProfile, FailureMechanismSystemType? segmentFailureMechanismType)
         {
-            if (Segment == null)
-            {
-                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
-            }
+//            if (Segment == null)
+//            {
+//                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+//            }
 
             return Segment.GetSoilProfileProbability(soilProfile, segmentFailureMechanismType);
         }
@@ -3862,63 +3200,6 @@
                 return LocalizationManager.GetTranslatedText(this, "AssignMaxValue");
             }
             return "";
-        }
-
-        #region Backwards compatibility
-
-        private SurfaceLine surfaceLine;
-
-        [Obsolete("Do not use this property; Only exists for backwards compatibility.", true)]
-        [Browsable(false)]
-        public virtual SurfaceLine LocalXZSurfaceLine
-        {
-            get
-            {
-                return null;
-            }
-            set
-            {
-                // Convert persisted 'old style surfaceline' into the new format, and discard the old one.
-                LocalXZSurfaceLine2 = new OldSurfaceLineToNewConverter().Convert(value);
-                value.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the surface line 
-        /// </summary>
-        /// <remarks>Aggregate relationship from <see cref="Dike.SurfaceLines"/>.</remarks>
-        [Browsable(false)]
-        [Obsolete("Do not use this property; Exists only for backwards compatibility.", true)]
-        public virtual SurfaceLine SurfaceLine
-        {
-            get
-            {
-                return surfaceLine;
-            }
-            set
-            {
-                surfaceLine = value;
-            }
-        }
-
-        /// <summary>
-        /// Allows this location instance to update its <see cref="Location.SurfaceLine2"/>
-        /// property if an old-style surfaceline was persisted.
-        /// </summary>
-        /// <param name="otherSurfaceline">The potential replacement candidate for a persisted
-        /// old-style surfaceline.</param>
-        public void SetNewSurfaceLineIfMatchesWithOldPersistedSurfaceLine(SurfaceLine2 otherSurfaceline)
-        {
-            if (surfaceLine != null && Equals(otherSurfaceline.Name, surfaceLine.Name))
-            {
-                SurfaceLine2 = otherSurfaceline;
-
-                surfaceLine.Dispose();
-                surfaceLine = null;
-            }
-        }
-
-        #endregion
+        }        
     }
 }
\ No newline at end of file