Index: Application/Application.Ringtoets/Uml/DelftTools.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Application/Application.Ringtoets/Uml/DelftTools.cd	(.../DelftTools.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Application/Application.Ringtoets/Uml/DelftTools.cd	(.../DelftTools.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -1,50 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="Core.Common.Core.Project">
-    <Position X="8.25" Y="1.25" Width="2" />
+  <Class Name="Core.Common.BaseDelftTools.Project">
+    <Position X="3.75" Y="0.5" Width="2" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
       <Compartment Name="Events" Collapsed="true" />
     </Compartments>
     <TypeIdentifier />
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="Core.Common.Core.IApplication">
-    <Position X="5" Y="0.75" Width="2.25" />
+  <Interface Name="Core.Common.BaseDelftTools.IApplication">
+    <Position X="0.5" Y="0.5" Width="2.25" />
     <TypeIdentifier />
-    <ShowAsAssociation>
-      <Property Name="Project" />
-      <Property Name="ProjectService" />
-      <Property Name="ModelService" />
-      <Property Name="DataItemService" />
-    </ShowAsAssociation>
   </Interface>
-  <Interface Name="Core.Common.Core.IPlugin">
-    <Position X="8.25" Y="4.5" Width="1.5" />
+  <Interface Name="Core.Common.BaseDelftTools.IPlugin">
+    <Position X="3.75" Y="3.25" Width="2.25" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Core.Dao.IProjectRepository">
-    <Position X="16.25" Y="4" Width="2" />
-    <Compartments>
-      <Compartment Name="Properties" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.BaseDelftTools.Data.IObjectRepository&lt;T, ID&gt;">
-    <Position X="16.25" Y="2" Width="2" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Core.Services.IDataItemService" Collapsed="true">
-    <Position X="2" Y="2.75" Width="1.5" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Core.Services.IModelService" Collapsed="true">
-    <Position X="2" Y="2" Width="1.5" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Core.Services.IProjectService" Collapsed="true">
-    <Position X="2" Y="1.25" Width="1.5" />
-    <TypeIdentifier />
-  </Interface>
   <Font Name="Tahoma" Size="8.25" />
 </ClassDiagram>
\ No newline at end of file
Index: Application/Application.Ringtoets/Uml/Gui.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Application/Application.Ringtoets/Uml/Gui.cd	(.../Gui.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Application/Application.Ringtoets/Uml/Gui.cd	(.../Gui.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -1,75 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1" MembersFormat="FullSignature">
   <Class Name="Application.Ringtoets.DeltaShellGui">
-    <Position X="16.25" Y="6.5" Width="3.75" />
+    <Position X="11.25" Y="5.5" Width="3.75" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>EMoGOoIxgrKDLQCFxAQ3yQUeBIBWVARAMmBAcwYBRKI=</HashCode>
+      <HashCode>EIIGMgIwgjKCKQABwAQ3SQUeBIBUFAQAIgBAcgABRKI=</HashCode>
       <FileName>DeltaShellGui.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="Application.Ringtoets.GuiCommandHandler">
-    <Position X="24.25" Y="1" Width="5.25" />
+    <Position X="17" Y="0.5" Width="5.25" />
     <TypeIdentifier>
-      <HashCode>AiIoDCRZGyEqAKQQFAonAKIAZkgkAiQoMEIhKIAA0BA=</HashCode>
+      <HashCode>ACIoCARQCiEKAIAQAAIhAAIAZAgACIAoMEIBIAAAUBA=</HashCode>
       <FileName>GuiCommandHandler.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DeltaShell.Core.DeltaShellApplication">
-    <Position X="11" Y="6.5" Width="4" />
+  <Class Name="Core.Common.Base.DeltaShellApplication">
+    <Position X="5.25" Y="7.75" Width="4" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
       <Compartment Name="Events" Collapsed="true" />
     </Compartments>
     <TypeIdentifier />
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DeltaShell.Core.Services.DataItemService" BaseTypeListCollapsed="true">
-    <Position X="19.25" Y="15.75" Width="4.75" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="DeltaShell.Core.Services.ModelService" BaseTypeListCollapsed="true">
-    <Position X="19.25" Y="18" Width="5" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="DeltaShell.Core.Services.ProjectService" BaseTypeListCollapsed="true">
-    <Position X="20.5" Y="7.25" Width="3.75" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
   <Interface Name="Core.Common.Gui.IGuiCommandHandler">
-    <Position X="3" Y="0.5" Width="3" />
+    <Position X="0.5" Y="0.5" Width="3" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Core.IApplication">
-    <Position X="11" Y="0.5" Width="4" />
+  <Interface Name="Core.Common.Gui.IGui">
+    <Position X="11.25" Y="0.5" Width="3.75" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Core.Services.IProjectService">
-    <Position X="2.5" Y="6.5" Width="4" />
+  <Interface Name="Core.Common.BaseDelftTools.IApplication">
+    <Position X="5.25" Y="0.5" Width="4" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Core.Services.IModelService">
-    <Position X="6.75" Y="12.75" Width="5" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Core.Services.IDataItemService">
-    <Position X="6.75" Y="15" Width="4.75" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Gui.IGui">
-    <Position X="16.25" Y="0.5" Width="3.75" />
-    <TypeIdentifier />
-    <ShowAsAssociation>
-      <Property Name="Application" />
-    </ShowAsAssociation>
-  </Interface>
   <Font Name="Tahoma" Size="8.25" />
 </ClassDiagram>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -48,7 +48,8 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\Release\</OutputPath>
@@ -61,7 +62,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
@@ -107,7 +109,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Uml\ProjectService.cd" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
Fisheye: Tag b3fd3730d4e334c04ccc041ed8d946c2873c3f9e refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/Uml/ProjectService.cd'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.BaseDelftTools/Core.Common.BaseDelftTools.csproj
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.BaseDelftTools/Core.Common.BaseDelftTools.csproj	(.../Core.Common.BaseDelftTools.csproj)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.BaseDelftTools/Core.Common.BaseDelftTools.csproj	(.../Core.Common.BaseDelftTools.csproj)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -43,7 +43,8 @@
     <WarningLevel>4</WarningLevel>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <NoWarn>1591</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -57,7 +58,8 @@
     <WarningLevel>4</WarningLevel>
     <DefineConstants>TRACE</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>
     </NoWarn>
@@ -141,8 +143,6 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <None Include="Uml\Dao.cd" />
-    <None Include="Uml\DataItems.cd" />
     <None Include="Uml\Workflow.cd" />
     <None Include="Uml\Core.cd" />
   </ItemGroup>
Index: Core/Common/src/Core.Common.BaseDelftTools/Uml/Core.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.BaseDelftTools/Uml/Core.cd	(.../Core.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.BaseDelftTools/Uml/Core.cd	(.../Core.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -1,301 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="Core.Common.Core.Project">
-    <Position X="9.25" Y="16.5" Width="2.5" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <AssociationLine Name="RootFolder" Type="Core.Common.Core.Folder" FixedFromPoint="true">
-      <Path>
-        <Point X="11.75" Y="17.5" />
-        <Point X="12.75" Y="17.5" />
-      </Path>
-    </AssociationLine>
+  <Class Name="Core.Common.BaseDelftTools.ApplicationPlugin" BaseTypeListCollapsed="true">
+    <Position X="8.25" Y="4" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAIgIAAAAAEggAAEsIAAADQAAAEkAAADAIAAAQQAACA=</HashCode>
-      <FileName>Project.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Property Name="RootFolder" />
-    </ShowAsAssociation>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="Core.Common.Core.Folder">
-    <Position X="12.75" Y="14.75" Width="3.25" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <AssociationLine Name="Folders" Type="Core.Common.Core.Folder" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="15.278" Y="14.75" />
-        <Point X="15.278" Y="14.168" />
-        <Point X="17.312" Y="14.168" />
-        <Point X="17.312" Y="15.263" />
-        <Point X="16" Y="15.263" />
-      </Path>
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="0.383" Y="0.124" />
-      </MemberNameLabel>
-    </AssociationLine>
-    <TypeIdentifier>
-      <HashCode>AAIIAAAMAKAACAAkCJgKygQBgICEAAMAINgIAAAUCgA=</HashCode>
-      <FileName>Folder.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsCollectionAssociation>
-      <Property Name="Items" />
-      <Property Name="Folders" />
-    </ShowAsCollectionAssociation>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="Core.Common.Core.ApplicationPlugin" BaseTypeListCollapsed="true">
-    <Position X="11.5" Y="4.75" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>IAAAAAAAIBBgAAFAEAEAAAQAAQAAwBAAAAAQAAAAAAA=</HashCode>
+      <HashCode>IAAAEAAAIBBgAABAEAEAAAQAAAAAwBAAAAAQAAAAAAA=</HashCode>
       <FileName>ApplicationPlugin.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Core.ModelInfo">
-    <Position X="13.75" Y="4.5" Width="2" />
+  <Class Name="Core.Common.BaseDelftTools.DataItemInfo">
+    <Position X="18" Y="8.25" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAAABAAAAAAAAAAAAAAAAAQAAgAAABAAAAAAAAAACAA=</HashCode>
-      <FileName>ModelInfo.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Core.Common.Core.DataItemInfo">
-    <Position X="13.75" Y="6.5" Width="1.75" />
-    <TypeIdentifier>
       <HashCode>AAAABAAAAAAAAAAAAAAAAAQAAAAAABAAAAAQAAAAGAI=</HashCode>
       <FileName>DataItemInfo.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="Core.Common.Core.DataItemInfo&lt;TValue&gt;">
-    <Position X="7" Y="22.5" Width="2.25" />
+  <Class Name="Core.Common.BaseDelftTools.DataItemInfo&lt;TValue&gt;">
+    <Position X="14.75" Y="8.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAABAAAAAAAAAAAAAAAAAQAAAAAABAABAAQAAAAGAI=</HashCode>
       <FileName>DataItemInfo.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="Core.Common.Core.Services.IProjectService">
-    <Position X="5" Y="12" Width="2.5" />
-    <AssociationLine Name="ProjectRepository" Type="Core.Common.Core.Dao.IProjectRepository">
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="0.146" Y="0.095" />
-      </MemberNameLabel>
-    </AssociationLine>
-    <AssociationLine Name="ProjectFileBasedItemRepository" Type="Core.Common.Core.Dao.IProjectFileBasedItemRepository">
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="-1.98" Y="0.198" />
-      </MemberNameLabel>
-    </AssociationLine>
-    <AssociationLine Name="ProjectRepositoryFactory" Type="Core.Common.Core.Dao.IProjectRepositoryFactory">
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="-1.572" Y="0.154" />
-      </MemberNameLabel>
-    </AssociationLine>
+  <Class Name="Core.Common.BaseDelftTools.Project">
+    <Position X="8.25" Y="9.5" Width="2.5" />
+    <Compartments>
+      <Compartment Name="Fields" Collapsed="true" />
+    </Compartments>
     <TypeIdentifier>
-      <HashCode>AAACAIIEBAAAIAgABAQABACAAAIEAEAAAAAAAACAABA=</HashCode>
-      <FileName>Services\IProjectService.cs</FileName>
+      <HashCode>AAAIAAAAAAAgCAIAAAAAAAQAAIAAAAAAAAAAAAAgAAA=</HashCode>
+      <FileName>Project.cs</FileName>
     </TypeIdentifier>
-    <ShowAsAssociation>
-      <Property Name="ProjectRepository" />
-      <Property Name="ProjectFileBasedItemRepository" />
-      <Property Name="ProjectRepositoryFactory" />
-    </ShowAsAssociation>
-  </Interface>
-  <Interface Name="Core.Common.Core.Services.IModelService">
-    <Position X="5.25" Y="7.5" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AgAAAAAAAgAAAAAAAAACAAgAgGAAAAAIAABAAAAAAAA=</HashCode>
-      <FileName>Services\IModelService.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.Services.IDataItemService">
-    <Position X="5.25" Y="10" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAABAEAAAEAAAAAAgCAAAAAA=</HashCode>
-      <FileName>Services\IDataItemService.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.IApplication">
-    <Position X="9.25" Y="8.75" Width="2.5" />
-    <AssociationLine Name="Project" Type="Core.Common.Core.Project">
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="0.192" Y="0.181" />
-      </MemberNameLabel>
-    </AssociationLine>
-    <AssociationLine Name="ActivityRunner" Type="Core.Common.BaseDelftTools.Threading.IActivityRunner" FixedFromPoint="true" FixedToPoint="true">
+    <Lollipop Position="0.2" />
+  </Class>
+  <Interface Name="Core.Common.BaseDelftTools.IApplication">
+    <Position X="4.25" Y="0.75" Width="2.5" />
+    <AssociationLine Name="ActivityRunner" Type="Core.Common.BaseDelftTools.Workflow.IActivityRunner" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="10.062" Y="8.75" />
-        <Point X="10.062" Y="3.615" />
-        <Point X="7.25" Y="3.615" />
+        <Point X="4.25" Y="2.125" />
+        <Point X="3.875" Y="2.125" />
+        <Point X="3.875" Y="2.115" />
+        <Point X="3" Y="2.115" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ProjectService" Type="Core.Common.Core.Services.IProjectService" FixedFromPoint="true">
-      <Path>
-        <Point X="9.25" Y="13.062" />
-        <Point X="7.5" Y="13.062" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="ModelService" Type="Core.Common.Core.Services.IModelService" FixedFromPoint="true">
-      <Path>
-        <Point X="9.25" Y="9.25" />
-        <Point X="7.5" Y="9.25" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="DataItemService" Type="Core.Common.Core.Services.IDataItemService" FixedToPoint="true">
-      <Path>
-        <Point X="9.25" Y="11.125" />
-        <Point X="7.5" Y="11.125" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="ScriptRunner" Type="Core.Common.Core.IScriptRunner" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="9.625" Y="8.75" />
-        <Point X="9.625" Y="6.375" />
-        <Point X="7.25" Y="6.375" />
-      </Path>
-    </AssociationLine>
     <TypeIdentifier>
-      <HashCode>YgADAAUAIAAAAogQpgACiADAEgAEEAAAsoABMAAAQBI=</HashCode>
+      <HashCode>QAADAAEAIAAAAoAQpgACDABAAgAEEAAAsgABMAAAABI=</HashCode>
       <FileName>IApplication.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
-      <Property Name="Project" />
       <Property Name="ActivityRunner" />
-      <Property Name="ProjectService" />
-      <Property Name="ModelService" />
-      <Property Name="DataItemService" />
-      <Property Name="ScriptRunner" />
     </ShowAsAssociation>
     <ShowAsCollectionAssociation>
       <Property Name="Plugins" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="Core.Common.Core.Dao.IProjectRepositoryFactory">
-    <Position X="4.25" Y="19.5" Width="2.25" />
+  <Interface Name="Core.Common.BaseDelftTools.IPlugin">
+    <Position X="8" Y="0.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAQgAAAACAAgAAAAAAAAAAACA=</HashCode>
-      <FileName>Dao\IProjectRepositoryFactory.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.Dao.IProjectRepository">
-    <Position X="4" Y="16.25" Width="2" />
-    <TypeIdentifier>
-      <HashCode>IAAAAAgQAAAAIAIAAAAAAAAAAAAAAEAAAhAwAACAAAA=</HashCode>
-      <FileName>Dao\IProjectRepository.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.IPlugin">
-    <Position X="11" Y="1.5" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>IAAAAAAAIABgAAFAEAAAAAQAAAAAgBAAAAAAAAAAAAA=</HashCode>
+      <HashCode>IAAAEAAAIABgAABAEAAAAAQAAAAAgBAAAAAAAAAAAAA=</HashCode>
       <FileName>IPlugin.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.Dao.IDataAccessListener">
-    <Position X="17.5" Y="6.75" Width="2" />
+  <Interface Name="Core.Common.BaseDelftTools.IFileExporter">
+    <Position X="19.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>hAAAIAAQAAAAAAAAAAAAAAAAAAAJgAAAAAAAAAAAAgA=</HashCode>
-      <FileName>Dao\IDataAccessListener.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.IFileExporter">
-    <Position X="19.75" Y="2" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAEEAEAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAABAQAAAAAgAAAAAAEEAEACAA=</HashCode>
       <FileName>IFileExporter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.IFileImporter">
-    <Position X="17.5" Y="2" Width="2" />
+  <Interface Name="Core.Common.BaseDelftTools.IFileImporter">
+    <Position X="15.25" Y="0.5" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAEAAAAAAEAgAAAAAAAAAQAABACABAAAAAEAAAACAA=</HashCode>
+      <HashCode>AAAEAAAAAAEAgAAAAAAAAAQAABECABAAAAAEAAAACAA=</HashCode>
       <FileName>IFileImporter.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Property Name="ProgressChanged" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="Core.Common.Core.IProjectImporter">
-    <Position X="17.75" Y="5.25" Width="1.5" />
+  <Interface Name="Core.Common.BaseDelftTools.Workflow.IActivityRunner">
+    <Position X="0.75" Y="0.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IProjectImporter.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.IProjectItem">
-    <Position X="18.25" Y="14.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IProjectItem.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.IProjectItemExporter">
-    <Position X="19.75" Y="4.5" Width="1.75" />
-    <InheritanceLine Type="Core.Common.Core.IFileExporter" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="20.562" Y="3.992" />
-        <Point X="20.562" Y="4.5" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IProjectItemExporter.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.IScriptRunner">
-    <Position X="5" Y="5.25" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAABAAAAAAAAEAAAAAAAIAAAAAAAAIAAAAA=</HashCode>
-      <FileName>IScriptRunner.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.BaseDelftTools.Threading.IActivityRunner">
-    <Position X="5" Y="2.25" Width="2.25" />
-    <TypeIdentifier>
       <HashCode>AABACAAAQAAAQAQAAAAAQAAAAAAAAAABAAAAAIAAAAA=</HashCode>
       <FileName>Workflow\IActivityRunner.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.Workflow.DataItems.IDataItem">
-    <Position X="19" Y="17" Width="2.25" />
+  <Interface Name="Core.Common.BaseDelftTools.Workflow.IActivity">
+    <Position X="2.75" Y="11.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AJYAAEiAAAAgAAAAEAEEQCAEAAAAAAAABAAgIAAEEAA=</HashCode>
-      <FileName>Workflow\DataItems\IDataItem.cs</FileName>
+      <HashCode>AAAAAAAEQAEAAQQAAAAAAAAAAFAABAAAAAAAAEAAAAg=</HashCode>
+      <FileName>Workflow\IActivity.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.Workflow.IModel">
-    <Position X="16.25" Y="20.5" Width="2.5" />
+  <Interface Name="Core.Common.BaseDelftTools.IProjectImporter">
+    <Position X="15" Y="4.5" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AEAAAACAAAAAAARIAAAAACxAACAAAgCgIQAgAAQAACA=</HashCode>
-      <FileName>Workflow\IModel.cs</FileName>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>IProjectImporter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.Workflow.IActivity">
-    <Position X="17" Y="17" Width="1.5" />
+  <Interface Name="Core.Common.BaseDelftTools.IProjectItemExporter">
+    <Position X="19" Y="4.5" Width="3" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEQAEAAQQAAAAAAAAAAFAABAAAAAAAAEAAAAA=</HashCode>
-      <FileName>Workflow\IActivity.cs</FileName>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>IProjectItemExporter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.Dao.IProjectFileBasedItemRepository">
-    <Position X="6.25" Y="16.25" Width="2.5" />
+  <Interface Name="Core.Common.BaseDelftTools.IProjectItem">
+    <Position X="2" Y="8.25" Width="3" />
     <TypeIdentifier>
-      <HashCode>AAAAAIAAAAAAAQAAAAAACACAAAAAAAgAABAAAACAAIA=</HashCode>
-      <FileName>Dao\IProjectFileBasedItemRepository.cs</FileName>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>IProjectItem.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.IProjectItemOwned">
-    <Position X="9.75" Y="22.5" Width="1.75" />
+  <Delegate Name="Core.Common.BaseDelftTools.ImportProgressChangedDelegate">
+    <Position X="11.5" Y="0.75" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IProjectItemOwned.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Delegate Name="Core.Common.Core.ImportProgressChangedDelegate">
-    <Position X="13.75" Y="2.25" Width="2.5" />
-    <TypeIdentifier>
       <HashCode>AAAAAAABAACAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAA=</HashCode>
       <FileName>IFileImporter.cs</FileName>
     </TypeIdentifier>
Fisheye: Tag b3fd3730d4e334c04ccc041ed8d946c2873c3f9e refers to a dead (removed) revision in file `Core/Common/src/Core.Common.BaseDelftTools/Uml/Dao.cd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b3fd3730d4e334c04ccc041ed8d946c2873c3f9e refers to a dead (removed) revision in file `Core/Common/src/Core.Common.BaseDelftTools/Uml/DataItems.cd'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.BaseDelftTools/Uml/Workflow.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.BaseDelftTools/Uml/Workflow.cd	(.../Workflow.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.BaseDelftTools/Uml/Workflow.cd	(.../Workflow.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="Core.Common.Core.Workflow.Activity">
-    <Position X="8.5" Y="0.5" Width="1.75" />
+  <Class Name="Core.Common.BaseDelftTools.Workflow.Activity">
+    <Position X="9.25" Y="0.5" Width="1.75" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>AAIAACAEQAEAAQQAAIAAAAQAQNACRAIAAAQAAEAAAAA=</HashCode>
+      <HashCode>AAYAACAEQAEABQQAAIACCAQAANAiRAIAAAQAAEAAAAg=</HashCode>
       <FileName>Workflow\Activity.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Core.Workflow.CompositeActivity">
-    <Position X="8.5" Y="4" Width="1.75" />
+  <Class Name="Core.Common.BaseDelftTools.Workflow.CompositeActivity">
+    <Position X="9.25" Y="4" Width="1.75" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>AAAAACAAAAAAAAAEAIAACAAAAIAAAAIAAAAIAIAAABA=</HashCode>
+      <HashCode>AAAAACAAAAAAAAAEAIACAAAAAIAAAAIAAAAIAIAAABA=</HashCode>
       <FileName>Workflow\CompositeActivity.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Core.Workflow.ParallelActivity">
-    <Position X="7.75" Y="6.75" Width="1.5" />
+  <Class Name="Core.Common.BaseDelftTools.Workflow.ParallelActivity">
+    <Position X="8.5" Y="6.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAIAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Workflow\ParallelActivity.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="Core.Common.Core.Workflow.SequentialActivity">
-    <Position X="9.75" Y="6.75" Width="1.75" />
+  <Class Name="Core.Common.BaseDelftTools.Workflow.SequentialActivity">
+    <Position X="10.5" Y="6.75" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAIAAAAAAAEAAAAAAAAAAAAEEAACAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAIAAAAAAAEAAAAAAAACAAAEEAACAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Workflow\SequentialActivity.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="Core.Common.Core.Workflow.IActivity">
-    <Position X="2" Y="0.5" Width="1.5" />
+  <Interface Name="Core.Common.BaseDelftTools.Workflow.IActivity">
+    <Position X="2.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEQAEAAQQAAAAAAAAAAFAABAAAAAAAAEAAAAA=</HashCode>
+      <HashCode>AAAAAAAEQAEAAQQAAAAAAAAAAFAABAAAAAAAAEAAAAg=</HashCode>
       <FileName>Workflow\IActivity.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Property Name="Status" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="Core.Common.Core.Workflow.ICompositeActivity">
-    <Position X="0.5" Y="4.5" Width="1.75" />
-    <AssociationLine Name="Activities" Type="Core.Common.Core.Workflow.IActivity" FixedFromPoint="true" FixedToPoint="true">
+  <Interface Name="Core.Common.BaseDelftTools.Workflow.ICompositeActivity">
+    <Position X="1.25" Y="4.5" Width="1.75" />
+    <AssociationLine Name="Activities" Type="Core.Common.BaseDelftTools.Workflow.IActivity" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="0.5" Y="4.937" />
-        <Point X="0.26" Y="4.937" />
-        <Point X="0.26" Y="2.812" />
-        <Point X="2" Y="2.812" />
+        <Point X="1.25" Y="4.937" />
+        <Point X="0.875" Y="4.937" />
+        <Point X="0.875" Y="2.812" />
+        <Point X="2.75" Y="2.812" />
       </Path>
     </AssociationLine>
     <TypeIdentifier>
@@ -66,24 +66,10 @@
       <Property Name="Activities" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="Core.Common.Core.Workflow.ITimeDependentModel">
-    <Position X="2.75" Y="9.75" Width="2.5" />
+  <Enum Name="Core.Common.BaseDelftTools.Workflow.ActivityStatus">
+    <Position X="5.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAgAAIIAAAAAAAAAAAkAAAABA=</HashCode>
-      <FileName>Workflow\ITimeDependentModel.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Core.Workflow.IModel">
-    <Position X="2.75" Y="4.5" Width="2.5" />
-    <TypeIdentifier>
-      <HashCode>AEAAAACAAAAAAARIAAAAACxAACAAAgCgIQAgAAQAACA=</HashCode>
-      <FileName>Workflow\IModel.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Enum Name="Core.Common.Core.Workflow.ActivityStatus">
-    <Position X="4.75" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>ACBAEAAAQCEAAAAAAAQAAAAAAAEAABAAABAAQAEAAAA=</HashCode>
+      <HashCode>ACBAEAAAwCEAAAAAAAQAAAAAAAEAAAAAABAAQAEAAAQ=</HashCode>
       <FileName>Workflow\ActivityStatus.cs</FileName>
     </TypeIdentifier>
   </Enum>
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Chart.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Chart.cd	(.../Chart.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Chart.cd	(.../Chart.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -9,7 +9,7 @@
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>CAIAQCAAAABAg0AAAAAAAAAACAAAACAIAIIAgABAAAA=</HashCode>
+      <HashCode>CAIAQCAAAABgg0AAAAAAAAAACAAAACAIAIIAgABAAAA=</HashCode>
       <FileName>Charting\IChartSeries.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -25,7 +25,7 @@
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAACAgAAQEAEAAAAAAAAAAAAAAgQAEACEABAAAE=</HashCode>
+      <HashCode>BAAAAAAGAgAAQEAEAAgAAAAACAAAAAgQAkAAEABCAAE=</HashCode>
       <FileName>Charting\IChart.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -38,57 +38,38 @@
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartAxis">
     <Position X="3.5" Y="8.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>gAAAACCAEAAAAEIAAAAAAIAAAAAIIAAIAAAAAAAAAAA=</HashCode>
+      <HashCode>gAAIACCAEAAAAEKAAAAAAIAAAAAIIAAJAAAgAAAAAAA=</HashCode>
       <FileName>Charting\IChartAxis.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartLegend">
     <Position X="0.75" Y="5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAACAAAEABAAAIAAAICAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAACAAAAAAAAAAAAAIAAAAAAACAAA=</HashCode>
       <FileName>Charting\IChartLegend.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartView">
     <Position X="3.25" Y="0.5" Width="1.5" />
-    <AssociationLine Name="Zoom" Type="Core.Common.Controls.Swf.Charting.IChartViewZoom" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="3.25" Y="1.938" />
-        <Point X="2.875" Y="1.938" />
-        <Point X="2.875" Y="1.938" />
-        <Point X="2" Y="1.938" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="ChartCoordinateService" Type="Core.Common.Controls.Swf.Charting.IChartCoordinateService" ManuallyRouted="true" FixedToPoint="true">
-      <Path>
-        <Point X="4.75" Y="1.875" />
-        <Point X="6.75" Y="1.875" />
-      </Path>
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="0.028" Y="0.158" />
-      </MemberNameLabel>
-    </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAICAgAAgEAAMAAAAAAAAAAACAAAQCAAAAQgQIA=</HashCode>
+      <HashCode>AAAAAAACAgIAgEAAIAAAAAAAAAAACAAASCAAAAQgQIA=</HashCode>
       <FileName>Charting\IChartView.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Property Name="Chart" />
-      <Property Name="Zoom" />
-      <Property Name="ChartCoordinateService" />
     </ShowAsAssociation>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.Series.IAreaChartSeries">
     <Position X="6.75" Y="10.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AQAAAAIAAAAAAAAAAwAggQAgAACAIAAAIAQIAAIUAAA=</HashCode>
+      <HashCode>AQAAAAIAAAAAAAAAAAAggQAgAACAIAAAIAQIAAIUAAA=</HashCode>
       <FileName>Charting\Series\IAreaChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.Series.ILineChartSeries">
     <Position X="9" Y="10.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AIiAAAAAAAAAAQAAAwAggEAAAAAACAEQIAAIAAMUAAA=</HashCode>
+      <HashCode>AACAAAAAAAAAAAAAAAAggEAAAAAAAAAQIAAIAAIUAAA=</HashCode>
       <FileName>Charting\Series\ILineChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -99,13 +80,6 @@
       <FileName>Charting\Series\IPointChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.IChartCoordinateService">
-    <Position X="6.75" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAEAAAAAAAAAACAAAAAAGAAAAAAAAAAAAAAAIAAGAQ=</HashCode>
-      <FileName>Charting\IChartCoordinateService.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewTool">
     <Position X="10" Y="3" Width="1.5" />
     <AssociationLine Name="ChartView" Type="Core.Common.Controls.Swf.Charting.IChartView" FixedFromPoint="true">
@@ -115,20 +89,13 @@
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAIAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewTool.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Property Name="ChartView" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewZoom">
-    <Position X="0.5" Y="1.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAABAAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\IChartViewZoom.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewSeriesTool">
     <Position X="10" Y="6.25" Width="1.5" />
     <TypeIdentifier>
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/UML/ChartTools.cd
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.Controls.Swf/Charting/UML/ChartTools.cd	(.../ChartTools.cd)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/UML/ChartTools.cd	(.../ChartTools.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -1,268 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.AddPointTool" Collapsed="true">
-    <Position X="15" Y="7" Width="1.5" />
+    <Position X="8.5" Y="8.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AECAAERABQAgAAEIAAAACAAACBAAAABAIAAAAECCACA=</HashCode>
+      <HashCode>AECAAERABQAgAAAIAAAACAAACBAAAABAIAAAAECCACE=</HashCode>
       <FileName>Charting\Tools\AddPointTool.cs</FileName>
     </TypeIdentifier>
+    <Lollipop Position="0.2" />
   </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.ZoomUsingMouseWheelTool" Collapsed="true">
-    <Position X="7.25" Y="4.5" Width="1.5" />
+    <Position X="0.75" Y="6.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\ZoomUsingMouseWheelTool.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.ChartViewSeriesToolBase" Collapsed="true">
-    <Position X="13" Y="4.5" Width="1.5" />
+    <Position X="6.5" Y="6.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAEgAQAACAAAAIQAAACAAAAAABABAAAAIEAAQAAiAAE=</HashCode>
+      <HashCode>AAEgAQAACIAAAIQAAACAQAAQABABAAAgIEAAQAAiAAE=</HashCode>
       <FileName>Charting\Tools\ChartViewSeriesToolBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.CursorLineTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="15.25" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAgAAIAgAEUAMAABACABAgAAAACEAAgAAAAIACAAgA=</HashCode>
-      <FileName>Charting\Tools\CursorLineTool.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.EditPointTool" Collapsed="true">
-    <Position X="13" Y="7" Width="1.5" />
+    <Position X="6.5" Y="8.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AEEAAAABECIAAAABCAAICAAYAhAEUBBAIAEQIQOCAiA=</HashCode>
+      <HashCode>AEEAAAABECAAAAAACAAYSAAIBhAEUAAAIAEQIQOCAgE=</HashCode>
       <FileName>Charting\Tools\EditPointTool.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.ExportChartAsImageChartTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="18" Y="12.25" Width="1.5" />
+    <Position X="7.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAIAAAADAAAAAAAAAAAAgAAAAAAAAAIA=</HashCode>
+      <HashCode>AAAAAAAAAIAAAIAAAADAAAAAAAAAAAAgAAAAIAAAAIA=</HashCode>
       <FileName>Charting\Tools\ExportChartAsImageChartTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.GeoAPIHelper" Collapsed="true">
-    <Position X="1" Y="0.75" Width="1.5" />
-    <NestedTypes>
-      <Class Name="Core.Common.Controls.Swf.Charting.Tools.GeoAPIHelper.GeometryFactory" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Charting\Tools\GeoApiHelper.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Class>
-    </NestedTypes>
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.PointEventArgs">
+    <Position X="1" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\GeoApiHelper.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.HistoryTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="5.5" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAogAAAAEAABAIAACACAAAgAADAAAAAgEAAAAAAAABA=</HashCode>
-      <FileName>Charting\Tools\HistoryTool.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.MarkerTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="9.25" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAQgAAAkAQAAAIAAEACAAgAAAEAAEAAgAgAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\MarkerTool.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.PointEventArgs" Collapsed="true">
-    <Position X="1" Y="1.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAE=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAYAE=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.RectangleTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="19.75" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>FBQiQCEQIUAgCIQMRAiAGAAEAAASBAAAAIAAAJBCAYo=</HashCode>
-      <FileName>Charting\Tools\RectangleTool.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.SelectPoint" Collapsed="true">
-    <Position X="8.25" Y="7" Width="1.5" />
+    <Position X="1.75" Y="8.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.SelectPointTool" Collapsed="true">
-    <Position X="11" Y="7" Width="1.5" />
+    <Position X="4.5" Y="8.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AACACBQAEQByiQsIBIAAiAAQAhCEQADABEAQQACCAgA=</HashCode>
+      <HashCode>AACACBQAAQAyiQIIBIAAyAAAAhCEQADABEAQAACCAgA=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
     <ShowAsCollectionAssociation>
       <Field Name="selectedPoints" />
     </ShowAsCollectionAssociation>
-    <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.SeriesBandTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="17.5" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAIAAAACAAAAQAABAAAAAAAAAAAAAAAE=</HashCode>
-      <FileName>Charting\Tools\SeriesBandTool.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="Core.Common.Controls.Swf.Charting.Tools.WaterLevelTool" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="11" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>gAKAAgACAABwCIIABACACAYQAACAAAAAABAAAgAgAAE=</HashCode>
-      <FileName>Charting\Tools\WaterLevelTool.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
   <Class Name="Steema.TeeChart.Tools.ToolSeries" Collapsed="true">
-    <Position X="11" Y="3" Width="1.5" />
+    <Position X="4.5" Y="4.75" Width="1.5" />
     <TypeIdentifier />
   </Class>
   <Class Name="Steema.TeeChart.Tools.CursorTool" Collapsed="true">
-    <Position X="15.25" Y="4.5" Width="1.5" />
+    <Position X="8.75" Y="6.25" Width="1.5" />
     <TypeIdentifier />
   </Class>
   <Class Name="Steema.TeeChart.Tools.SeriesBandTool" Collapsed="true">
-    <Position X="17.5" Y="4.5" Width="1.5" />
+    <Position X="11" Y="6.25" Width="1.5" />
     <TypeIdentifier />
   </Class>
   <Class Name="Steema.TeeChart.Tools.Annotation" Collapsed="true">
-    <Position X="19.75" Y="3" Width="1.5" />
+    <Position X="13.25" Y="4.75" Width="1.5" />
     <TypeIdentifier />
   </Class>
   <Class Name="Steema.TeeChart.Tools.Tool" Collapsed="true">
-    <Position X="15.5" Y="1.25" Width="1.5" />
+    <Position X="9" Y="3" Width="1.5" />
     <TypeIdentifier />
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.ISeriesBandTool" Collapsed="true">
-    <Position X="9.75" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAE=</HashCode>
-      <FileName>Charting\Tools\IBandTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IBandTool" Collapsed="true">
-    <Position X="0.75" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\IBandTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.ICursorLineTool" Collapsed="true">
-    <Position X="7.75" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AEAAAAIAAAAUAEAAAAAABAAAAAAAEAAAAAAAIACAAAA=</HashCode>
-      <FileName>Charting\Tools\ICursorLineTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IHistoryTool" Collapsed="true">
-    <Position X="12" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAIAAAAAAAABAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\IHistoryTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IMarkerTool" Collapsed="true">
-    <Position X="14" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAQAAAAAAQAAAAAAEAAAAAAAAEAAEAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\IMarkerTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IRectangleTool" Collapsed="true">
-    <Position X="15.75" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>EAACAAAAAAAAAAQAAAAAGEAAAAAAAAAACAAAAAAAAIA=</HashCode>
-      <FileName>Charting\Tools\IRectangleTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.ISelectPointTool" Collapsed="true">
-    <Position X="5.75" Y="10.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAACAAEAQAAAAAAAAAAgAAAAgAAAABABAAAQAAAAgA=</HashCode>
-      <FileName>Charting\Tools\ISelectPointTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IWaterLevelTool" Collapsed="true">
-    <Position X="0.75" Y="12.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAQAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\IWaterLevelTool.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewTool" Collapsed="true">
-    <Position X="9.75" Y="8.75" Width="1.5" />
+    <Position X="3.25" Y="10.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAIAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewSeriesTool" Collapsed="true">
-    <Position X="3" Y="10.75" Width="1.75" />
+    <Position X="1.25" Y="12.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\IChartViewSeriesTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewContextMenuTool" Collapsed="true">
-    <Position X="17.75" Y="10.75" Width="1.5" />
+    <Position X="4.75" Y="12.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewContextMenuTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="Core.Common.Controls.Swf.Charting.Tools.NearestPointStyles" Collapsed="true">
-    <Position X="1" Y="6.75" Width="1.5" />
+  <Enum Name="Core.Common.Controls.Swf.Charting.Tools.NearestPointStyles">
+    <Position X="1" Y="3.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAggAgAAAAAAAAEAAAA=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
   </Enum>
-  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.SelectionChangedEventHandler" Collapsed="true">
-    <Position X="1" Y="4" Width="1.5" />
+  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.SelectionChangedEventHandler">
+    <Position X="3.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAIQAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAQAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolDraggingEventHandler" Collapsed="true">
-    <Position X="1" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\RectangleTool.cs</FileName>
-    </TypeIdentifier>
-  </Delegate>
-  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolResizingEventHandler" Collapsed="true">
-    <Position X="1" Y="6" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\RectangleTool.cs</FileName>
-    </TypeIdentifier>
-  </Delegate>
-  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolResizedEventHandler" Collapsed="true">
-    <Position X="1" Y="5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\RectangleTool.cs</FileName>
-    </TypeIdentifier>
-  </Delegate>
-  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolDraggedEventHandler" Collapsed="true">
-    <Position X="1" Y="2.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Charting\Tools\RectangleTool.cs</FileName>
-    </TypeIdentifier>
-  </Delegate>
   <Font Name="Segoe UI" Size="9" />
 </ClassDiagram>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -rb3fd3730d4e334c04ccc041ed8d946c2873c3f9e
--- Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd	(.../Charting.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd	(.../Charting.cd)	(revision b3fd3730d4e334c04ccc041ed8d946c2873c3f9e)
@@ -36,7 +36,7 @@
   <Class Name="Core.Common.Controls.Swf.Charting.TeeChartHelper" Collapsed="true">
     <Position X="19.5" Y="3" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAgAAAAA=</HashCode>
+      <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAA=</HashCode>
       <FileName>Charting\TeeChartHelper.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -99,7 +99,7 @@
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.AddPointTool" Collapsed="true">
     <Position X="4.25" Y="4.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AEGgAERAAQAgAIEIAACACEAQCBAAAABAIAAAAECCAAA=</HashCode>
+      <HashCode>AECAAERABQAgAAAIAAAACAAACBAAAABAIAAAAECCACE=</HashCode>
       <FileName>Charting\Tools\AddPointTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -115,10 +115,9 @@
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.EditPointTool" Collapsed="true">
     <Position X="8.75" Y="4.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AEEgAAIAGRIAAIAACACICAAQABAEAABAIAAQQQOCAgE=</HashCode>
+      <HashCode>AEEAAAABECAAAAAACAAYSAAIBhAEUAAAIAEQIQOCAgE=</HashCode>
       <FileName>Charting\Tools\EditPointTool.cs</FileName>
     </TypeIdentifier>
-    <Lollipop Position="0.2" />
   </Class>
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.HistoryTool" Collapsed="true">
     <Position X="11" Y="4.75" Width="1.5" />
@@ -139,7 +138,7 @@
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.PointEventArgs" Collapsed="true">
     <Position X="21.25" Y="2" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAYAE=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -154,10 +153,9 @@
   <Class Name="Core.Common.Controls.Swf.Charting.Tools.SelectPointTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="2.25" Y="4.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AACgABQAGABwiYoABICAAAAQAgCEQAAABEAQQACgAgA=</HashCode>
+      <HashCode>AACACBQAAQAyiQIIBIAAyAAAAhCEQADABEAQAACCAgA=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
-    <Lollipop Position="0.2" />
   </Class>
   <Class Name="Core.Common.Gui.Swf.Controls.Charting.Tools.SeriesChartTool" Collapsed="true">
     <Position X="6.5" Y="3.5" Width="1.5" />
@@ -203,15 +201,8 @@
   </Class>
   <Class Name="Steema.TeeChart.Styles.CustomPoint" Collapsed="true">
     <Position X="20" Y="12.5" Width="1.5" />
-    <NestedTypes>
-      <Delegate Name="Steema.TeeChart.Styles.CustomPoint.ClickPointerEventHandler" Collapsed="true">
-        <TypeIdentifier />
-      </Delegate>
-      <Delegate Name="Steema.TeeChart.Styles.CustomPoint.GetPointerStyleEventHandler" Collapsed="true">
-        <TypeIdentifier />
-      </Delegate>
-    </NestedTypes>
     <TypeIdentifier />
+    <Lollipop Position="0.2" />
   </Class>
   <Class Name="Steema.TeeChart.Styles.Line" Collapsed="true">
     <Position X="22.25" Y="15.5" Width="1.5" />
@@ -239,7 +230,7 @@
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartSeries">
     <Position X="7.5" Y="11.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>CAAAQCAAAAAAg0AAAAAAAAAEAAAAACAIAAAAAAQgAAI=</HashCode>
+      <HashCode>CAIAQCAAAABgg0AAAAAAAAAACAAAACAIAIIAgABAAAA=</HashCode>
       <FileName>Charting\IChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -302,7 +293,7 @@
   <Interface Name="Core.Common.Controls.Swf.Charting.IChart">
     <Position X="11.5" Y="11" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>BAAAIAAAAAAAQEAAAAAAACAAACAAABABAEAAEABBAAE=</HashCode>
+      <HashCode>BAAAAAAGAgAAQEAEAAgAAAAACAAAAAgQAkAAEABCAAE=</HashCode>
       <FileName>Charting\IChart.cs</FileName>
     </TypeIdentifier>
     <ShowAsCollectionAssociation>
@@ -312,7 +303,7 @@
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartView">
     <Position X="14.5" Y="9" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAIAAAAAgAAAMAAAAAAAAAAACAAAQCAAAAQgQIA=</HashCode>
+      <HashCode>AAAAAAACAgIAgEAAIAAAAAAAAAAACAAASCAAAAQgQIA=</HashCode>
       <FileName>Charting\IChartView.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -325,21 +316,21 @@
   <Interface Name="Core.Common.Controls.Swf.Charting.Series.IAreaChartSeries">
     <Position X="5.5" Y="15.75" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAQwAEKAACIEgEoAAwAgAAIAAAgAACAAAAAAgBBEAAA=</HashCode>
+      <HashCode>AQAAAAIAAAAAAAAAAAAggQAgAACAIAAAIAQIAAIUAAA=</HashCode>
       <FileName>Charting\Series\IAreaChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.Series.IPointChartSeries">
     <Position X="10" Y="15.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAIAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
+      <HashCode>AQAAAAIAAAAAgAAAAAAAAAAAAAAAAAAABAAAAAAAAAA=</HashCode>
       <FileName>Charting\Series\IPointChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.Swf.Charting.Series.ILineChartSeries">
     <Position X="7.75" Y="15.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>CIIgAAAAAAAEAUCAgwAgAAAAAAAAAAAAAgAIAAEEAAE=</HashCode>
+      <HashCode>AACAAAAAAAAAAAAAAAAggEAAAAAAAAAQIAAIAAIUAAA=</HashCode>
       <FileName>Charting\Series\ILineChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -353,7 +344,7 @@
   <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewTool">
     <Position X="11.75" Y="8.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAIAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewTool.cs</FileName>
     </TypeIdentifier>
   </Interface>