Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r469 -r538
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 469)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 538)
@@ -70,12 +70,14 @@
             set;
         }
 
+        // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
         public static string MStabExePath
         {
             get;
             set;
         }
 
+        // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
         public static string SlopeWExePath
         {
             get;
@@ -432,6 +434,7 @@
             }
         }
 
+        // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
         public ProgramType ProgramType
         {
             // For now, only MStab (= default value) allowed so ReadOnly. Add setter when needed.
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs
===================================================================
diff -u -r452 -r538
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 538)
@@ -51,6 +51,7 @@
         AssessmentRegional,
         Operational,
         Design,
+        // TODO: NWO obsolete
         NWO
     }
 
@@ -60,6 +61,7 @@
         SlopeW
     };
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum StabilityKernelType
     {
         // The Classic models all use DGMStabDam.dll to generate a sti file from the input (so also pl-lines only)
@@ -85,6 +87,7 @@
     {
         NoAdaption,
         AdaptGeometry,
+        // TODO: NWO obsolete
         AdaptNWO
     };
 
@@ -103,6 +106,7 @@
         HorizontalBalance        
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum MStabModelType
     {
         Bishop,
@@ -117,6 +121,7 @@
         SpencerLow
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum PipingModelType
     {
         Bligh,
@@ -139,8 +144,9 @@
         SoilGeometry2D
     }
 
-    
 
+
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum MStabShearStrength
     {
         CPhi,
@@ -151,31 +157,36 @@
         Default
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum MStabSearchMethod
     {
         Grid,
         GeneticAlgorithm
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum MStabGridPosition
     {
         Left,
         Right
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum MStabZonesType
     {
         NoZones = 0,
         ZoneAreas = 1,
         ForbiddenZone = 2
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum NonWaterRetainingObjectCategory
     {
         Tree,
         Main
     };
 
+    // TODO: NWO obsolete
     public enum NonWaterRetainingObjectType
     {
         Oak,
@@ -191,6 +202,7 @@
         SlopeAdaptionBeforeShoulderAdaption
     }
 
+    // TODO: NWO obsolete
     public enum PhreaticAdaptionType //NWO
     {
         None,
@@ -214,37 +226,43 @@
         BeyondPLLine // indicates that point is outside the scope of the pl line.
     };
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum DikeDrySensitivity //RWScenarios
     {
         None,
         Dry
     }
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum HydraulicShortcutType //RWScenarios
     {
         HydraulicShortcut,
         NoHydraulicShortcut
     }
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum RWResultType //RWScenarios
     {
         ProbabilityOfFailure,
         SafetyFactor
     }
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum ResultEvaluation //RWScenarios
     {
         Accepted,
         Rejected,
         NotEvaluated
     }
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum LoadSituation //RWScenarios
     {
         Dry,
         Wet
     }
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum ScenarioType //RWScenarios
     {
         Scenario01 = 1,
@@ -260,6 +278,7 @@
         Scenario11 = 11
     }
 
+    // TODO: RW this is regional specific code and should be moved to its own class
     public enum SchematizationType //Schematizationfactor
     {
         MacroStabilityInnerSideWet,
@@ -269,20 +288,23 @@
         HorizontalBalanceDry
     }
 
+    // TODO: Operational. This is operational specific code and should be moved to its own class
     public enum DataSourceTypeSensors  //Sensors
     {
         Ignore,
         LocationData,
         Sensor
     }
 
+    // TODO: Operational. This is operational specific code and should be moved to its own class
     public enum SensorType  //Sensors
     {
         PiezometricHead,
         WaterLevel,
         PolderLevel
     }
 
+    // TODO: Operational. This is operational specific code and should be moved to its own class
     /// <summary>
     /// Type of output series
     /// </summary>
@@ -358,6 +380,7 @@
         Mixed
     }
 
+    // TODO: Operational. This is operational specific code and should be moved to its own class
     public enum TimeStepUnit
     {
         Second,
@@ -377,6 +400,7 @@
         NotImplemented // Option is not implemented (so also no available)
     }
 
+    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
     public enum IntrusionVerticalWaterPressureType
     {
         Standard,