Index: Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs
===================================================================
diff -u -r7090143d6542dc5b6bfc3b920dc1a8c8dc16accb -r4e205e9a39251d5c382c0fa064cc1a5d7239b5bf
--- Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision 7090143d6542dc5b6bfc3b920dc1a8c8dc16accb)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision 4e205e9a39251d5c382c0fa064cc1a5d7239b5bf)
@@ -41,7 +41,7 @@
     /// <typeparam name="TMapFeatureLayer">The type of map feature layer to set the converted data to.</typeparam>
     public abstract class FeatureBasedMapDataConverter<TFeatureBasedMapData, TMapFeatureLayer> : IFeatureBasedMapDataConverter
         where TFeatureBasedMapData : FeatureBasedMapData
-        where TMapFeatureLayer : IMapFeatureLayer
+        where TMapFeatureLayer : FeatureLayer, IMapFeatureLayer
     {
         public bool CanConvertMapData(FeatureBasedMapData data)
         {
@@ -92,6 +92,11 @@
         {
             ValidateParameters(data);
 
+            layer.IsVisible = data.IsVisible;
+            ((TMapFeatureLayer) layer).Name = data.Name;
+            layer.ShowLabels = data.ShowLabels;
+            layer.LabelLayer = GetLabelLayer(GetColumnNameLookup(data), layer.DataSet, data.ShowLabels, data.SelectedMetaDataAttribute);
+
             ConvertLayerProperties((TFeatureBasedMapData) data, (TMapFeatureLayer) layer);
         }
 
@@ -132,7 +137,7 @@
             }
         }
 
-        protected static Dictionary<string, int> GetColumnNameLookup(FeatureBasedMapData data)
+        private static Dictionary<string, int> GetColumnNameLookup(FeatureBasedMapData data)
         {
             return Enumerable.Range(0, data.MetaData.Count())
                              .ToDictionary(md => data.MetaData.ElementAt(md), mdi => mdi + 1);
@@ -146,7 +151,7 @@
         /// <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(IDictionary<string, int> metaDataLookup, IFeatureSet featureSet, bool showLabels, string labelToShow)
+        private static MapLabelLayer GetLabelLayer(IDictionary<string, int> metaDataLookup, IFeatureSet featureSet, bool showLabels, string labelToShow)
         {
             var labelLayer = new MapLabelLayer();
 
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -r7090143d6542dc5b6bfc3b920dc1a8c8dc16accb -r4e205e9a39251d5c382c0fa064cc1a5d7239b5bf
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 7090143d6542dc5b6bfc3b920dc1a8c8dc16accb)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 4e205e9a39251d5c382c0fa064cc1a5d7239b5bf)
@@ -49,11 +49,6 @@
 
         protected override void ConvertLayerProperties(MapLineData data, MapLineLayer layer)
         {
-            layer.IsVisible = data.IsVisible;
-            layer.Name = data.Name;
-            layer.ShowLabels = data.ShowLabels;
-            layer.LabelLayer = GetLabelLayer(GetColumnNameLookup(data), layer.FeatureSet, data.ShowLabels, data.SelectedMetaDataAttribute);
-
             if (data.Style != null)
             {
                 layer.Symbolizer = new LineSymbolizer(data.Style.Color, data.Style.Color, data.Style.Width, data.Style.Style, LineCap.Round);
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs
===================================================================
diff -u -r7090143d6542dc5b6bfc3b920dc1a8c8dc16accb -r4e205e9a39251d5c382c0fa064cc1a5d7239b5bf
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 7090143d6542dc5b6bfc3b920dc1a8c8dc16accb)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 4e205e9a39251d5c382c0fa064cc1a5d7239b5bf)
@@ -47,11 +47,6 @@
 
         protected override void ConvertLayerProperties(MapPointData data, MapPointLayer layer)
         {
-            layer.IsVisible = data.IsVisible;
-            layer.Name = data.Name;
-            layer.ShowLabels = data.ShowLabels;
-            layer.LabelLayer = GetLabelLayer(GetColumnNameLookup(data), layer.FeatureSet, data.ShowLabels, data.SelectedMetaDataAttribute);
-
             if (data.Style != null)
             {
                 layer.Symbolizer = new PointSymbolizer(data.Style.Color, MapDataHelper.Convert(data.Style.Symbol), data.Style.Size);
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r7090143d6542dc5b6bfc3b920dc1a8c8dc16accb -r4e205e9a39251d5c382c0fa064cc1a5d7239b5bf
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 7090143d6542dc5b6bfc3b920dc1a8c8dc16accb)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 4e205e9a39251d5c382c0fa064cc1a5d7239b5bf)
@@ -68,11 +68,6 @@
 
         protected override void ConvertLayerProperties(MapPolygonData data, MapPolygonLayer layer)
         {
-            layer.IsVisible = data.IsVisible;
-            layer.Name = data.Name;
-            layer.ShowLabels = data.ShowLabels;
-            layer.LabelLayer = GetLabelLayer(GetColumnNameLookup(data), layer.FeatureSet, data.ShowLabels, data.SelectedMetaDataAttribute);
-
             if (data.Style != null)
             {
                 layer.Symbolizer = new PolygonSymbolizer(data.Style.FillColor, data.Style.StrokeColor, data.Style.Width);