Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r8b36313c9a9136c821c2614762889a63968aa8e6 -rb89eebcea2923640c50590ddc8c9f9b1120c0ea1
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 8b36313c9a9136c821c2614762889a63968aa8e6)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision b89eebcea2923640c50590ddc8c9f9b1120c0ea1)
@@ -24,7 +24,6 @@
 using System.Linq;
 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;
@@ -255,40 +254,37 @@
         {
             for (var i = 0; i < mapDataThatShouldBeDrawn.Count; i++)
             {
-                map.Layers.Move(drawnMapDataLookup[mapDataThatShouldBeDrawn[i]].MapFeatureLayer, i);
+                map.Layers.Move(drawnMapDataLookup[mapDataThatShouldBeDrawn[i]].FeatureBasedMapDataLayer, i);
             }
         }
 
         private void DrawMapData(FeatureBasedMapData featureBasedMapData)
         {
-            var mapFeatureLayer = FeatureBasedMapDataLayerFactory.Create(featureBasedMapData);
+            var featureBasedMapDataLayer = FeatureBasedMapDataLayerFactory.Create(featureBasedMapData);
 
             var drawnMapData = new DrawnMapData
             {
                 FeatureBasedMapData = featureBasedMapData,
                 Features = featureBasedMapData.Features,
-                MapFeatureLayer = mapFeatureLayer
+                FeatureBasedMapDataLayer = featureBasedMapDataLayer
             };
 
-            drawnMapData.Observer = new Observer(() =>
+            drawnMapData.Observer = new Observer(() => { drawnMapData.FeatureBasedMapDataLayer.Update(); })
             {
-                drawnMapData.MapFeatureLayer.Update();
-            })
-            {
                 Observable = featureBasedMapData
             };
 
             drawnMapDataList.Add(drawnMapData);
 
-            map.Layers.Add(mapFeatureLayer);
+            map.Layers.Add(featureBasedMapDataLayer);
         }
 
         private void RemoveMapData(DrawnMapData drawnMapDataToRemove)
         {
             drawnMapDataToRemove.Observer.Dispose();
             drawnMapDataList.Remove(drawnMapDataToRemove);
 
-            map.Layers.Remove(drawnMapDataToRemove.MapFeatureLayer);
+            map.Layers.Remove(drawnMapDataToRemove.FeatureBasedMapDataLayer);
         }
 
         private static IEnumerable<FeatureBasedMapData> GetFeatureBasedMapDataRecursively(MapDataCollection mapDataCollection)
@@ -346,7 +342,7 @@
 
             public MapFeature[] Features { get; set; }
 
-            public IFeatureBasedMapDataLayer MapFeatureLayer { get; set; }
+            public IFeatureBasedMapDataLayer FeatureBasedMapDataLayer { get; set; }
 
             public Observer Observer { get; set; }
         }
Index: Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs
===================================================================
diff -u -rd348f01e2a67e8ceee60a095c7f858d2f8c02081 -rb89eebcea2923640c50590ddc8c9f9b1120c0ea1
--- Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision d348f01e2a67e8ceee60a095c7f858d2f8c02081)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision b89eebcea2923640c50590ddc8c9f9b1120c0ea1)
@@ -39,15 +39,29 @@
     /// </summary>
     /// <typeparam name="TFeatureBasedMapData">The type of feature based map data to convert.</typeparam>
     /// <typeparam name="TMapFeatureLayer">The type of map feature layer to set the converted data to.</typeparam>
-    public abstract class FeatureBasedMapDataConverter<TFeatureBasedMapData, TMapFeatureLayer> : IFeatureBasedMapDataConverter
+    public abstract class FeatureBasedMapDataConverter<TFeatureBasedMapData, TMapFeatureLayer>
         where TFeatureBasedMapData : FeatureBasedMapData
         where TMapFeatureLayer : FeatureLayer, IMapFeatureLayer
     {
+        /// <summary>
+        /// Checks whether the <see cref="FeatureBasedMapDataConverter{TFeatureBasedMapData, TMapFeatureLayer}"/> can convert the <paramref name="data"/>.
+        /// </summary>
+        /// <param name="data">The <see cref="FeatureBasedMapData"/> to check for.</param>
+        /// <returns><c>true</c> if the <paramref name="data"/> can be converted by the
+        /// <see cref="FeatureBasedMapDataConverter{TFeatureBasedMapData, TMapFeatureLayer}"/>,
+        /// <c>false</c> otherwise.</returns>
         public bool CanConvertMapData(FeatureBasedMapData data)
         {
             return data is TFeatureBasedMapData;
         }
 
+        /// <summary>
+        /// Creates a <see cref="IMapFeatureLayer"/> based on the <paramref name="data"/> that was given.
+        /// </summary>
+        /// <param name="data">The data to transform into a <see cref="IMapFeatureLayer"/>.</param>
+        /// <returns>A new <see cref="IMapFeatureLayer"/>.</returns>
+        /// <exception cref="ArgumentException">Thrown when <see cref="CanConvertMapData"/> returns <c>false</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> is <c>null</c>.</exception>
         public IMapFeatureLayer Convert(FeatureBasedMapData data)
         {
             ValidateParameters(data);
@@ -60,13 +74,28 @@
             return layer;
         }
 
+        /// <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="ArgumentException">Thrown when <see cref="CanConvertMapData"/> returns <c>false</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> or <paramref name="layer"/> is <c>null</c>.</exception>
         public void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer)
         {
             ValidateParameters(data, layer);
 
             ConvertLayerFeaturesInternal(data, 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>
+        /// <exception cref="ArgumentException">Thrown when <see cref="CanConvertMapData"/> returns <c>false</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> or <paramref name="layer"/> is <c>null</c>.</exception>
         public void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer)
         {
             ValidateParameters(data, layer);
Fisheye: Tag b89eebcea2923640c50590ddc8c9f9b1120c0ea1 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r8b36313c9a9136c821c2614762889a63968aa8e6 -rb89eebcea2923640c50590ddc8c9f9b1120c0ea1
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 8b36313c9a9136c821c2614762889a63968aa8e6)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision b89eebcea2923640c50590ddc8c9f9b1120c0ea1)
@@ -64,7 +64,6 @@
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Converter\IFeatureBasedMapDataConverter.cs" />
     <Compile Include="Converter\FeatureBasedMapDataConverter.cs" />
     <Compile Include="Layer\IFeatureBasedMapDataLayer.cs" />
     <Compile Include="Layer\FeatureBasedMapDataLayerFactory.cs" />