Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs
===================================================================
diff -u -r6b4da58002fb726ef36e283982e21cad498f38b3 -re7b52d704cd62636707e3f4afd65321a63448d79
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision 6b4da58002fb726ef36e283982e21cad498f38b3)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision e7b52d704cd62636707e3f4afd65321a63448d79)
@@ -94,12 +94,12 @@
         }
 
         /// <summary>
-        /// Adds <see cref="MapFeature.MetaData"/> as attributes to the given <see cref="Feature"/> and to the <see cref="FeatureSet.DataTable"/>.
+        /// Adds <see cref="MapFeature.MetaData"/> as attributes to the given <see cref="Feature"/> and to the <see cref="IFeatureSet.DataTable"/>.
         /// </summary>
         /// <param name="ringtoetsMapFeature">The <see cref="MapFeature"/> to get the mete data from.</param>
-        /// <param name="featureSet">The <see cref="FeatureSet"/> to add the attributes to.</param>
+        /// <param name="featureSet">The <see cref="IFeatureSet"/> to add the attributes to.</param>
         /// <param name="feature">The <see cref="Feature"/> to add the attributes to.</param>
-        protected void AddMetaDataAsAttributes(MapFeature ringtoetsMapFeature, FeatureSet featureSet, Feature feature)
+        protected void AddMetaDataAsAttributes(MapFeature ringtoetsMapFeature, IFeatureSet featureSet, Feature feature)
         {
             var columnKey = 1;
             foreach (var attribute in ringtoetsMapFeature.MetaData)
@@ -125,11 +125,11 @@
         /// <summary>
         /// Gets a new <see cref="MapLabelLayer"/>.
         /// </summary>
-        /// <param name="featureSet">The <see cref="FeatureSet"/> to add the <see cref="MapLabelLayer"/> to.</param>
+        /// <param name="featureSet">The <see cref="IFeatureSet"/> to add the <see cref="MapLabelLayer"/> to.</param>
         /// <param name="showLabels">Indicator whether to show the labels or not.</param>
         /// <param name="labelToShow">The key of the attribute to show the labels for.</param>
         /// <returns>A new <see cref="MapLabelLayer"/>.</returns>
-        protected MapLabelLayer GetLabelLayer(FeatureSet featureSet, bool showLabels, string labelToShow)
+        protected MapLabelLayer GetLabelLayer(IFeatureSet featureSet, bool showLabels, string labelToShow)
         {
             var labelLayer = new MapLabelLayer();
 
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -r6b4da58002fb726ef36e283982e21cad498f38b3 -re7b52d704cd62636707e3f4afd65321a63448d79
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 6b4da58002fb726ef36e283982e21cad498f38b3)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision e7b52d704cd62636707e3f4afd65321a63448d79)
@@ -29,7 +29,6 @@
 using DotSpatial.Data;
 using DotSpatial.Symbology;
 using DotSpatial.Topology;
