Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r0280af2522389e4f1291c22e0cbea677995e3fba -rf245fcfc202b53559917a5b89810a30c42949303
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 0280af2522389e4f1291c22e0cbea677995e3fba)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -25,6 +25,7 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Components.DotSpatial.Converter;
+using Core.Components.DotSpatial.Layer;
 using Core.Components.DotSpatial.MapFunctions;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
@@ -260,7 +261,7 @@
 
         private void DrawMapData(FeatureBasedMapData featureBasedMapData)
         {
-            var mapFeatureLayer = MapFeatureLayerFactory.Create(featureBasedMapData);
+            var mapFeatureLayer = MapFeatureLayerFactory.CreateLayer(featureBasedMapData);
 
             var drawnMapData = new DrawnMapData
             {
@@ -271,14 +272,7 @@
 
             drawnMapData.Observer = new Observer(() =>
             {
-                if (!ReferenceEquals(drawnMapData.FeatureBasedMapData.Features, drawnMapData.Features))
-                {
-                    MapFeatureLayerFactory.ConvertLayerFeatures(drawnMapData.FeatureBasedMapData, drawnMapData.MapFeatureLayer);
-
-                    drawnMapData.Features = drawnMapData.FeatureBasedMapData.Features;
-                }
-
-                MapFeatureLayerFactory.ConvertLayerProperties(drawnMapData.FeatureBasedMapData, drawnMapData.MapFeatureLayer);
+                drawnMapData.MapFeatureLayer.Update();
             })
             {
                 Observable = featureBasedMapData
@@ -352,7 +346,7 @@
 
             public MapFeature[] Features { get; set; }
 
-            public IMapFeatureLayer MapFeatureLayer { get; set; }
+            public IFeatureBasedMapDataLayer MapFeatureLayer { get; set; }
 
             public Observer Observer { get; set; }
         }
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs
===================================================================
diff -u -rc600c9837e2b119fc8881a312a1404e7a9d04288 -rf245fcfc202b53559917a5b89810a30c42949303
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs	(.../MapFeatureLayerFactory.cs)	(revision c600c9837e2b119fc8881a312a1404e7a9d04288)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs	(.../MapFeatureLayerFactory.cs)	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Core.Components.DotSpatial.Layer;
 using Core.Components.Gis.Data;
 using DotSpatial.Controls;
 
@@ -39,59 +40,44 @@
             new MapPolygonDataConverter()
         };
 
-        /// <summary>
-        /// Creates a <see cref="IMapFeatureLayer"/> from the given <paramref name="data"/>.
-        /// </summary>
-        /// <param name="data">The <see cref="FeatureBasedMapData"/> to base the creation of <see cref="IMapFeatureLayer"/> upon.</param>
-        /// <returns>A new layer based on <see cref="FeatureBasedMapData"/>.</returns>
-        /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
-        public static IMapFeatureLayer Create(FeatureBasedMapData data)
+        public static IFeatureBasedMapDataLayer CreateLayer(FeatureBasedMapData data)
         {
-            var converter = converters.FirstOrDefault(c => c.CanConvertMapData(data));
-            if (converter != null)
+            var mapPointData = data as MapPointData;
+            if (mapPointData != null)
             {
-                return converter.Convert(data);
+                return new MapPointDataLayer(mapPointData);
             }
 
-            throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
-        }
-
-        /// <summary>
-        /// Converts all feature related data from <paramref name="data"/> to <paramref name="layer"/>.
-        /// </summary>
-        /// <param name="data">The data to convert the feature related data from.</param>
-        /// <param name="layer">The layer to convert the feature related data to.</param>
-        /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
-        public static void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer)
-        {
-            var converter = converters.FirstOrDefault(c => c.CanConvertMapData(data));
-            if (converter != null)
+            var mapLineData = data as MapLineData;
+            if (mapLineData != null)
             {
-                converter.ConvertLayerFeatures(data, layer);
+                return new MapLineDataLayer(mapLineData);
             }
-            else
+
+            var mapPolygonData = data as MapPolygonData;
+            if (mapPolygonData != null)
             {
-                throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
+                return new MapPolygonDataLayer(mapPolygonData);
             }
+
+            throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
         }
 
         /// <summary>
