Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Extensions.cs
===================================================================
diff -u -r6404 -r7077
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Extensions.cs	(.../SurfaceLine2Extensions.cs)	(revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Extensions.cs	(.../SurfaceLine2Extensions.cs)	(revision 7077)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2025. All rights reserved.
+// Copyright (C) Stichting Deltares 2026. All rights reserved.
 // 
 // This file is part of the Dam Engine.
 // 
@@ -132,10 +132,7 @@
     /// False otherwise.</returns>
     public static bool HasDike(this SurfaceLine2 line)
     {
-        return IsDefined(line, CharacteristicPointType.DikeToeAtRiver) &&
-               IsDefined(line, CharacteristicPointType.DikeTopAtRiver) &&
-               IsDefined(line, CharacteristicPointType.DikeTopAtPolder) &&
-               IsDefined(line, CharacteristicPointType.DikeToeAtPolder);
+        return line.IsDefined(CharacteristicPointType.DikeToeAtRiver) && line.IsDefined(CharacteristicPointType.DikeTopAtRiver) && line.IsDefined(CharacteristicPointType.DikeTopAtPolder) && line.IsDefined(CharacteristicPointType.DikeToeAtPolder);
     }
 
     /// <summary>
@@ -284,8 +281,7 @@
     /// inside shoulder; False otherwise.</returns>
     public static bool HasShoulderInside(this SurfaceLine2 line)
     {
-        return IsDefined(line, CharacteristicPointType.ShoulderTopInside) &&
-               IsDefined(line, CharacteristicPointType.ShoulderBaseInside);
+        return line.IsDefined(CharacteristicPointType.ShoulderTopInside) && line.IsDefined(CharacteristicPointType.ShoulderBaseInside);
     }
 
     /// <summary>
@@ -297,8 +293,7 @@
     /// ditch; False otherwise.</returns>
     public static bool HasDitch(this SurfaceLine2 line)
     {
-        return IsDefined(line, CharacteristicPointType.DitchDikeSide) &&
-               IsDefined(line, CharacteristicPointType.DitchPolderSide);
+        return line.IsDefined(CharacteristicPointType.DitchDikeSide) && line.IsDefined(CharacteristicPointType.DitchPolderSide);
     }
 
     /// <summary>
@@ -323,7 +318,7 @@
             // check the unchecked points
             Point2D bottomDitchDikeSide = line.CharacteristicPoints.GetPoint2D(CharacteristicPointType.BottomDitchDikeSide);
             Point2D bottomDitchPolderSide = line.CharacteristicPoints.GetPoint2D(CharacteristicPointType.BottomDitchPolderSide);
-            res = (bottomDitchDikeSide != null && bottomDitchPolderSide != null);
+            res = bottomDitchDikeSide != null && bottomDitchPolderSide != null;
 
             // check the ditch points describe following shape:
             //     0       0
@@ -505,7 +500,7 @@
     public static double DetermineShoulderLength(this SurfaceLine2 line)
     {
         Point2D shoulderTopInside = line.CharacteristicPoints.GetPoint2D(CharacteristicPointType.ShoulderTopInside);
-        if (shoulderTopInside != null && HasAnnotation(line, CharacteristicPointType.ShoulderBaseInside))
+        if (shoulderTopInside != null && line.HasAnnotation(CharacteristicPointType.ShoulderBaseInside))
         {
             return line.DetermineShoulderLengthForGivenShoulderTopInside(shoulderTopInside);
         }