Index: Core/Components/src/Core.Components.Charting.Forms/Core.Components.Charting.Forms.csproj
===================================================================
diff -u -r70fbf8ce1b5d38dc837bb7e923c9c908e81cf18f -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Components/src/Core.Components.Charting.Forms/Core.Components.Charting.Forms.csproj	(.../Core.Components.Charting.Forms.csproj)	(revision 70fbf8ce1b5d38dc837bb7e923c9c908e81cf18f)
+++ Core/Components/src/Core.Components.Charting.Forms/Core.Components.Charting.Forms.csproj	(.../Core.Components.Charting.Forms.csproj)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -42,6 +42,12 @@
     <Compile Include="IChartControl.cs" />
     <Compile Include="IChartView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PropertyClasses\ChartDataCollectionProperties.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
@@ -59,14 +65,27 @@
       <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
+      <Name>Core.Common.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Core.Components.Charting\Core.Components.Charting.csproj">
       <Project>{516ebc95-b8f2-428c-b7f6-733f01bf8fdd}</Project>
       <Name>Core.Components.Charting</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="PropertyClasses\" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Core/Components/src/Core.Components.Charting.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Charting.Forms/Properties/Resources.Designer.cs	(revision 0)
+++ Core/Components/src/Core.Components.Charting.Forms/Properties/Resources.Designer.cs	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -0,0 +1,111 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Core.Components.Charting.Forms.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Components.Charting.Forms.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Algemeen.
+        /// </summary>
+        internal static string Categories_General {
+            get {
+                return ResourceManager.GetString("Categories_General", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De naam van deze gegevensreeksenmap..
+        /// </summary>
+        internal static string ChartDataCollectionProperties_Name_Description {
+            get {
+                return ResourceManager.GetString("ChartDataCollectionProperties_Name_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Naam.
+        /// </summary>
+        internal static string ChartDataCollectionProperties_Name_DisplayName {
+            get {
+                return ResourceManager.GetString("ChartDataCollectionProperties_Name_DisplayName", resourceCulture);
+            }
+        }
+    }
+}
Index: Core/Components/src/Core.Components.Charting.Forms/Properties/Resources.resx
===================================================================
diff -u
--- Core/Components/src/Core.Components.Charting.Forms/Properties/Resources.resx	(revision 0)
+++ Core/Components/src/Core.Components.Charting.Forms/Properties/Resources.resx	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Categories_General" xml:space="preserve">
+    <value>Algemeen</value>
+  </data>
+  <data name="ChartDataCollectionProperties_Name_Description" xml:space="preserve">
+    <value>De naam van deze gegevensreeksenmap.</value>
+  </data>
+  <data name="ChartDataCollectionProperties_Name_DisplayName" xml:space="preserve">
+    <value>Naam</value>
+  </data>
+</root>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Charting.Forms.Test/Core.Components.Charting.Forms.Test.csproj
===================================================================
diff -u -r70fbf8ce1b5d38dc837bb7e923c9c908e81cf18f -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Components/test/Core.Components.Charting.Forms.Test/Core.Components.Charting.Forms.Test.csproj	(.../Core.Components.Charting.Forms.Test.csproj)	(revision 70fbf8ce1b5d38dc837bb7e923c9c908e81cf18f)
+++ Core/Components/test/Core.Components.Charting.Forms.Test/Core.Components.Charting.Forms.Test.csproj	(.../Core.Components.Charting.Forms.Test.csproj)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -6,8 +6,8 @@
     <ProjectGuid>{04F970EF-3536-4661-BAEE-9EB0BFC7DB7D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Core.Componentes.Chart.Forms.Test</RootNamespace>
-    <AssemblyName>Core.Componentes.Chart.Forms.Test</AssemblyName>
+    <RootNamespace>Core.Components.Charting.Forms.Test</RootNamespace>
+    <AssemblyName>Core.Components.Charting.Forms.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -39,6 +39,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -51,12 +55,40 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PropertyClasses\ChartDataCollectionPropertiesTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Components.Charting.Forms\Core.Components.Charting.Forms.csproj">
+      <Project>{2465CCA1-C505-4827-9454-4FD5FD9194CD}</Project>
+      <Name>Core.Components.Charting.Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Components.Charting\Core.Components.Charting.csproj">
+      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
+      <Name>Core.Components.Charting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.Components.Charting.TestUtil\Core.Components.Charting.TestUtil.csproj">
+      <Project>{E900A014-CA87-4374-87F0-813D653A9698}</Project>
+      <Name>Core.Components.Charting.TestUtil</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Components/test/Core.Components.Charting.Forms.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r70fbf8ce1b5d38dc837bb7e923c9c908e81cf18f -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Components/test/Core.Components.Charting.Forms.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 70fbf8ce1b5d38dc837bb7e923c9c908e81cf18f)
+++ Core/Components/test/Core.Components.Charting.Forms.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -22,6 +22,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Core.Components.Chart.Forms.Test")]
-[assembly: AssemblyProduct("Core.Components.Chart.Forms.Test")]
+[assembly: AssemblyTitle("Core.Components.Charting.Forms.Test")]
+[assembly: AssemblyProduct("Core.Components.Charting.Forms.Test")]
 [assembly: Guid("04f970ef-3536-4661-baee-9eb0bfc7db7d")]
\ No newline at end of file
Index: Core/Components/test/Core.Components.Charting.Forms.Test/PropertyClasses/ChartDataCollectionPropertiesTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Charting.Forms.Test/PropertyClasses/ChartDataCollectionPropertiesTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Charting.Forms.Test/PropertyClasses/ChartDataCollectionPropertiesTest.cs	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -0,0 +1,86 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.TestUtil;
+using Core.Components.Charting.Data;
+using Core.Components.Charting.Forms.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Components.Charting.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ChartDataCollectionPropertiesTest
+    {
+        private const int namePropertyIndex = 0;
+
+        [Test]
+        public void Constructor_ReturnsExpectedValues()
+        {
+            // Call
+            var properties = new ChartDataCollectionProperties();
+
+            Assert.IsInstanceOf<ObjectProperties<ChartDataCollection>>(properties);
+            Assert.IsNull(properties.Data);
+        }
+
+        [Test]
+        public void Data_SetNewChartDataCollectionInstance_ReturnCorrectPropertyValues()
+        {
+            // Setup
+            var chartDataCollection = new ChartDataCollection("Test");
+            var properties = new ChartDataCollectionProperties();
+
+            // Call
+            properties.Data = chartDataCollection;
+
+            // Assert
+            Assert.AreEqual(chartDataCollection.Name, properties.Name);
+        }
+
+        [Test]
+        public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
+        {
+            // Setup
+            var chartDataCollection = new ChartDataCollection("Test");
+
+            // Call
+            var properties = new ChartDataCollectionProperties
+            {
+                Data = chartDataCollection
+            };
+
+            // Assert
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+            Assert.AreEqual(1, dynamicProperties.Count);
+
+            const string generalCategory = "Algemeen";
+
+            PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
+                                                                            generalCategory,
+                                                                            "Naam",
+                                                                            "De naam van deze gegevensreeksenmap.",
+                                                                            true);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs
===================================================================
diff -u -r343449d430f43342f74677ff37ade9332080f966 -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs	(.../ChartPlugin.cs)	(revision 343449d430f43342f74677ff37ade9332080f966)
+++ Core/Plugins/src/Core.Plugins.Chart/ChartPlugin.cs	(.../ChartPlugin.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -20,10 +20,13 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Plugin;
+using Core.Components.Charting.Data;
 using Core.Components.Charting.Forms;
+using Core.Components.Charting.Forms.PropertyClasses;
 using Core.Plugins.Chart.Commands;
 using Core.Plugins.Chart.Legend;
 
@@ -35,9 +38,7 @@
     public class ChartPlugin : PluginBase
     {
         private ChartingRibbon chartingRibbon;
-
         private ChartLegendController chartLegendController;
-
         private bool activated;
 
         public override IRibbonCommandHandler RibbonCommandHandler
@@ -58,6 +59,11 @@
             activated = true;
         }
 
+        public override IEnumerable<PropertyInfo> GetPropertyInfos()
+        {
+            yield return new PropertyInfo<ChartDataCollection, ChartDataCollectionProperties>();
+        }
+
         public override void Dispose()
         {
             if (activated)
@@ -107,16 +113,10 @@
         private void UpdateComponentsForActiveDocumentView()
         {
             var chartView = Gui.ViewHost.ActiveDocumentView as IChartView;
-            if (chartView != null)
-            {
-                chartingRibbon.Chart = chartView.Chart;
-                chartLegendController.Update(chartView.Chart);
-            }
-            else
-            {
-                chartingRibbon.Chart = null;
-                chartLegendController.Update(null);
-            }
+            IChartControl chartControl = chartView?.Chart;
+
+            chartLegendController.Update(chartControl);
+            chartingRibbon.Chart = chartControl;
         }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -r2d704a409d762d8fb54d2f8be285246861019ea0 -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 2d704a409d762d8fb54d2f8be285246861019ea0)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -39,11 +38,14 @@
     /// <summary>
     /// This class defines a view which shows the data that have been added to a <see cref="IChartControl"/>.
     /// </summary>
-    public sealed partial class ChartLegendView : UserControl, IView
+    public sealed partial class ChartLegendView : UserControl, IView, ISelectionProvider
     {
         private readonly IContextMenuBuilderProvider contextMenuBuilderProvider;
         private IChartControl chartControl;
+        private bool settingData;
 
+        public event EventHandler<EventArgs> SelectionChanged;
+
         /// <summary>
         /// Creates a new instance of <see cref="ChartLegendView"/>.
         /// </summary>
@@ -62,6 +64,8 @@
             Text = ChartResources.General_Chart;
 
             RegisterTreeNodeInfos();
+
+            treeViewControl.SelectedDataChanged += TreeViewControlSelectedDataChanged;
         }
 
         public IChartControl ChartControl
@@ -77,6 +81,14 @@
             }
         }
 
+        public object Selection
+        {
+            get
+            {
+                return treeViewControl.SelectedData;
+            }
+        }
+
         public object Data
         {
             get
@@ -85,7 +97,11 @@
             }
             set
             {
+                settingData = true;
+
                 treeViewControl.Data = (ChartData) value;
+
+                settingData = false;
             }
         }
 
@@ -105,6 +121,8 @@
                 OnDrop = ChartDataContextOnDrop,
                 ContextMenuStrip = (nodeData, parentData, treeView) => contextMenuBuilderProvider.Get(nodeData, treeView)
                                                                                                  .AddCustomItem(CreateZoomToExtentsItem(nodeData.WrappedData))
+                                                                                                 .AddSeparator()
+                                                                                                 .AddPropertiesItem()
                                                                                                  .Build()
             });
 
@@ -119,6 +137,8 @@
                 OnDrop = ChartDataCollectionOnDrop,
                 ContextMenuStrip = (nodeData, parentData, treeView) => contextMenuBuilderProvider.Get(nodeData, treeView)
                                                                                                  .AddCustomItem(CreateZoomToExtentsItem(nodeData))
+                                                                                                 .AddSeparator()
+                                                                                                 .AddPropertiesItem()
                                                                                                  .Build()
             });
         }
