Index: Core/Components/src/Core.Components.Charting/Data/ChartAreaData.cs
===================================================================
diff -u -rebbb56ddd6ef8857548dcbbfa51c0650f0207d86 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.Charting/Data/ChartAreaData.cs	(.../ChartAreaData.cs)	(revision ebbb56ddd6ef8857548dcbbfa51c0650f0207d86)
+++ Core/Components/src/Core.Components.Charting/Data/ChartAreaData.cs	(.../ChartAreaData.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Core.Common.Base.Geometry;
 using Core.Components.Charting.Styles;
 
 namespace Core.Components.Charting.Data
@@ -39,7 +40,7 @@
         /// <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
         /// <c>null</c> or only whitespace.</exception>
-        public ChartAreaData(IEnumerable<Tuple<double, double>> points, string name) : base(points, name) {}
+        public ChartAreaData(IEnumerable<Point2D> points, string name) : base(points, name) { }
 
         /// <summary>
         /// The style of the chart area.
Index: Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs
===================================================================
diff -u -r0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs	(.../ChartLineData.cs)	(revision 0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21)
+++ Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs	(.../ChartLineData.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Core.Common.Base.Geometry;
 using Core.Components.Charting.Styles;
 
 namespace Core.Components.Charting.Data
@@ -39,7 +40,7 @@
         /// <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
         /// <c>null</c> or only whitespace.</exception>
-        public ChartLineData(IEnumerable<Tuple<double, double>> points, string name) : base(points, name) {}
+        public ChartLineData(IEnumerable<Point2D> points, string name) : base(points, name) { }
 
         /// <summary>
         /// Gets or sets the style of the line.
Index: Core/Components/src/Core.Components.Charting/Data/ChartPointData.cs
===================================================================
diff -u -rebbb56ddd6ef8857548dcbbfa51c0650f0207d86 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.Charting/Data/ChartPointData.cs	(.../ChartPointData.cs)	(revision ebbb56ddd6ef8857548dcbbfa51c0650f0207d86)
+++ Core/Components/src/Core.Components.Charting/Data/ChartPointData.cs	(.../ChartPointData.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Core.Common.Base.Geometry;
 using Core.Components.Charting.Styles;
 
 namespace Core.Components.Charting.Data
@@ -39,7 +40,7 @@
         /// <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
         /// <c>null</c> or only whitespace.</exception>
-        public ChartPointData(IEnumerable<Tuple<double, double>> points, string name) : base(points, name) {}
+        public ChartPointData(IEnumerable<Point2D> points, string name) : base(points, name) { }
 
         /// <summary>
         /// The style of the point.
Index: Core/Components/src/Core.Components.Charting/Data/PointBasedChartData.cs
===================================================================
diff -u -r1dd7affebae1187cb96778e85d021f7dc5ac9e50 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.Charting/Data/PointBasedChartData.cs	(.../PointBasedChartData.cs)	(revision 1dd7affebae1187cb96778e85d021f7dc5ac9e50)
+++ Core/Components/src/Core.Components.Charting/Data/PointBasedChartData.cs	(.../PointBasedChartData.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Common.Base.Geometry;
 
 namespace Core.Components.Charting.Data
 {
@@ -39,7 +40,7 @@
         /// <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
         /// <c>null</c> or only whitespace.</exception>
-        protected PointBasedChartData(IEnumerable<Tuple<double, double>> points, string name) : base(name)
+        protected PointBasedChartData(IEnumerable<Point2D> points, string name) : base(name)
         {
             if (points == null)
             {
@@ -58,6 +59,6 @@
         /// <summary>
         /// Gets the collection of points in 2D space.
         /// </summary>
-        public IEnumerable<Tuple<double, double>> Points { get; private set; }
+        public IEnumerable<Point2D> Points { get; private set; }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs
===================================================================
diff -u -rebbb56ddd6ef8857548dcbbfa51c0650f0207d86 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs	(.../ChartAreaDataConverter.cs)	(revision ebbb56ddd6ef8857548dcbbfa51c0650f0207d86)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs	(.../ChartAreaDataConverter.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -40,7 +40,7 @@
             };
             foreach (var p in data.Points)
             {
-                series.Points.Add(TupleToDataPoint(p));
+                series.Points.Add(Point2DToDataPoint(p));
             }
             if (series.Points.Count > 0)
             {
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataConverter.cs
===================================================================
diff -u -rf816b467d3aae059a7728645575ec2eabfbcb0f7 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataConverter.cs	(.../ChartDataConverter.cs)	(revision f816b467d3aae059a7728645575ec2eabfbcb0f7)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataConverter.cs	(.../ChartDataConverter.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Core.Common.Base.Geometry;
 using Core.Components.Charting.Data;
 using OxyPlot;
 using OxyPlot.Series;
@@ -60,10 +61,10 @@
         /// <returns>A new <see cref="DataPoint"/> based on <paramref name="obj"/>.</returns>
         /// <exception cref="InvalidCastException">Thrown when <paramref name="obj"/> is not
         /// of type <see cref="Tuple"/> of <see cref="double"/>.</exception>
-        protected static DataPoint TupleToDataPoint(object obj)
+        protected static DataPoint Point2DToDataPoint(object obj)
         {
-            var point = (Tuple<double, double>) obj;
-            return new DataPoint(point.Item1, point.Item2);
+            Point2D point = (Point2D) obj;
+            return new DataPoint(point.X, point.Y);
         }
 
         /// <summary>
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartLineDataConverter.cs
===================================================================
diff -u -r8234497f3e1f17b463f7997c2b5496f8b05909ea -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartLineDataConverter.cs	(.../ChartLineDataConverter.cs)	(revision 8234497f3e1f17b463f7997c2b5496f8b05909ea)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartLineDataConverter.cs	(.../ChartLineDataConverter.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -37,7 +37,7 @@
             var series = new LineSeries
             {
                 ItemsSource = data.Points.ToArray(),
-                Mapping = TupleToDataPoint,
+                Mapping = Point2DToDataPoint,
                 IsVisible = data.IsVisible,
                 Tag = data
             };
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartPointDataConverter.cs
===================================================================
diff -u -r8a78c6597ce3fdb511d0f426245006f30ecd2b27 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartPointDataConverter.cs	(.../ChartPointDataConverter.cs)	(revision 8a78c6597ce3fdb511d0f426245006f30ecd2b27)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartPointDataConverter.cs	(.../ChartPointDataConverter.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -39,7 +39,7 @@
             {
                 ItemsSource = data.Points.ToArray(),
                 IsVisible = data.IsVisible,
-                Mapping = TupleToDataPoint,
+                Mapping = Point2DToDataPoint,
                 LineStyle = LineStyle.None,
                 MarkerType = MarkerType.Circle,
                 Tag = data
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartAreaDataTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartAreaDataTest.cs	(.../ChartAreaDataTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartAreaDataTest.cs	(.../ChartAreaDataTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.ObjectModel;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
@@ -47,7 +48,7 @@
         public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             // Call
             TestDelegate test = () => new ChartAreaData(points, invalidName);
@@ -60,7 +61,7 @@
         public void Constructor_WithEmptyPoints_CreatesNewICharData()
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             // Call
             var data = new ChartAreaData(points, "test data");
@@ -85,13 +86,13 @@
             CollectionAssert.AreEqual(points, data.Points);
         }
 
-        private Collection<Tuple<double, double>> CreateTestPoints()
+        private Collection<Point2D> CreateTestPoints()
         {
-            return new Collection<Tuple<double, double>>
+            return new Collection<Point2D>
             {
-                Tuple.Create(0.0, 1.1),    
-                Tuple.Create(1.0, 2.1),
-                Tuple.Create(1.6, 1.6)    
+                new Point2D(0.0, 1.1),
+                new Point2D(1.0, 2.1),
+                new Point2D(1.6, 1.6)    
             };
         }
     }
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartDataCollectionTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartDataCollectionTest.cs	(.../ChartDataCollectionTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartDataCollectionTest.cs	(.../ChartDataCollectionTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
@@ -90,7 +91,7 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var objectToAdd = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
+            var objectToAdd = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
 
             // Call
             data.Add(objectToAdd);
@@ -120,8 +121,8 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var oldDataElement = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
-            var newDataElement = new ChartPointData(Enumerable.Empty<Tuple<double, double>>(), "another test");
+            var oldDataElement = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
+            var newDataElement = new ChartPointData(Enumerable.Empty<Point2D>(), "another test");
 
             data.Add(oldDataElement);
 
@@ -143,7 +144,7 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var oldDataElement = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
+            var oldDataElement = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
 
             data.Add(oldDataElement);
 
@@ -165,8 +166,8 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var dataElement = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
-            var newDataElement = new ChartPointData(Enumerable.Empty<Tuple<double, double>>(), "another test");
+            var dataElement = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
+            var newDataElement = new ChartPointData(Enumerable.Empty<Point2D>(), "another test");
 
             data.Add(dataElement);
 
@@ -188,7 +189,7 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var dataElement = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
+            var dataElement = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
 
             data.Add(dataElement);
 
@@ -209,7 +210,7 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var dataElement = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
+            var dataElement = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
 
             data.Add(dataElement);
 
@@ -231,8 +232,8 @@
             // Setup
             var list = Enumerable.Empty<ChartData>().ToList();
             var data = new ChartDataCollection(list, "test");
-            var dataElement = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test");
-            var otherDataElement = new ChartPointData(Enumerable.Empty<Tuple<double, double>>(), "another test");
+            var dataElement = new ChartLineData(Enumerable.Empty<Point2D>(), "test");
+            var otherDataElement = new ChartPointData(Enumerable.Empty<Point2D>(), "another test");
 
             data.Add(dataElement);
 
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs	(.../ChartLineDataTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs	(.../ChartLineDataTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,7 +21,7 @@
 
 using System;
 using System.Collections.ObjectModel;
-using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
@@ -48,7 +48,7 @@
         public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             // Call
             TestDelegate test = () => new ChartLineData(points, invalidName);
@@ -61,7 +61,7 @@
         public void Constructor_WithEmptyPoints_CreatesNewICharData()
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             // Call
             var data = new ChartLineData(points, "test data");
@@ -86,13 +86,13 @@
             CollectionAssert.AreEqual(points, data.Points);
         }
 
-        private Collection<Tuple<double, double>> CreateTestPoints()
+        private Collection<Point2D> CreateTestPoints()
         {
-            return new Collection<Tuple<double, double>>
+            return new Collection<Point2D>
             {
-                Tuple.Create(0.0, 1.1),    
-                Tuple.Create(1.0, 2.1),
-                Tuple.Create(1.6, 1.6)    
+                new Point2D(0.0, 1.1),
+                new Point2D(1.0, 2.1),
+                new Point2D(1.6, 1.6)
             };
         }
     }
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartPointDataTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartPointDataTest.cs	(.../ChartPointDataTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartPointDataTest.cs	(.../ChartPointDataTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.ObjectModel;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
@@ -47,7 +48,7 @@
         public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             // Call
             TestDelegate test = () => new ChartPointData(points, invalidName);
@@ -60,7 +61,7 @@
         public void Constructor_WithEmptyPoints_CreatesNewICharData()
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             // Call
             var data = new ChartPointData(points, "test data");
@@ -85,13 +86,13 @@
             CollectionAssert.AreEqual(points, data.Points);
         }
 
-        private Collection<Tuple<double, double>> CreateTestPoints()
+        private Collection<Point2D> CreateTestPoints()
         {
-            return new Collection<Tuple<double, double>>
+            return new Collection<Point2D>
             {
-                Tuple.Create(0.0, 1.1),    
-                Tuple.Create(1.0, 2.1),
-                Tuple.Create(1.6, 1.6)    
+                new Point2D(0.0, 1.1),
+                new Point2D(1.0, 2.1),
+                new Point2D(1.6, 1.6)
             };
         }
     }
Index: Core/Components/test/Core.Components.Charting.Test/Data/PointBasedChartDataTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.Charting.Test/Data/PointBasedChartDataTest.cs	(.../PointBasedChartDataTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Components/test/Core.Components.Charting.Test/Data/PointBasedChartDataTest.cs	(.../PointBasedChartDataTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
@@ -48,10 +49,10 @@
         public void Constructor_InvalidName_ThrowsArgumentExcpetion(string invalidName)
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>
+            var points = new Collection<Point2D>
             {
-                Tuple.Create(0.0, 1.0),
-                Tuple.Create(2.5, 1.1)
+                new Point2D(0.0, 1.0),
+                new Point2D(2.5, 1.1)
             };
 
             // Call
@@ -65,10 +66,10 @@
         public void Constructor_WithPoints_PropertiesSet()
         {
             // Setup
-            var points = new Collection<Tuple<double, double>>
+            var points = new Collection<Point2D>
             {
-                Tuple.Create(0.0, 1.0),
-                Tuple.Create(2.5, 1.1)
+                new Point2D(0.0, 1.0),
+                new Point2D(2.5, 1.1)
             };
             
             // Call
@@ -83,6 +84,6 @@
 
     public class TestPointBasedChartData : PointBasedChartData
     {
-        public TestPointBasedChartData(IEnumerable<Tuple<double,double>> points, string name) : base(points, name) { }
+        public TestPointBasedChartData(IEnumerable<Point2D> points, string name) : base(points, name) { }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs	(.../ChartControlTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs	(.../ChartControlTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -22,6 +22,7 @@
 using System;
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base.Geometry;
 using Core.Common.Utils.Reflection;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
@@ -55,7 +56,7 @@
             // Setup
             using (var chart = new ChartControl())
             {
-                var testData = new ChartPointData(Enumerable.Empty<Tuple<double, double>>(), "test data");
+                var testData = new ChartPointData(Enumerable.Empty<Point2D>(), "test data");
 
                 // Call
                 chart.Data.Add(testData);
@@ -115,7 +116,7 @@
             using (var form = new Form())
             {
                 var chart = new ChartControl();
-                var testData = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test data");
+                var testData = new ChartLineData(Enumerable.Empty<Point2D>(), "test data");
                 var view = TypeUtils.GetField<PlotView>(chart, "view");
                 var invalidated = 0;
 
@@ -143,7 +144,7 @@
             using (var form = new Form())
             {
                 var chart = new ChartControl();
-                var testData = new ChartLineData(Enumerable.Empty<Tuple<double, double>>(), "test data");
+                var testData = new ChartLineData(Enumerable.Empty<Point2D>(), "test data");
                 var view = TypeUtils.GetField<PlotView>(chart, "view");
                 var invalidated = 0;
 
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs
===================================================================
diff -u -rebbb56ddd6ef8857548dcbbfa51c0650f0207d86 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs	(.../ChartAreaDataConverterTest.cs)	(revision ebbb56ddd6ef8857548dcbbfa51c0650f0207d86)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs	(.../ChartAreaDataConverterTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -24,6 +24,7 @@
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Styles;
@@ -53,7 +54,7 @@
         {
             // Setup
             var converter = new ChartAreaDataConverter();
-            var areaData = new ChartAreaData(new Collection<Tuple<double, double>>(), "test data");
+            var areaData = new ChartAreaData(new Collection<Point2D>(), "test data");
 
             // Call
             var canConvert = converter.CanConvertSeries(areaData);
@@ -83,11 +84,11 @@
             var converter = new ChartAreaDataConverter();
             var random = new Random(21);
             var randomCount = random.Next(5, 10);
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             for (int i = 0; i < randomCount; i++)
             {
-                points.Add(Tuple.Create(random.NextDouble(), random.NextDouble()));
+                points.Add(new Point2D(random.NextDouble(), random.NextDouble()));
             }
 
             var areaData = new ChartAreaData(points, "test data");
@@ -98,7 +99,7 @@
             // Assert
             Assert.IsInstanceOf<IList<Series>>(series);
             var areaSeries = ((AreaSeries)series[0]);
-            var expectedData = points.Select(t => new DataPoint(t.Item1, t.Item2)).ToArray();
+            var expectedData = points.Select(t => new DataPoint(t.X, t.Y)).ToArray();
             CollectionAssert.AreEqual(expectedData, areaSeries.Points);
             CollectionAssert.AreEqual(new Collection<DataPoint> { expectedData.First() }, areaSeries.Points2);
         }
@@ -143,7 +144,7 @@
             var converter = new ChartAreaDataConverter();
             var expectedColor = Color.FromKnownColor(color);
             var style = new ChartAreaStyle(expectedColor, Color.Red, 3);
-            var data = new ChartAreaData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartAreaData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -166,7 +167,7 @@
             var converter = new ChartAreaDataConverter();
             var expectedColor = Color.FromKnownColor(color);
             var style = new ChartAreaStyle(Color.Red, expectedColor, 3);
-            var data = new ChartAreaData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartAreaData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -188,7 +189,7 @@
             // Setup
             var converter = new ChartAreaDataConverter();
             var style = new ChartAreaStyle(Color.Red, Color.Red, width);
-            var data = new ChartAreaData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartAreaData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataCollectionConverterTest.cs
===================================================================
diff -u -r0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataCollectionConverterTest.cs	(.../ChartDataCollectionConverterTest.cs)	(revision 0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataCollectionConverterTest.cs	(.../ChartDataCollectionConverterTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.TestUtil;
@@ -80,13 +81,13 @@
             var converter = new ChartDataCollectionConverter();
             var random = new Random(21);
             var randomCount = random.Next(5, 10);
-            var pointsArea = new Collection<Tuple<double, double>>();
-            var pointsLine = new Collection<Tuple<double, double>>();
+            var pointsArea = new Collection<Point2D>();
+            var pointsLine = new Collection<Point2D>();
 
             for (int i = 0; i < randomCount; i++)
             {
-                pointsArea.Add(Tuple.Create(random.NextDouble(), random.NextDouble()));
-                pointsLine.Add(Tuple.Create(random.NextDouble(), random.NextDouble()));
+                pointsArea.Add(new Point2D(random.NextDouble(), random.NextDouble()));
+                pointsLine.Add(new Point2D(random.NextDouble(), random.NextDouble()));
             }
 
             var collectionData = new ChartDataCollection(new List<ChartData>(), "test data");
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataConverterTest.cs
===================================================================
diff -u -r0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataConverterTest.cs	(.../ChartDataConverterTest.cs)	(revision 0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataConverterTest.cs	(.../ChartDataConverterTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.TestUtil;
@@ -35,21 +36,19 @@
     public class ChartDataConverterTest
     {
         [Test]
-        public void TupleToDataPoint_RandomTupleDoubleDouble_ReturnsDataPoint()
+        public void Point2DToDataPoint_RandomPoint2D_ReturnsDataPoint()
         {
             // Setup
             var random = new Random(21);
-            var a = random.NextDouble();
-            var b = random.NextDouble();
-            var tuple = Tuple.Create(a,b);
+            var point2D = new Point2D(random.NextDouble(), random.NextDouble());
             var testConverter = new TestChartDataConverter<ChartData>();
 
             // Call
-            var point = testConverter.PublicTupleToDataPoint(tuple);
+            var point = testConverter.PublicPoint2DToDataPoint(point2D);
 
             // Assert
-            Assert.AreEqual(a, point.X);
-            Assert.AreEqual(b, point.Y);
+            Assert.AreEqual(point2D.X, point.X);
+            Assert.AreEqual(point2D.Y, point.Y);
         }
 
         [Test]
@@ -116,9 +115,9 @@
                 throw new NotImplementedException();
             }
 
-            public DataPoint PublicTupleToDataPoint(object obj)
+            public DataPoint PublicPoint2DToDataPoint(object obj)
             {
-                return TupleToDataPoint(obj);
+                return Point2DToDataPoint(obj);
             }
         }
     }
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs
===================================================================
diff -u -r8234497f3e1f17b463f7997c2b5496f8b05909ea -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs	(.../ChartLineDataConverterTest.cs)	(revision 8234497f3e1f17b463f7997c2b5496f8b05909ea)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs	(.../ChartLineDataConverterTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -24,6 +24,7 @@
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Styles;
@@ -53,7 +54,7 @@
         {
             // Setup
             var converter = new ChartLineDataConverter();
-            var lineData = new ChartLineData(new Collection<Tuple<double, double>>(), "test data");
+            var lineData = new ChartLineData(new Collection<Point2D>(), "test data");
 
             // Call
             var canConvert = converter.CanConvertSeries(lineData);
@@ -83,11 +84,11 @@
             var converter = new ChartLineDataConverter();
             var random = new Random(21);
             var randomCount = random.Next(5, 10);
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             for (int i = 0; i < randomCount; i++)
             {
-                points.Add(Tuple.Create(random.NextDouble(), random.NextDouble()));
+                points.Add(new Point2D(random.NextDouble(), random.NextDouble()));
             }
 
             var lineData = new ChartLineData(points, "test data");
@@ -142,7 +143,7 @@
             var converter = new ChartLineDataConverter();
             var expectedColor = Color.FromKnownColor(color);
             var style = new ChartLineStyle(expectedColor, 3, DashStyle.Solid);
-            var data = new ChartLineData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartLineData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -164,7 +165,7 @@
             // Setup
             var converter = new ChartLineDataConverter();
             var style = new ChartLineStyle(Color.Red, width, DashStyle.Solid);
-            var data = new ChartLineData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartLineData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -188,7 +189,7 @@
             // Setup
             var converter = new ChartLineDataConverter();
             var style = new ChartLineStyle(Color.Red, 3, dashStyle);
-            var data = new ChartLineData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartLineData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs
===================================================================
diff -u -r8a78c6597ce3fdb511d0f426245006f30ecd2b27 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs	(.../ChartPointDataConverterTest.cs)	(revision 8a78c6597ce3fdb511d0f426245006f30ecd2b27)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs	(.../ChartPointDataConverterTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Styles;
@@ -52,7 +53,7 @@
         {
             // Setup
             var converter = new ChartPointDataConverter();
-            var pointData = new ChartPointData(new Collection<Tuple<double, double>>(), "test data");
+            var pointData = new ChartPointData(new Collection<Point2D>(), "test data");
 
             // Call
             var canConvert = converter.CanConvertSeries(pointData);
@@ -82,11 +83,11 @@
             var converter = new ChartPointDataConverter();
             var random = new Random(21);
             var randomCount = random.Next(5, 10);
-            var points = new Collection<Tuple<double, double>>();
+            var points = new Collection<Point2D>();
 
             for (int i = 0; i < randomCount; i++)
             {
-                points.Add(Tuple.Create(random.NextDouble(), random.NextDouble()));
+                points.Add(new Point2D(random.NextDouble(), random.NextDouble()));
             }
 
             var pointData = new ChartPointData(points, "test data");
@@ -143,7 +144,7 @@
             var converter = new ChartPointDataConverter();
             var expectedColor = Color.FromKnownColor(color);
             var style = new ChartPointStyle(expectedColor, 3, Color.Red, 2, ChartPointSymbol.Circle);
-            var data = new ChartPointData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartPointData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -166,7 +167,7 @@
             var converter = new ChartPointDataConverter();
             var expectedColor = Color.FromKnownColor(color);
             var style = new ChartPointStyle(Color.Red, 3, expectedColor, 2, ChartPointSymbol.Circle);
-            var data = new ChartPointData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartPointData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -188,7 +189,7 @@
             // Setup
             var converter = new ChartPointDataConverter();
             var style = new ChartPointStyle(Color.Red, width, Color.Red, 2, ChartPointSymbol.Circle);
-            var data = new ChartPointData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartPointData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -210,7 +211,7 @@
             // Setup
             var converter = new ChartPointDataConverter();
             var style = new ChartPointStyle(Color.Red, 3, Color.Red, strokeThickness, ChartPointSymbol.Circle);
-            var data = new ChartPointData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartPointData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
@@ -234,7 +235,7 @@
             // Setup
             var converter = new ChartPointDataConverter();
             var style = new ChartPointStyle(Color.Red, 3, Color.Red, 2, symbol);
-            var data = new ChartPointData(new Collection<Tuple<double, double>>(), "test")
+            var data = new ChartPointData(new Collection<Point2D>(), "test")
             {
                 Style = style
             };
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartSeriesFactoryTest.cs
===================================================================
diff -u -r0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartSeriesFactoryTest.cs	(.../ChartSeriesFactoryTest.cs)	(revision 0b76c9841bdeef5c3b9fa1ba0d6cb98a63b90c21)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartSeriesFactoryTest.cs	(.../ChartSeriesFactoryTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.TestUtil;
 using Core.Components.OxyPlot.Converter;
@@ -107,18 +108,18 @@
             Assert.Throws<NotSupportedException>(test);
         }
 
-        private static ICollection<DataPoint> CreateExpectedData(IEnumerable<Tuple<double, double>> testData)
+        private static ICollection<DataPoint> CreateExpectedData(IEnumerable<Point2D> testData)
         {
-            return testData.Select(p => new DataPoint(p.Item1, p.Item2)).ToArray();
+            return testData.Select(p => new DataPoint(p.X, p.Y)).ToArray();
         }
 
-        private static Collection<Tuple<double, double>> CreateTestData()
+        private static Collection<Point2D> CreateTestData()
         {
-            return new Collection<Tuple<double, double>>
+            return new Collection<Point2D>
             {
-                Tuple.Create(1.2, 3.4),
-                Tuple.Create(3.2, 3.4),
-                Tuple.Create(0.2, 2.4)
+                new Point2D(1.2, 3.4),
+                new Point2D(3.2, 3.4),
+                new Point2D(0.2, 2.4)
             };
         }
     }
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Forms/ChartDataViewTest.cs
===================================================================
diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Forms/ChartDataViewTest.cs	(.../ChartDataViewTest.cs)	(revision f816a8ef737d38b4f044855b73abf3ea32b79422)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Forms/ChartDataViewTest.cs	(.../ChartDataViewTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base.Geometry;
 using Core.Components.Charting.Data;
 using Core.Components.OxyPlot.Forms;
 using Core.Plugins.OxyPlot.Forms;
@@ -67,7 +68,7 @@
             using (var chartView = new ChartDataView())
             {
                 var chart = (ChartControl) chartView.Controls[0];
-                var pointData = new ChartPointData(Enumerable.Empty<Tuple<double, double>>(), "test");
+                var pointData = new ChartPointData(Enumerable.Empty<Point2D>(), "test");
                 var chartDataCollection = new ChartDataCollection(new ChartData[]
                 {
                     pointData
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartAreaDataTreeNodeInfoTest.cs
===================================================================
diff -u -r170ec8698dfed095e23f4fa822fe2198b3e5f242 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartAreaDataTreeNodeInfoTest.cs	(.../ChartAreaDataTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartAreaDataTreeNodeInfoTest.cs	(.../ChartAreaDataTreeNodeInfoTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 using Core.Common.Utils.Reflection;
@@ -60,7 +61,7 @@
         public void Text_Always_ReturnsNameFromChartData()
         {
             // Setup
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -77,7 +78,7 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -94,7 +95,7 @@
         public void CanDrag_Always_ReturnsTrue()
         {
             // Setup
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -111,7 +112,7 @@
         public void CanCheck_Always_ReturnsTrue()
         {
             // Setup
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -129,7 +130,7 @@
         public void IsChecked_Always_ReturnsAccordingToVisibleStateOfAreaData(bool isVisible)
         {
             // Setup
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             areaData.IsVisible = isVisible;
 
@@ -149,7 +150,7 @@
         public void OnNodeChecked_AreaDataNodeWithoutParent_SetsAreaDataVisibility(bool initialVisibleState)
         {
             // Setup
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -170,7 +171,7 @@
         {
             // Setup
             var observable = mocks.StrictMock<IObservable>();
-            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Point2D>(), "test data");
 
             observable.Expect(o => o.NotifyObservers());
 
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -r170ec8698dfed095e23f4fa822fe2198b3e5f242 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLineDataTreeNodeInfoTest.cs	(.../ChartLineDataTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLineDataTreeNodeInfoTest.cs	(.../ChartLineDataTreeNodeInfoTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 using Core.Common.Utils.Reflection;
@@ -60,7 +61,7 @@
         public void Text_Always_ReturnsNameFromChartData()
         {
             // Setup
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -77,7 +78,7 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -94,7 +95,7 @@
         public void CanDrag_Always_ReturnsTrue()
         {
             // Setup
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -111,7 +112,7 @@
         public void CanCheck_Always_ReturnsTrue()
         {
             // Setup
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -129,7 +130,7 @@
         public void IsChecked_Always_ReturnsAccordingToVisibleStateOfLineData(bool isVisible)
         {
             // Setup
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             lineData.IsVisible = isVisible;
 
@@ -149,7 +150,7 @@
         public void LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
         {
             // Setup
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -170,7 +171,7 @@
         {
             // Setup
             var observable = mocks.StrictMock<IObservable>();
-            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Point2D>(), "test data");
 
             observable.Expect(o => o.NotifyObservers());
 
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartPointDataTreeNodeInfoTest.cs
===================================================================
diff -u -r170ec8698dfed095e23f4fa822fe2198b3e5f242 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartPointDataTreeNodeInfoTest.cs	(.../ChartPointDataTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartPointDataTreeNodeInfoTest.cs	(.../ChartPointDataTreeNodeInfoTest.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 using Core.Common.Utils.Reflection;
@@ -60,7 +61,7 @@
         public void Text_Always_ReturnsNameFromChartData()
         {
             // Setup
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -77,7 +78,7 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -94,7 +95,7 @@
         public void CanDrag_Always_ReturnsTrue()
         {
             // Setup
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -111,7 +112,7 @@
         public void CanCheck_Always_ReturnsTrue()
         {
             // Setup
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -129,7 +130,7 @@
         public void IsChecked_Always_ReturnsAccordingToVisibleStateOfPointsData(bool isVisible)
         {
             // Setup
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             pointData.IsVisible = isVisible;
 
@@ -149,7 +150,7 @@
         public void PointDataNodeWithoutParent_SetsPointDataVisibility(bool initialVisibleState)
         {
             // Setup
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             mocks.ReplayAll();
 
@@ -170,7 +171,7 @@
         {
             // Setup
             var observable = mocks.StrictMock<IObservable>();
-            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Point2D>(), "test data");
 
             observable.Expect(o => o.NotifyObservers());
 
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs
===================================================================
diff -u -r8a78c6597ce3fdb511d0f426245006f30ecd2b27 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision 8a78c6597ce3fdb511d0f426245006f30ecd2b27)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui;
 using Core.Components.Charting.Data;
@@ -45,184 +46,184 @@
 
         public void Execute(params object[] arguments)
         {
-            var line1 = new ChartLineData(new Collection<Tuple<double, double>>
+            var line1 = new ChartLineData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.500),
-                Tuple.Create(0.1, 0.723),
-                Tuple.Create(0.2, 0.892),
-                Tuple.Create(0.3, 1.013),
-                Tuple.Create(0.4, 1.092),
-                Tuple.Create(0.5, 1.135),
-                Tuple.Create(0.6, 1.148),
-                Tuple.Create(0.7, 1.137),
-                Tuple.Create(0.8, 1.108),
-                Tuple.Create(0.9, 1.067),
-                Tuple.Create(1.0, 1.020),
-                Tuple.Create(1.1, 0.973),
-                Tuple.Create(1.2, 0.932),
-                Tuple.Create(1.3, 0.903),
-                Tuple.Create(1.4, 0.892),
-                Tuple.Create(1.5, 0.905),
-                Tuple.Create(1.6, 0.948),
-                Tuple.Create(1.7, 1.027),
-                Tuple.Create(1.8, 1.148),
-                Tuple.Create(1.9, 1.317),
-                Tuple.Create(2.0, 1.540),
-                Tuple.Create(2.1, 1.823)
+                new Point2D(0.0, 0.500),
+                new Point2D(0.1, 0.723),
+                new Point2D(0.2, 0.892),
+                new Point2D(0.3, 1.013),
+                new Point2D(0.4, 1.092),
+                new Point2D(0.5, 1.135),
+                new Point2D(0.6, 1.148),
+                new Point2D(0.7, 1.137),
+                new Point2D(0.8, 1.108),
+                new Point2D(0.9, 1.067),
+                new Point2D(1.0, 1.020),
+                new Point2D(1.1, 0.973),
+                new Point2D(1.2, 0.932),
+                new Point2D(1.3, 0.903),
+                new Point2D(1.4, 0.892),
+                new Point2D(1.5, 0.905),
+                new Point2D(1.6, 0.948),
+                new Point2D(1.7, 1.027),
+                new Point2D(1.8, 1.148),
+                new Point2D(1.9, 1.317),
+                new Point2D(2.0, 1.540),
+                new Point2D(2.1, 1.823)
             }, Resources.OpenChartViewCommand_Execute_Line_one)
             {
                 Style = new ChartLineStyle(Color.DarkRed, 3, DashStyle.Solid)
             };
 
 
-            var line2 = new ChartLineData(new Collection<Tuple<double, double>>
+            var line2 = new ChartLineData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.800),
-                Tuple.Create(0.1, 1.009),
-                Tuple.Create(0.2, 1.162),
-                Tuple.Create(0.3, 1.267),
-                Tuple.Create(0.4, 1.328),
-                Tuple.Create(0.5, 1.351),
-                Tuple.Create(0.6, 1.340),
-                Tuple.Create(0.7, 1.302),
-                Tuple.Create(0.8, 1.242),
-                Tuple.Create(0.9, 1.165),
-                Tuple.Create(1.0, 1.076),
-                Tuple.Create(1.1, 0.982),
-                Tuple.Create(1.2, 0.886),
-                Tuple.Create(1.3, 0.796),
-                Tuple.Create(1.4, 0.716),
-                Tuple.Create(1.5, 0.652),
-                Tuple.Create(1.6, 0.608),
-                Tuple.Create(1.7, 0.591),
-                Tuple.Create(1.8, 0.606),
-                Tuple.Create(1.9, 0.658),
-                Tuple.Create(2.0, 0.752),
-                Tuple.Create(2.1, 0.895)
+                new Point2D(0.0, 0.800),
+                new Point2D(0.1, 1.009),
+                new Point2D(0.2, 1.162),
+                new Point2D(0.3, 1.267),
+                new Point2D(0.4, 1.328),
+                new Point2D(0.5, 1.351),
+                new Point2D(0.6, 1.340),
+                new Point2D(0.7, 1.302),
+                new Point2D(0.8, 1.242),
+                new Point2D(0.9, 1.165),
+                new Point2D(1.0, 1.076),
+                new Point2D(1.1, 0.982),
+                new Point2D(1.2, 0.886),
+                new Point2D(1.3, 0.796),
+                new Point2D(1.4, 0.716),
+                new Point2D(1.5, 0.652),
+                new Point2D(1.6, 0.608),
+                new Point2D(1.7, 0.591),
+                new Point2D(1.8, 0.606),
+                new Point2D(1.9, 0.658),
+                new Point2D(2.0, 0.752),
+                new Point2D(2.1, 0.895)
             }, Resources.OpenChartViewCommand_Execute_Line_two)
             {
                 Style = new ChartLineStyle(Color.DarkSlateBlue, 2, DashStyle.DashDot)
             };
 
-            var area1 = new ChartAreaData(new Collection<Tuple<double, double>>
+            var area1 = new ChartAreaData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.500),
-                Tuple.Create(0.1, 0.723),
-                Tuple.Create(0.2, 0.892),
-                Tuple.Create(0.3, 1.013),
-                Tuple.Create(0.4, 1.092),
-                Tuple.Create(0.5, 1.135),
-                Tuple.Create(0.6, 1.148),
-                Tuple.Create(0.7, 1.137),
-                Tuple.Create(0.8, 1.108),
-                Tuple.Create(0.9, 1.067),
-                Tuple.Create(1.0, 1.020),
-                Tuple.Create(1.1, 0.973),
-                Tuple.Create(1.2, 0.932),
-                Tuple.Create(1.3, 0.903),
-                Tuple.Create(1.4, 0.892),
-                Tuple.Create(1.5, 0.905),
-                Tuple.Create(1.5, 0.905 - 0.5),
-                Tuple.Create(1.4, 0.892 - 0.5),
-                Tuple.Create(1.3, 0.903 - 0.5),
-                Tuple.Create(1.2, 0.932 - 0.5),
-                Tuple.Create(1.1, 0.973 - 0.5),
-                Tuple.Create(1.0, 1.020 - 0.5),
-                Tuple.Create(0.9, 1.067 - 0.5),
-                Tuple.Create(0.8, 1.108 - 0.51),
-                Tuple.Create(0.7, 1.137 - 0.52),
-                Tuple.Create(0.6, 1.148 - 0.53),
-                Tuple.Create(0.5, 1.135 - 0.52),
-                Tuple.Create(0.4, 1.092 - 0.51),
-                Tuple.Create(0.3, 1.013 - 0.5),
-                Tuple.Create(0.2, 0.892 - 0.5),
-                Tuple.Create(0.1, 0.723 - 0.5),
-                Tuple.Create(0.0, 0.000),
-                Tuple.Create(0.0, 0.500)
+                new Point2D(0.0, 0.500),
+                new Point2D(0.1, 0.723),
+                new Point2D(0.2, 0.892),
+                new Point2D(0.3, 1.013),
+                new Point2D(0.4, 1.092),
+                new Point2D(0.5, 1.135),
+                new Point2D(0.6, 1.148),
+                new Point2D(0.7, 1.137),
+                new Point2D(0.8, 1.108),
+                new Point2D(0.9, 1.067),
+                new Point2D(1.0, 1.020),
+                new Point2D(1.1, 0.973),
+                new Point2D(1.2, 0.932),
+                new Point2D(1.3, 0.903),
+                new Point2D(1.4, 0.892),
+                new Point2D(1.5, 0.905),
+                new Point2D(1.5, 0.905 - 0.5),
+                new Point2D(1.4, 0.892 - 0.5),
+                new Point2D(1.3, 0.903 - 0.5),
+                new Point2D(1.2, 0.932 - 0.5),
+                new Point2D(1.1, 0.973 - 0.5),
+                new Point2D(1.0, 1.020 - 0.5),
+                new Point2D(0.9, 1.067 - 0.5),
+                new Point2D(0.8, 1.108 - 0.51),
+                new Point2D(0.7, 1.137 - 0.52),
+                new Point2D(0.6, 1.148 - 0.53),
+                new Point2D(0.5, 1.135 - 0.52),
+                new Point2D(0.4, 1.092 - 0.51),
+                new Point2D(0.3, 1.013 - 0.5),
+                new Point2D(0.2, 0.892 - 0.5),
+                new Point2D(0.1, 0.723 - 0.5),
+                new Point2D(0.0, 0.000),
+                new Point2D(0.0, 0.500)
             }, Resources.OpenChartViewCommand_Execute_Area_one)
             {
                 Style = new ChartAreaStyle(Color.DarkSeaGreen, Color.DarkGreen, 5)
             };
 
 
-            var area2 = new ChartAreaData(new Collection<Tuple<double, double>>
+            var area2 = new ChartAreaData(new Collection<Point2D>
             {
-                Tuple.Create(0.1, 0.723 - 0.5),
-                Tuple.Create(0.2, 0.892 - 0.5),
-                Tuple.Create(0.3, 1.013 - 0.49),
-                Tuple.Create(0.4, 1.092 - 0.48),
-                Tuple.Create(0.5, 1.135 - 0.47),
-                Tuple.Create(0.6, 1.148 - 0.46),
-                Tuple.Create(0.7, 1.137 - 0.47),
-                Tuple.Create(0.8, 1.108 - 0.48),
-                Tuple.Create(0.9, 1.067 - 0.49),
-                Tuple.Create(1.0, 1.020 - 0.50),
-                Tuple.Create(1.1, 0.973 - 0.5),
-                Tuple.Create(1.2, 0.932 - 0.5),
-                Tuple.Create(1.3, 0.903 - 0.5),
-                Tuple.Create(1.4, 0.892 - 0.5),
-                Tuple.Create(1.5, 0.905 - 0.5),
-                Tuple.Create(1.5, 0.905),
-                Tuple.Create(1.6, 0.948),
-                Tuple.Create(1.7, 1.027),
-                Tuple.Create(1.8, 1.148),
-                Tuple.Create(1.8, 0.606),
-                Tuple.Create(1.9, 0.658),
-                Tuple.Create(2.0, 0.752),
-                Tuple.Create(2.0, 0.350),
-                Tuple.Create(1.5, 0.905 - 0.7),
-                Tuple.Create(1.4, 0.892 - 0.7),
-                Tuple.Create(1.3, 0.903 - 0.7),
-                Tuple.Create(1.2, 0.932 - 0.7),
-                Tuple.Create(1.1, 0.973 - 0.7),
-                Tuple.Create(1.0, 1.020 - 0.7),
-                Tuple.Create(0.9, 1.067 - 0.7),
-                Tuple.Create(0.8, 1.108 - 0.7),
-                Tuple.Create(0.7, 1.137 - 0.7),
-                Tuple.Create(0.6, 1.148 - 0.7),
-                Tuple.Create(0.5, 1.135 - 0.7),
-                Tuple.Create(0.4, 1.092 - 0.7),
-                Tuple.Create(0.3, 1.013 - 0.7),
-                Tuple.Create(0.2, 0.892 - 0.7),
-                Tuple.Create(0.1, 0.723 - 0.7),
-                Tuple.Create(0.1, 0.723 - 0.5)
+                new Point2D(0.1, 0.723 - 0.5),
+                new Point2D(0.2, 0.892 - 0.5),
+                new Point2D(0.3, 1.013 - 0.49),
+                new Point2D(0.4, 1.092 - 0.48),
+                new Point2D(0.5, 1.135 - 0.47),
+                new Point2D(0.6, 1.148 - 0.46),
+                new Point2D(0.7, 1.137 - 0.47),
+                new Point2D(0.8, 1.108 - 0.48),
+                new Point2D(0.9, 1.067 - 0.49),
+                new Point2D(1.0, 1.020 - 0.50),
+                new Point2D(1.1, 0.973 - 0.5),
+                new Point2D(1.2, 0.932 - 0.5),
+                new Point2D(1.3, 0.903 - 0.5),
+                new Point2D(1.4, 0.892 - 0.5),
+                new Point2D(1.5, 0.905 - 0.5),
+                new Point2D(1.5, 0.905),
+                new Point2D(1.6, 0.948),
+                new Point2D(1.7, 1.027),
+                new Point2D(1.8, 1.148),
+                new Point2D(1.8, 0.606),
+                new Point2D(1.9, 0.658),
+                new Point2D(2.0, 0.752),
+                new Point2D(2.0, 0.350),
+                new Point2D(1.5, 0.905 - 0.7),
+                new Point2D(1.4, 0.892 - 0.7),
+                new Point2D(1.3, 0.903 - 0.7),
+                new Point2D(1.2, 0.932 - 0.7),
+                new Point2D(1.1, 0.973 - 0.7),
+                new Point2D(1.0, 1.020 - 0.7),
+                new Point2D(0.9, 1.067 - 0.7),
+                new Point2D(0.8, 1.108 - 0.7),
+                new Point2D(0.7, 1.137 - 0.7),
+                new Point2D(0.6, 1.148 - 0.7),
+                new Point2D(0.5, 1.135 - 0.7),
+                new Point2D(0.4, 1.092 - 0.7),
+                new Point2D(0.3, 1.013 - 0.7),
+                new Point2D(0.2, 0.892 - 0.7),
+                new Point2D(0.1, 0.723 - 0.7),
+                new Point2D(0.1, 0.723 - 0.5)
             }, Resources.OpenChartViewCommand_Execute_Area_two)
             {
                 Style = new ChartAreaStyle(Color.FromArgb(120, Color.Wheat), Color.DarkOrange, 2)
             };
 
-            var points1 = new ChartPointData(new Collection<Tuple<double, double>>
+            var points1 = new ChartPointData(new Collection<Point2D>
             {
-                Tuple.Create(0.2, 0.892 + 0.04),
-                Tuple.Create(0.3, 1.013 + 0.02),
-                Tuple.Create(0.4, 1.092),
-                Tuple.Create(0.5, 1.135 - 0.02),
-                Tuple.Create(0.6, 1.148 + 0.01),
-                Tuple.Create(1.4, 0.892 - 0.02),
-                Tuple.Create(1.5, 0.905 + 0.01),
-                Tuple.Create(1.8, 1.148 + 0.02)
+                new Point2D(0.2, 0.892 + 0.04),
+                new Point2D(0.3, 1.013 + 0.02),
+                new Point2D(0.4, 1.092),
+                new Point2D(0.5, 1.135 - 0.02),
+                new Point2D(0.6, 1.148 + 0.01),
+                new Point2D(1.4, 0.892 - 0.02),
+                new Point2D(1.5, 0.905 + 0.01),
+                new Point2D(1.8, 1.148 + 0.02)
             }, Resources.OpenChartViewCommand_Execute_Points_one)
             {
                 Style = new ChartPointStyle(Color.Crimson, 6, Color.AntiqueWhite, 3, ChartPointSymbol.Circle)
             };
 
-            var points2 = new ChartPointData(new Collection<Tuple<double, double>>
+            var points2 = new ChartPointData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.800 + 0.01),
-                Tuple.Create(0.1, 1.009 + 0.02),
-                Tuple.Create(0.2, 1.162 + 0.03),
-                Tuple.Create(0.2, 1.162 + 0.05),
-                Tuple.Create(0.2, 1.162 - 0.03),
-                Tuple.Create(0.2, 1.162 - 0.01),
-                Tuple.Create(0.3, 1.267),
-                Tuple.Create(0.4, 1.328 - 0.01),
-                Tuple.Create(0.53, 1.351),
-                Tuple.Create(0.69, 1.340),
-                Tuple.Create(0.73, 1.302),
-                Tuple.Create(1.4, 0.716 - 0.02),
-                Tuple.Create(1.4, 0.716 + 0.02),
-                Tuple.Create(1.7, 0.591),
-                Tuple.Create(1.8, 0.606)
+                new Point2D(0.0, 0.800 + 0.01),
+                new Point2D(0.1, 1.009 + 0.02),
+                new Point2D(0.2, 1.162 + 0.03),
+                new Point2D(0.2, 1.162 + 0.05),
+                new Point2D(0.2, 1.162 - 0.03),
+                new Point2D(0.2, 1.162 - 0.01),
+                new Point2D(0.3, 1.267),
+                new Point2D(0.4, 1.328 - 0.01),
+                new Point2D(0.53, 1.351),
+                new Point2D(0.69, 1.340),
+                new Point2D(0.73, 1.302),
+                new Point2D(1.4, 0.716 - 0.02),
+                new Point2D(1.4, 0.716 + 0.02),
+                new Point2D(1.7, 0.591),
+                new Point2D(1.8, 0.606)
             }, Resources.OpenChartViewCommand_Execute_Points_two)
             {
                 Style = new ChartPointStyle(Color.FromArgb(190, Color.Gold), 7, Color.DeepSkyBlue, 2, ChartPointSymbol.Diamond)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -r80c86231452b9beb7e8b8eba3698ceb9c0551de3 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 80c86231452b9beb7e8b8eba3698ceb9c0551de3)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -171,8 +171,6 @@
             {
                 if (!ReferenceEquals(value, data.WrappedData.SurfaceLine))
                 {
-                    var oldSurfaceLine = data.WrappedData.SurfaceLine;
-
                     data.WrappedData.SurfaceLine = value;
                     PipingInputService.SetMatchingStochasticSoilModel(data.WrappedData, GetAvailableStochasticSoilModels());
                     data.WrappedData.NotifyObservers();