-        /// Converts all general properties (like <see cref="FeatureBasedMapData.Name"/> and <see cref="FeatureBasedMapData.IsVisible"/>) 
-        /// from <paramref name="data"/> to <paramref name="layer"/>.
+        /// Creates a <see cref="IMapFeatureLayer"/> from the given <paramref name="data"/>.
         /// </summary>
-        /// <param name="data">The data to convert the general properties from.</param>
-        /// <param name="layer">The layer to convert the general properties to.</param>
-        public static void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer)
+        /// <param name="data">The <see cref="FeatureBasedMapData"/> to base the creation of <see cref="IMapFeatureLayer"/> upon.</param>
+        /// <returns>A new layer based on <see cref="FeatureBasedMapData"/>.</returns>
+        /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
+        public static IMapFeatureLayer Create(FeatureBasedMapData data)
         {
             var converter = converters.FirstOrDefault(c => c.CanConvertMapData(data));
             if (converter != null)
             {
-                converter.ConvertLayerProperties(data, layer);
+                return converter.Convert(data);
             }
-            else
-            {
-                throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
-            }
+
+            throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
         }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c -rf245fcfc202b53559917a5b89810a30c42949303
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -44,6 +44,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="DotSpatial.Projections, Version=1.8.0.0, Culture=neutral, PublicKeyToken=272632bddd08a38b, processorArchitecture=MSIL" />
     <Reference Include="DotSpatial.Symbology, Version=1.8.0.0, Culture=neutral, PublicKeyToken=6178c08da7998387, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Symbology.dll</HintPath>
@@ -65,11 +66,15 @@
     </Compile>
     <Compile Include="Converter\IFeatureBasedMapDataConverter.cs" />
     <Compile Include="Converter\FeatureBasedMapDataConverter.cs" />
+    <Compile Include="Layer\IFeatureBasedMapDataLayer.cs" />
     <Compile Include="Converter\MapFeatureLayerFactory.cs" />
     <Compile Include="Converter\MapDataHelper.cs" />
     <Compile Include="Converter\MapLineDataConverter.cs" />
+    <Compile Include="Layer\MapLineDataLayer.cs" />
     <Compile Include="Converter\MapPointDataConverter.cs" />
+    <Compile Include="Layer\MapPointDataLayer.cs" />
     <Compile Include="Converter\MapPolygonDataConverter.cs" />
+    <Compile Include="Layer\MapPolygonDataLayer.cs" />
     <Compile Include="MapFunctions\MapFunctionSelectionZoom.cs" />
     <Compile Include="MouseCoordinatesMapExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Components/src/Core.Components.DotSpatial/Layer/IFeatureBasedMapDataLayer.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Layer/IFeatureBasedMapDataLayer.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/IFeatureBasedMapDataLayer.cs	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -0,0 +1,36 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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 DotSpatial.Controls;