@@ -148,10 +168,7 @@
             return new StrictContextMenuItem($"&{ChartResources.Ribbon_ZoomToAll}",
                                              toolTip,
                                              ChartResources.ZoomToAllIcon,
-                                             (sender, args) =>
-                                             {
-                                                 ChartControl?.ZoomToAllVisibleLayers(nodeData);
-                                             })
+                                             (sender, args) => { ChartControl?.ZoomToAllVisibleLayers(nodeData); })
             {
                 Enabled = isEnabled
             };
@@ -164,7 +181,6 @@
             var hasData = false;
             foreach (ChartData chartData in chartDatas)
             {
-
                 if (chartData.IsVisible)
                 {
                     isVisible = true;
@@ -208,6 +224,14 @@
             observableParent?.NotifyObservers();
         }
 
+        private void TreeViewControlSelectedDataChanged(object sender, EventArgs e)
+        {
+            if (SelectionChanged != null && !settingData)
+            {
+                SelectionChanged(this, new EventArgs());
+            }
+        }
+
         #region ChartDataContext
 
         private Image GetImage(ChartDataContext context)
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r2d704a409d762d8fb54d2f8be285246861019ea0 -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 2d704a409d762d8fb54d2f8be285246861019ea0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -46,13 +46,12 @@
     [TestFixture]
     public class ChartDataCollectionTreeNodeInfoTest
     {
+        private const int contextMenuZoomToAllIndex = 0;
         private ChartLegendView chartLegendView;
         private TreeNodeInfo info;
         private IContextMenuBuilderProvider contextMenuBuilderProvider;
         private MockRepository mocks;
 
-        private const int contextMenuZoomToAllIndex = 0;
-
         [SetUp]
         public void SetUp()
         {
@@ -304,6 +303,36 @@
         }
 
         [Test]
+        public void ContextMenuStrip_MapDataCollectionWithVisibleFeatureBasedmapData_CallsContextMenuBuilderMethods()
+        {
+            // Setup
+            var chartDataCollection = new ChartDataCollection("test data");
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
+                using (mocks.Ordered())
+                {
+                    menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.Build()).Return(null);
+                }
+
+                contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(chartDataCollection, treeViewControl))
+                                          .Return(menuBuilder);
+                mocks.ReplayAll();
+
+                // Call
+                info.ContextMenuStrip(chartDataCollection, null, treeViewControl);
+
+                // Assert
+                // Asserts done in TearDown
+            }
+        }
+
+        [Test]
         public void ContextMenuStrip_InvisibleChartDataInChartDataCollection_ZoomToAllDisabled()
         {
             // Setup
@@ -322,7 +351,6 @@
             using (ContextMenuStrip contextMenu = info.ContextMenuStrip(chartDataCollection, null, null))
             {
                 // Assert
-                Assert.AreEqual(1, contextMenu.Items.Count);
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
                                                               "&Zoom naar alles",
                                                               "Om het zoomniveau aan te passen moet er minstens één gegevensreeks in deze map met gegevensreeksen zichtbaar zijn.",
@@ -359,8 +387,6 @@
             using (ContextMenuStrip contextMenu = info.ContextMenuStrip(chartDataCollection, null, null))
             {
                 // Assert
-                Assert.AreEqual(1, contextMenu.Items.Count);
-
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
                                                               "&Zoom naar alles",
                                                               "Om het zoomniveau aan te passen moet minstens één van de zichtbare gegevensreeksen in deze map met gegevensreeksen elementen bevatten.",
@@ -382,7 +408,7 @@
                 IsVisible = true,
                 Points = new[]
                 {
-                    new Point2D(0, 1),
+                    new Point2D(0, 1)
                 }
             };
             var chartDataCollection = new ChartDataCollection("test data");
@@ -392,7 +418,6 @@
             using (ContextMenuStrip contextMenu = info.ContextMenuStrip(chartDataCollection, null, null))
             {
                 // Assert
-                Assert.AreEqual(1, contextMenu.Items.Count);
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
                                                               "&Zoom naar alles",
                                                               "Zet het zoomniveau van de grafiek dusdanig dat alle zichtbare gegevensreeksen in deze map met gegevensreeksen precies in het beeld passen.",
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -r39c7764f75bd4ab7e0f7c172c4eb446bae7a3d1d -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 39c7764f75bd4ab7e0f7c172c4eb446bae7a3d1d)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -516,6 +516,8 @@
             using (mocks.Ordered())
             {
                 builder.Expect(mb => mb.AddCustomItem(Arg<StrictContextMenuItem>.Is.NotNull)).Return(builder);
+                builder.Expect(mb => mb.AddSeparator()).Return(builder);
+                builder.Expect(mb => mb.AddPropertiesItem()).Return(builder);
                 builder.Expect(mb => mb.Build()).Return(null);
             }
             contextMenuBuilderProvider.Expect(p => p.Get(null, null)).IgnoreArguments().Return(builder);
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs
===================================================================
diff -u -rc349a104ffe6e2b39878cd0169cace7eea4fddb6 -rbaf30f71add766acbccd7b79eea9319d7bba556f
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision c349a104ffe6e2b39878cd0169cace7eea4fddb6)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision baf30f71add766acbccd7b79eea9319d7bba556f)
@@ -22,12 +22,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Windows.Forms;
 using Core.Common.Controls.TreeView;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.ContextMenu;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Reflection;
 using Core.Components.Charting.Data;
