Index: Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs
===================================================================
diff -u -r956c3e0ce151ba33c204d2ebad3dc349a0304e06 -rf1533826e584432afb90f50645bad20a803eeac1
--- Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision 956c3e0ce151ba33c204d2ebad3dc349a0304e06)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision f1533826e584432afb90f50645bad20a803eeac1)
@@ -54,14 +54,19 @@
             return Convert((TFeatureBasedMapData) data);
         }
 
-        public void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer)
+        public void ConvertLayerFeatures(FeatureBasedMapData data, IFeatureLayer layer)
         {
             ValidateParameters(data);
 
+            ClearLayerData(layer);
+            SetDataTableColumns(data, layer);
+
             ConvertLayerFeatures((TFeatureBasedMapData) data, (TMapFeatureLayer) layer);
+
+            layer.DataSet.InitializeVertices();
         }
 
-        public void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer)
+        public void ConvertLayerProperties(FeatureBasedMapData data, IFeatureLayer layer)
         {
             ValidateParameters(data);
 
@@ -102,17 +107,17 @@
             return points.Select(point => new Coordinate(point.X, point.Y));
         }
 
-        protected static void ClearLayerData(FeatureLayer layer)
+        protected static void ClearLayerData(IFeatureLayer layer)
         {
-            layer.FeatureSet.Features.Clear();
-            layer.FeatureSet.DataTable.Clear();
+            layer.DataSet.Features.Clear();
+            layer.DataSet.DataTable.Clear();
         }
 
-        protected static void SetDataTableColumns(FeatureBasedMapData data, FeatureLayer layer)
+        protected static void SetDataTableColumns(FeatureBasedMapData data, IFeatureLayer layer)
         {
             for (var i = 1; i <= data.MetaData.Count(); i++)
             {
-                layer.FeatureSet.DataTable.Columns.Add(i.ToString(), typeof(string));
+                layer.DataSet.DataTable.Columns.Add(i.ToString(), typeof(string));
             }
         }
 
Index: Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs
===================================================================
diff -u -rc7608335f86c59fff48f77d5bc83b2692ef18fef -rf1533826e584432afb90f50645bad20a803eeac1
--- Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs	(.../IFeatureBasedMapDataConverter.cs)	(revision c7608335f86c59fff48f77d5bc83b2692ef18fef)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs	(.../IFeatureBasedMapDataConverter.cs)	(revision f1533826e584432afb90f50645bad20a803eeac1)
@@ -22,11 +22,12 @@
 using System;
 using Core.Components.Gis.Data;
 using DotSpatial.Controls;
+using DotSpatial.Symbology;
 
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// The interface for a converter which converts <see cref="FeatureBasedMapData"/> into <see cref="IMapFeatureLayer"/>.
+    /// The interface for a converter which converts <see cref="FeatureBasedMapData"/> into <see cref="IFeatureLayer"/>.
     /// </summary>
     public interface IFeatureBasedMapDataConverter
     {
@@ -52,14 +53,14 @@
         /// </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>
-        void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer);
+        void ConvertLayerFeatures(FeatureBasedMapData data, IFeatureLayer layer);
 
         /// <summary>
         /// Converts all general properties (like <see cref="FeatureBasedMapData.Name"/> and <see cref="FeatureBasedMapData.IsVisible"/>) 
         /// from <paramref name="data"/> to <paramref name="layer"/>.
         /// </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>
-        void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer);
+        void ConvertLayerProperties(FeatureBasedMapData data, IFeatureLayer layer);
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -r956c3e0ce151ba33c204d2ebad3dc349a0304e06 -rf1533826e584432afb90f50645bad20a803eeac1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 956c3e0ce151ba33c204d2ebad3dc349a0304e06)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision f1533826e584432afb90f50645bad20a803eeac1)
@@ -41,17 +41,17 @@
         {
             var layer = new MapLineLayer();
 
+            ClearLayerData(layer);
+            SetDataTableColumns(data, layer);
             ConvertLayerFeatures(data, layer);
             ConvertLayerProperties(data, layer);
+            layer.DataSet.InitializeVertices();
 
             return layer;
         }
 
         protected override void ConvertLayerFeatures(MapLineData data, MapLineLayer layer)
         {
-            ClearLayerData(layer);
-            SetDataTableColumns(data, layer);
-
             var columnNameLookup = GetColumnNameLookup(data);
 
             foreach (MapFeature mapFeature in data.Features)
@@ -63,8 +63,6 @@
                     feature.DataRow[columnNameLookup[attribute.Key].ToString()] = attribute.Value;
                 }
             }
-
-            layer.FeatureSet.InitializeVertices();
         }
 
         protected override void ConvertLayerProperties(MapLineData data, MapLineLayer layer)
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs
===================================================================
diff -u -r956c3e0ce151ba33c204d2ebad3dc349a0304e06 -rf1533826e584432afb90f50645bad20a803eeac1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 956c3e0ce151ba33c204d2ebad3dc349a0304e06)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision f1533826e584432afb90f50645bad20a803eeac1)
@@ -39,17 +39,17 @@
         {
             var layer = new MapPointLayer();
 
+            ClearLayerData(layer);
+            SetDataTableColumns(data, layer);
             ConvertLayerFeatures(data, layer);
             ConvertLayerProperties(data, layer);
+            layer.DataSet.InitializeVertices();
 
             return layer;
         }
 
         protected override void ConvertLayerFeatures(MapPointData data, MapPointLayer layer)
         {
-            ClearLayerData(layer);
-            SetDataTableColumns(data, layer);
-
             var columnNameLookup = GetColumnNameLookup(data);
 
             foreach (MapFeature mapFeature in data.Features)
@@ -63,8 +63,6 @@
                     }
                 }
             }
-
-            layer.FeatureSet.InitializeVertices();
         }
 
         protected override void ConvertLayerProperties(MapPointData data, MapPointLayer layer)
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r956c3e0ce151ba33c204d2ebad3dc349a0304e06 -rf1533826e584432afb90f50645bad20a803eeac1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 956c3e0ce151ba33c204d2ebad3dc349a0304e06)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision f1533826e584432afb90f50645bad20a803eeac1)
@@ -39,17 +39,17 @@
         {
             var layer = new MapPolygonLayer();
 
+            ClearLayerData(layer);
+            SetDataTableColumns(data, layer);
             ConvertLayerFeatures(data, layer);
             ConvertLayerProperties(data, layer);
+            layer.DataSet.InitializeVertices();
 
             return layer;
         }
 
         protected override void ConvertLayerFeatures(MapPolygonData data, MapPolygonLayer layer)
         {
-            ClearLayerData(layer);
-            SetDataTableColumns(data, layer);
-
             var columnNameLookup = GetColumnNameLookup(data);
 
             foreach (var mapFeature in data.Features)
@@ -81,8 +81,6 @@
                     feature.DataRow[columnNameLookup[attribute.Key].ToString()] = attribute.Value;
                 }
             }
-
-            layer.FeatureSet.InitializeVertices();
         }
 
         protected override void ConvertLayerProperties(MapPolygonData data, MapPolygonLayer layer)