-using LineStyle = Core.Components.Gis.Style.LineStyle;
 
 namespace Core.Components.DotSpatial.Converter
 {
@@ -41,26 +40,35 @@
     {
         protected override IMapFeatureLayer Convert(MapLineData data)
         {
-            var featureSet = new FeatureSet(FeatureType.Line);
+            var layer = new MapLineLayer();
 
+            ConvertLayerFeatures(data, layer);
+            ConvertLayerProperties(data, layer);
+
+            return layer;
+        }
+
+        private void ConvertLayerFeatures(MapLineData data, MapLineLayer layer)
+        {
             foreach (MapFeature mapFeature in data.Features)
             {
-                AddMetaDataAsAttributes(mapFeature, featureSet, new Feature(GetGeometry(mapFeature), featureSet));
+                AddMetaDataAsAttributes(mapFeature, layer.FeatureSet, new Feature(GetGeometry(mapFeature), layer.FeatureSet));
             }
 
-            featureSet.InitializeVertices();
+            layer.FeatureSet.InitializeVertices();
+        }
 
-            var layer = new MapLineLayer(featureSet)
-            {
-                IsVisible = data.IsVisible,
-                Name = data.Name,
-                ShowLabels = data.ShowLabels,
-                LabelLayer = GetLabelLayer(featureSet, data.ShowLabels, data.SelectedMetaDataAttribute)
-            };
+        private void ConvertLayerProperties(MapLineData data, MapLineLayer layer)
+        {
+            layer.IsVisible = data.IsVisible;
+            layer.Name = data.Name;
+            layer.ShowLabels = data.ShowLabels;
+            layer.LabelLayer = GetLabelLayer(layer.FeatureSet, data.ShowLabels, data.SelectedMetaDataAttribute);
 
-            CreateStyle(layer, data.Style);
-
-            return layer;
+            if (data.Style != null)
+            {
+                layer.Symbolizer = new LineSymbolizer(data.Style.Color, data.Style.Color, data.Style.Width, data.Style.Style, LineCap.Round);
+            }
         }
 
         private static IBasicGeometry GetGeometry(MapFeature mapFeature)
@@ -87,13 +95,5 @@
         {
             return factory.CreateLineString(ConvertPoint2DElementsToCoordinates(points).ToList());
         }
-
-        private static void CreateStyle(MapLineLayer layer, LineStyle style)
-        {
-            if (style != null)
-            {
-                layer.Symbolizer = new LineSymbolizer(style.Color, style.Color, style.Width, style.Style, LineCap.Round);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs
===================================================================
diff -u -r675771641656abfb56ef89be86bad7bd21684016 -re7b52d704cd62636707e3f4afd65321a63448d79
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 675771641656abfb56ef89be86bad7bd21684016)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision e7b52d704cd62636707e3f4afd65321a63448d79)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.Style;
 using DotSpatial.Controls;
 using DotSpatial.Data;
 using DotSpatial.Symbology;
@@ -39,43 +38,44 @@
     {
         protected override IMapFeatureLayer Convert(MapPointData data)
         {
-            var featureSet = new FeatureSet(FeatureType.Point);
+            var layer = new MapPointLayer();
 
+            ConvertLayerFeatures(data, layer);
+            ConvertLayerProperties(data, layer);
+
+            return layer;
+        }
+
+        private void ConvertLayerFeatures(MapPointData data, MapPointLayer layer)
+        {
             foreach (var ringtoetsMapFeature in data.Features)
             {
                 foreach (var feature in GetAllMapFeatureCoordinates(ringtoetsMapFeature)
-                    .Select(c => new Feature(new Point(c.X, c.Y), featureSet)))
+                    .Select(c => new Feature(new Point(c.X, c.Y), layer.FeatureSet)))
                 {
-                    AddMetaDataAsAttributes(ringtoetsMapFeature, featureSet, feature);
+                    AddMetaDataAsAttributes(ringtoetsMapFeature, layer.FeatureSet, feature);
                 }
             }
 
-            featureSet.InitializeVertices();
+            layer.FeatureSet.InitializeVertices();
+        }
 
-            var layer = new MapPointLayer(featureSet)
-            {
-                IsVisible = data.IsVisible,
-                Name = data.Name,
-                ShowLabels = data.ShowLabels,
-                LabelLayer = GetLabelLayer(featureSet, data.ShowLabels, data.SelectedMetaDataAttribute)
-            };
+        private void ConvertLayerProperties(MapPointData data, MapPointLayer layer)
+        {
+            layer.IsVisible = data.IsVisible;
+            layer.Name = data.Name;
+            layer.ShowLabels = data.ShowLabels;
+            layer.LabelLayer = GetLabelLayer(layer.FeatureSet, data.ShowLabels, data.SelectedMetaDataAttribute);
 
-            CreateStyle(layer, data.Style);
-
-            return layer;
+            if (data.Style != null)
+            {
+                layer.Symbolizer = new PointSymbolizer(data.Style.Color, MapDataHelper.Convert(data.Style.Symbol), data.Style.Size);
+            }
         }
 
         private static IEnumerable<Coordinate> GetAllMapFeatureCoordinates(MapFeature feature)
         {
             return feature.MapGeometries.SelectMany(mapGeometry => ConvertPoint2DElementsToCoordinates(mapGeometry.PointCollections.First()));
         }
-
-        private static void CreateStyle(MapPointLayer layer, PointStyle style)
-        {
-            if (style != null)
-            {
-                layer.Symbolizer = new PointSymbolizer(style.Color, MapDataHelper.Convert(style.Symbol), style.Size);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r675771641656abfb56ef89be86bad7bd21684016 -re7b52d704cd62636707e3f4afd65321a63448d79
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 675771641656abfb56ef89be86bad7bd21684016)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision e7b52d704cd62636707e3f4afd65321a63448d79)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Core.Components.Gis.Data;
-using Core.Components.Gis.Style;
 using DotSpatial.Controls;
 using DotSpatial.Data;
 using DotSpatial.Symbology;
@@ -39,8 +38,16 @@
     {
         protected override IMapFeatureLayer Convert(MapPolygonData data)
         {
-            var featureSet = new FeatureSet(FeatureType.Polygon);
+            var layer = new MapPolygonLayer();
 
+            ConvertLayerFeatures(data, layer);
+            ConvertLayerProperties(data, layer);
+
+            return layer;
+        }
+
+        private void ConvertLayerFeatures(MapPolygonData data, MapPolygonLayer layer)
+        {
             foreach (var mapFeature in data.Features)
             {
                 var geometryList = new List<IPolygon>();
@@ -63,22 +70,23 @@
                     geometryList.Add(polygon);
                 }
 
-                AddMetaDataAsAttributes(mapFeature, featureSet, new Feature(GetGeometry(geometryList), featureSet));
+                AddMetaDataAsAttributes(mapFeature, layer.FeatureSet, new Feature(GetGeometry(geometryList), layer.FeatureSet));
             }
 
-            featureSet.InitializeVertices();
+            layer.FeatureSet.InitializeVertices();
+        }
 
-            var layer = new MapPolygonLayer(featureSet)
-            {
-                IsVisible = data.IsVisible,
-                Name = data.Name,
-                ShowLabels = data.ShowLabels,
-                LabelLayer = GetLabelLayer(featureSet, data.ShowLabels, data.SelectedMetaDataAttribute)
-            };
+        private void ConvertLayerProperties(MapPolygonData data, MapPolygonLayer layer)
+        {
+            layer.IsVisible = data.IsVisible;
+            layer.Name = data.Name;
+            layer.ShowLabels = data.ShowLabels;
+            layer.LabelLayer = GetLabelLayer(layer.FeatureSet, data.ShowLabels, data.SelectedMetaDataAttribute);
 
-            CreateStyle(layer, data.Style);
-
-            return layer;
+            if (data.Style != null)
+            {
+                layer.Symbolizer = new PolygonSymbolizer(data.Style.FillColor, data.Style.StrokeColor, data.Style.Width);
+            }
         }
 
         private static IBasicGeometry GetGeometry(List<IPolygon> geometryList)
@@ -93,7 +101,8 @@
             else
             {
                 ILinearRing shell = null;
-                ILinearRing[] holes = {};
+                ILinearRing[] holes =
+                {};
 
                 if (geometryList.Count == 1)
                 {
@@ -106,13 +115,5 @@
             }
             return geometry;
         }
-
-        private static void CreateStyle(IPolygonLayer layer, PolygonStyle style)
-        {
-            if (style != null)
-            {
-                layer.Symbolizer = new PolygonSymbolizer(style.FillColor, style.StrokeColor, style.Width);
-            }
-        }
     }
 }
\ No newline at end of file