+using Core.Components.Charting.TestUtil;
 using Core.Plugins.Chart.Legend;
 using Core.Plugins.Chart.PresentationObjects;
 using Core.Plugins.Chart.Properties;
@@ -133,6 +136,106 @@
         }
 
         [Test]
+        [Apartment(ApartmentState.STA)]
+        public void Selection_Always_ReturnsSelectedNodeData()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var contextMenuBuilderProvider = mocks.Stub<IContextMenuBuilderProvider>();
+            mocks.ReplayAll();
+
+            ChartData chartData = CreateChartData();
+            var chartDataCollection = new ChartDataCollection("collection");
+            chartDataCollection.Add(chartData);
+
+            using (var view = new ChartLegendView(contextMenuBuilderProvider)
+            {
+                Data = chartDataCollection
+            })
+            {
+                var context = new ChartDataContext(chartData, chartDataCollection);
+
+                var treeViewControl = TypeUtils.GetField<TreeViewControl>(view, "treeViewControl");
+                WindowsFormsTestHelper.Show(treeViewControl);
+                treeViewControl.TrySelectNodeForData(context);
+
+                // Call
+                object selection = view.Selection;
+
+                // Assert
+                Assert.AreSame(chartData, ((ChartDataContext) selection).WrappedData);
+            }
+            WindowsFormsTestHelper.CloseAll();
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [Apartment(ApartmentState.STA)]
+        public void GivenChartLegendView_WhenSelectedNodeChanged_SelectionChangedFired()
+        {
+            // Given
+            ChartData chartData = CreateChartData();
+            var chartDataCollection = new ChartDataCollection("collection");
+            chartDataCollection.Add(chartData);
+
+            var mocks = new MockRepository();
+            var contextMenuBuilderProvider = mocks.Stub<IContextMenuBuilderProvider>();
+            mocks.ReplayAll();
+
+            using (var view = new ChartLegendView(contextMenuBuilderProvider)
+            {
+                Data = chartDataCollection
+            })
+            {
+                var treeViewControl = TypeUtils.GetField<TreeViewControl>(view, "treeViewControl");
+                WindowsFormsTestHelper.Show(treeViewControl);
+
+                var selectionChangedCount = 0;
+                view.SelectionChanged += (sender, args) => selectionChangedCount++;
+
+                // When
+                var context = new ChartDataContext(chartData, chartDataCollection);
+                treeViewControl.TrySelectNodeForData(context);
+
+                // Then
+                Assert.AreEqual(1, selectionChangedCount);
+            }
+            WindowsFormsTestHelper.CloseAll();
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [Apartment(ApartmentState.STA)]
+        public void GivenChartLegendView_WhenSettingData_SelectionChangedNotFired()
+        {
+            // Given
+            var mocks = new MockRepository();
+            var contextMenuBuilderProvider = mocks.Stub<IContextMenuBuilderProvider>();
+            mocks.ReplayAll();
+
+            using (var view = new ChartLegendView(contextMenuBuilderProvider)
+            {
+                Data = new ChartDataCollection("collection")
+            })
+            {
+                var treeViewControl = TypeUtils.GetField<TreeViewControl>(view, "treeViewControl");
+                WindowsFormsTestHelper.Show(treeViewControl);
+
+                var selectionChangedCount = 0;
+                view.SelectionChanged += (sender, args) => selectionChangedCount++;
+
+                // When
+                view.Data = new ChartDataCollection("collection");
+
+                // Then
+                Assert.AreEqual(0, selectionChangedCount);
+            }
+            WindowsFormsTestHelper.CloseAll();
+            mocks.VerifyAll();
+        }
+
+        [Test]
         [TestCase(0)]
         [TestCase(1)]
         [TestCase(2)]
@@ -143,12 +246,12 @@
             var menuBuilderProvider = mocks.Stub<IContextMenuBuilderProvider>();
             mocks.ReplayAll();
 
-            ChartData chartLineData = CreateChartLineData();
+            ChartData chartData = CreateChartData();
             var rootCollection = new ChartDataCollection("test data");
 
-            rootCollection.Add(chartLineData);
-            rootCollection.Add(CreateChartLineData());
-            rootCollection.Add(CreateChartLineData());
+            rootCollection.Add(chartData);
+            rootCollection.Add(CreateChartData());
+            rootCollection.Add(CreateChartData());
 
             using (var chartLegendView = new ChartLegendView(menuBuilderProvider)
             {
@@ -159,21 +262,21 @@
                 var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
                 TreeNodeInfo info = treeNodeInfoLookup[typeof(ChartDataCollection)];
 
-                var context = new ChartDataContext(chartLineData, rootCollection);
+                var context = new ChartDataContext(chartData, rootCollection);
 
                 // When
                 info.OnDrop(context, rootCollection, rootCollection, index, treeViewControl);
 
                 // Then
-                Assert.AreEqual(2 - index, rootCollection.Collection.ToList().IndexOf(chartLineData));
+                Assert.AreEqual(2 - index, rootCollection.Collection.ToList().IndexOf(chartData));
             }
 
             mocks.VerifyAll();
         }
 
-        private ChartData CreateChartLineData()
+        private static ChartData CreateChartData()
         {
-            return new ChartLineData("some name");
+            return new TestChartData("some name");
         }
     }
 }
\ No newline at end of file