Fisheye: Tag a78278485dc8fdf746bbb9976fba976242ba5e9b refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -rbbc410887bcfea1fc93f1c2eb4a2a5126bf632ce -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision bbc410887bcfea1fc93f1c2eb4a2a5126bf632ce)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -427,7 +427,6 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Charting\UML\Charting.cd" />
     <None Include="Charting\UML\ChartTools.cd" />
     <None Include="Charting\UML\Chart.cd" />
     <None Include="packages.config" />
Index: Core/Common/src/Core.Common.Controls.Swf/Uml/TableView.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Controls.Swf/Uml/TableView.cd	(.../TableView.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Controls.Swf/Uml/TableView.cd	(.../TableView.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -13,7 +13,7 @@
       </Enum>
     </NestedTypes>
     <TypeIdentifier>
-      <HashCode>u620HAmC0OxDYOo+GMjAKURXmChxqbtoSDFLxZjZR6U=</HashCode>
+      <HashCode>u620HAmC0PxDYOo6GMjAKURXmChhrbtoSDFLxZjZR6U=</HashCode>
       <FileName>Table\TableView.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -24,13 +24,6 @@
     </ShowAsCollectionAssociation>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="Core.Common.Controls.Swf.Table.TableViewArgumentBasedPasteController">
-    <Position X="0.75" Y="2" Width="3" />
-    <TypeIdentifier>
-      <HashCode>AAAAQIAAAAAAQAAKAAAAEMAEACAAMAAAAIAAAQAACAg=</HashCode>
-      <FileName>Table\TableViewArgumentBasedPasteController.cs</FileName>
-    </TypeIdentifier>
-  </Class>
   <Class Name="Core.Common.Controls.Swf.Table.TableViewCellFormatterProvider" BaseTypeListCollapsed="true">
     <Position X="10.5" Y="3.75" Width="2.5" />
     <TypeIdentifier>
@@ -42,7 +35,7 @@
   <Class Name="Core.Common.Controls.Swf.Table.TableViewCellStyle">
     <Position X="11.5" Y="8" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAQAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAABAAI=</HashCode>
+      <HashCode>AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAI=</HashCode>
       <FileName>Table\TableViewCellStyle.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -53,7 +46,7 @@
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>CAAADCAAACBiAAIgYAECAI0BAEBACRBICAgIAYAAAEA=</HashCode>
+      <HashCode>CAAADCAAACBiAAIgYAECAM0BAEBACRBICAgIAYAAAEA=</HashCode>
       <FileName>Table\TableViewColumn.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
@@ -83,7 +76,7 @@
   <Class Name="Core.Common.Controls.Swf.Table.TableViewPasteController" Collapsed="true">
     <Position X="1" Y="0.75" Width="2" />
     <TypeIdentifier>
-      <HashCode>BCAAQAAAAECAgAAMAiQACEACAAgABQAgBCAAIEACAog=</HashCode>
+      <HashCode>BCAAQAAAAECAgAAEAiQACEACAAgABQAgBCAAIEACAog=</HashCode>
       <FileName>Table\TableViewPasteController.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
Index: Core/Common/src/Core.Common.Controls.Swf/Uml/TreeView.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Controls.Swf/Uml/TreeView.cd	(.../TreeView.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Controls.Swf/Uml/TreeView.cd	(.../TreeView.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -7,14 +7,14 @@
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
     <NestedTypes>
-      <Enum Name="Core.Common.Controls.Swf.TreeViewControls.TreeView.PlaceholderLocation" Collapsed="true">
+      <Class Name="Core.Common.Controls.Swf.TreeViewControls.TreeView.NativeInterop" Collapsed="true">
         <TypeIdentifier>
           <NewMemberFileName>TreeViewControls\TreeView.cs</NewMemberFileName>
         </TypeIdentifier>
-      </Enum>
+      </Class>
     </NestedTypes>
     <TypeIdentifier>
-      <HashCode>CDIwEIQIACZJCRAIaACTCAWIAgGaAFIjAooYgKyRLAI=</HashCode>
+      <HashCode>CBOwCoAIACRLCBEIwoCZCAWQAgCCAFAjhIoAAAyELQM=</HashCode>
       <FileName>TreeViewControls\TreeView.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -55,7 +55,7 @@
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>CAAgCAAAAABgECAIABQETIAEDAggABEiAAAACEIAIAg=</HashCode>
+      <HashCode>CyQgACAAACggECAIBBCFTIAEDAggABEiIAAACEIAIAA=</HashCode>
       <FileName>TreeViewControls\TreeNode.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -66,7 +66,7 @@
   <Class Name="Core.Common.Controls.Swf.TreeViewControls.TreeViewNodePresenterBase&lt;T&gt;" BaseTypeListCollapsed="true">
     <Position X="18.75" Y="0.75" Width="3" />
     <TypeIdentifier>
-      <HashCode>AoAAABQACgAIAAAAIAgAAAkACAABABAIEEKIACIGoAE=</HashCode>
+      <HashCode>AAAAABQACgAIAAAAIAAAAAsACAABABAAEECIAAIGoAE=</HashCode>
       <FileName>TreeViewControls\TreeViewNodePresenterBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
Index: Core/Common/src/Core.Common.Controls/UML/ITableView.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Controls/UML/ITableView.cd	(.../ITableView.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Controls/UML/ITableView.cd	(.../ITableView.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -8,7 +8,7 @@
     </TypeIdentifier>
   </Class>
   <Class Name="Core.Common.Controls.TableSelectionChangedEventArgs">
-    <Position X="8.75" Y="10" Width="2.5" />
+    <Position X="8" Y="4" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>TableSelectionChangedEventArgs.cs</FileName>
@@ -36,21 +36,21 @@
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.ITableViewPasteController">
-    <Position X="5" Y="6.5" Width="2" />
+    <Position X="5" Y="6" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAIA=</HashCode>
       <FileName>ITableViewPasteController.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Controls.IRowValidationResult">
-    <Position X="5" Y="4.75" Width="1.75" />
+    <Position X="8" Y="0.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAEAAAAAAAAAAAACAAAAAAAAAAAAAABAAAAAA=</HashCode>
       <FileName>IRowValidationResult.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Enum Name="Core.Common.Controls.TableViewPasteBehaviourOptions">
-    <Position X="5" Y="10.5" Width="2.5" />
+    <Position X="8" Y="2.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>TableViewPasteBehaviourOptions.cs</FileName>
Index: Core/Common/src/Core.Common.Gui/Uml/Gui.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Gui/Uml/Gui.cd	(.../Gui.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Gui/Uml/Gui.cd	(.../Gui.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -1,214 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
   <Class Name="Core.Common.Gui.SelectedItemChangedEventArgs">
-    <Position X="11" Y="20.75" Width="2.75" />
+    <Position X="10.25" Y="6" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>ItemEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="Core.Common.Gui.SelectedItemChangedEventArgs&lt;T&gt;">
-    <Position X="11" Y="22.5" Width="2.75" />
+  <Class Name="Core.Common.Gui.PropertyInfoExtensions">
+    <Position X="10.25" Y="7.75" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>ItemEventArgs.cs</FileName>
+      <FileName>PropertyInfoExtensions.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="Core.Common.Gui.guiPluginPlugin" BaseTypeListCollapsed="true">
-    <Position X="14.75" Y="18.5" Width="1.5" />
+  <Class Name="Core.Common.Gui.ActiveViewChangeEventArgs">
+    <Position X="10.25" Y="9.25" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAIAAAAAAAAAEAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>GuiPluginConfiguration.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Core.Common.Gui.ViewEventArgs">
-    <Position X="11" Y="24.25" Width="2.75" />
-    <TypeIdentifier>
       <HashCode>AAgAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>ViewEventArgs.cs</FileName>
+      <FileName>ActiveViewChangeEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Core.Common.Gui.GuiPlugin" Collapsed="true">
-    <Position X="9.5" Y="8.25" Width="1.5" />
+    <Position X="9.25" Y="2.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>YEAAQAAAJCRgEAFAECAIAEQAAAABgBAAEACBAAAACEA=</HashCode>
+      <HashCode>YMQAUAAAICRgEABAECAIAAQAAAIBgBAAEACBAAAICAA=</HashCode>
       <FileName>GuiPlugin.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Interface Name="Core.Common.Gui.IGui">
-    <Position X="6.75" Y="8" Width="1.75" />
-    <AssociationLine Name="CompositeViewProvider" Type="Core.Common.Gui.ICompositeViewProvider" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="8.5" Y="9.312" />
-        <Point X="9.174" Y="9.312" />
-        <Point X="9.174" Y="9.562" />
-        <Point X="11.75" Y="9.562" />
-      </Path>
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="0.212" Y="0.155" />
-      </MemberNameLabel>
-    </AssociationLine>
-    <AssociationLine Name="CopyPasteHandler" Type="Core.Common.Gui.IProjectItemCopyPasteHandler" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="6.75" Y="9.345" />
-        <Point X="5.882" Y="9.345" />
-        <Point X="5.882" Y="18" />
-        <Point X="3.5" Y="18" />
-      </Path>
-      <MemberNameLabel ManuallyPlaced="true">
-        <Position X="0.098" Y="0.29" />
-      </MemberNameLabel>
-    </AssociationLine>
-    <AssociationLine Name="DocumentViews" Type="Core.Common.Gui.IViewManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="6.75" Y="9.057" />
-        <Point X="5.476" Y="9.057" />
-        <Point X="5.476" Y="13.587" />
-        <Point X="3" Y="13.587" />
-      </Path>
-    </AssociationLine>
+    <Position X="6.5" Y="2.25" Width="1.75" />
     <AssociationLine Name="MainWindow" Type="Core.Common.Gui.Forms.IMainWindow" FixedFromPoint="true">
       <Path>
-        <Point X="6.75" Y="8.576" />
-        <Point X="3" Y="8.576" />
+        <Point X="6.5" Y="2.826" />
+        <Point X="2.75" Y="2.826" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ToolWindowViews" Type="Core.Common.Gui.IViewManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="6.75" Y="8.816" />
-        <Point X="5.052" Y="8.816" />
-        <Point X="5.052" Y="12.512" />
-        <Point X="3" Y="12.512" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="UndoRedoManager" Type="Core.Common.BaseDelftTools.UndoRedo.IUndoRedoManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="6.75" Y="9.489" />
-        <Point X="6.51" Y="9.489" />
-        <Point X="6.51" Y="21.415" />
-        <Point X="3" Y="21.415" />
-      </Path>
-    </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AAAAAgAAABAAIAAAAAAGgBAABAAAAAAAIkAAAwAAACI=</HashCode>
+      <HashCode>AAAAAgAAABAAIAAAAAAnAAEABAAAEAAAIgAAQgAAQCI=</HashCode>
       <FileName>IGui.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
-      <Property Name="Application" />
       <Property Name="CommandHandler" />
-      <Property Name="CompositeViewProvider" />
-      <Property Name="CopyPasteHandler" />
-      <Property Name="DocumentViews" />
-      <Property Name="ViewContextManager" />
       <Property Name="MainWindow" />
-      <Property Name="ToolWindowViews" />
-      <Property Name="UndoRedoManager" />
     </ShowAsAssociation>
     <ShowAsCollectionAssociation>
       <Property Name="Commands" />
       <Property Name="Plugins" />
     </ShowAsCollectionAssociation>
   </Interface>
   <Interface Name="Core.Common.Gui.IGuiCommandHandler">
-    <Position X="8" Y="17.25" Width="1.75" />
+    <Position X="7.75" Y="11.5" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>ACAACAAREAAqAKQQFAoiACAAZgAkAiQAMEAhKIAAgBA=</HashCode>
+      <HashCode>ACIgCAAQAAAKAIAAAAIhAAIAYAAACIAAIEABIAAAABA=</HashCode>
       <FileName>IGuiCommandHandler.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Core.Common.Gui.Forms.IMainWindow">
-    <Position X="1.25" Y="7.5" Width="1.75" />
+    <Position X="1" Y="1.75" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAIAAAAAAIIAAEAAAQAAAAAAAAAEAAgIAAAAAAGAAIA=</HashCode>
+      <HashCode>AAIAAAAAAIAAAEAAAQAgAAAAAAAEAAgIAAAAAACAgIA=</HashCode>
       <FileName>Forms\IMainWindow.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Core.IApplication" Collapsed="true">
-    <Position X="9.25" Y="6" Width="1.75" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Gui.ICompositeViewProvider">
-    <Position X="11.75" Y="9.25" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
-      <FileName>ICompositeViewProvider.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Gui.IProjectItemCopyPasteHandler">
-    <Position X="1.25" Y="16.25" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AQQRBAAAAAQAAAAAAAAAAAAAAgAAAAAAQEAAAAAACAA=</HashCode>
-      <FileName>IProjectItemCopyPasteHandler.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Gui.IViewManager">
-    <Position X="1.25" Y="11.5" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AIIAEIAAAAAAAAAAQAAACUACCAAAAMAAAAAAAABACAA=</HashCode>
-      <FileName>IViewManager.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.BaseDelftTools.UndoRedo.IUndoRedoManager">
-    <Position X="1.25" Y="19.25" Width="1.75" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Gui.IViewProvider">
-    <Position X="11.75" Y="6.5" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AEAAAAAAAQAAAAABAAEAAAAAAAIAAIAgAAAAAAAAAAA=</HashCode>
-      <FileName>IViewProvider.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Controls.ICommand">
-    <Position X="11.75" Y="11" Width="2.25" />
+    <Position X="3.5" Y="5.5" Width="2.25" />
     <TypeIdentifier />
   </Interface>
   <Interface Name="Core.Common.Gui.Forms.IProjectExplorer">
-    <Position X="1.25" Y="4.5" Width="1.75" />
+    <Position X="2" Y="13.75" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEIAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAA=</HashCode>
       <FileName>Forms\IProjectExplorer.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Gui.IGuiContextManager">
-    <Position X="11.5" Y="15" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAABAAAAAQAAAAAAAAAAAAAAAAAAAAACAAAAAAAEAAA=</HashCode>
-      <FileName>IGuiContextManager.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Gui.IConfigureDialog">
-    <Position X="11" Y="18.5" Width="2.25" />
+    <Position X="10.25" Y="4.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IConfigureDialog.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Gui.IGuiView">
-    <Position X="4.25" Y="4.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IGuiView.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Gui.ISelectionContainer">
-    <Position X="6.5" Y="3.25" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAEAAAQAAAQAA=</HashCode>
-      <FileName>ISelectionContainer.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Controls.IView">
-    <Position X="2.75" Y="0.5" Width="1.5" />
+    <Position X="2.25" Y="10.75" Width="1.5" />
     <TypeIdentifier />
   </Interface>
   <Interface Name="Core.Common.Gui.IGuiCommand" Collapsed="true">
-    <Position X="9.5" Y="11.5" Width="1.5" />
+    <Position X="3.75" Y="7.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IGuiCommand.cs</FileName>
     </TypeIdentifier>
   </Interface>
+  <Interface Name="Core.Common.Gui.IViewResolver">
+    <Position X="11.5" Y="0.75" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>AIAAAIAAAAAAABEAAAAAAAkQAAAAAIAAAAAAAAAACAA=</HashCode>
+      <FileName>IViewResolver.cs</FileName>
+    </TypeIdentifier>
+  </Interface>
   <Font Name="Tahoma" Size="8.25" />
 </ClassDiagram>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Uml/Properties.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Gui/Uml/Properties.cd	(.../Properties.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Gui/Uml/Properties.cd	(.../Properties.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -9,34 +9,18 @@
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="Core.Common.Gui.PropertyInfo&lt;TObject, TProperty&gt;">
-    <Position X="3.75" Y="3.25" Width="3" />
+    <Position X="0.5" Y="4.25" Width="3" />
     <TypeIdentifier>
-      <HashCode>ASAgIAAAAAAAAAAAAAAABAAAAAAAAAQAAIACEAAAAAA=</HashCode>
+      <HashCode>AQAAIAAAAAAAAAAAAAAAAAAAgAAAAAAAAIACEAAAAAA=</HashCode>
       <FileName>PropertyInfo.cs</FileName>
     </TypeIdentifier>
-    <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Gui.DynamicObjectProperties">
-    <Position X="0.5" Y="4.5" Width="2.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAAAA=</HashCode>
-      <FileName>DynamicObjectProperties.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
   <Interface Name="Core.Common.Gui.IObjectProperties">
     <Position X="0.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAA=</HashCode>
       <FileName>IObjectProperties.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Gui.IPropertyInfo">
-    <Position X="3.75" Y="0.5" Width="2" />
-    <TypeIdentifier>
-      <HashCode>ASAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAIACEAAAAAA=</HashCode>
-      <FileName>IPropertyInfo.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Font Name="Segoe UI" Size="9" />
 </ClassDiagram>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Uml/ViewManager.cd
===================================================================
diff -u -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Gui/Uml/ViewManager.cd	(.../ViewManager.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
+++ Core/Common/src/Core.Common.Gui/Uml/ViewManager.cd	(.../ViewManager.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -1,76 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Interface Name="Core.Common.Gui.IGuiView">
-    <Position X="7" Y="6" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IGuiView.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="Core.Common.Gui.ICompositeViewProvider">
-    <Position X="1.25" Y="4.5" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
-      <FileName>ICompositeViewProvider.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Gui.IConfigureDialog">
-    <Position X="9.5" Y="0.5" Width="1.5" />
+    <Position X="2.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IConfigureDialog.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Core.Common.Gui.IViewManager">
-    <Position X="5" Y="1" Width="2.75" />
-    <TypeIdentifier>
-      <HashCode>AIIAEIAAAAAAIAAAAAAACUACDAAAAMAAAAAAAABACAA=</HashCode>
-      <FileName>IViewManager.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Property Name="ActiveView" />
-      <Property Name="ViewProvider" />
-    </ShowAsAssociation>
-    <ShowAsCollectionAssociation>
-      <Property Name="AllViews" />
-    </ShowAsCollectionAssociation>
-  </Interface>
-  <Interface Name="Core.Common.Gui.IViewProvider">
-    <Position X="1" Y="1.25" Width="2.5" />
-    <TypeIdentifier>
-      <HashCode>AEAAAAAAAQAAAAABIAEAAAAAAAAAAIAgAAAAAAAAAAA=</HashCode>
-      <FileName>IViewProvider.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
   <Interface Name="Core.Common.Controls.IView">
-    <Position X="9.5" Y="2.25" Width="1.5" />
+    <Position X="2.75" Y="2.25" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Controls.IView&lt;T&gt;">
-    <Position X="11.5" Y="6" Width="1.5" />
-    <TypeIdentifier />
-  </Interface>
   <Interface Name="Core.Common.Controls.ICompositeView">
-    <Position X="13.75" Y="6" Width="1.5" />
+    <Position X="1.25" Y="6" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Controls.IContextAwareView">
-    <Position X="9" Y="6" Width="2" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Controls.ISuspendibleView">
-    <Position X="12" Y="2.75" Width="1.5" />
-    <TypeIdentifier />
-  </Interface>
   <Interface Name="Core.Common.Controls.IReusableView">
-    <Position X="15.75" Y="6" Width="1.5" />
+    <Position X="4.25" Y="6" Width="1.5" />
     <TypeIdentifier />
   </Interface>
+  <Interface Name="Core.Common.Gui.IViewResolver">
+    <Position X="6.75" Y="0.5" Width="2.5" />
+    <TypeIdentifier>
+      <HashCode>AIAAAIAAAAAAABEAAAAAAAkQAAAAAIAAAAAAAAAACAA=</HashCode>
+      <FileName>IViewResolver.cs</FileName>
+    </TypeIdentifier>
+  </Interface>
   <Enum Name="Core.Common.Gui.ViewLocation">
-    <Position X="3" Y="6.25" Width="1.5" />
+    <Position X="6.75" Y="4.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAUAAAAAAAIAAACCACAAAAAAAA=</HashCode>
-      <FileName>IViewManager.cs</FileName>
+      <FileName>IViewList.cs</FileName>
     </TypeIdentifier>
   </Enum>
   <Font Name="Segoe UI" Size="9" />
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r2b725e06c6107d639ba726b56cfbf273c91e2b35 -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 2b725e06c6107d639ba726b56cfbf273c91e2b35)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -207,7 +207,6 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Uml\Workflow.cd" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
Fisheye: Tag a78278485dc8fdf746bbb9976fba976242ba5e9b refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Uml/Workflow.cd'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/src/Core.GIS.GeoAPI/Uml/Geometries.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Core/GIS/src/Core.GIS.GeoAPI/Uml/Geometries.cd	(.../Geometries.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/GIS/src/Core.GIS.GeoAPI/Uml/Geometries.cd	(.../Geometries.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -1,209 +1,203 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="GeoAPI.Geometries.Dimension">
-    <Position X="10.25" Y="13.25" Width="1.75" />
+  <Class Name="Core.GIS.GeoAPI.Geometries.Dimension">
+    <Position X="11.25" Y="13.25" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAEAAA=</HashCode>
       <FileName>Geometries\Dimension.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="GeoAPI.Geometries.Location">
-    <Position X="12.75" Y="13" Width="1.75" />
+  <Class Name="Core.GIS.GeoAPI.Geometries.Location">
+    <Position X="13.75" Y="13" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAA=</HashCode>
       <FileName>Geometries\Location.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="GeoAPI.Geometries.IntersectionMatrix">
-    <Position X="11" Y="7.75" Width="2.5" />
+  <Class Name="Core.GIS.GeoAPI.Geometries.IntersectionMatrix">
+    <Position X="12" Y="7.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>ABIAAAAgAIAAFABEiAAAACAAAAQAAAAAAgFAAAgAgwA=</HashCode>
       <FileName>Geometries\IntersectionMatrix.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="GeoAPI.Geometries.IGeometry">
-    <Position X="0.5" Y="2.25" Width="2" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IGeometry">
+    <Position X="1.5" Y="2.25" Width="2" />
     <TypeIdentifier>
       <HashCode>CQBAAhAEgJBIhIDAMAhAAABIYAxARABAsBTAASAZTIA=</HashCode>
       <FileName>Geometries\IGeometry.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IGeometryFactory">
-    <Position X="9.5" Y="0.5" Width="2.25" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IGeometryFactory">
+    <Position X="10.5" Y="0.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAACAgAgAIgAACAAAgAANgAACAAAgAAAAQAAAA=</HashCode>
+      <HashCode>AAAAAAAACAgAgAIgAACAAAgAANgAACAAAAAAAAQAAAA=</HashCode>
       <FileName>Geometries\IGeometryFactory.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IGeometryFilter">
-    <Position X="0.5" Y="15.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IGeometryFilter">
+    <Position X="1.5" Y="15.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IGeometryFilter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ICoordinate">
-    <Position X="8" Y="7.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ICoordinate">
+    <Position X="9" Y="7.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAwAAAAAAAgABAAAAAAAAAYAE=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAgAAAAAAAgABAAAAAAAAAYAE=</HashCode>
       <FileName>Geometries\ICoordinate.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ICoordinateFilter">
-    <Position X="3" Y="14" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ICoordinateFilter">
+    <Position X="4" Y="14" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\ICoordinateFilter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ICoordinateSequence">
-    <Position X="12" Y="1.75" Width="2" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ICoordinateSequence">
+    <Position X="13" Y="1.75" Width="2" />
     <TypeIdentifier>
       <HashCode>QAAAAAAAAAAAJAAAAAAAAAQAAAAAQCABYgAAAAAAAAA=</HashCode>
       <FileName>Geometries\ICoordinateSequence.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ICoordinateSequenceFactory">
-    <Position X="12" Y="0.5" Width="2.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ICoordinateSequenceFactory">
+    <Position X="13" Y="0.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\ICoordinateSequenceFactory.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ICurve">
-    <Position X="3" Y="8.5" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ICurve">
+    <Position X="4" Y="8.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAhAAAAAQAAAAAAAAAAAAAAAAEAAAAAAAAAAAAg=</HashCode>
       <FileName>Geometries\ICurve.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IEnvelope">
-    <Position X="8" Y="10.25" Width="2" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IEnvelope">
+    <Position X="9" Y="10.25" Width="2" />
     <TypeIdentifier>
       <HashCode>MBgABBAwBAAAAAAAEBAAAEBAAAAAAABIAAAmAQAQAIA=</HashCode>
       <FileName>Geometries\IEnvelope.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IGeometryCollection">
-    <Position X="6.75" Y="2" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IGeometryCollection">
+    <Position X="7.75" Y="2" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAACCAAAAAQAAAAAAAAAAAAAAAAEAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAEAAA=</HashCode>
       <FileName>Geometries\IGeometryCollection.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IGeometryComponentFilter">
-    <Position X="0.5" Y="14" Width="2.25" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IGeometryComponentFilter">
+    <Position X="1.5" Y="14" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IGeometryComponentFilter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ILinearRing">
-    <Position X="3" Y="12.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ILineString">
+    <Position X="4" Y="10.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Geometries\ILinearRing.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="GeoAPI.Geometries.ILineString">
-    <Position X="3" Y="10.5" Width="1.5" />
-    <TypeIdentifier>
       <HashCode>AAAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAA=</HashCode>
       <FileName>Geometries\ILineString.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IMultiCurve">
-    <Position X="6.75" Y="4.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IMultiCurve">
+    <Position X="7.75" Y="4.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IMultiCurve.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IMultiLineString">
-    <Position X="6.75" Y="5.5" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IMultiLineString">
+    <Position X="7.75" Y="5.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IMultiLineString.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IMultiPoint">
-    <Position X="8.5" Y="4.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IMultiPoint">
+    <Position X="9.5" Y="4.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IMultiPoint.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IMultiPolygon">
-    <Position X="5" Y="5.5" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IMultiPolygon">
+    <Position X="6" Y="5.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IMultiPolygon.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IMultiSurface">
-    <Position X="5" Y="4.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IMultiSurface">
+    <Position X="6" Y="4.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IMultiSurface.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IPoint">
-    <Position X="5.75" Y="7.5" Width="1.5" />
-    <InheritanceLine Type="GeoAPI.Geometries.IGeometry" FixedFromPoint="true">
-      <Path>
-        <Point X="2.5" Y="8.188" />
-        <Point X="5.75" Y="8.188" />
-      </Path>
-    </InheritanceLine>
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IPoint">
+    <Position X="6.75" Y="7.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAE=</HashCode>
+      <HashCode>AAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAA=</HashCode>
       <FileName>Geometries\IPoint.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IPolygon">
-    <Position X="3" Y="5.5" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IPolygon">
+    <Position X="4" Y="5.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAIIQAAAAIBAAAAAAAAAAEAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IPolygon.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.IPrecisionModel">
-    <Position X="11" Y="5.25" Width="2" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.IPrecisionModel">
+    <Position X="12" Y="5.25" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAACAAAAAAgAIAAQAIAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\IPrecisionModel.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="GeoAPI.Geometries.ISurface">
-    <Position X="3" Y="3.75" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ISurface">
+    <Position X="4" Y="3.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Geometries\ISurface.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="GeoAPI.Geometries.Dimensions">
-    <Position X="5.75" Y="13.25" Width="1.5" />
+  <Interface Name="Core.GIS.GeoAPI.Geometries.ILinearRing">
+    <Position X="4" Y="12.5" Width="1.5" />
     <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Geometries\ILinearRing.cs</FileName>
+    </TypeIdentifier>
+  </Interface>
+  <Enum Name="Core.GIS.GeoAPI.Geometries.Dimensions">
+    <Position X="6.75" Y="13.25" Width="1.5" />
+    <TypeIdentifier>
       <HashCode>AAAAAAAAAACAgAAAAAAAIAAEAAAAAAAAgAgAAAAAAAA=</HashCode>
       <FileName>Geometries\Dimension.cs</FileName>
     </TypeIdentifier>
   </Enum>
-  <Enum Name="GeoAPI.Geometries.Locations">
-    <Position X="5.75" Y="10.5" Width="1.5" />
+  <Enum Name="Core.GIS.GeoAPI.Geometries.Locations">
+    <Position X="6.75" Y="10.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAIAIAAAAABAA=</HashCode>
       <FileName>Geometries\Location.cs</FileName>
     </TypeIdentifier>
   </Enum>
-  <Enum Name="GeoAPI.Geometries.Ordinates">
-    <Position X="5.75" Y="15" Width="1.5" />
+  <Enum Name="Core.GIS.GeoAPI.Geometries.Ordinates">
+    <Position X="6.75" Y="15" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAYAE=</HashCode>
       <FileName>Geometries\ICoordinateSequence.cs</FileName>
     </TypeIdentifier>
   </Enum>
-  <Enum Name="GeoAPI.Geometries.PrecisionModels">
-    <Position X="5.75" Y="12" Width="1.5" />
+  <Enum Name="Core.GIS.GeoAPI.Geometries.PrecisionModels">
+    <Position X="6.75" Y="12" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAEAAAAAEAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Geometries\IPrecisionModel.cs</FileName>
Index: Ringtoets/Piping/uml/Ringtoets.Piping.UML/Plugins/Wti/Piping/PipingCalculation.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Ringtoets/Piping/uml/Ringtoets.Piping.UML/Plugins/Wti/Piping/PipingCalculation.cd	(.../PipingCalculation.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Ringtoets/Piping/uml/Ringtoets.Piping.UML/Plugins/Wti/Piping/PipingCalculation.cd	(.../PipingCalculation.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="Wti.Calculation.Piping.PipingCalculation">
+  <Class Name="Ringtoets.Piping.Calculation.Piping.PipingCalculation">
     <Position X="4" Y="2.5" Width="1.75" />
     <TypeIdentifier />
   </Class>
-  <Class Name="Wti.Calculation.Piping.PipingCalculationException">
+  <Class Name="Ringtoets.Piping.Calculation.Piping.PipingCalculationException">
     <Position X="3.75" Y="0.5" Width="2.25" />
     <TypeIdentifier />
   </Class>
-  <Class Name="Wti.Calculation.Piping.PipingCalculationInput">
+  <Class Name="Ringtoets.Piping.Calculation.Piping.PipingCalculationInput">
     <Position X="0.5" Y="2.5" Width="2.25" />
     <TypeIdentifier />
   </Class>
-  <Class Name="Wti.Calculation.Piping.PipingCalculationResult">
+  <Class Name="Ringtoets.Piping.Calculation.Piping.PipingCalculationResult">
     <Position X="7" Y="2.5" Width="2.25" />
     <TypeIdentifier />
   </Class>
Index: Ringtoets/Piping/uml/Ringtoets.Piping.UML/Plugins/Wti/Piping/PipingDataModel.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -ra78278485dc8fdf746bbb9976fba976242ba5e9b
--- Ringtoets/Piping/uml/Ringtoets.Piping.UML/Plugins/Wti/Piping/PipingDataModel.cd	(.../PipingDataModel.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Ringtoets/Piping/uml/Ringtoets.Piping.UML/Plugins/Wti/Piping/PipingDataModel.cd	(.../PipingDataModel.cd)	(revision a78278485dc8fdf746bbb9976fba976242ba5e9b)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="Wti.Data.PipingData">
-    <Position X="4.25" Y="1" Width="2.25" />
+  <Class Name="Ringtoets.Piping.Data.PipingData">
+    <Position X="0.5" Y="0.5" Width="2.25" />
     <TypeIdentifier />
     <ShowAsAssociation>
       <Property Name="Output" />
     </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Wti.Data.PipingOutput">
-    <Position X="7.5" Y="1" Width="2" />
+  <Class Name="Ringtoets.Piping.Data.PipingOutput">
+    <Position X="3.75" Y="0.5" Width="2" />
     <TypeIdentifier />
   </Class>
   <Font Name="Segoe UI" Size="9" />