+
+namespace Core.Components.DotSpatial.Layer
+{
+    /// <summary>
+    /// Interface for feature based map data layers.
+    /// </summary>
+    public interface IFeatureBasedMapDataLayer : IMapLayer
+    {
+        /// <summary>
+        /// Updates the map data layer.
+        /// </summary>
+        void Update();
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Layer/MapLineDataLayer.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Layer/MapLineDataLayer.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/MapLineDataLayer.cs	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -0,0 +1,68 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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 Core.Components.DotSpatial.Converter;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
+using DotSpatial.Controls;
+
+namespace Core.Components.DotSpatial.Layer
+{
+    /// <summary>
+    /// A <see cref="MapLineLayer"/> based on and updated according to the wrapped <see cref="MapLineData"/>.
+    /// </summary>
+    public class MapLineDataLayer : MapLineLayer, IFeatureBasedMapDataLayer
+    {
+        private readonly MapLineData mapLineData;
+        private readonly MapLineDataConverter converter = new MapLineDataConverter();
+
+        private MapFeature[] drawnFeatures;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="MapLineDataLayer"/>.
+        /// </summary>
+        /// <param name="mapLineData">The <see cref="MapLineData"/> which the map line layer is based upon.</param>
+        public MapLineDataLayer(MapLineData mapLineData)
+        {
+            if (mapLineData == null)
+            {
+                throw new ArgumentNullException("mapLineData");
+            }
+
+            this.mapLineData = mapLineData;
+
+            Update();
+        }
+
+        public void Update()
+        {
+            if (!ReferenceEquals(mapLineData.Features, drawnFeatures))
+            {
+                converter.ConvertLayerFeatures(mapLineData, this);
+
+                drawnFeatures = mapLineData.Features;
+            }
+
+            converter.ConvertLayerProperties(mapLineData, this);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Layer/MapPointDataLayer.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Layer/MapPointDataLayer.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/MapPointDataLayer.cs	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -0,0 +1,47 @@
+using System;
+using Core.Components.DotSpatial.Converter;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
+using DotSpatial.Controls;
+
+namespace Core.Components.DotSpatial.Layer
+{
+    /// <summary>
+    /// A <see cref="MapPointLayer"/> based on and updated according to the wrapped <see cref="MapPointData"/>.
+    /// </summary>
+    public class MapPointDataLayer : MapPointLayer, IFeatureBasedMapDataLayer
+    {
+        private readonly MapPointData mapPointData;
+        private readonly MapPointDataConverter converter = new MapPointDataConverter();
+
+        private MapFeature[] drawnFeatures;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="MapPointDataLayer"/>.
+        /// </summary>
+        /// <param name="mapPointData">The <see cref="MapPointData"/> which the map point layer is based upon.</param>
+        public MapPointDataLayer(MapPointData mapPointData)
+        {
+            if (mapPointData == null)
+            {
+                throw new ArgumentNullException("mapPointData");
+            }
+
+            this.mapPointData = mapPointData;
+
+            Update();
+        }
+
+        public void Update()
+        {
+            if (!ReferenceEquals(mapPointData.Features, drawnFeatures))
+            {
+                converter.ConvertLayerFeatures(mapPointData, this);
+
+                drawnFeatures = mapPointData.Features;
+            }
+
+            converter.ConvertLayerProperties(mapPointData, this);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Layer/MapPolygonDataLayer.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Layer/MapPolygonDataLayer.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/MapPolygonDataLayer.cs	(revision f245fcfc202b53559917a5b89810a30c42949303)
@@ -0,0 +1,68 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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 Core.Components.DotSpatial.Converter;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
+using DotSpatial.Controls;
+
+namespace Core.Components.DotSpatial.Layer
+{
+    /// <summary>
+    /// A <see cref="MapPolygonLayer"/> based on and updated according to the wrapped <see cref="MapPolygonData"/>.
+    /// </summary>
+    public class MapPolygonDataLayer : MapPolygonLayer, IFeatureBasedMapDataLayer
+    {
+        private readonly MapPolygonData mapPolygonData;
+        private readonly MapPolygonDataConverter converter = new MapPolygonDataConverter();
+
+        private MapFeature[] drawnFeatures;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="MapPolygonDataLayer"/>.
+        /// </summary>
+        /// <param name="mapPolygonData">The <see cref="MapPolygonData"/> which the map polygon layer is based upon.</param>
+        public MapPolygonDataLayer(MapPolygonData mapPolygonData)
+        {
+            if (mapPolygonData == null)
+            {
+                throw new ArgumentNullException("mapPolygonData");
+            }
+
+            this.mapPolygonData = mapPolygonData;
+
+            Update();
+        }
+
+        public void Update()
+        {
+            if (!ReferenceEquals(mapPolygonData.Features, drawnFeatures))
+            {
+                converter.ConvertLayerFeatures(mapPolygonData, this);
+
+                drawnFeatures = mapPolygonData.Features;
+            }
+
+            converter.ConvertLayerProperties(mapPolygonData, this);
+        }
+    }
+}
\ No newline at end of file