Index: Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -r7e4316524d8b68201e4b3b3da307ebeb0e0d9551
--- Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs	(.../ChartPlugin.cs)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs	(.../ChartPlugin.cs)	(revision 7e4316524d8b68201e4b3b3da307ebeb0e0d9551)
@@ -63,7 +63,11 @@
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
             yield return new PropertyInfo<ChartDataCollection, ChartDataCollectionProperties>();
-//            yield return new PropertyInfo<ChartDataContext, ChartDataProperties>();
+            yield return new PropertyInfo<ChartLineData, ChartLineDataProperties>();
+            yield return new PropertyInfo<ChartMultipleAreaData, ChartMultipleAreaDataProperties>();
+            yield return new PropertyInfo<ChartMultipleLineData, ChartMultipleLineDataProperties>();
+            yield return new PropertyInfo<ChartPointData, ChartPointDataProperties>();
+            yield return new PropertyInfo<PointBasedChartData, PointBasedChartDataProperties>();
         }
 
         public override void Dispose()
Index: Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -r7e4316524d8b68201e4b3b3da307ebeb0e0d9551
--- Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs	(.../ChartPluginTest.cs)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs	(.../ChartPluginTest.cs)	(revision 7e4316524d8b68201e4b3b3da307ebeb0e0d9551)
@@ -36,7 +36,6 @@
 using Core.Components.Charting.Data;
 using Core.Components.OxyPlot.Forms;
 using Core.Plugins.Chart.Legend;
-using Core.Plugins.Chart.PresentationObjects;
 using Core.Plugins.Chart.PropertyClasses;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -155,12 +154,37 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(1, propertyInfos.Length);
+                Assert.AreEqual(6, propertyInfos.Length);
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ChartDataCollection),
                     typeof(ChartDataCollectionProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ChartLineData),
+                    typeof(ChartLineDataProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ChartMultipleAreaData),
+                    typeof(ChartMultipleAreaDataProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ChartMultipleLineData),
+                    typeof(ChartMultipleLineDataProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ChartPointData),
+                    typeof(ChartPointDataProperties));
+
+                PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(PointBasedChartData),
+                    typeof(PointBasedChartDataProperties));
             }
         }
     }
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -rbaf30f71add766acbccd7b79eea9319d7bba556f -r7e4316524d8b68201e4b3b3da307ebeb0e0d9551
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 7e4316524d8b68201e4b3b3da307ebeb0e0d9551)
@@ -303,7 +303,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_MapDataCollectionWithVisibleFeatureBasedmapData_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_WithChartDataCollection_CallsContextMenuBuilderMethods()
         {
             // Setup
             var chartDataCollection = new ChartDataCollection("test data");
@@ -320,7 +320,8 @@
                     menuBuilder.Expect(mb => mb.Build()).Return(null);
                 }
 
-                contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(chartDataCollection, treeViewControl))
+                contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(null, null))
+                                          .IgnoreArguments()
                                           .Return(menuBuilder);
                 mocks.ReplayAll();