From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 13 Jan 2017 12:56:41 +0000 (+0200)
Subject: Fixed adapters.xml line endings to standard LF.
X-Git-Tag: v1.27.0~24
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=3b1643524683e7603d7007c8aa708997badb8ebe

Fixed adapters.xml line endings to standard LF.

For some reason one of the original adapters.xml files had gotten a
macintosh-style CR line ending on its first line which started the
proliferation of CR line endings in all the adapters.xml files.

refs #6959

Change-Id: Ia4f41ffb38a02ddb6d25e37b12a49450a40dcf5a
---

diff --git a/bundles/org.simantics.annotation.ui/adapters.xml b/bundles/org.simantics.annotation.ui/adapters.xml
index df1bf75e9..4bc8d9f0f 100644
--- a/bundles/org.simantics.annotation.ui/adapters.xml
+++ b/bundles/org.simantics.annotation.ui/adapters.xml
@@ -1,3 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
    Copyright (c) 2007, 2012 Association for Decentralized Information Management
    in Industry THTH ry.
    All rights reserved. This program and the accompanying materials
    are made available under the terms of the Eclipse Public License v1.0
    which accompanies this distribution, and is available at
    http://www.eclipse.org/legal/epl-v10.html
   
    Contributors:
        VTT Technical Research Centre of Finland - initial API and implementation
 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2012 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
 <adapters>
-	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
		<type uri="http://www.simantics.org/Annotation-0.0/Annotation"
			class="org.simantics.annotation.ui.modelBrowser2.model.AnnotationNode">
			<this />
		</type>
	</target>
	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
		<resource
			uri="http://www.simantics.org/Annotation-0.0/Actions/NewAnnotation"
			class="org.simantics.annotation.ui.actions.NewAnnotation" />
		<resource
			uri="http://www.simantics.org/Annotation-0.0/Actions/NewAnnotationType"
			class="org.simantics.annotation.ui.actions.NewAnnotationType" />
		<resource
			uri="http://www.simantics.org/Annotation-0.0/Actions/NewAnnotationInstance"
			class="org.simantics.annotation.ui.actions.NewAnnotationInstance" />
	</target>

	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<resource
			uri="http://www.simantics.org/Annotation-0.0/AnnotationBC/AnnotationTypeLabelRule"
			class="org.simantics.annotation.ui.modelBrowser2.model.AnnotationTypeLabelRule"
			constructor="get" />
	</target>

	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<baseType uri="http://www.simantics.org/Viewpoint-0.0/VisualsRule" />
		<resource
			uri="http://www.simantics.org/Annotation-0.0/AnnotationBC/AnnotationTypeModifierRule"
			class="org.simantics.browsing.ui.model.modifiers.SingleObjectStringPropertyModifierRule">
			<graph />
			<string>http://www.simantics.org/Layer0-0.0/HasRange/Inverse</string>
			<string>http://www.simantics.org/Layer0-0.0/HasName</string>
		</resource>
	</target>

	<target interface="org.simantics.ui.workbench.IEditorNamingService">
		<type uri="http://www.simantics.org/Annotation-0.0/AnnotationType"
			class="org.simantics.annotation.ui.editor.AnnotationTypeEditorNamingService">
		</type>
	</target>
	
	<target interface="org.simantics.db.layer0.adapter.DropActionFactory">
		<resource
			uri="http://www.simantics.org/Annotation-1.0/Actions/AnnotationDropAction"
			class="org.simantics.annotation.ui.actions.AnnotationDropActionFactory" />
	</target>
	
</adapters>
\ No newline at end of file
+	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
+		<type uri="http://www.simantics.org/Annotation-0.0/Annotation"
+			class="org.simantics.annotation.ui.modelBrowser2.model.AnnotationNode">
+			<this />
+		</type>
+	</target>
+	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
+		<resource
+			uri="http://www.simantics.org/Annotation-0.0/Actions/NewAnnotation"
+			class="org.simantics.annotation.ui.actions.NewAnnotation" />
+		<resource
+			uri="http://www.simantics.org/Annotation-0.0/Actions/NewAnnotationType"
+			class="org.simantics.annotation.ui.actions.NewAnnotationType" />
+		<resource
+			uri="http://www.simantics.org/Annotation-0.0/Actions/NewAnnotationInstance"
+			class="org.simantics.annotation.ui.actions.NewAnnotationInstance" />
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<resource
+			uri="http://www.simantics.org/Annotation-0.0/AnnotationBC/AnnotationTypeLabelRule"
+			class="org.simantics.annotation.ui.modelBrowser2.model.AnnotationTypeLabelRule"
+			constructor="get" />
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<baseType uri="http://www.simantics.org/Viewpoint-0.0/VisualsRule" />
+		<resource
+			uri="http://www.simantics.org/Annotation-0.0/AnnotationBC/AnnotationTypeModifierRule"
+			class="org.simantics.browsing.ui.model.modifiers.SingleObjectStringPropertyModifierRule">
+			<graph />
+			<string>http://www.simantics.org/Layer0-0.0/HasRange/Inverse</string>
+			<string>http://www.simantics.org/Layer0-0.0/HasName</string>
+		</resource>
+	</target>
+
+	<target interface="org.simantics.ui.workbench.IEditorNamingService">
+		<type uri="http://www.simantics.org/Annotation-0.0/AnnotationType"
+			class="org.simantics.annotation.ui.editor.AnnotationTypeEditorNamingService">
+		</type>
+	</target>
+	
+	<target interface="org.simantics.db.layer0.adapter.DropActionFactory">
+		<resource
+			uri="http://www.simantics.org/Annotation-1.0/Actions/AnnotationDropAction"
+			class="org.simantics.annotation.ui.actions.AnnotationDropActionFactory" />
+	</target>
+	
+</adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.browsing.ui.graph/adapters.xml b/bundles/org.simantics.browsing.ui.graph/adapters.xml
index 85c06ffc9..95434c0e8 100644
--- a/bundles/org.simantics.browsing.ui.graph/adapters.xml
+++ b/bundles/org.simantics.browsing.ui.graph/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,7 +12,8 @@
  -->
 
 <adapters>
-
<!-- 
+
+<!-- 
 	<target interface="org.simantics.browsing.ui.Tester">
 		<type 
 			uri = "http://www.simantics.org/Layer0-0.0/TypeContextTester"
diff --git a/bundles/org.simantics.browsing.ui.model/adapters.xml b/bundles/org.simantics.browsing.ui.model/adapters.xml
index 153de6fc8..50b343479 100644
--- a/bundles/org.simantics.browsing.ui.model/adapters.xml
+++ b/bundles/org.simantics.browsing.ui.model/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2010, 2011 Association for Decentralized Information Management in
     Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -23,9 +24,18 @@
         <type
             uri="http://www.simantics.org/Viewpoint-0.0/RelationChildRule"
             class="org.simantics.browsing.ui.model.children.RelationChildRule">
-            <single uri="http://www.simantics.org/Viewpoint-0.0/RelationChildRule/HasRelation"/>
            <atMostOne uri="http://www.simantics.org/Viewpoint-0.0/RelationChildRule/HasTest"
                       to="org.simantics.browsing.ui.model.tests.Test"/>
+            <single uri="http://www.simantics.org/Viewpoint-0.0/RelationChildRule/HasRelation"/>
+            <atMostOne uri="http://www.simantics.org/Viewpoint-0.0/RelationChildRule/HasTest"
+                       to="org.simantics.browsing.ui.model.tests.Test"/>
         </type>
-        <type
            uri="http://www.simantics.org/Viewpoint-0.0/RelationStatementRule"
            class="org.simantics.browsing.ui.model.children.RelationStatementRule">
            <single uri="http://www.simantics.org/Viewpoint-0.0/RelationStatementRule/HasRelation"/>
            <atMostOne uri="http://www.simantics.org/Viewpoint-0.0/RelationStatementRule/HasTest"
                       to="org.simantics.browsing.ui.model.tests.Test"/>
        </type>
        <type
+        <type
+            uri="http://www.simantics.org/Viewpoint-0.0/RelationStatementRule"
+            class="org.simantics.browsing.ui.model.children.RelationStatementRule">
+            <single uri="http://www.simantics.org/Viewpoint-0.0/RelationStatementRule/HasRelation"/>
+            <atMostOne uri="http://www.simantics.org/Viewpoint-0.0/RelationStatementRule/HasTest"
+                       to="org.simantics.browsing.ui.model.tests.Test"/>
+        </type>
+        <type
             uri="http://www.simantics.org/Viewpoint-0.0/CompositeChildRule"
             class="org.simantics.browsing.ui.model.children.CompositeChildRule">
             <graph/>
@@ -46,12 +56,17 @@
         <resource
             uri="http://www.simantics.org/Viewpoint-0.0/ResourceLabelLabelRule"
             class="org.simantics.browsing.ui.model.labels.ResourceLabelLabelRule"/>
-        <resource
            uri="http://www.simantics.org/Viewpoint-0.0/StandardNameLabelRule"
            class="org.simantics.browsing.ui.model.labels.StandardNameLabelRule"/>
        <type
+        <resource
+            uri="http://www.simantics.org/Viewpoint-0.0/StandardNameLabelRule"
+            class="org.simantics.browsing.ui.model.labels.StandardNameLabelRule"/>
+        <type
             uri="http://www.simantics.org/Viewpoint-0.0/ConstantLabelRule"
             class="org.simantics.browsing.ui.model.labels.ConstantLabelRule">
             <single uri="http://www.simantics.org/Viewpoint-0.0/ConstantLabelRule/HasLabel" 
                     to="java.lang.String"/>
-            <single uri="http://www.simantics.org/Viewpoint-0.0/ConstantLabelRule/HasColumnKey" 
                    to="java.lang.String"/>
        </type>
+            <single uri="http://www.simantics.org/Viewpoint-0.0/ConstantLabelRule/HasColumnKey" 
+                    to="java.lang.String"/>
+        </type>
         <resource
             uri="http://www.simantics.org/Viewpoint-0.0/ResourceNameModifierRule"
             class="org.simantics.browsing.ui.model.modifiers.StringPropertyModifierRule">
@@ -64,7 +79,13 @@
             <graph/>
             <string>http://www.simantics.org/Layer0-0.0/HasLabel</string>
         </resource>
-        <resource
            uri="http://www.simantics.org/Viewpoint-0.0/VariableLabelModifierRule"
            class="org.simantics.browsing.ui.model.modifiers.VariablePropertyModifierRule">
            <graph/>
            <string>HasLabel</string>
        </resource>
        <resource
+        <resource
+            uri="http://www.simantics.org/Viewpoint-0.0/VariableLabelModifierRule"
+            class="org.simantics.browsing.ui.model.modifiers.VariablePropertyModifierRule">
+            <graph/>
+            <string>HasLabel</string>
+        </resource>
+        <resource
             uri="http://www.simantics.org/Viewpoint-0.0/NoModifierRule"
             class="org.simantics.browsing.ui.model.modifiers.NoModifierRule"
             constructor="get">
@@ -75,7 +96,9 @@
             class="org.simantics.browsing.ui.model.images.ConstantImageRule">
             <single uri="http://www.simantics.org/Viewpoint-0.0/ConstantImageRule/HasImage" 
                     to="org.eclipse.jface.resource.ImageDescriptor"/>
-            <single uri="http://www.simantics.org/Viewpoint-0.0/ConstantImageRule/HasColumnKey" 
                    to="java.lang.String"/>
        </type>
+            <single uri="http://www.simantics.org/Viewpoint-0.0/ConstantImageRule/HasColumnKey" 
+                    to="java.lang.String"/>
+        </type>
 
         <type
             uri="http://www.simantics.org/Viewpoint-0.0/ConstantLabelDecorationRule"
@@ -91,8 +114,14 @@
         <resource
             uri="http://www.simantics.org/Viewpoint-0.0/PassThruSorterRule"
             class="org.simantics.browsing.ui.model.sorters.PassThruSorterRule"/>
-        <resource
            uri="http://www.simantics.org/Viewpoint-0.0/LinkedListSorterRule"
            class="org.simantics.browsing.ui.model.sorters.LinkedListSorterRule"/>
-        <baseType uri="http://www.simantics.org/Viewpoint-0.0/ImageDecorationRule" />
        
        <resource
            uri="http://www.simantics.org/Viewpoint-0.0/DescriptionTooltipRule"
            class="org.simantics.browsing.ui.model.tooltips.DescriptionTooltipRule" />
+        <resource
+            uri="http://www.simantics.org/Viewpoint-0.0/LinkedListSorterRule"
+            class="org.simantics.browsing.ui.model.sorters.LinkedListSorterRule"/>
+        <baseType uri="http://www.simantics.org/Viewpoint-0.0/ImageDecorationRule" />
+        
+        <resource
+            uri="http://www.simantics.org/Viewpoint-0.0/DescriptionTooltipRule"
+            class="org.simantics.browsing.ui.model.tooltips.DescriptionTooltipRule" />
     </target>
     
     <target interface="org.simantics.browsing.ui.model.nodetypes.NodeType">
@@ -118,8 +147,41 @@
             uri="http://www.simantics.org/Viewpoint-0.0/HasStatementTest"
             class="org.simantics.browsing.ui.model.tests.HasStatementTest">
             <single uri="http://www.simantics.org/Viewpoint-0.0/HasStatementTest/HasRelation"/>
-        </type>
        <type
            uri="http://www.simantics.org/Viewpoint-0.0/HasInstanceOfTest"
            class="org.simantics.browsing.ui.model.tests.HasInstanceOfTest">
            <single uri="http://www.simantics.org/Viewpoint-0.0/HasInstanceOfTest/IsInstanceOf"/>
        </type>
        <type
            uri="http://www.simantics.org/Viewpoint-0.0/HasNegatedTest"
            class="org.simantics.browsing.ui.model.tests.HasNegatedTest">
            <single uri="http://www.simantics.org/Viewpoint-0.0/HasNegatedTest/HasTest"
                to="org.simantics.browsing.ui.model.tests.Test"/>
        </type>
-        <type
            uri="http://www.simantics.org/Viewpoint-0.0/AndTest"
            class="org.simantics.browsing.ui.model.tests.AndTest">
            <related uri="http://www.simantics.org/Viewpoint-0.0/AndTest/HasTest"
                to="org.simantics.browsing.ui.model.tests.Test"/>
        </type>
        <type
            uri="http://www.simantics.org/Viewpoint-0.0/OrTest"
            class="org.simantics.browsing.ui.model.tests.OrTest">
            <related uri="http://www.simantics.org/Viewpoint-0.0/OrTest/HasTest"
                to="org.simantics.browsing.ui.model.tests.Test"/>
        </type>
        <type
            uri="http://www.simantics.org/Viewpoint-0.0/InstanceOfTest"
            class="org.simantics.browsing.ui.model.tests.InstanceOfTest">
            <graph/>
            <this/>
        </type>
        <type uri="http://www.simantics.org/Viewpoint-0.0/FailTest"
            class="org.simantics.browsing.ui.model.tests.FailTest"
            constructor="get">
        </type>
    </target>
+        </type>
+        <type
+            uri="http://www.simantics.org/Viewpoint-0.0/HasInstanceOfTest"
+            class="org.simantics.browsing.ui.model.tests.HasInstanceOfTest">
+            <single uri="http://www.simantics.org/Viewpoint-0.0/HasInstanceOfTest/IsInstanceOf"/>
+        </type>
+        <type
+            uri="http://www.simantics.org/Viewpoint-0.0/HasNegatedTest"
+            class="org.simantics.browsing.ui.model.tests.HasNegatedTest">
+            <single uri="http://www.simantics.org/Viewpoint-0.0/HasNegatedTest/HasTest"
+                to="org.simantics.browsing.ui.model.tests.Test"/>
+        </type>
+        <type
+            uri="http://www.simantics.org/Viewpoint-0.0/AndTest"
+            class="org.simantics.browsing.ui.model.tests.AndTest">
+            <related uri="http://www.simantics.org/Viewpoint-0.0/AndTest/HasTest"
+                to="org.simantics.browsing.ui.model.tests.Test"/>
+        </type>
+        <type
+            uri="http://www.simantics.org/Viewpoint-0.0/OrTest"
+            class="org.simantics.browsing.ui.model.tests.OrTest">
+            <related uri="http://www.simantics.org/Viewpoint-0.0/OrTest/HasTest"
+                to="org.simantics.browsing.ui.model.tests.Test"/>
+        </type>
+        <type
+            uri="http://www.simantics.org/Viewpoint-0.0/InstanceOfTest"
+            class="org.simantics.browsing.ui.model.tests.InstanceOfTest">
+            <graph/>
+            <this/>
+        </type>
+        <type uri="http://www.simantics.org/Viewpoint-0.0/FailTest"
+            class="org.simantics.browsing.ui.model.tests.FailTest"
+            constructor="get">
+        </type>
+    </target>
     
     <target interface="org.simantics.browsing.ui.model.actions.IActionCategory">
         <baseType uri="http://www.simantics.org/Viewpoint-0.0/ActionCategory" />
diff --git a/bundles/org.simantics.browsing.ui.swt/adapters.xml b/bundles/org.simantics.browsing.ui.swt/adapters.xml
index be5e873e1..607301713 100644
--- a/bundles/org.simantics.browsing.ui.swt/adapters.xml
+++ b/bundles/org.simantics.browsing.ui.swt/adapters.xml
@@ -1,3 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
    Copyright (c) 2007, 2012 Association for Decentralized Information Management
    in Industry THTH ry.
    All rights reserved. This program and the accompanying materials
    are made available under the terms of the Eclipse Public License v1.0
    which accompanies this distribution, and is available at
    http://www.eclipse.org/legal/epl-v10.html
   
    Contributors:
        VTT Technical Research Centre of Finland - initial API and implementation
 -->
-<adapters>

	<target
		interface="org.simantics.browsing.ui.graph.impl.SessionContextInputSource">
		<resource
			uri="http://www.simantics.org/Browsing-0.0/WorkbenchSelectionInputSource"
			class="org.simantics.browsing.ui.graph.impl.WorkbenchSelectionInputSource">
		</resource>
		<resource
			uri="http://www.simantics.org/Browsing-0.0/WorkbenchSelectionResourceInputSource"
			class="org.simantics.browsing.ui.graph.impl.WorkbenchSelectionResourceInputSource">
		</resource>
	</target>

	<target interface="org.simantics.browsing.ui.swt.ModelledAction">
		<type
			uri="http://www.simantics.org/Browsing-0.0/Wizard"
			class="org.simantics.browsing.ui.swt.ModelledWizard">
			<this/>
		</type>
		<type
			uri="http://www.simantics.org/Browsing-0.0/Dialog"
			class="org.simantics.browsing.ui.swt.ModelledDialog">
			<this/>
		</type>
	</target>

	<target interface="org.simantics.browsing.ui.swt.ModelledIcon">
		<type
			uri="http://www.simantics.org/Browsing-0.0/BundleIcon"
			class="org.simantics.browsing.ui.swt.BundleIcon">
			<graph/>
			<this/>
		</type>
	</target>

	<target interface="org.simantics.browsing.ui.swt.ModelledWizardPage">
		<type
			uri="http://www.simantics.org/Browsing-0.0/WizardPage"
			class="org.simantics.browsing.ui.swt.ModelledWizardPageImpl">
			<this/>
		</type>
	</target>

	<target interface="org.simantics.browsing.ui.swt.ModelledControl">
		<type
			uri="http://www.simantics.org/Browsing-0.0/GraphExplorerComposite"
			class="org.simantics.browsing.ui.swt.ModelledGraphExplorerComposite">
			<this/>
		</type>
		<type
			uri="http://www.simantics.org/Browsing-0.0/Composite"
			class="org.simantics.browsing.ui.swt.ModelledComposite">
			<this/>
		</type>
		<type
			uri="http://www.simantics.org/Browsing-0.0/Combo"
			class="org.simantics.browsing.ui.swt.ModelledCombo">
			<this/>
		</type>
		<type
			uri="http://www.simantics.org/Browsing-0.0/Button"
			class="org.simantics.browsing.ui.swt.ModelledButton">
			<this/>
		</type>
	</target>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2012 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
+<adapters>
+
+	<target
+		interface="org.simantics.browsing.ui.graph.impl.SessionContextInputSource">
+		<resource
+			uri="http://www.simantics.org/Browsing-0.0/WorkbenchSelectionInputSource"
+			class="org.simantics.browsing.ui.graph.impl.WorkbenchSelectionInputSource">
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Browsing-0.0/WorkbenchSelectionResourceInputSource"
+			class="org.simantics.browsing.ui.graph.impl.WorkbenchSelectionResourceInputSource">
+		</resource>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.swt.ModelledAction">
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/Wizard"
+			class="org.simantics.browsing.ui.swt.ModelledWizard">
+			<this/>
+		</type>
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/Dialog"
+			class="org.simantics.browsing.ui.swt.ModelledDialog">
+			<this/>
+		</type>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.swt.ModelledIcon">
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/BundleIcon"
+			class="org.simantics.browsing.ui.swt.BundleIcon">
+			<graph/>
+			<this/>
+		</type>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.swt.ModelledWizardPage">
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/WizardPage"
+			class="org.simantics.browsing.ui.swt.ModelledWizardPageImpl">
+			<this/>
+		</type>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.swt.ModelledControl">
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/GraphExplorerComposite"
+			class="org.simantics.browsing.ui.swt.ModelledGraphExplorerComposite">
+			<this/>
+		</type>
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/Composite"
+			class="org.simantics.browsing.ui.swt.ModelledComposite">
+			<this/>
+		</type>
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/Combo"
+			class="org.simantics.browsing.ui.swt.ModelledCombo">
+			<this/>
+		</type>
+		<type
+			uri="http://www.simantics.org/Browsing-0.0/Button"
+			class="org.simantics.browsing.ui.swt.ModelledButton">
+			<this/>
+		</type>
+	</target>
 </adapters>
diff --git a/bundles/org.simantics.charts/adapters.xml b/bundles/org.simantics.charts/adapters.xml
index f585c7ea7..c436e1605 100644
--- a/bundles/org.simantics.charts/adapters.xml
+++ b/bundles/org.simantics.charts/adapters.xml
@@ -1,6 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2007, 2011 Association for Decentralized Information Management 
	in Industry THTH ry. All rights reserved. This program and the accompanying 
	materials are made available under the terms of the Eclipse Public License 
	v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html 
	Contributors: VTT Technical Research Centre of Finland - initial API and 
	implementation -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2007, 2011 Association for Decentralized Information Management 
+	in Industry THTH ry. All rights reserved. This program and the accompanying 
+	materials are made available under the terms of the Eclipse Public License 
+	v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html 
+	Contributors: VTT Technical Research Centre of Finland - initial API and 
+	implementation -->
 
 <adapters>
 
-	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
		<type uri="http://www.simantics.org/Charts-0.0/Chart/Item" class="org.simantics.ui.icons.BundleImageDescriptorProvider">
			<bundle />
			<string>icons/tag_blue.png</string>
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/NewChart"
			class="org.simantics.charts.ui.NewChart" />
		<resource uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/NewChartGroup"
			class="org.simantics.charts.ui.NewChartGroup" />
	</target>
	
-	<target interface="org.simantics.db.layer0.adapter.DropActionFactory">
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/ChartGroupDropAction"
			class="org.simantics.charts.ui.ChartGroupDropActionFactory" />
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/ChartDropAction"
			class="org.simantics.charts.ui.ChartDropActionFactory" />
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/ChartItemDropAction"
			class="org.simantics.charts.ui.ChartItemDropActionFactory" />
	    <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/SubscriptionDropAction"
            class="org.simantics.charts.ui.SubscriptionDropActionFactory" />
	</target>

	<target interface="org.simantics.db.layer0.adapter.PasteHandler">
		<type uri="http://www.simantics.org/Charts-0.0/TimeSeriesChart"
			class="org.simantics.charts.ui.ChartPasteHandler">
			<this />
		</type>
		<type uri="http://www.simantics.org/Charts-0.0/ChartGroup"
			class="org.simantics.charts.ui.ChartGroupPasteHandler">
			<this />
		</type>
	</target>

	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/Images/ChartItemImage"
			class="org.simantics.charts.ui.ChartItemImageRule"
			constructor="get" />
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartItemLabelRule"
			class="org.simantics.charts.ui.ChartItemLabelRule" />
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartItemNameModifierRule"
			class="org.simantics.charts.ui.ChartItemNameModifierRule">
			<graph />
		</resource>
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartSorterRule"
			class="org.simantics.charts.ui.ChartSorterRule" />
		<resource
			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartItemLabelDecorationRule"
			class="org.simantics.charts.ui.ChartItemLabelDecorationRule" />
	</target>

</adapters>
\ No newline at end of file
+	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
+		<type uri="http://www.simantics.org/Charts-0.0/Chart/Item" class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+			<bundle />
+			<string>icons/tag_blue.png</string>
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/NewChart"
+			class="org.simantics.charts.ui.NewChart" />
+		<resource uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/NewChartGroup"
+			class="org.simantics.charts.ui.NewChartGroup" />
+	</target>
+	
+	<target interface="org.simantics.db.layer0.adapter.DropActionFactory">
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/ChartGroupDropAction"
+			class="org.simantics.charts.ui.ChartGroupDropActionFactory" />
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/ChartDropAction"
+			class="org.simantics.charts.ui.ChartDropActionFactory" />
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartActionContext/Actions/ChartItemDropAction"
+			class="org.simantics.charts.ui.ChartItemDropActionFactory" />
+	    <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/SubscriptionDropAction"
+            class="org.simantics.charts.ui.SubscriptionDropActionFactory" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.PasteHandler">
+		<type uri="http://www.simantics.org/Charts-0.0/TimeSeriesChart"
+			class="org.simantics.charts.ui.ChartPasteHandler">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Charts-0.0/ChartGroup"
+			class="org.simantics.charts.ui.ChartGroupPasteHandler">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/Images/ChartItemImage"
+			class="org.simantics.charts.ui.ChartItemImageRule"
+			constructor="get" />
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartItemLabelRule"
+			class="org.simantics.charts.ui.ChartItemLabelRule" />
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartItemNameModifierRule"
+			class="org.simantics.charts.ui.ChartItemNameModifierRule">
+			<graph />
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartSorterRule"
+			class="org.simantics.charts.ui.ChartSorterRule" />
+		<resource
+			uri="http://www.simantics.org/Charts-0.0/ChartBrowseContext/ChartItemLabelDecorationRule"
+			class="org.simantics.charts.ui.ChartItemLabelDecorationRule" />
+	</target>
+
+</adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.datatypes/adapters.xml b/bundles/org.simantics.datatypes/adapters.xml
index 2c658d428..ea5419390 100644
--- a/bundles/org.simantics.datatypes/adapters.xml
+++ b/bundles/org.simantics.datatypes/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,5 +12,9 @@
  -->
 
 <adapters>
-
  	<target interface="org.simantics.datatypes.adt.Color">
		<adapter uri="http://www.simantics.org/Datatypes-0.0/RGB/Integer"
			contextClass="org.simantics.db.RelationContext" adapterClass="org.simantics.datatypes.adapter.RGBIntegerRelatedAdapter" />
	</target>
+
+  	<target interface="org.simantics.datatypes.adt.Color">
+		<adapter uri="http://www.simantics.org/Datatypes-0.0/RGB/Integer"
+			contextClass="org.simantics.db.RelationContext" adapterClass="org.simantics.datatypes.adapter.RGBIntegerRelatedAdapter" />
+	</target>
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.db.layer0/adapters.xml b/bundles/org.simantics.db.layer0/adapters.xml
index 034a8ea32..13fbd87b2 100644
--- a/bundles/org.simantics.db.layer0/adapters.xml
+++ b/bundles/org.simantics.db.layer0/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -7,10 +8,181 @@
     http://www.eclipse.org/legal/epl-v10.html
    
     Contributors:
-        VTT Technical Research Centre of Finland - initial API and implementation
        Semantum Oy - issue #4190
+        VTT Technical Research Centre of Finland - initial API and implementation
+        Semantum Oy - issue #4190
  -->
 
-<adapters>

	<target interface="java.lang.Double">
		<adapter uri="http://www.simantics.org/Layer0-0.0/Double"
			contextClass="org.simantics.db.RelationContext" adapterClass="org.simantics.db.layer0.adapter.LiteralDoubleAdapter" />
	</target>

	<target interface="java.lang.String">
		<adapter uri="http://www.simantics.org/Layer0-0.0/String"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.db.layer0.adapter.LiteralStringAdapter"/>
		<adapter uri="http://www.simantics.org/Layer0-0.0/RVI"
			adapterClass="org.simantics.db.layer0.adapter.RVIStringAdapter"/>
	</target>

	<target interface="java.lang.String">
		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
		    contextClass="org.simantics.db.layer0.variable.Variable"
			adapterClass="org.simantics.db.layer0.adapter.LiteralVariableStringAdapter"/>
	</target>

	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.variable.StandardVariableBuilder" >
		</type>
	</target>

	<target interface="org.simantics.db.layer0.variable.Variable">
		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
			adapterClass="org.simantics.db.layer0.variable.URIResourceVariableAdapter" />
		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
			contextClass="org.simantics.db.layer0.variable.Variable"
			adapterClass="org.simantics.db.layer0.variable.StandardGraphChildVariableAdapter" />
		<adapter uri="http://www.simantics.org/Layer0-0.0/Value"
 			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
 			adapterClass="org.simantics.db.layer0.variable.StandardModelledPropertyVariable" />
		<adapter uri="http://www.simantics.org/Layer0-0.0/ExternalValue"
 			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
 			adapterClass="org.simantics.db.layer0.variable.StandardModelledPropertyVariable" />
		<adapter uri="http://www.simantics.org/Layer0-0.0/Property"
 			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
 			adapterClass="org.simantics.db.layer0.variable.StandardModelledPropertyVariable" />
		<adapter uri="http://www.simantics.org/Layer0X-0.0/ResourcePropertyRelation"
			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.db.layer0.variable.ResourcePropertyVariableAdapter" />
	</target>

	<target interface="org.simantics.db.layer0.variable.VariableModifier">
		<adapter uri="http://www.simantics.org/Layer0-0.0/Literal"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.db.layer0.variable.StandardVariableModifierAdapter"/>
	</target>

	<!--  <target interface="org.simantics.db.layer0.variable.PropertyVariableFactory">
		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.variable.StandardPropertyVariableFactory" >
		</type>
	</target> -->

	<target interface="org.simantics.db.layer0.variable.RVIResolver">
		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.variable.StandardRVIResolver" >
		</type>
	</target>

	<target interface="org.simantics.db.layer0.variable.GraphPropertyFactory">
		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
			contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.db.layer0.adapter.StandardGraphPropertyFactoryAdapter" />
	</target>

	<target interface="org.simantics.db.layer0.adapter.SubgraphExtent">
		<resource uri="http://www.simantics.org/Layer0X-0.0/EntitySubgraphExtent"
			class="org.simantics.db.layer0.adapter.impl.EntitySubgraphExtent" >
		</resource>
	</target>

	<target
		interface="org.simantics.db.layer0.adapter.InstanceFactory">
		<baseType
			uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<resource
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.DefaultInstanceFactory">
			<this />
		</resource>
	</target>

	<target
		interface="org.simantics.db.layer0.adapter.PasteHandler">
		<baseType
			uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<!--  <type
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
			<this />
		</type> -->
		<type
			uri="http://www.simantics.org/Simulation-0.0/Model"
			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Layer0-0.0/Library"
			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
			<this />
		</type>
	</target>

	<target
		interface="org.simantics.db.layer0.adapter.CopyHandler">
		<baseType
			uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<type
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.DefaultCopyHandler">
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
			class="org.simantics.db.layer0.adapter.impl.SharedOntologyCopyHandler">
			<this />
		</type>
	</target>

	<target
		interface="org.simantics.db.layer0.adapter.Instances">
		<resource
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.EntityInstances">
			<this/>
		</resource>
	</target>

	<target
		interface="org.simantics.db.layer0.adapter.StringModifier">
		<baseType
			uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<type
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.StringModifierImpl">
			<graph />
			<this />
		</type>
	</target>

	<target
		interface="org.simantics.db.layer0.adapter.StringIndexModifier">
		<baseType
			uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<type
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.StringIndexModifierImpl">
			<graph />
			<this />
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.StringModifierFactory">
		<baseType uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<type
			uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.db.layer0.adapter.impl.EntityStringModifierFactory">
			<this />
		</type>
	</target>
+<adapters>
+
+	<target interface="java.lang.Double">
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Double"
+			contextClass="org.simantics.db.RelationContext" adapterClass="org.simantics.db.layer0.adapter.LiteralDoubleAdapter" />
+	</target>
+
+	<target interface="java.lang.String">
+		<adapter uri="http://www.simantics.org/Layer0-0.0/String"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.db.layer0.adapter.LiteralStringAdapter"/>
+		<adapter uri="http://www.simantics.org/Layer0-0.0/RVI"
+			adapterClass="org.simantics.db.layer0.adapter.RVIStringAdapter"/>
+	</target>
+
+	<target interface="java.lang.String">
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
+		    contextClass="org.simantics.db.layer0.variable.Variable"
+			adapterClass="org.simantics.db.layer0.adapter.LiteralVariableStringAdapter"/>
+	</target>
+
+	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
+		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.variable.StandardVariableBuilder" >
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.variable.Variable">
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
+			adapterClass="org.simantics.db.layer0.variable.URIResourceVariableAdapter" />
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
+			contextClass="org.simantics.db.layer0.variable.Variable"
+			adapterClass="org.simantics.db.layer0.variable.StandardGraphChildVariableAdapter" />
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Value"
+ 			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+ 			adapterClass="org.simantics.db.layer0.variable.StandardModelledPropertyVariable" />
+		<adapter uri="http://www.simantics.org/Layer0-0.0/ExternalValue"
+ 			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+ 			adapterClass="org.simantics.db.layer0.variable.StandardModelledPropertyVariable" />
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Property"
+ 			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+ 			adapterClass="org.simantics.db.layer0.variable.StandardModelledPropertyVariable" />
+		<adapter uri="http://www.simantics.org/Layer0X-0.0/ResourcePropertyRelation"
+			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+			adapterClass="org.simantics.db.layer0.variable.ResourcePropertyVariableAdapter" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.variable.VariableModifier">
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Literal"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.db.layer0.variable.StandardVariableModifierAdapter"/>
+	</target>
+
+	<!--  <target interface="org.simantics.db.layer0.variable.PropertyVariableFactory">
+		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.variable.StandardPropertyVariableFactory" >
+		</type>
+	</target> -->
+
+	<target interface="org.simantics.db.layer0.variable.RVIResolver">
+		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.variable.StandardRVIResolver" >
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.variable.GraphPropertyFactory">
+		<adapter uri="http://www.simantics.org/Layer0-0.0/Entity"
+			contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.db.layer0.adapter.StandardGraphPropertyFactoryAdapter" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.SubgraphExtent">
+		<resource uri="http://www.simantics.org/Layer0X-0.0/EntitySubgraphExtent"
+			class="org.simantics.db.layer0.adapter.impl.EntitySubgraphExtent" >
+		</resource>
+	</target>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.InstanceFactory">
+		<baseType
+			uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<resource
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.DefaultInstanceFactory">
+			<this />
+		</resource>
+	</target>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.PasteHandler">
+		<baseType
+			uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<!--  <type
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
+			<this />
+		</type> -->
+		<type
+			uri="http://www.simantics.org/Simulation-0.0/Model"
+			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
+			<this />
+		</type>
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
+			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
+			<this />
+		</type>
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/Library"
+			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
+			<this />
+		</type>
+	</target>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.CopyHandler">
+		<baseType
+			uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.DefaultCopyHandler">
+			<this />
+		</type>
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
+			class="org.simantics.db.layer0.adapter.impl.SharedOntologyCopyHandler">
+			<this />
+		</type>
+	</target>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.Instances">
+		<resource
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.EntityInstances">
+			<this/>
+		</resource>
+	</target>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.StringModifier">
+		<baseType
+			uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.StringModifierImpl">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.StringIndexModifier">
+		<baseType
+			uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.StringIndexModifierImpl">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.StringModifierFactory">
+		<baseType uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<type
+			uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.db.layer0.adapter.impl.EntityStringModifierFactory">
+			<this />
+		</type>
+	</target>
 	<target interface="org.simantics.db.layer0.adapter.Valuations">
 		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
 			class="org.simantics.db.layer0.adapter.impl.DefaultValuations">
@@ -19,7 +191,8 @@
 	</target>
 
 	<target interface="org.simantics.db.layer0.adapter.GenericRelation">
-		<baseType uri="http://www.simantics.org/Layer0X-0.0/GenericRelation" />
		<resource uri = "http://www.simantics.org/Layer0X-0.0/DependenciesRelation"
+		<baseType uri="http://www.simantics.org/Layer0X-0.0/GenericRelation" />
+		<resource uri = "http://www.simantics.org/Layer0X-0.0/DependenciesRelation"
 			class="org.simantics.db.layer0.genericrelation.DependenciesRelation">
 			<graph />
 			<this />
@@ -27,10 +200,78 @@
 	</target>
 
 	<target interface="org.simantics.db.layer0.adapter.GenericRelationIndex">
-		<baseType uri="http://www.simantics.org/Layer0X-0.0/GenericRelation" />
		<resource uri = "http://www.simantics.org/Layer0X-0.0/DependenciesRelation"
+		<baseType uri="http://www.simantics.org/Layer0X-0.0/GenericRelation" />
+		<resource uri = "http://www.simantics.org/Layer0X-0.0/DependenciesRelation"
 			class="org.simantics.db.layer0.genericrelation.DependenciesRelation">
 			<graph />
 			<this />
 		</resource>
-	</target>

	<target interface="org.simantics.scl.runtime.function.Function">
		<resource uri = "http://www.simantics.org/Layer0X-0.0/Dependencies"
			class="org.simantics.db.layer0.genericrelation.Dependencies">
		</resource>
		<resource uri = "http://www.simantics.org/Layer0X-0.0/DependencyResources"
			class="org.simantics.db.layer0.genericrelation.DependencyResources">
		</resource>
	</target>

	<target interface="org.simantics.db.layer0.adapter.Remover">
		<baseType uri="http://www.simantics.org/Layer0-0.0/Entity" />
		<type uri="http://www.simantics.org/Layer0-0.0/Entity" class="org.simantics.db.layer0.adapter.impl.EntityRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
			class="org.simantics.db.layer0.adapter.SharedOntologyRemover">
			<this />
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.Template">
		<baseType uri="http://www.simantics.org/Layer0-0.0/Template" />

		<type uri="http://www.simantics.org/Layer0-0.0/Template" class="org.simantics.db.layer0.adapter.impl.GraphTemplate"
			constructor="create">
			<graph />
			<this />
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
		<baseType uri="http://www.simantics.org/Action-0.0/Action" />
	</target>

	<target interface="org.simantics.db.layer0.migration.MigrationStep">
		<type uri = "http://www.simantics.org/Layer0-0.0/MigrationSequence"
			class="org.simantics.db.layer0.migration.MigrationSequence">
			<graph />
			<this />
		</type>
	</target>

	<target interface="org.simantics.db.layer0.migration.MigrationStep">
		<type uri = "http://www.simantics.org/Layer0-0.0/NamespaceMigrationStep"
			class="org.simantics.db.layer0.migration.NamespaceMigrationStep">
			<graph />
			<this />
		</type>
		<type uri = "http://www.simantics.org/Layer0-0.0/OrderedSetToListMigrationStep"
			class="org.simantics.db.layer0.migration.OrderedSetToListMigrationStep">
			<graph />
			<this />
		</type>		
	</target>

	<target interface="org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory">
		<resource
			uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
			class="org.simantics.db.layer0.adapter.impl.SharedOntologyImportAdvisorFactory">
		</resource>
		<resource
			uri="http://www.simantics.org/Simulation-0.0/Model"
			class="org.simantics.db.layer0.adapter.impl.ModelImportAdvisorFactory">
		</resource>
	</target>
	
+	</target>
+
+	<target interface="org.simantics.scl.runtime.function.Function">
+		<resource uri = "http://www.simantics.org/Layer0X-0.0/Dependencies"
+			class="org.simantics.db.layer0.genericrelation.Dependencies">
+		</resource>
+		<resource uri = "http://www.simantics.org/Layer0X-0.0/DependencyResources"
+			class="org.simantics.db.layer0.genericrelation.DependencyResources">
+		</resource>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.Remover">
+		<baseType uri="http://www.simantics.org/Layer0-0.0/Entity" />
+		<type uri="http://www.simantics.org/Layer0-0.0/Entity" class="org.simantics.db.layer0.adapter.impl.EntityRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
+			class="org.simantics.db.layer0.adapter.SharedOntologyRemover">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.Template">
+		<baseType uri="http://www.simantics.org/Layer0-0.0/Template" />
+
+		<type uri="http://www.simantics.org/Layer0-0.0/Template" class="org.simantics.db.layer0.adapter.impl.GraphTemplate"
+			constructor="create">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
+		<baseType uri="http://www.simantics.org/Action-0.0/Action" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.migration.MigrationStep">
+		<type uri = "http://www.simantics.org/Layer0-0.0/MigrationSequence"
+			class="org.simantics.db.layer0.migration.MigrationSequence">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.migration.MigrationStep">
+		<type uri = "http://www.simantics.org/Layer0-0.0/NamespaceMigrationStep"
+			class="org.simantics.db.layer0.migration.NamespaceMigrationStep">
+			<graph />
+			<this />
+		</type>
+		<type uri = "http://www.simantics.org/Layer0-0.0/OrderedSetToListMigrationStep"
+			class="org.simantics.db.layer0.migration.OrderedSetToListMigrationStep">
+			<graph />
+			<this />
+		</type>		
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory">
+		<resource
+			uri="http://www.simantics.org/Layer0-0.0/SharedOntology"
+			class="org.simantics.db.layer0.adapter.impl.SharedOntologyImportAdvisorFactory">
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Simulation-0.0/Model"
+			class="org.simantics.db.layer0.adapter.impl.ModelImportAdvisorFactory">
+		</resource>
+	</target>
+	
 </adapters>
diff --git a/bundles/org.simantics.db.services/adapters.xml b/bundles/org.simantics.db.services/adapters.xml
index 2b294a889..f2687a89c 100644
--- a/bundles/org.simantics.db.services/adapters.xml
+++ b/bundles/org.simantics.db.services/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
diff --git a/bundles/org.simantics.diagram.profile/adapters.xml b/bundles/org.simantics.diagram.profile/adapters.xml
index cbe89093a..8e3a71400 100644
--- a/bundles/org.simantics.diagram.profile/adapters.xml
+++ b/bundles/org.simantics.diagram.profile/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -10,4 +11,91 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/DirectProfileRule"
            class="org.simantics.diagram.profile.view.RuntimeDirectProfileEntries"/>
        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryChildrenRule"
            class="org.simantics.diagram.profile.view.ProfileEntryChildren"/>
    </target>

    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <baseType uri="http://www.simantics.org/Viewpoint-0.0/VisualsRule" />
        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryImageRule"
            class="org.simantics.diagram.profile.view.ResourcePairImageRule"/>
        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryLabelRule"
            class="org.simantics.diagram.profile.view.ResourcePairLabelRule"/>
        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryCheckRule"
            class="org.simantics.diagram.profile.view.ProfileCheckContributor"/>
    </target>

	<target interface="org.simantics.browsing.ui.swt.ModelledAction">
	<!--
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/AddEntriesAction"
			class="org.simantics.diagram.profile.view.AddEntriesAction">
			<this />
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/RemoveEntriesAction"
			class="org.simantics.diagram.profile.view.RemoveEntriesAction">
			<this />
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateProfileAction"
			class="org.simantics.diagram.profile.view.CreateProfileAction">
			<this />
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateStyleAction"
			class="org.simantics.diagram.profile.view.CreateStyleAction">
			<this />
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateGroupAction"
			class="org.simantics.diagram.profile.view.CreateGroupAction">
			<this />
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateEntryAction"
			class="org.simantics.diagram.profile.view.CreateEntryAction">
			<this />
		</resource>
	-->
	</target>

	<target interface="org.simantics.browsing.ui.swt.widgets.impl.ReadFactory">
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/AvailableProfiles"
			class="org.simantics.diagram.profile.view.AvailableProfiles">
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/SelectedProfile"
			class="org.simantics.diagram.profile.view.SelectedProfile">
		</resource>
	</target>

	<target interface="org.eclipse.swt.events.ModifyListener">
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/ActiveProfileModifier"
			class="org.simantics.diagram.profile.view.ActiveProfileModifier">
		</resource>
	</target>

	<target interface="org.eclipse.swt.widgets.Listener">
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/ProfileEntrySelectionListener"
			class="org.simantics.diagram.profile.view.ProfileEntrySelectionListener">
		</resource>
	</target>

	<target
		interface="org.simantics.browsing.ui.graph.impl.SessionContextInputSource">
		<resource
			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/ActiveRuntimeDiagramInputSource"
			class="org.simantics.diagram.profile.view.ActiveRuntimeDiagramInputSource">
		</resource>
	</target>

</adapters>
\ No newline at end of file
+<adapters>
+
+	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
+        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/DirectProfileRule"
+            class="org.simantics.diagram.profile.view.RuntimeDirectProfileEntries"/>
+        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryChildrenRule"
+            class="org.simantics.diagram.profile.view.ProfileEntryChildren"/>
+    </target>
+
+    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+        <baseType uri="http://www.simantics.org/Viewpoint-0.0/VisualsRule" />
+        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryImageRule"
+            class="org.simantics.diagram.profile.view.ResourcePairImageRule"/>
+        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryLabelRule"
+            class="org.simantics.diagram.profile.view.ResourcePairLabelRule"/>
+        <resource uri="http://www.simantics.org/Diagram-0.0/ProfilesBrowseContext/EntryCheckRule"
+            class="org.simantics.diagram.profile.view.ProfileCheckContributor"/>
+    </target>
+
+	<target interface="org.simantics.browsing.ui.swt.ModelledAction">
+	<!--
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/AddEntriesAction"
+			class="org.simantics.diagram.profile.view.AddEntriesAction">
+			<this />
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/RemoveEntriesAction"
+			class="org.simantics.diagram.profile.view.RemoveEntriesAction">
+			<this />
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateProfileAction"
+			class="org.simantics.diagram.profile.view.CreateProfileAction">
+			<this />
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateStyleAction"
+			class="org.simantics.diagram.profile.view.CreateStyleAction">
+			<this />
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateGroupAction"
+			class="org.simantics.diagram.profile.view.CreateGroupAction">
+			<this />
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/CreateEntryAction"
+			class="org.simantics.diagram.profile.view.CreateEntryAction">
+			<this />
+		</resource>
+	-->
+	</target>
+
+	<target interface="org.simantics.browsing.ui.swt.widgets.impl.ReadFactory">
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/AvailableProfiles"
+			class="org.simantics.diagram.profile.view.AvailableProfiles">
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/SelectedProfile"
+			class="org.simantics.diagram.profile.view.SelectedProfile">
+		</resource>
+	</target>
+
+	<target interface="org.eclipse.swt.events.ModifyListener">
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/ActiveProfileModifier"
+			class="org.simantics.diagram.profile.view.ActiveProfileModifier">
+		</resource>
+	</target>
+
+	<target interface="org.eclipse.swt.widgets.Listener">
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/ProfileEntrySelectionListener"
+			class="org.simantics.diagram.profile.view.ProfileEntrySelectionListener">
+		</resource>
+	</target>
+
+	<target
+		interface="org.simantics.browsing.ui.graph.impl.SessionContextInputSource">
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/ProfilesView/ActiveRuntimeDiagramInputSource"
+			class="org.simantics.diagram.profile.view.ActiveRuntimeDiagramInputSource">
+		</resource>
+	</target>
+
+</adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.diagram/adapters.xml b/bundles/org.simantics.diagram/adapters.xml
index f4baea1c4..bec5591c7 100644
--- a/bundles/org.simantics.diagram/adapters.xml
+++ b/bundles/org.simantics.diagram/adapters.xml
@@ -1 +1,216 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
    Copyright (c) 2007, 2010 Association for Decentralized Information Management
    in Industry THTH ry.
    All rights reserved. This program and the accompanying materials
    are made available under the terms of the Eclipse Public License v1.0
    which accompanies this distribution, and is available at
    http://www.eclipse.org/legal/epl-v10.html
   
    Contributors:
        VTT Technical Research Centre of Finland - initial API and implementation
 -->

<adapters>

	<target interface="org.simantics.scenegraph.profile.ProfileEntry">
		<type
			uri="http://www.simantics.org/Diagram-0.0/GroupStyleProfileEntry"
			class="org.simantics.diagram.adapter.GroupStyleProfileEntry">
			<graph />
			<this />
		</type>
	</target>

	<target interface="org.simantics.scenegraph.profile.Style">
		<type
			uri="http://www.simantics.org/Diagram-0.0/ConstantStyle"
			class="org.simantics.diagram.adapter.ConstantStyle">
			<graph />
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Diagram-0.0/ExpressionStyle"
			class="org.simantics.diagram.adapter.ExpressionStyle">
			<this />
		</type>
	</target>

	<target interface="org.simantics.scenegraph.profile.Group">
		<type
			uri="http://www.simantics.org/Diagram-0.0/TypeGroup"
			class="org.simantics.diagram.adapter.TypeGroup">
			<graph />
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Diagram-0.0/MappedTypeGroup"
			class="org.simantics.diagram.adapter.MappedTypeGroup">
			<graph />
			<this />
		</type>
	</target>

	<target interface="org.simantics.g2d.diagram.DiagramClass">
		<baseType uri="http://www.simantics.org/Diagram-0.0/Composite" />
		<adapter uri="http://www.simantics.org/Diagram-0.0/Composite"
			adapterClass="org.simantics.diagram.adapter.DiagramClassAdapter" />
	</target>

	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<resource uri="http://www.simantics.org/Diagram-0.0/Flag"
			class="org.simantics.diagram.adapter.FlagClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/Composite"
			class="org.simantics.diagram.adapter.CompositeClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/DefinedElement"
			class="org.simantics.diagram.adapter.DefinedElementFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/SVGElement"
			class="org.simantics.diagram.adapter.SVGElementClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/RasterElement"
			class="org.simantics.diagram.adapter.RasterElementClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/AnimatedSVGElement"
			class="org.simantics.diagram.adapter.AnimatedSVGElementClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/BranchPoint"
			class="org.simantics.diagram.adapter.BranchPointClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/Connection"
			class="org.simantics.diagram.adapter.DefaultConnectionEdgeClassFactory" />
		<resource uri="http://www.simantics.org/Diagram-0.0/TextElement"
			class="org.simantics.diagram.adapter.TextElementClassFactory" />

		<type uri="http://www.simantics.org/Diagram-0.0/Connection"
			class="org.simantics.diagram.adapter.DefaultConnectionClassFactory" />

		<resource uri="http://www.simantics.org/Diagram-0.0/RouteGraphConnection"
			class="org.simantics.diagram.adapter.RouteGraphConnectionClassFactory">
			<graph />
		</resource>
		<type uri="http://www.simantics.org/Diagram-0.0/RouteGraphConnection"
			class="org.simantics.diagram.adapter.RouteGraphConnectionClassFactory">
			<graph/>
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Flag"
			class="org.simantics.diagram.adapter.FlagClassFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/Composite"
			class="org.simantics.diagram.adapter.CompositeClassFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/RasterElement"
			class="org.simantics.diagram.adapter.RasterElementClassFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/SVGElement"
			class="org.simantics.diagram.adapter.SVGElementClassFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/AnimatedSVGElement"
			class="org.simantics.diagram.adapter.AnimatedSVGElementClassFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/DefinedElement"
			class="org.simantics.diagram.adapter.DefinedElementFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/BranchPoint"
			class="org.simantics.diagram.adapter.BranchPointClassFactory" />
		<type uri="http://www.simantics.org/Diagram-0.0/TextElement"
			class="org.simantics.diagram.adapter.TextElementClassFactory" />
	</target>

	<target interface="org.simantics.diagram.synchronization.graph.ElementWriter">
		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
			class="org.simantics.diagram.adapter.DummyElementWriter" />
		<resource uri="http://www.simantics.org/Diagram-0.0/Flag"
			class="org.simantics.diagram.adapter.FlagWriter" />
		<resource uri="http://www.simantics.org/Diagram-0.0/TextElement"
			class="org.simantics.diagram.adapter.TextElementWriter" />
	</target>

	<target interface="org.simantics.diagram.symbolcontribution.SymbolContribution">
		<type uri="http://www.simantics.org/Diagram-0.0/BasicSymbolContribution"
			class="org.simantics.diagram.symbolcontribution.BasicSymbolContribution">
			<this />
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/IndexRootSymbolContribution"
			class="org.simantics.diagram.symbolcontribution.IndexRootSymbolContribution">
		</type>
	</target>

	<target interface="org.simantics.diagram.symbolcontribution.SymbolContributionFilter">
		<resource uri="http://www.simantics.org/Diagram-0.0/DenyFilter"
			class="org.simantics.diagram.symbolcontribution.DenyFilter"
			constructor="get">
		</resource>
		<type uri="http://www.simantics.org/Diagram-0.0/SCLFilter"
			class="org.simantics.diagram.symbolcontribution.SCLFilter">
			<this />
		</type>
	</target>


	<target interface="org.simantics.g2d.routing.IRouter2">
		<resource uri="http://www.simantics.org/Diagram-0.0/LinearRouting"
			class="org.simantics.g2d.routing.TrivialRouter2" />
		<resource uri="http://www.simantics.org/Diagram-0.0/RightAngledRouting"
			class="org.simantics.g2d.routing.algorithm2.Router4" />
	</target>

	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
		<type uri="http://www.simantics.org/Diagram-0.0/Diagram"
			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
			<bundle />
			<string>icons/diagram.png</string>
		</type>
		<resource uri="http://www.simantics.org/Diagram-0.0/Diagram"
			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
			<bundle />
			<string>icons/diagram.png</string>
		</resource>
	</target>

	<target interface="org.simantics.db.layer0.adapter.StringModifierFactory">
		<type uri="http://www.simantics.org/Diagram-0.0/Flag" class="org.simantics.diagram.flag.FlagStringModifierFactory">
			<graph />
			<this />
		</type>
	</target>

	<target interface="org.simantics.diagram.flag.FlagLabelingScheme">
		<baseType uri="http://www.simantics.org/Diagram-0.0/FlagLabelingScheme" />
		<resource
			uri="http://www.simantics.org/Diagram-0.0/FlagLabelingScheme/Alphabetical"
			class="org.simantics.diagram.flag.PermutativeFlagLabelingScheme">
			<string>A</string>
			<string>A</string>
			<string>Z</string>
		</resource>
		<resource
			uri="http://www.simantics.org/Diagram-0.0/FlagLabelingScheme/Numeric"
			class="org.simantics.diagram.flag.PermutativeFlagLabelingScheme">
			<string>1</string>
			<string>1</string>
			<string>9</string>
		</resource>
	</target>

	<target interface="org.simantics.scenegraph.loader.ScenegraphLoader">
		<type uri="http://www.simantics.org/Diagram-0.0/Scenegraph/AbstractText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.diagram.elements.TextNode</string>
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Scenegraph/SVGImage" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.scenegraph.g2d.nodes.SVGNode</string>
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Scenegraph/Composite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.scenegraph.g2d.nodes.spatial.RTreeNode</string>
		</type>
	</target>
	<target
		interface="org.simantics.db.layer0.adapter.PasteHandler">
		<type
			uri="http://www.simantics.org/Diagram-0.0/Scenegraph/Composite"
			class="org.simantics.diagram.adapter.ScenegraphCompositePasteHandler">
			<this />
		</type>
	</target>

	<target interface="org.simantics.diagram.synchronization.graph.layer.IGraphLayerUtil">
		<resource uri="http://www.simantics.org/Diagram-0.0/Layer"
			class="org.simantics.diagram.synchronization.graph.layer.GraphLayerUtil">
			<this />
		</resource>
	</target>
</adapters>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2010 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
+
+<adapters>
+
+	<target interface="org.simantics.scenegraph.profile.ProfileEntry">
+		<type
+			uri="http://www.simantics.org/Diagram-0.0/GroupStyleProfileEntry"
+			class="org.simantics.diagram.adapter.GroupStyleProfileEntry">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.scenegraph.profile.Style">
+		<type
+			uri="http://www.simantics.org/Diagram-0.0/ConstantStyle"
+			class="org.simantics.diagram.adapter.ConstantStyle">
+			<graph />
+			<this />
+		</type>
+		<type
+			uri="http://www.simantics.org/Diagram-0.0/ExpressionStyle"
+			class="org.simantics.diagram.adapter.ExpressionStyle">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.scenegraph.profile.Group">
+		<type
+			uri="http://www.simantics.org/Diagram-0.0/TypeGroup"
+			class="org.simantics.diagram.adapter.TypeGroup">
+			<graph />
+			<this />
+		</type>
+		<type
+			uri="http://www.simantics.org/Diagram-0.0/MappedTypeGroup"
+			class="org.simantics.diagram.adapter.MappedTypeGroup">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.g2d.diagram.DiagramClass">
+		<baseType uri="http://www.simantics.org/Diagram-0.0/Composite" />
+		<adapter uri="http://www.simantics.org/Diagram-0.0/Composite"
+			adapterClass="org.simantics.diagram.adapter.DiagramClassAdapter" />
+	</target>
+
+	<target interface="org.simantics.diagram.adapter.ElementFactory">
+		<resource uri="http://www.simantics.org/Diagram-0.0/Flag"
+			class="org.simantics.diagram.adapter.FlagClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/Composite"
+			class="org.simantics.diagram.adapter.CompositeClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/DefinedElement"
+			class="org.simantics.diagram.adapter.DefinedElementFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/SVGElement"
+			class="org.simantics.diagram.adapter.SVGElementClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/RasterElement"
+			class="org.simantics.diagram.adapter.RasterElementClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/AnimatedSVGElement"
+			class="org.simantics.diagram.adapter.AnimatedSVGElementClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/BranchPoint"
+			class="org.simantics.diagram.adapter.BranchPointClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/Connection"
+			class="org.simantics.diagram.adapter.DefaultConnectionEdgeClassFactory" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/TextElement"
+			class="org.simantics.diagram.adapter.TextElementClassFactory" />
+
+		<type uri="http://www.simantics.org/Diagram-0.0/Connection"
+			class="org.simantics.diagram.adapter.DefaultConnectionClassFactory" />
+
+		<resource uri="http://www.simantics.org/Diagram-0.0/RouteGraphConnection"
+			class="org.simantics.diagram.adapter.RouteGraphConnectionClassFactory">
+			<graph />
+		</resource>
+		<type uri="http://www.simantics.org/Diagram-0.0/RouteGraphConnection"
+			class="org.simantics.diagram.adapter.RouteGraphConnectionClassFactory">
+			<graph/>
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Flag"
+			class="org.simantics.diagram.adapter.FlagClassFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/Composite"
+			class="org.simantics.diagram.adapter.CompositeClassFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/RasterElement"
+			class="org.simantics.diagram.adapter.RasterElementClassFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/SVGElement"
+			class="org.simantics.diagram.adapter.SVGElementClassFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/AnimatedSVGElement"
+			class="org.simantics.diagram.adapter.AnimatedSVGElementClassFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/DefinedElement"
+			class="org.simantics.diagram.adapter.DefinedElementFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/BranchPoint"
+			class="org.simantics.diagram.adapter.BranchPointClassFactory" />
+		<type uri="http://www.simantics.org/Diagram-0.0/TextElement"
+			class="org.simantics.diagram.adapter.TextElementClassFactory" />
+	</target>
+
+	<target interface="org.simantics.diagram.synchronization.graph.ElementWriter">
+		<type uri="http://www.simantics.org/Layer0-0.0/Entity"
+			class="org.simantics.diagram.adapter.DummyElementWriter" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/Flag"
+			class="org.simantics.diagram.adapter.FlagWriter" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/TextElement"
+			class="org.simantics.diagram.adapter.TextElementWriter" />
+	</target>
+
+	<target interface="org.simantics.diagram.symbolcontribution.SymbolContribution">
+		<type uri="http://www.simantics.org/Diagram-0.0/BasicSymbolContribution"
+			class="org.simantics.diagram.symbolcontribution.BasicSymbolContribution">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/IndexRootSymbolContribution"
+			class="org.simantics.diagram.symbolcontribution.IndexRootSymbolContribution">
+		</type>
+	</target>
+
+	<target interface="org.simantics.diagram.symbolcontribution.SymbolContributionFilter">
+		<resource uri="http://www.simantics.org/Diagram-0.0/DenyFilter"
+			class="org.simantics.diagram.symbolcontribution.DenyFilter"
+			constructor="get">
+		</resource>
+		<type uri="http://www.simantics.org/Diagram-0.0/SCLFilter"
+			class="org.simantics.diagram.symbolcontribution.SCLFilter">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.g2d.routing.IRouter2">
+		<resource uri="http://www.simantics.org/Diagram-0.0/LinearRouting"
+			class="org.simantics.g2d.routing.TrivialRouter2" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/RightAngledRouting"
+			class="org.simantics.g2d.routing.algorithm2.Router4" />
+	</target>
+
+	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
+		<type uri="http://www.simantics.org/Diagram-0.0/Diagram"
+			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+			<bundle />
+			<string>icons/diagram.png</string>
+		</type>
+		<resource uri="http://www.simantics.org/Diagram-0.0/Diagram"
+			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+			<bundle />
+			<string>icons/diagram.png</string>
+		</resource>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.StringModifierFactory">
+		<type uri="http://www.simantics.org/Diagram-0.0/Flag" class="org.simantics.diagram.flag.FlagStringModifierFactory">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.diagram.flag.FlagLabelingScheme">
+		<baseType uri="http://www.simantics.org/Diagram-0.0/FlagLabelingScheme" />
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/FlagLabelingScheme/Alphabetical"
+			class="org.simantics.diagram.flag.PermutativeFlagLabelingScheme">
+			<string>A</string>
+			<string>A</string>
+			<string>Z</string>
+		</resource>
+		<resource
+			uri="http://www.simantics.org/Diagram-0.0/FlagLabelingScheme/Numeric"
+			class="org.simantics.diagram.flag.PermutativeFlagLabelingScheme">
+			<string>1</string>
+			<string>1</string>
+			<string>9</string>
+		</resource>
+	</target>
+
+	<target interface="org.simantics.scenegraph.loader.ScenegraphLoader">
+		<type uri="http://www.simantics.org/Diagram-0.0/Scenegraph/AbstractText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.diagram.elements.TextNode</string>
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Scenegraph/SVGImage" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.scenegraph.g2d.nodes.SVGNode</string>
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Scenegraph/Composite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.scenegraph.g2d.nodes.spatial.RTreeNode</string>
+		</type>
+	</target>
+	<target
+		interface="org.simantics.db.layer0.adapter.PasteHandler">
+		<type
+			uri="http://www.simantics.org/Diagram-0.0/Scenegraph/Composite"
+			class="org.simantics.diagram.adapter.ScenegraphCompositePasteHandler">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.diagram.synchronization.graph.layer.IGraphLayerUtil">
+		<resource uri="http://www.simantics.org/Diagram-0.0/Layer"
+			class="org.simantics.diagram.synchronization.graph.layer.GraphLayerUtil">
+			<this />
+		</resource>
+	</target>
+</adapters>
diff --git a/bundles/org.simantics.document.swt.core/adapters.xml b/bundles/org.simantics.document.swt.core/adapters.xml
index 416baf276..99e8eae73 100644
--- a/bundles/org.simantics.document.swt.core/adapters.xml
+++ b/bundles/org.simantics.document.swt.core/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -10,5 +11,13 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.selectionview.TabContribution">
		<type uri="http://www.simantics.org/SWT-0.0/TypedVariableTabContribution"
			class="org.simantics.document.swt.core.selection.TypedVariableTabContribution">
			<graph/>
			<this/>
		</type>
	</target>
+<adapters>
+
+	<target interface="org.simantics.selectionview.TabContribution">
+		<type uri="http://www.simantics.org/SWT-0.0/TypedVariableTabContribution"
+			class="org.simantics.document.swt.core.selection.TypedVariableTabContribution">
+			<graph/>
+			<this/>
+		</type>
+	</target>
 </adapters>
diff --git a/bundles/org.simantics.document.ui/adapters.xml b/bundles/org.simantics.document.ui/adapters.xml
index 74bd124c2..873ecb46d 100644
--- a/bundles/org.simantics.document.ui/adapters.xml
+++ b/bundles/org.simantics.document.ui/adapters.xml
@@ -1,2 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
    Copyright (c) 2007, 2012 Association for Decentralized Information Management
    in Industry THTH ry.
    All rights reserved. This program and the accompanying materials
    are made available under the terms of the Eclipse Public License v1.0
    which accompanies this distribution, and is available at
    http://www.eclipse.org/legal/epl-v10.html
   
    Contributors:
        VTT Technical Research Centre of Finland - initial API and implementation
 -->
-<adapters>
	<target interface="org.simantics.selectionview.TabContribution">
		<type uri="http://www.simantics.org/DocumentUI-1.1/DocumentTabContributionType"
			class="org.simantics.document.ui.contribution.DocumentTabContribution">
			<graph/>
			<this/>
		</type>
		
	</target>
	
	<!-- Search -->
	<target interface="org.simantics.scl.runtime.function.Function">
		<resource uri="http://www.simantics.org/DocumentUI-1.1/SearchFunction"
			class="org.simantics.document.ui.function.SearchFunction">
		</resource>
	</target>
	
	<target interface="org.simantics.browsing.ui.model.tests.Test">
   		<type
            uri="http://www.simantics.org/DocumentUI-1.1/DocumentOldTest"
            class="org.simantics.document.ui.test.DocumentOldTest">
        </type>
        <type
            uri="http://www.simantics.org/DocumentUI-1.1/DocumentNotOldTest"
            class="org.simantics.document.ui.test.DocumentNotOldTest">
        </type>
        
   </target>   

</adapters>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2012 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
+<adapters>
+	<target interface="org.simantics.selectionview.TabContribution">
+		<type uri="http://www.simantics.org/DocumentUI-1.1/DocumentTabContributionType"
+			class="org.simantics.document.ui.contribution.DocumentTabContribution">
+			<graph/>
+			<this/>
+		</type>
+		
+	</target>
+	
+	<!-- Search -->
+	<target interface="org.simantics.scl.runtime.function.Function">
+		<resource uri="http://www.simantics.org/DocumentUI-1.1/SearchFunction"
+			class="org.simantics.document.ui.function.SearchFunction">
+		</resource>
+	</target>
+	
+	<target interface="org.simantics.browsing.ui.model.tests.Test">
+   		<type
+            uri="http://www.simantics.org/DocumentUI-1.1/DocumentOldTest"
+            class="org.simantics.document.ui.test.DocumentOldTest">
+        </type>
+        <type
+            uri="http://www.simantics.org/DocumentUI-1.1/DocumentNotOldTest"
+            class="org.simantics.document.ui.test.DocumentNotOldTest">
+        </type>
+        
+   </target>   
+
+</adapters>
diff --git a/bundles/org.simantics.document/adapters.xml b/bundles/org.simantics.document/adapters.xml
index 4168f6d8a..35dacd66d 100644
--- a/bundles/org.simantics.document/adapters.xml
+++ b/bundles/org.simantics.document/adapters.xml
@@ -1,2 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
    Copyright (c) 2007, 2012 Association for Decentralized Information Management
    in Industry THTH ry.
    All rights reserved. This program and the accompanying materials
    are made available under the terms of the Eclipse Public License v1.0
    which accompanies this distribution, and is available at
    http://www.eclipse.org/legal/epl-v10.html
   
    Contributors:
        VTT Technical Research Centre of Finland - initial API and implementation
 -->
-<adapters>

	<target interface="org.simantics.scenegraph.loader.ScenegraphLoader">
		<type uri="http://www.simantics.org/Document-0.0/Scenegraph/Wiki" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.document.node.Wiki</string>
		</type>
		<type uri="http://www.simantics.org/Document-0.0/Scenegraph/Composite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.document.node.Composite</string>
		</type>
		<type uri="http://www.simantics.org/Document-0.0/Scenegraph/Diagram" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.document.node.Diagram</string>
		</type>
	</target>

</adapters>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2012 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
+<adapters>
+
+	<target interface="org.simantics.scenegraph.loader.ScenegraphLoader">
+		<type uri="http://www.simantics.org/Document-0.0/Scenegraph/Wiki" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.document.node.Wiki</string>
+		</type>
+		<type uri="http://www.simantics.org/Document-0.0/Scenegraph/Composite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.document.node.Composite</string>
+		</type>
+		<type uri="http://www.simantics.org/Document-0.0/Scenegraph/Diagram" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.document.node.Diagram</string>
+		</type>
+	</target>
+
+</adapters>
diff --git a/bundles/org.simantics.event/adapters.xml b/bundles/org.simantics.event/adapters.xml
index d5ddf5e3b..f34c85f1c 100644
--- a/bundles/org.simantics.event/adapters.xml
+++ b/bundles/org.simantics.event/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2011 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -13,14 +14,24 @@
 <adapters>
 
 	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
-		<resource
			uri="http://www.simantics.org/Event-0.0/View/EventBrowseContext/ProjectEventsRule"
			class="org.simantics.event.view.contribution.ProjectEventsRule"
			constructor="get" />
	</target>
+		<resource
+			uri="http://www.simantics.org/Event-0.0/View/EventBrowseContext/ProjectEventsRule"
+			class="org.simantics.event.view.contribution.ProjectEventsRule"
+			constructor="get" />
+	</target>
 
-	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<resource
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<resource
 			uri="http://www.simantics.org/Event-0.0/View/EventBrowseContext/EventLabelRule"
 			class="org.simantics.event.view.contribution.EventLabelRule"
 			constructor="get" />
 
-		<resource
			uri="http://www.simantics.org/Event-0.0/View/EventBrowseContext/EventImageRule"
			class="org.simantics.event.view.contribution.EventImageRule"
			constructor="get" />

		<resource
+		<resource
+			uri="http://www.simantics.org/Event-0.0/View/EventBrowseContext/EventImageRule"
+			class="org.simantics.event.view.contribution.EventImageRule"
+			constructor="get" />
+
+		<resource
 			uri="http://www.simantics.org/Event-0.0/View/EventBrowseContext/EventDecorationRule"
 			class="org.simantics.event.view.contribution.EventDecorationRule"
 			constructor="get" />
diff --git a/bundles/org.simantics.image.ui/adapters.xml b/bundles/org.simantics.image.ui/adapters.xml
index 147fac7c2..ee4fc114a 100644
--- a/bundles/org.simantics.image.ui/adapters.xml
+++ b/bundles/org.simantics.image.ui/adapters.xml
@@ -8,7 +8,7 @@
 		<type uri="http://www.simantics.org/Image2-0.0/Image"
 			class="org.simantics.image.ui.modelBrowser.ImageNode">
 			<this />
-		</type>		
+		</type>
 	</target>
 
 </adapters>
diff --git a/bundles/org.simantics.issues.common/adapters.xml b/bundles/org.simantics.issues.common/adapters.xml
index e392c35bd..5cf4730d2 100644
--- a/bundles/org.simantics.issues.common/adapters.xml
+++ b/bundles/org.simantics.issues.common/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,4 +12,20 @@
  -->
 
 <adapters>
-
	<target interface="org.simantics.issues.common.BatchIssueSource">
		<type uri="http://www.simantics.org/Issue-0.0/Sources/DependencyTracker"
			class="org.simantics.issues.common.DependencyTrackerBatchIssueSource">
			<this />
		</type>
	</target>

	<target interface="org.simantics.issues.common.IssueSource">
		<type uri="http://www.simantics.org/Issue-0.0/Sources/DependencyTracker"
			class="org.simantics.issues.common.DependencyIssueSource2" >
			<graph />
			<this />
		</type>
	</target>

</adapters>
\ No newline at end of file
+
+	<target interface="org.simantics.issues.common.BatchIssueSource">
+		<type uri="http://www.simantics.org/Issue-0.0/Sources/DependencyTracker"
+			class="org.simantics.issues.common.DependencyTrackerBatchIssueSource">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.issues.common.IssueSource">
+		<type uri="http://www.simantics.org/Issue-0.0/Sources/DependencyTracker"
+			class="org.simantics.issues.common.DependencyIssueSource2" >
+			<graph />
+			<this />
+		</type>
+	</target>
+
+</adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.issues.ui/adapters.xml b/bundles/org.simantics.issues.ui/adapters.xml
index 8173016a9..55eb87c84 100644
--- a/bundles/org.simantics.issues.ui/adapters.xml
+++ b/bundles/org.simantics.issues.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2011 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -12,4 +13,68 @@
 
 <adapters>
 
-	<target interface="org.simantics.browsing.ui.model.tests.Test">
		<resource
			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/UserIssueTest"
			class="org.simantics.issues.ui.UserIssueTest"/>
	</target>

	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<resource
			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueLabelDecorationRule"
			class="org.simantics.issues.ui.contribution.IssueLabelDecorationRule"
			constructor="get" />
		<resource
			uri="http://www.simantics.org/IssueUI-0.0/BatchIssueSourceBrowseContext/IssueSourceCheckRule"
			class="org.simantics.issues.ui.contribution.IssueSourceCheckRule"/>
		<resource
			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueLabelRule"
			class="org.simantics.issues.ui.IssueLabelRule"/>
		<type uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/SeverityFolderLabelRule"
			class="org.simantics.issues.ui.SeverityFolderLabelRule">
			<this />
		</type>
		<resource
			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueImageRule"
			class="org.simantics.issues.ui.IssueImageRule"/>
	</target>

	<target interface="org.simantics.db.layer0.adapter.DropActionFactory">
		<resource
			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueContextDropAction"
			class="org.simantics.issues.ui.contribution.IssueContextDropAction" />
	</target>

    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
    
		<type uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/SeverityFolderRule"
			class="org.simantics.issues.ui.SeverityFolderRule">
			<this />
		</type>
		<type uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/SeverityChildRule"
			class="org.simantics.issues.ui.SeverityChildRule">
			<this />
		</type>
		
    </target>

	<target interface="org.simantics.db.layer0.adapter.ActionFactory">

		<type uri="http://www.simantics.org/IssueUI-0.0/Actions/SetSeverityAction"
			class="org.simantics.issues.ui.SetSeverityAction">
			<this />
		</type>

		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Resolve"
			class="org.simantics.issues.ui.handler.Resolve"/>
		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Unresolve"
			class="org.simantics.issues.ui.handler.Unresolve"/>
		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Hide"
			class="org.simantics.issues.ui.handler.Hide"/>
		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Unhide"
			class="org.simantics.issues.ui.handler.Unhide"/>
		
    </target>
			

</adapters>
\ No newline at end of file
+	<target interface="org.simantics.browsing.ui.model.tests.Test">
+		<resource
+			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/UserIssueTest"
+			class="org.simantics.issues.ui.UserIssueTest"/>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<resource
+			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueLabelDecorationRule"
+			class="org.simantics.issues.ui.contribution.IssueLabelDecorationRule"
+			constructor="get" />
+		<resource
+			uri="http://www.simantics.org/IssueUI-0.0/BatchIssueSourceBrowseContext/IssueSourceCheckRule"
+			class="org.simantics.issues.ui.contribution.IssueSourceCheckRule"/>
+		<resource
+			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueLabelRule"
+			class="org.simantics.issues.ui.IssueLabelRule"/>
+		<type uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/SeverityFolderLabelRule"
+			class="org.simantics.issues.ui.SeverityFolderLabelRule">
+			<this />
+		</type>
+		<resource
+			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueImageRule"
+			class="org.simantics.issues.ui.IssueImageRule"/>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.DropActionFactory">
+		<resource
+			uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/IssueContextDropAction"
+			class="org.simantics.issues.ui.contribution.IssueContextDropAction" />
+	</target>
+
+    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
+    
+		<type uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/SeverityFolderRule"
+			class="org.simantics.issues.ui.SeverityFolderRule">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/IssueUI-0.0/IssueBrowseContext/SeverityChildRule"
+			class="org.simantics.issues.ui.SeverityChildRule">
+			<this />
+		</type>
+		
+    </target>
+
+	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
+
+		<type uri="http://www.simantics.org/IssueUI-0.0/Actions/SetSeverityAction"
+			class="org.simantics.issues.ui.SetSeverityAction">
+			<this />
+		</type>
+
+		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Resolve"
+			class="org.simantics.issues.ui.handler.Resolve"/>
+		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Unresolve"
+			class="org.simantics.issues.ui.handler.Unresolve"/>
+		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Hide"
+			class="org.simantics.issues.ui.handler.Hide"/>
+		<resource uri="http://www.simantics.org/IssueUI-0.0/Actions/Unhide"
+			class="org.simantics.issues.ui.handler.Unhide"/>
+		
+    </target>
+			
+
+</adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.layer0.utils/adapters.xml b/bundles/org.simantics.layer0.utils/adapters.xml
index 1ce76183c..a53e3ad59 100644
--- a/bundles/org.simantics.layer0.utils/adapters.xml
+++ b/bundles/org.simantics.layer0.utils/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -104,7 +105,8 @@
 		<baseType
 			uri="http://www.simantics.org/Layer0X-0.0/Trigger" />
 	</target>
-
<!--
+
+<!--
 	<target
 		interface="org.simantics.layer0.utils.expressions.IExpression">
 		<baseType
@@ -119,7 +121,8 @@
 			<graph />
 			<this />
 		</type>
-	</target>
	-->
+	</target>
+	-->
 
 	<target
 		interface="java.lang.String">
diff --git a/bundles/org.simantics.mapping/adapters.xml b/bundles/org.simantics.mapping/adapters.xml
index 5faa503d3..f2687a89c 100644
--- a/bundles/org.simantics.mapping/adapters.xml
+++ b/bundles/org.simantics.mapping/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,63 +12,4 @@
  -->
 
 <adapters>
-
-<!--
-<target interface="org.simantics.mapping.rules.IMappingRule">
-<baseType uri = "http://www.simantics.org/Mapping/2.0#MappingRule"/>
-
-<type uri = "http://www.simantics.org/Mapping/2.0#CompositeRule"
-      class = "org.simantics.mapping.rules.CompositeRule">
-    <related uri = "http://www.simantics.org/Mapping/2.0#HasMappingRule" 
-             to = "org.simantics.mapping.rules.IMappingRule"/>      
-</type>
-
-<type uri = "http://www.simantics.org/Mapping/2.0#SourceQuantificationRule"
-      class = "org.simantics.mapping.rules.SourceQuantificationRule">
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasBinaryPredicate" 
-            to = "org.simantics.layer0.utils.binaryPredicates.IBinaryPredicate"/>             
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasMappingRule" 
-            to = "org.simantics.mapping.rules.IMappingRule"/>      
-</type>
-
-<type uri = "http://www.simantics.org/Mapping/2.0#TargetInstantiationRule"
-      class = "org.simantics.mapping.rules.TargetInstantiationRule">
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasBinaryPredicate" 
-            to = "org.simantics.layer0.utils.binaryPredicates.IBinaryPredicate"/>             
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasMappingRule" 
-            to = "org.simantics.mapping.rules.IMappingRule"/>      
-</type>
-
-<type uri = "http://www.simantics.org/Mapping/2.0#TargetSupportRule"
-      class = "org.simantics.mapping.rules.TargetSupportRule">
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasBinaryPredicate" 
-            to = "org.simantics.layer0.utils.binaryPredicates.IBinaryPredicate"/>   
-</type>
-
-<type uri = "http://www.simantics.org/Mapping/2.0#TargetPredicateRule"
-      class = "org.simantics.mapping.rules.TargetPredicateRule">
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasPredicate"
-            to = "org.simantics.layer0.utils.predicates.IPredicate"/>
-</type>
-
-<type uri = "http://www.simantics.org/Mapping/2.0#TypeBasedMappingRule"
-      class = "org.simantics.mapping.rules.TypeBasedMappingRule">
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasMappingInfoRelation"/>   
-</type>
-
-</target>
-
-<target interface="org.simantics.layer0.utils.triggers.ITrigger">
-
-<type uri = "http://www.simantics.org/Mapping/2.0#Mapping"
-      class = "org.simantics.mapping.Mapping">
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasSource"/>   
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasTarget"/>
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasMappingRelation"/>
-    <single uri = "http://www.simantics.org/Mapping/2.0#HasMappingRule"
-            to = "org.simantics.mapping.rules.IMappingRule"/>
-</type>
-
-</target>
--->
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.modeling.template2d.ui/adapters.xml b/bundles/org.simantics.modeling.template2d.ui/adapters.xml
index 048fd3868..13dcfaa89 100644
--- a/bundles/org.simantics.modeling.template2d.ui/adapters.xml
+++ b/bundles/org.simantics.modeling.template2d.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2012 Association for Decentralized Information Management in
     Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -79,7 +80,12 @@
 			-->
 		<resource uri="http://www.simantics.org/ModelingTemplate2d-0.0/Actions/AssignDrawingTemplate"
 			class="org.simantics.modeling.template2d.ui.actions.AssignDrawingTemplate" />
-
		<!--
		<resource uri="http://www.simantics.org/ModelingTemplate2d-0.0/Actions/FixLinkedList"
			class="org.simantics.modeling.template2d.ui.actions.FixLinkedList" />
		-->
	</target>
+
+		<!--
+		<resource uri="http://www.simantics.org/ModelingTemplate2d-0.0/Actions/FixLinkedList"
+			class="org.simantics.modeling.template2d.ui.actions.FixLinkedList" />
+		-->
+	</target>
 
 	<target
 		interface="org.simantics.db.layer0.adapter.PasteHandler">
@@ -90,5 +96,18 @@
 			class="org.simantics.modeling.template2d.ui.adapters.SVGImagePasteHandler">
 			<this />
 		</type>
-	</target>

	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
		<resource
			uri="http://www.simantics.org/ModelingTemplate2d-0.0/DiagramTemplateBC/ScenegraphChildren"
			class="org.simantics.modeling.template2d.ui.adapters.ScenegraphChildrenRule" />
	</target>

	<target interface="org.simantics.browsing.ui.model.tests.Test">
		<resource
			uri="http://www.simantics.org/ModelingTemplate2d-0.0/DiagramTemplateAC/IsInModelTest"
			class="org.simantics.modeling.template2d.ui.adapters.IsInModelTest"
			constructor="get" />
	</target>
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
+		<resource
+			uri="http://www.simantics.org/ModelingTemplate2d-0.0/DiagramTemplateBC/ScenegraphChildren"
+			class="org.simantics.modeling.template2d.ui.adapters.ScenegraphChildrenRule" />
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.tests.Test">
+		<resource
+			uri="http://www.simantics.org/ModelingTemplate2d-0.0/DiagramTemplateAC/IsInModelTest"
+			class="org.simantics.modeling.template2d.ui.adapters.IsInModelTest"
+			constructor="get" />
+	</target>
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.modeling.ui/adapters.xml b/bundles/org.simantics.modeling.ui/adapters.xml
index 641e11408..274db7a09 100644
--- a/bundles/org.simantics.modeling.ui/adapters.xml
+++ b/bundles/org.simantics.modeling.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,7 +12,106 @@
  -->
 
 <adapters>
-
	<target interface="org.simantics.ui.fonts.FontDescriptor">
		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedFont"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedFontAdapter"/>
	</target>

	<target interface="org.simantics.ui.fonts.FontDescriptor">
		<adapter uri="http://www.simantics.org/Diagram-0.0/RealizedFont"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.RealizedFontAdapter"/>
	</target>

	<target interface="org.simantics.common.color.Color">
		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedColor"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedColorAdapter"/>
	</target>

	<target interface="org.simantics.common.color.Color">
		<adapter uri="http://www.simantics.org/Diagram-0.0/RealizedColor"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.RealizedColorAdapter"/>
	</target>

	<target interface="org.simantics.common.format.Formatter">
		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedFormatter"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedFormatterAdapter"/>
	</target>

	<target interface="org.simantics.common.format.Formatter">
		<adapter uri="http://www.simantics.org/Diagram-0.0/RealizedFormatter"
		    contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.RealizedFormatterAdapter"/>
	</target>

	<target interface="java.lang.String">
		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedMonitorExpression"
			contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedExpressionAdapter"/>
		<adapter uri="http://www.simantics.org/Charts-0.0/ObtainedDouble"
			contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.chart.property.ObtainedDoubleStringAdapter"/>
	</target>

	<target interface="java.lang.Double">
		<adapter
			uri="http://www.simantics.org/Charts-0.0/ObtainedDouble"
			contextClass="org.simantics.db.RelationContext"
			adapterClass="org.simantics.modeling.ui.chart.property.ObtainedDoubleAdapter" />
	</target>

	<target interface="org.simantics.common.color.Color">
		<type uri="http://www.simantics.org/Diagram-0.0/RGB"
			class="org.simantics.modeling.ui.diagram.monitor.RGB">
			<graph />
			<this />
		</type>
	</target>

    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <resource uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ChildrenInActiveExperiment"
                  class="org.simantics.modeling.ui.viewpoint.ChildrenInActiveExperiment">
            <graph/>
        </resource>
        <resource uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/VariableChildRule"
                  class="org.simantics.modeling.ui.viewpoint.VariableChildRule"/>
        <type uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/VariablePropertyRule"
                  class="org.simantics.modeling.ui.viewpoint.VariablePropertyRule">
                  <graph />
                  <this />
        </type>
    </target>

    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <resource uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/VariableLabelRule"
                  class="org.simantics.modeling.ui.viewpoint.VariableLabelRule"/>
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ExperimentLabelRule"
            class="org.simantics.structural.ui.modelBrowser.contributions.ExperimentLabelRule"
            constructor="get" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ComponentTypeLockStatusImageDecorationRule"
            class="org.simantics.structural.ui.modelBrowser.contributions.ComponentTypeLockStatusImageDecorationRule"/>
    </target>

	<target interface="org.simantics.db.layer0.variable.Expression">
		<type uri="http://www.simantics.org/Modeling-0.0/BasicExpression" class="org.simantics.modeling.ui.expression.BasicExpression">
			<this />
		</type>
	</target>

	<target interface="org.simantics.db.layer0.variable.EquationExpression">
		<type uri="http://www.simantics.org/Modeling-0.0/BasicExpression" class="org.simantics.modeling.ui.expression.BasicExpression">
			<this />
		</type>
	</target>

	<target
+
+	<target interface="org.simantics.ui.fonts.FontDescriptor">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedFont"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedFontAdapter"/>
+	</target>
+
+	<target interface="org.simantics.ui.fonts.FontDescriptor">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/RealizedFont"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.RealizedFontAdapter"/>
+	</target>
+
+	<target interface="org.simantics.common.color.Color">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedColor"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedColorAdapter"/>
+	</target>
+
+	<target interface="org.simantics.common.color.Color">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/RealizedColor"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.RealizedColorAdapter"/>
+	</target>
+
+	<target interface="org.simantics.common.format.Formatter">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedFormatter"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedFormatterAdapter"/>
+	</target>
+
+	<target interface="org.simantics.common.format.Formatter">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/RealizedFormatter"
+		    contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.RealizedFormatterAdapter"/>
+	</target>
+
+	<target interface="java.lang.String">
+		<adapter uri="http://www.simantics.org/Diagram-0.0/ObtainedMonitorExpression"
+			contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.diagram.monitor.ObtainedExpressionAdapter"/>
+		<adapter uri="http://www.simantics.org/Charts-0.0/ObtainedDouble"
+			contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.chart.property.ObtainedDoubleStringAdapter"/>
+	</target>
+
+	<target interface="java.lang.Double">
+		<adapter
+			uri="http://www.simantics.org/Charts-0.0/ObtainedDouble"
+			contextClass="org.simantics.db.RelationContext"
+			adapterClass="org.simantics.modeling.ui.chart.property.ObtainedDoubleAdapter" />
+	</target>
+
+	<target interface="org.simantics.common.color.Color">
+		<type uri="http://www.simantics.org/Diagram-0.0/RGB"
+			class="org.simantics.modeling.ui.diagram.monitor.RGB">
+			<graph />
+			<this />
+		</type>
+	</target>
+
+    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
+        <resource uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ChildrenInActiveExperiment"
+                  class="org.simantics.modeling.ui.viewpoint.ChildrenInActiveExperiment">
+            <graph/>
+        </resource>
+        <resource uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/VariableChildRule"
+                  class="org.simantics.modeling.ui.viewpoint.VariableChildRule"/>
+        <type uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/VariablePropertyRule"
+                  class="org.simantics.modeling.ui.viewpoint.VariablePropertyRule">
+                  <graph />
+                  <this />
+        </type>
+    </target>
+
+    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+        <resource uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/VariableLabelRule"
+                  class="org.simantics.modeling.ui.viewpoint.VariableLabelRule"/>
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ExperimentLabelRule"
+            class="org.simantics.structural.ui.modelBrowser.contributions.ExperimentLabelRule"
+            constructor="get" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ComponentTypeLockStatusImageDecorationRule"
+            class="org.simantics.structural.ui.modelBrowser.contributions.ComponentTypeLockStatusImageDecorationRule"/>
+    </target>
+
+	<target interface="org.simantics.db.layer0.variable.Expression">
+		<type uri="http://www.simantics.org/Modeling-0.0/BasicExpression" class="org.simantics.modeling.ui.expression.BasicExpression">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.variable.EquationExpression">
+		<type uri="http://www.simantics.org/Modeling-0.0/BasicExpression" class="org.simantics.modeling.ui.expression.BasicExpression">
+			<this />
+		</type>
+	</target>
+
+	<target
 		interface="org.simantics.scenegraph.adapters.ISceneGraphProvider">
 		<type
 			uri="http://www.simantics.org/Structural-0.0/Component"
@@ -55,7 +155,8 @@
 			<graph />
 			<this />
 		</type>
-
        <!--
+
+        <!--
         <type
             uri="http://www.simantics.org/Charts-0.0/ChartGroup"
             class="org.simantics.modeling.ui.modelBrowser.model.ChartGroup">
@@ -76,7 +177,8 @@
             <graph />
             <this />
         </type>
-
        <type
+
+        <type
             uri="http://www.simantics.org/Modeling-0.0/SubscriptionItem"
             class="org.simantics.modeling.ui.modelBrowser.model.SubscriptionItem">
             <graph />
@@ -88,7 +190,7 @@
             class="org.simantics.modeling.ui.modelBrowser.model.Subscription">
             <this />
         </type>
-        -->
+        -->
 		<type
 			uri="http://www.simantics.org/Simulation-0.0/Experiment"
 			class="org.simantics.modeling.ui.modelBrowser.model.Experiment">
@@ -111,27 +213,52 @@
 	</target>
 
 	<target
-		interface="org.simantics.ui.icons.ImageDescriptorProvider">
		<!--
+		interface="org.simantics.ui.icons.ImageDescriptorProvider">
+		<!--
 		<resource
 			uri="http://www.simantics.org/Modeling-0.0/Operations/NewComponentType"
 			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
 			<bundle />
 			<string>icons/box_add.png</string>
-		</resource>
		-->
+		</resource>
+		-->
 		<resource
 			uri="http://www.simantics.org/Modeling-0.0/Operations/NavigateToTarget"
 			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
 			<bundle />
 			<string>icons/bullet_go.png</string>
-		</resource>
        <resource
            uri="http://www.simantics.org/Layer0X-0.0/DependenciesRelation"
            class="org.simantics.ui.icons.BundleImageDescriptorProvider">
            <bundle />
            <string>icons/table_relationship.png</string>
        </resource>
        <type
            uri="http://www.simantics.org/Diagram-0.0/ProfileEntry"
            class="org.simantics.ui.icons.BundleImageDescriptorProvider">
            <bundle />
            <string>icons/bullet_yellow.png</string>
        </type>
        <type
            uri="http://www.simantics.org/Diagram-0.0/Profile"
            class="org.simantics.ui.icons.BundleImageDescriptorProvider">
            <bundle />
            <string>icons/bullet_green.png</string>
        </type>
	</target>
+		</resource>
+        <resource
+            uri="http://www.simantics.org/Layer0X-0.0/DependenciesRelation"
+            class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+            <bundle />
+            <string>icons/table_relationship.png</string>
+        </resource>
+        <type
+            uri="http://www.simantics.org/Diagram-0.0/ProfileEntry"
+            class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+            <bundle />
+            <string>icons/bullet_yellow.png</string>
+        </type>
+        <type
+            uri="http://www.simantics.org/Diagram-0.0/Profile"
+            class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+            <bundle />
+            <string>icons/bullet_green.png</string>
+        </type>
+	</target>
 
 	<target interface="org.simantics.diagram.adapter.ElementFactory">
 		<resource uri="http://www.simantics.org/Diagram-0.0/Monitor"
-			class="org.simantics.modeling.ui.diagram.monitor.MonitorClassFactory2" />
		<resource uri="http://www.simantics.org/Diagram-0.0/Slider"
			class="org.simantics.modeling.ui.diagram.SliderClassFactory" />			
+			class="org.simantics.modeling.ui.diagram.monitor.MonitorClassFactory2" />
+		<resource uri="http://www.simantics.org/Diagram-0.0/Slider"
+			class="org.simantics.modeling.ui.diagram.SliderClassFactory" />			
 		<resource uri="http://www.simantics.org/Diagram-0.0/SymbolMonitor"
 			class="org.simantics.modeling.ui.diagram.SymbolMonitorClassFactory" />
 		<type uri="http://www.simantics.org/Diagram-0.0/Monitor"
-			class="org.simantics.modeling.ui.diagram.monitor.MonitorClassFactory2" />
		<type uri="http://www.simantics.org/Diagram-0.0/Slider"
			class="org.simantics.modeling.ui.diagram.SliderClassFactory" />			
+			class="org.simantics.modeling.ui.diagram.monitor.MonitorClassFactory2" />
+		<type uri="http://www.simantics.org/Diagram-0.0/Slider"
+			class="org.simantics.modeling.ui.diagram.SliderClassFactory" />			
 		<type uri="http://www.simantics.org/Diagram-0.0/SymbolMonitor"
 			class="org.simantics.modeling.ui.diagram.SymbolMonitorClassFactory" />
 	</target>
@@ -141,4 +268,175 @@
 			class="org.simantics.modeling.ui.diagram.monitor.MonitorWriter" />
 	</target>
 
-	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
		<type uri="http://www.simantics.org/Charts-0.0/Chart"
			class="org.simantics.modeling.ui.modelBrowser2.model.ChartNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Charts-0.0/ChartGroup"
			class="org.simantics.modeling.ui.modelBrowser2.model.ChartGroupNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Image-0.0/Image"
			class="org.simantics.modeling.ui.modelBrowser2.model.ImageNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Layer0X-0.0/RelationView"
			class="org.simantics.modeling.ui.modelBrowser2.model.RelationViewNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
			class="org.simantics.modeling.ui.modelBrowser2.model.SpreadsheetNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Simulation-0.0/State"
			class="org.simantics.modeling.ui.modelBrowser2.model.StateNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Modeling-0.0/Subscription"
			class="org.simantics.modeling.ui.modelBrowser2.model.SubscriptionNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Modeling-0.0/Subscription/Item"
			class="org.simantics.modeling.ui.modelBrowser2.model.SubscriptionItemNode">
			<this />
		</type>
		<type uri="http://www.simantics.org/Charts-0.0/Chart/Item"
			class="org.simantics.modeling.ui.modelBrowser2.model.TrendItemNode">
			<this />
		</type>
	</target>

	<target interface="org.simantics.modeling.ui.modelBrowser2.contributions.RelationViewContributor">
		<type uri="http://www.simantics.org/Modeling-0.0/DependenciesView"
			class="org.simantics.modeling.ui.modelBrowser2.contributions.DependenciesViewContributor">
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewComponentType"
			class="org.simantics.modeling.ui.actions.NewComponentTypeAction" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewProceduralComponentType"
			class="org.simantics.modeling.ui.actions.NewProceduralComponentType" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewDocument"
			class="org.simantics.modeling.ui.actions.NewDocument" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewLibrary"
			class="org.simantics.modeling.ui.actions.NewLibrary" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewLocalLibrary"
			class="org.simantics.modeling.ui.actions.NewLocalLibrary" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/MigrateComponentType"
			class="org.simantics.modeling.ui.actions.MigrateComponentType" />
<!-- 		<resource -->
<!-- 			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/MigrateMasterTypical" -->
<!-- 			class="org.simantics.modeling.ui.actions.MigrateMasterTypical" /> -->
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/CompilePGraphs"
			class="org.simantics.modeling.ui.actions.CompilePGraphs" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Delete"
			class="org.simantics.modeling.ui.actions.Delete" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewConnectionPoint"
            class="org.simantics.modeling.ui.actions.NewConnectionPoint" />			
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewSymbol"
            class="org.simantics.modeling.ui.actions.NewSymbol" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/AssignSymbolGroup"
			class="org.simantics.modeling.ui.actions.AssignSymbolGroup" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/ConfigureConnectionTypes"
			class="org.simantics.modeling.ui.actions.ConfigureConnectionTypes" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/MergeFlags"
			class="org.simantics.modeling.ui.actions.MergeFlagsAction" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/RenameDiagramComponents"
            class="org.simantics.modeling.ui.actions.RenameDiagramComponents" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewSCLQuery"
            class="org.simantics.modeling.ui.actions.NewSCLQuery" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Copy"
            class="org.simantics.modeling.ui.actions.Copy" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Cut"
            class="org.simantics.modeling.ui.actions.Cut" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Paste"
            class="org.simantics.modeling.ui.actions.Paste" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Lock"
            class="org.simantics.modeling.ui.actions.LockAction" />
        <resource
            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Unlock"
            class="org.simantics.modeling.ui.actions.UnlockAction" />            
		<resource
			uri="http://www.simantics.org/Modeling-0.0/NewMasterTypicalDiagram"
			class="org.simantics.modeling.ui.typicals.NewMasterTypicalDiagram" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/NewTypicalDiagramInstance"
			class="org.simantics.modeling.ui.typicals.NewTypicalDiagramInstance" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/ImportImages"
			class="org.simantics.image.ui.ImportImagesActionFactory" />
	</target>

	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionLabelRule"
			class="org.simantics.modeling.ui.modelBrowser2.label.SubscriptionLabelRule"
			constructor="get" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionImageRule"
			class="org.simantics.modeling.ui.modelBrowser2.image.SubscriptionImageRule"
			constructor="get" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionItemLabelRule"
			class="org.simantics.modeling.ui.modelBrowser2.label.SubscriptionItemLabelRule" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionItemLabelDecorationRule"
			class="org.simantics.modeling.ui.modelBrowser2.label.SubscriptionItemLabelDecorationRule" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ConnectionRelationLabelDecorationRule"
			class="org.simantics.modeling.ui.modelBrowser2.label.ConnectionRelationLabelDecorationRule" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ConnectionRelationModifierRule"
			class="org.simantics.modeling.ui.modelBrowser2.label.ConnectionRelationModifierRule" />
	</target>

	<target interface="org.simantics.browsing.ui.model.tests.Test">
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/IsComponent"
			class="org.simantics.modeling.ui.modelBrowser2.contributions.IsComponentTest"
			constructor="get" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/IsUserDefinedComponentTest"
			class="org.simantics.modeling.ui.modelBrowser2.contributions.IsUserDefinedComponentTest"
			constructor="get" />
	</target>

	<target interface="org.simantics.diagram.handler.CopyPasteStrategy">
		<type uri="http://www.simantics.org/Diagram-0.0/Diagram"
			class="org.simantics.diagram.handler.DefaultCopyPasteStrategy" />
	</target>

	<target interface="org.simantics.diagram.synchronization.CopyAdvisor">
		<type uri="http://www.simantics.org/Diagram-0.0/Diagram"
			class="org.simantics.modeling.mapping.DefaultMappedCopyAdvisor">
		</type>
	</target>

	<target interface="org.simantics.ui.workbench.IEditorNamingService">
		<type uri="http://www.simantics.org/Structural-0.0/ProceduralComponentTypeCode"
			class="org.simantics.modeling.ui.componentTypeEditor.ProceduralComponentTypeEditorNamingService">
		</type>
	</target>

</adapters>
\ No newline at end of file
+	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
+		<type uri="http://www.simantics.org/Charts-0.0/Chart"
+			class="org.simantics.modeling.ui.modelBrowser2.model.ChartNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Charts-0.0/ChartGroup"
+			class="org.simantics.modeling.ui.modelBrowser2.model.ChartGroupNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Image-0.0/Image"
+			class="org.simantics.modeling.ui.modelBrowser2.model.ImageNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Layer0X-0.0/RelationView"
+			class="org.simantics.modeling.ui.modelBrowser2.model.RelationViewNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
+			class="org.simantics.modeling.ui.modelBrowser2.model.SpreadsheetNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Simulation-0.0/State"
+			class="org.simantics.modeling.ui.modelBrowser2.model.StateNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Modeling-0.0/Subscription"
+			class="org.simantics.modeling.ui.modelBrowser2.model.SubscriptionNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Modeling-0.0/Subscription/Item"
+			class="org.simantics.modeling.ui.modelBrowser2.model.SubscriptionItemNode">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Charts-0.0/Chart/Item"
+			class="org.simantics.modeling.ui.modelBrowser2.model.TrendItemNode">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.modeling.ui.modelBrowser2.contributions.RelationViewContributor">
+		<type uri="http://www.simantics.org/Modeling-0.0/DependenciesView"
+			class="org.simantics.modeling.ui.modelBrowser2.contributions.DependenciesViewContributor">
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.ActionFactory">
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewComponentType"
+			class="org.simantics.modeling.ui.actions.NewComponentTypeAction" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewProceduralComponentType"
+			class="org.simantics.modeling.ui.actions.NewProceduralComponentType" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewDocument"
+			class="org.simantics.modeling.ui.actions.NewDocument" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewLibrary"
+			class="org.simantics.modeling.ui.actions.NewLibrary" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewLocalLibrary"
+			class="org.simantics.modeling.ui.actions.NewLocalLibrary" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/MigrateComponentType"
+			class="org.simantics.modeling.ui.actions.MigrateComponentType" />
+<!-- 		<resource -->
+<!-- 			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/MigrateMasterTypical" -->
+<!-- 			class="org.simantics.modeling.ui.actions.MigrateMasterTypical" /> -->
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/CompilePGraphs"
+			class="org.simantics.modeling.ui.actions.CompilePGraphs" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Delete"
+			class="org.simantics.modeling.ui.actions.Delete" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewConnectionPoint"
+            class="org.simantics.modeling.ui.actions.NewConnectionPoint" />			
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewSymbol"
+            class="org.simantics.modeling.ui.actions.NewSymbol" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/AssignSymbolGroup"
+			class="org.simantics.modeling.ui.actions.AssignSymbolGroup" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/ConfigureConnectionTypes"
+			class="org.simantics.modeling.ui.actions.ConfigureConnectionTypes" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/MergeFlags"
+			class="org.simantics.modeling.ui.actions.MergeFlagsAction" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/RenameDiagramComponents"
+            class="org.simantics.modeling.ui.actions.RenameDiagramComponents" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/NewSCLQuery"
+            class="org.simantics.modeling.ui.actions.NewSCLQuery" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Copy"
+            class="org.simantics.modeling.ui.actions.Copy" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Cut"
+            class="org.simantics.modeling.ui.actions.Cut" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Paste"
+            class="org.simantics.modeling.ui.actions.Paste" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Lock"
+            class="org.simantics.modeling.ui.actions.LockAction" />
+        <resource
+            uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Unlock"
+            class="org.simantics.modeling.ui.actions.UnlockAction" />            
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/NewMasterTypicalDiagram"
+			class="org.simantics.modeling.ui.typicals.NewMasterTypicalDiagram" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/NewTypicalDiagramInstance"
+			class="org.simantics.modeling.ui.typicals.NewTypicalDiagramInstance" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/ImportImages"
+			class="org.simantics.image.ui.ImportImagesActionFactory" />
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionLabelRule"
+			class="org.simantics.modeling.ui.modelBrowser2.label.SubscriptionLabelRule"
+			constructor="get" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionImageRule"
+			class="org.simantics.modeling.ui.modelBrowser2.image.SubscriptionImageRule"
+			constructor="get" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionItemLabelRule"
+			class="org.simantics.modeling.ui.modelBrowser2.label.SubscriptionItemLabelRule" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/SubscriptionItemLabelDecorationRule"
+			class="org.simantics.modeling.ui.modelBrowser2.label.SubscriptionItemLabelDecorationRule" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ConnectionRelationLabelDecorationRule"
+			class="org.simantics.modeling.ui.modelBrowser2.label.ConnectionRelationLabelDecorationRule" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/ConnectionRelationModifierRule"
+			class="org.simantics.modeling.ui.modelBrowser2.label.ConnectionRelationModifierRule" />
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.tests.Test">
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/IsComponent"
+			class="org.simantics.modeling.ui.modelBrowser2.contributions.IsComponentTest"
+			constructor="get" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext/IsUserDefinedComponentTest"
+			class="org.simantics.modeling.ui.modelBrowser2.contributions.IsUserDefinedComponentTest"
+			constructor="get" />
+	</target>
+
+	<target interface="org.simantics.diagram.handler.CopyPasteStrategy">
+		<type uri="http://www.simantics.org/Diagram-0.0/Diagram"
+			class="org.simantics.diagram.handler.DefaultCopyPasteStrategy" />
+	</target>
+
+	<target interface="org.simantics.diagram.synchronization.CopyAdvisor">
+		<type uri="http://www.simantics.org/Diagram-0.0/Diagram"
+			class="org.simantics.modeling.mapping.DefaultMappedCopyAdvisor">
+		</type>
+	</target>
+
+	<target interface="org.simantics.ui.workbench.IEditorNamingService">
+		<type uri="http://www.simantics.org/Structural-0.0/ProceduralComponentTypeCode"
+			class="org.simantics.modeling.ui.componentTypeEditor.ProceduralComponentTypeEditorNamingService">
+		</type>
+	</target>
+
+</adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.modeling/adapters.xml b/bundles/org.simantics.modeling/adapters.xml
index 5ba3f4967..c56ab44ad 100644
--- a/bundles/org.simantics.modeling/adapters.xml
+++ b/bundles/org.simantics.modeling/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2014 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -7,15 +8,45 @@
     http://www.eclipse.org/legal/epl-v10.html
    
     Contributors:
-        VTT Technical Research Centre of Finland - initial API and implementation
        Semantum Oy - ConnectionRelationStringModifierFactory
+        VTT Technical Research Centre of Finland - initial API and implementation
+        Semantum Oy - ConnectionRelationStringModifierFactory
  -->
 
-<adapters>

	<target
		interface="org.simantics.db.layer0.adapter.CopyHandler">
		<type
			uri="http://www.simantics.org/Structural-0.0/Composite"
			class="org.simantics.modeling.adapters.CompositeCopyHandler">
			<this />
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.SubgraphExtent">
		<resource uri="http://www.simantics.org/Modeling-0.0/MappingSubgraphExtent"
			class="org.simantics.modeling.adapters.MappingSubgraphExtent" >
		</resource>
	</target>

	<target interface="org.simantics.db.layer0.adapter.SubgraphExtent">
		<resource uri="http://www.simantics.org/Diagram-0.0/DiagramSubgraphExtent"
			class="org.simantics.modeling.adapters.DiagramSubgraphExtent" >
		</resource>
	</target>
-	<target interface="org.simantics.db.layer0.adapter.SubgraphAdvisor">
		<resource uri="http://www.simantics.org/Modeling-0.0/MappingSubgraphAdvisor"
			class="org.simantics.modeling.adapters.MappingSubgraphAdvisor" >
		</resource>
	</target>

	<target
+<adapters>
+
+	<target
+		interface="org.simantics.db.layer0.adapter.CopyHandler">
+		<type
+			uri="http://www.simantics.org/Structural-0.0/Composite"
+			class="org.simantics.modeling.adapters.CompositeCopyHandler">
+			<this />
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.SubgraphExtent">
+		<resource uri="http://www.simantics.org/Modeling-0.0/MappingSubgraphExtent"
+			class="org.simantics.modeling.adapters.MappingSubgraphExtent" >
+		</resource>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.SubgraphExtent">
+		<resource uri="http://www.simantics.org/Diagram-0.0/DiagramSubgraphExtent"
+			class="org.simantics.modeling.adapters.DiagramSubgraphExtent" >
+		</resource>
+	</target>
+	<target interface="org.simantics.db.layer0.adapter.SubgraphAdvisor">
+		<resource uri="http://www.simantics.org/Modeling-0.0/MappingSubgraphAdvisor"
+			class="org.simantics.modeling.adapters.MappingSubgraphAdvisor" >
+		</resource>
+	</target>
+
+	<target
 		interface="org.simantics.layer0.utils.operations.IOperation">
-		<!--
		<resource
+		<!--
+		<resource
 			uri="http://www.simantics.org/Modeling-0.0/Operations/NewComponentType"
-			class="org.simantics.modeling.actions.NewComponentType" />
		-->
+			class="org.simantics.modeling.actions.NewComponentType" />
+		-->
 		<resource
 			uri="http://www.simantics.org/Modeling-0.0/Operations/NavigateToTarget"
 			class="org.simantics.modeling.actions.NavigateToTarget" />
@@ -41,7 +72,11 @@
 		</type>
 		<type
 			uri="http://www.simantics.org/Modeling-0.0/ComponentTypeUpdater"
-			class="org.simantics.modeling.mapping.ComponentTypeUpdater">
			<graph />
			<this />
		</type>
	</target>
+			class="org.simantics.modeling.mapping.ComponentTypeUpdater">
+			<graph />
+			<this />
+		</type>
+	</target>
 	<!--<target interface="java.lang.String">
 		<adapter uri="http://www.simantics.org/Diagram-0.0/Element"
 			adapterClass="org.simantics.modeling.adapters.ElementStringAdapter" />
@@ -54,5 +89,140 @@
 			<single uri="http://www.simantics.org/Modeling-0.0/HasBaseRules"
 				to="org.simantics.structural2.modelingRules.IModelingRules" />
 		</type>
-	</target>

	<target interface="org.simantics.db.layer0.adapter.Remover">
		<type uri="http://www.simantics.org/Structural-0.0/Component"
			class="org.simantics.db.layer0.adapter.impl.RelatedObjectRemover">
			<graph />
			<this />
			<string>http://www.simantics.org/Modeling-0.0/ComponentToElement</string>
			<string>http://www.simantics.org/Modeling-0.0/HasParentComponent/Inverse</string>
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Element" class="org.simantics.modeling.adapters.ElementRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Monitor" class="org.simantics.modeling.adapters.MonitorRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Charts-0.0/Chart"
			class="org.simantics.db.layer0.adapter.impl.ConsistsOfRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Simulation-0.0/Run" 
		      class="org.simantics.modeling.adapters.RunRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Flag"
			class="org.simantics.modeling.adapters.FlagRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Structural-0.0/ConnectionRelation"
			class="org.simantics.modeling.adapters.ConnectionRelationRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Diagram-0.0/Terminal"
			class="org.simantics.modeling.adapters.TerminalRemover">
			<this />
		</type>
		<type uri="http://www.simantics.org/Modeling-0.0/ReferenceElement"
			class="org.simantics.modeling.adapters.ReferenceElementRemover">
			<this />
		</type>
	</target>
	
	<target interface="org.simantics.scl.runtime.function.Function">
        <resource uri="http://www.simantics.org/Simulation-0.0/ActiveExperiment"
            class="org.simantics.modeling.adapters.ActiveExperiment">
        </resource>
    </target>

    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
        <type uri="http://www.simantics.org/Modeling-0.0/NewComposite"
            class="org.simantics.modeling.adapters.NewCompositeActionFactory">
            <single uri="http://www.simantics.org/Modeling-0.0/NewComposite/HasCompositeType" />
            <single uri="http://www.simantics.org/Modeling-0.0/NewComposite/HasDefaultName"
                    to="java.lang.String" />
        </type>
    </target>
    
    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
        <type uri="http://www.simantics.org/Modeling-0.0/ExportModel"
            class="org.simantics.modeling.adapters.ExportModelActionFactory">
            <single uri="http://www.simantics.org/Modeling-0.0/ExportModel/extension"
                    to="java.lang.String" />
            <single uri="http://www.simantics.org/Modeling-0.0/ExportModel/format"
                    to="java.lang.String" />
        </type>
        <type uri="http://www.simantics.org/Modeling-0.0/SCLAction"
            class="org.simantics.modeling.SCLAction">
            <graph/>
            <this/>
        </type>
		<resource uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Help"
			class="org.simantics.modeling.actions.Help" />
    </target>
    
    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <type uri="http://www.simantics.org/Modeling-0.0/SCLChildRule"
            class="org.simantics.modeling.adapters.SCLChildRule">
			<graph />
			<this />
        </type>
    </target>    

    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <type uri="http://www.simantics.org/Modeling-0.0/SCLLabelRule"
            class="org.simantics.modeling.adapters.SCLLabelRule">
			<graph />
			<this />
        </type>
    </target>    

    <target interface="org.simantics.browsing.ui.model.tests.Test">
        <type uri="http://www.simantics.org/Modeling-0.0/SCLTest"
            class="org.simantics.modeling.adapters.SCLTest">
			<graph />
			<this />
        </type>
    </target>    

	<target interface="org.simantics.db.layer0.adapter.StringModifierFactory">
		<type
			uri="http://www.simantics.org/Structural-0.0/ConnectionRelation"
			class="org.simantics.modeling.adapters.ConnectionRelationStringModifierFactory">
			<this />
		</type>
	</target>


	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
		<type uri="http://www.simantics.org/Modeling-1.2/SCLCommandSession" class="org.simantics.modeling.scl.SCLVariableBuilder" />
	</target>

	<target interface="org.simantics.db.layer0.migration.MigrationStep">
		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/attachCreationInformationStep"
			class="org.simantics.modeling.migration.AttachCreationInformationStep"
			constructor="get">
		</resource>
		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/guidCreationStep"
			class="org.simantics.modeling.migration.GuidCreationStep"
			constructor="get">
		</resource>
		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/layerCleanupMigrationStep"
			class="org.simantics.modeling.migration.LayerCleanupMigrationStep">
		</resource>
		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/documentCleanupMigrationStep"
			class="org.simantics.modeling.migration.DocumentCleanupMigrationStep">
		</resource>
	</target>

	<target interface="org.simantics.modeling.typicals.ITypicalSynchronizationRule">
		<baseType
			uri="http://www.simantics.org/Modeling-0.0/TypicalSynchronizationRule" />
		<resource
			uri="http://www.simantics.org/Modeling-0.0/PageSettingsTypicalRule"
			class="org.simantics.modeling.typicals.rules.PageSettingsTypicalRule"
			constructor="get" />
	</target>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.Remover">
+		<type uri="http://www.simantics.org/Structural-0.0/Component"
+			class="org.simantics.db.layer0.adapter.impl.RelatedObjectRemover">
+			<graph />
+			<this />
+			<string>http://www.simantics.org/Modeling-0.0/ComponentToElement</string>
+			<string>http://www.simantics.org/Modeling-0.0/HasParentComponent/Inverse</string>
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Element" class="org.simantics.modeling.adapters.ElementRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Monitor" class="org.simantics.modeling.adapters.MonitorRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Charts-0.0/Chart"
+			class="org.simantics.db.layer0.adapter.impl.ConsistsOfRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Simulation-0.0/Run" 
+		      class="org.simantics.modeling.adapters.RunRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Flag"
+			class="org.simantics.modeling.adapters.FlagRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Structural-0.0/ConnectionRelation"
+			class="org.simantics.modeling.adapters.ConnectionRelationRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Diagram-0.0/Terminal"
+			class="org.simantics.modeling.adapters.TerminalRemover">
+			<this />
+		</type>
+		<type uri="http://www.simantics.org/Modeling-0.0/ReferenceElement"
+			class="org.simantics.modeling.adapters.ReferenceElementRemover">
+			<this />
+		</type>
+	</target>
+	
+	<target interface="org.simantics.scl.runtime.function.Function">
+        <resource uri="http://www.simantics.org/Simulation-0.0/ActiveExperiment"
+            class="org.simantics.modeling.adapters.ActiveExperiment">
+        </resource>
+    </target>
+
+    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
+        <type uri="http://www.simantics.org/Modeling-0.0/NewComposite"
+            class="org.simantics.modeling.adapters.NewCompositeActionFactory">
+            <single uri="http://www.simantics.org/Modeling-0.0/NewComposite/HasCompositeType" />
+            <single uri="http://www.simantics.org/Modeling-0.0/NewComposite/HasDefaultName"
+                    to="java.lang.String" />
+        </type>
+    </target>
+    
+    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
+        <type uri="http://www.simantics.org/Modeling-0.0/ExportModel"
+            class="org.simantics.modeling.adapters.ExportModelActionFactory">
+            <single uri="http://www.simantics.org/Modeling-0.0/ExportModel/extension"
+                    to="java.lang.String" />
+            <single uri="http://www.simantics.org/Modeling-0.0/ExportModel/format"
+                    to="java.lang.String" />
+        </type>
+        <type uri="http://www.simantics.org/Modeling-0.0/SCLAction"
+            class="org.simantics.modeling.SCLAction">
+            <graph/>
+            <this/>
+        </type>
+		<resource uri="http://www.simantics.org/Modeling-0.0/ModelingActionContext/Actions/Help"
+			class="org.simantics.modeling.actions.Help" />
+    </target>
+    
+    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
+        <type uri="http://www.simantics.org/Modeling-0.0/SCLChildRule"
+            class="org.simantics.modeling.adapters.SCLChildRule">
+			<graph />
+			<this />
+        </type>
+    </target>    
+
+    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+        <type uri="http://www.simantics.org/Modeling-0.0/SCLLabelRule"
+            class="org.simantics.modeling.adapters.SCLLabelRule">
+			<graph />
+			<this />
+        </type>
+    </target>    
+
+    <target interface="org.simantics.browsing.ui.model.tests.Test">
+        <type uri="http://www.simantics.org/Modeling-0.0/SCLTest"
+            class="org.simantics.modeling.adapters.SCLTest">
+			<graph />
+			<this />
+        </type>
+    </target>    
+
+	<target interface="org.simantics.db.layer0.adapter.StringModifierFactory">
+		<type
+			uri="http://www.simantics.org/Structural-0.0/ConnectionRelation"
+			class="org.simantics.modeling.adapters.ConnectionRelationStringModifierFactory">
+			<this />
+		</type>
+	</target>
+
+
+	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
+		<type uri="http://www.simantics.org/Modeling-1.2/SCLCommandSession" class="org.simantics.modeling.scl.SCLVariableBuilder" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.migration.MigrationStep">
+		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/attachCreationInformationStep"
+			class="org.simantics.modeling.migration.AttachCreationInformationStep"
+			constructor="get">
+		</resource>
+		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/guidCreationStep"
+			class="org.simantics.modeling.migration.GuidCreationStep"
+			constructor="get">
+		</resource>
+		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/layerCleanupMigrationStep"
+			class="org.simantics.modeling.migration.LayerCleanupMigrationStep">
+		</resource>
+		<resource uri="http://www.simantics.org/Modeling-1.2/Migration/documentCleanupMigrationStep"
+			class="org.simantics.modeling.migration.DocumentCleanupMigrationStep">
+		</resource>
+	</target>
+
+	<target interface="org.simantics.modeling.typicals.ITypicalSynchronizationRule">
+		<baseType
+			uri="http://www.simantics.org/Modeling-0.0/TypicalSynchronizationRule" />
+		<resource
+			uri="http://www.simantics.org/Modeling-0.0/PageSettingsTypicalRule"
+			class="org.simantics.modeling.typicals.rules.PageSettingsTypicalRule"
+			constructor="get" />
+	</target>
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.project/adapters.xml b/bundles/org.simantics.project/adapters.xml
index f79eff8e7..549068a59 100644
--- a/bundles/org.simantics.project/adapters.xml
+++ b/bundles/org.simantics.project/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
diff --git a/bundles/org.simantics.scenegraph.loader/adapters.xml b/bundles/org.simantics.scenegraph.loader/adapters.xml
index 444ac7ce1..7a267a7df 100644
--- a/bundles/org.simantics.scenegraph.loader/adapters.xml
+++ b/bundles/org.simantics.scenegraph.loader/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -10,5 +11,23 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.db.layer0.variable.Variable">
		<adapter uri="http://www.simantics.org/Scenegraph-0.0/LiftedPropertyRelation"
			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.scenegraph.loader.LiftedPropertyVariableAdapter" />
	</target>

	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
	    <type uri="http://www.simantics.org/Scenegraph-0.0/Node"
			class="org.simantics.scenegraph.loader.SceneGraphVariableBuilder" />
	</target>

	<target interface="org.simantics.db.layer0.adapter.Remover">
		<type uri="http://www.simantics.org/Scenegraph-0.0/Node"
			class="org.simantics.scenegraph.loader.NodeRemover">
			<this />
		</type>
	</target>
+<adapters>
+
+	<target interface="org.simantics.db.layer0.variable.Variable">
+		<adapter uri="http://www.simantics.org/Scenegraph-0.0/LiftedPropertyRelation"
+			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+			adapterClass="org.simantics.scenegraph.loader.LiftedPropertyVariableAdapter" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
+		<type uri="http://www.simantics.org/Scenegraph-0.0/Node"
+			class="org.simantics.scenegraph.loader.SceneGraphVariableBuilder" />
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.Remover">
+		<type uri="http://www.simantics.org/Scenegraph-0.0/Node"
+			class="org.simantics.scenegraph.loader.NodeRemover">
+			<this />
+		</type>
+	</target>
 </adapters>
diff --git a/bundles/org.simantics.selectionview/adapters.xml b/bundles/org.simantics.selectionview/adapters.xml
index 851b2588b..90f1f6d0f 100644
--- a/bundles/org.simantics.selectionview/adapters.xml
+++ b/bundles/org.simantics.selectionview/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -10,5 +11,63 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.selectionview.TabContribution">
		<type uri="http://www.simantics.org/SelectionView-0.0/SCLTabContribution"
			class="org.simantics.selectionview.SCLTabContribution">
			<graph/>
			<this/>
		</type>
		<type uri="http://www.simantics.org/SelectionView-0.0/TypedVariableTabContribution"
			class="org.simantics.selectionview.TypedVariableTabContribution">
			<graph/>
			<this/>
		</type>
		<type uri="http://www.simantics.org/SelectionView-0.0/VariableTabContribution"
			class="org.simantics.selectionview.VariableTabContribution">
			<graph/>
			<this/>
		</type>
	</target>


    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <type uri="http://www.simantics.org/SelectionViewUI-0.0/VariablePropertyCategoryRule"
             class="org.simantics.selectionview.VariablePropertyCategoryRule">
             <graph/>
             <this/>
        </type>
    </target>

    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/CategoryNodeLabelRule"
                  class="org.simantics.selectionview.CategoryNodeLabelRule"/>
        <type uri="http://www.simantics.org/SelectionViewUI-0.0/StandardPropertySorterRuleType"
                  class="org.simantics.selectionview.StandardPropertySorterRule">
                  <this/>
        </type>
                  
        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/VariablePropertyLabelRule"
                  class="org.simantics.selectionview.VariablePropertyLabelRule"/>
        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/VariablePropertyModifierRule"
                  class="org.simantics.selectionview.VariablePropertyModifierRule"/>
        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/VariableColoringDecorationRule"
                  class="org.simantics.selectionview.VariableColoringDecorationRule"/>
    </target>

	<target interface="org.simantics.db.layer0.variable.Variable">
		<!--<adapter uri="http://www.simantics.org/SelectionView-0.0/StandardPropertyInfo"
			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.selectionview.PropertyInfoVariableAdapter" />-->
		<adapter uri="http://www.simantics.org/SelectionView-0.0/DisplayProperty"
			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.selectionview.DisplayPropertyVariableAdapter" />
		<adapter uri="http://www.simantics.org/SelectionView-0.0/DisplayValue"
			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.selectionview.DisplayValueVariableAdapter" />
		<adapter uri="http://www.simantics.org/SelectionView-0.0/DisplayUnit"
			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.selectionview.DisplayUnitVariableAdapter" />
	</target>
+<adapters>
+
+	<target interface="org.simantics.selectionview.TabContribution">
+		<type uri="http://www.simantics.org/SelectionView-0.0/SCLTabContribution"
+			class="org.simantics.selectionview.SCLTabContribution">
+			<graph/>
+			<this/>
+		</type>
+		<type uri="http://www.simantics.org/SelectionView-0.0/TypedVariableTabContribution"
+			class="org.simantics.selectionview.TypedVariableTabContribution">
+			<graph/>
+			<this/>
+		</type>
+		<type uri="http://www.simantics.org/SelectionView-0.0/VariableTabContribution"
+			class="org.simantics.selectionview.VariableTabContribution">
+			<graph/>
+			<this/>
+		</type>
+	</target>
+
+
+    <target interface="org.simantics.browsing.ui.model.children.ChildRule">
+        <type uri="http://www.simantics.org/SelectionViewUI-0.0/VariablePropertyCategoryRule"
+             class="org.simantics.selectionview.VariablePropertyCategoryRule">
+             <graph/>
+             <this/>
+        </type>
+    </target>
+
+    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/CategoryNodeLabelRule"
+                  class="org.simantics.selectionview.CategoryNodeLabelRule"/>
+        <type uri="http://www.simantics.org/SelectionViewUI-0.0/StandardPropertySorterRuleType"
+                  class="org.simantics.selectionview.StandardPropertySorterRule">
+                  <this/>
+        </type>
+                  
+        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/VariablePropertyLabelRule"
+                  class="org.simantics.selectionview.VariablePropertyLabelRule"/>
+        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/VariablePropertyModifierRule"
+                  class="org.simantics.selectionview.VariablePropertyModifierRule"/>
+        <resource uri="http://www.simantics.org/SelectionViewUI-0.0/VariableColoringDecorationRule"
+                  class="org.simantics.selectionview.VariableColoringDecorationRule"/>
+    </target>
+
+	<target interface="org.simantics.db.layer0.variable.Variable">
+		<!--<adapter uri="http://www.simantics.org/SelectionView-0.0/StandardPropertyInfo"
+			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+			adapterClass="org.simantics.selectionview.PropertyInfoVariableAdapter" />-->
+		<adapter uri="http://www.simantics.org/SelectionView-0.0/DisplayProperty"
+			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+			adapterClass="org.simantics.selectionview.DisplayPropertyVariableAdapter" />
+		<adapter uri="http://www.simantics.org/SelectionView-0.0/DisplayValue"
+			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+			adapterClass="org.simantics.selectionview.DisplayValueVariableAdapter" />
+		<adapter uri="http://www.simantics.org/SelectionView-0.0/DisplayUnit"
+			contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
+			adapterClass="org.simantics.selectionview.DisplayUnitVariableAdapter" />
+	</target>
 </adapters>
diff --git a/bundles/org.simantics.simulation/adapters.xml b/bundles/org.simantics.simulation/adapters.xml
index 2b294a889..f2687a89c 100644
--- a/bundles/org.simantics.simulation/adapters.xml
+++ b/bundles/org.simantics.simulation/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
diff --git a/bundles/org.simantics.spreadsheet.graph/adapters.xml b/bundles/org.simantics.spreadsheet.graph/adapters.xml
index a1eb772f4..1cc6a25c2 100644
--- a/bundles/org.simantics.spreadsheet.graph/adapters.xml
+++ b/bundles/org.simantics.spreadsheet.graph/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,42 +12,34 @@
  -->
 
 <adapters>
-
<!--
	<target interface="org.simantics.db.layer0.variable.Variable">
	    <adapter uri="http://www.simantics.org/Spreadsheet-0.0/Cell"
			contextClass="org.simantics.db.layer0.variable.Variable"
			adapterClass="org.simantics.spreadsheet.graph.adapter.CellVariableAdapter" />
	    <adapter uri="http://www.simantics.org/Spreadsheet-0.0/TextCell"
			contextClass="org.simantics.db.layer0.variable.Variable"
			adapterClass="org.simantics.spreadsheet.graph.adapter.TextCellVariableAdapter" />
	    <adapter uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
			contextClass="org.simantics.db.layer0.variable.Variable"
			adapterClass="org.simantics.spreadsheet.graph.adapter.SpreadsheetVariableAdapter" />
	</target>
	-->

<!--
	<target interface="org.simantics.db.layer0.variable.Variable">
		<adapter uri="http://www.simantics.org/Spreadsheet-0.0/DefaultContent"
		    contextClass="org.simantics.db.layer0.variable.ModelledVariablePropertyDescriptor"
			adapterClass="org.simantics.spreadsheet.graph.DefaultContentPropertyVariable"/>
	</target>
	-->
		<!-- 

	<target interface="org.simantics.db.layer0.variable.Variable">
		<type uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
			class="org.simantics.spreadsheet.graph.adapter.SpreadsheetVariable" >
			<graph />
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/ExpressionRealization"
			class="org.simantics.spreadsheet.graph.adapter.ExpressionVariable" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/CommandRealization"
			class="org.simantics.spreadsheet.graph.adapter.CommandVariable" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/TextRealization"
			class="org.simantics.spreadsheet.graph.adapter.TextVariable" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/MatrixRealization"
			class="org.simantics.spreadsheet.graph.adapter.MatrixVariable" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/DimensionsRealization"
			class="org.simantics.spreadsheet.graph.adapter.DimensionsVariable" >
			<this />
		</type>
	</target>
		-->

	<target interface="org.simantics.db.layer0.variable.VariableFactory">
		<type uri="http://www.simantics.org/Spreadsheet-0.0/DoubleArrayCell"
			class="org.simantics.spreadsheet.graph.adapter.DoubleArrayCells" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Spreadsheet-0.0/StringArrayCell"
			class="org.simantics.spreadsheet.graph.adapter.StringArrayCells" >
			<this />
		</type>
	</target>

<!--
	<target
		interface="org.simantics.db.layer0.adapter.StringModifier">
		<type
			uri="http://www.simantics.org/Spreadsheet-0.0/TextCell"
			class="org.simantics.spreadsheet.graph.adapter.TextCellStringModifier">
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Spreadsheet-0.0/ExpressionCell"
			class="org.simantics.spreadsheet.graph.adapter.ExpressionCellStringModifier">
			<this />
		</type>
	</target>
	-->

	<target interface="org.simantics.db.layer0.adapter.Template">
	<resource uri = "http://www.simantics.org/Spreadsheet-0.0/CompositeTemplate"
	      class = "org.simantics.spreadsheet.graph.adapter.CompositeTemplate"/>
	</target>
-<!--
	<target
-		interface="org.simantics.spreadsheet.graph.ServerCell">
-		<baseType
-			uri="http://www.simantics.org/Spreadsheet-0.0/Cell" />
 
-		<type
			uri="http://www.simantics.org/Spreadsheet-0.0/Cell"
			class="org.simantics.spreadsheet.graph.servercell.GenericServerCell">
		</type>

		<type
-			uri="http://www.simantics.org/Spreadsheet-0.0/TextCell"
-			class="org.simantics.spreadsheet.graph.servercell.TextServerCell">
-		</type>
-
-		<type
-			uri="http://www.simantics.org/Spreadsheet-0.0/TextBlockCell"
-			class="org.simantics.spreadsheet.graph.servercell.TextBlockServerCell">
+	<target interface="org.simantics.db.layer0.variable.VariableFactory">
+		<type uri="http://www.simantics.org/Spreadsheet-0.0/DoubleArrayCell"
+			class="org.simantics.spreadsheet.graph.adapter.DoubleArrayCells" >
+			<this />
 		</type>
-
-		<type
-			uri="http://www.simantics.org/Spreadsheet-0.0/ExpressionCell"
-			class="org.simantics.spreadsheet.graph.servercell.ExpressionServerCell">
+		<type uri="http://www.simantics.org/Spreadsheet-0.0/StringArrayCell"
+			class="org.simantics.spreadsheet.graph.adapter.StringArrayCells" >
+			<this />
 		</type>
+	</target>
 
-		<type
			uri="http://www.simantics.org/Spreadsheet-0.0/CommandCell"
			class="org.simantics.spreadsheet.graph.servercell.CommandServerCell">
		</type>

		<type
			uri="http://www.simantics.org/Spreadsheet-0.0/MatrixCell"
			class="org.simantics.spreadsheet.graph.servercell.MatrixServerCell">
		</type>

	</target>
-	<target
-
-		interface="org.simantics.spreadsheet.ModelCellCreator">
-		<baseType
-			uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet" />
+	<target interface="org.simantics.db.layer0.adapter.Template">
+	<resource uri = "http://www.simantics.org/Spreadsheet-0.0/CompositeTemplate"
+	      class = "org.simantics.spreadsheet.graph.adapter.CompositeTemplate"/>
+	</target>
 
-		<type
-			uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
-			class="org.simantics.spreadsheet.graph.adapter.DefaultCellCreator">
-			<graph />
+ 
+	<target interface="org.simantics.db.layer0.adapter.Remover">
+		<type uri="http://www.simantics.org/Spreadsheet-0.0/Book"
+			class="org.simantics.spreadsheet.graph.adapter.SpreadsheetBookRemover">
 			<this />
 		</type>
+	</target>
 
-	</target>
	-->
-
 
-	<target interface="org.simantics.db.layer0.adapter.Remover">
		<type uri="http://www.simantics.org/Spreadsheet-0.0/Book"
			class="org.simantics.spreadsheet.graph.adapter.SpreadsheetBookRemover">
			<this />
		</type>
	</target>

 
 	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
		<type uri="http://www.simantics.org/Spreadsheet-1.2/Book" class="org.simantics.spreadsheet.graph.SpreadsheetVariableBuilder" />
	</target>
 
+ 
+ 	<target interface="org.simantics.db.layer0.variable.VariableBuilder">
+		<type uri="http://www.simantics.org/Spreadsheet-1.2/Book" class="org.simantics.spreadsheet.graph.SpreadsheetVariableBuilder" />
+	</target>
+ 
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.spreadsheet.ui/adapters.xml b/bundles/org.simantics.spreadsheet.ui/adapters.xml
index 1a7d1027d..86f43e507 100644
--- a/bundles/org.simantics.spreadsheet.ui/adapters.xml
+++ b/bundles/org.simantics.spreadsheet.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,5 +12,36 @@
  -->
 
 <adapters>
-
	<target interface="org.simantics.diagram.synchronization.graph.ElementWriter">
		<resource uri="http://www.simantics.org/Spreadsheet-0.0/SpreadsheetElement"
			class="org.simantics.spreadsheet.ui.SheetWriter" />
	</target>

	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<resource
			uri="http://www.simantics.org/Spreadsheet-0.0/SpreadsheetElement"
			class="org.simantics.spreadsheet.ui.SheetFactory">
		</resource>
		<type
			uri="http://www.simantics.org/Spreadsheet-0.0/SpreadsheetElement"
			class="org.simantics.spreadsheet.ui.SheetFactory">
		</type>
	</target>

	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
		<type uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
			<bundle />
			<string>icons/table.png</string>
		</type>
	</target>

	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
		<type uri="http://www.simantics.org/Spreadsheet-0.0/Book"
			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
			<bundle />
			<string>icons/book.png</string>
		</type>
	</target>
+
+	<target interface="org.simantics.diagram.synchronization.graph.ElementWriter">
+		<resource uri="http://www.simantics.org/Spreadsheet-0.0/SpreadsheetElement"
+			class="org.simantics.spreadsheet.ui.SheetWriter" />
+	</target>
+
+	<target interface="org.simantics.diagram.adapter.ElementFactory">
+		<resource
+			uri="http://www.simantics.org/Spreadsheet-0.0/SpreadsheetElement"
+			class="org.simantics.spreadsheet.ui.SheetFactory">
+		</resource>
+		<type
+			uri="http://www.simantics.org/Spreadsheet-0.0/SpreadsheetElement"
+			class="org.simantics.spreadsheet.ui.SheetFactory">
+		</type>
+	</target>
+
+	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
+		<type uri="http://www.simantics.org/Spreadsheet-0.0/Spreadsheet"
+			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+			<bundle />
+			<string>icons/table.png</string>
+		</type>
+	</target>
+
+	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
+		<type uri="http://www.simantics.org/Spreadsheet-0.0/Book"
+			class="org.simantics.ui.icons.BundleImageDescriptorProvider">
+			<bundle />
+			<string>icons/book.png</string>
+		</type>
+	</target>
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.structural.ui/adapters.xml b/bundles/org.simantics.structural.ui/adapters.xml
index 29a65e176..0492eb6b4 100644
--- a/bundles/org.simantics.structural.ui/adapters.xml
+++ b/bundles/org.simantics.structural.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,7 +12,50 @@
  -->
 
 <adapters>
-
	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
	
		<type uri="http://www.simantics.org/Structural-0.0/Component"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/brick.png</string>
		</type>

		<type uri="http://www.simantics.org/Structural-0.0/Composite"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/bricks.png</string>
		</type>
		
		<type uri="http://www.simantics.org/Structural-0.0/ComponentType"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/bricks.png</string>
		</type>

		<type uri="http://www.simantics.org/Structural-0.0/ConnectionRelation"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/connect.png</string>
		</type>
		
        <type uri="http://www.simantics.org/Structural-0.0/Property"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/textfield.png</string>
		</type>		

	</target>
+
+	<target interface="org.simantics.ui.icons.ImageDescriptorProvider">
+	
+		<type uri="http://www.simantics.org/Structural-0.0/Component"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/brick.png</string>
+		</type>
+
+		<type uri="http://www.simantics.org/Structural-0.0/Composite"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/bricks.png</string>
+		</type>
+		
+		<type uri="http://www.simantics.org/Structural-0.0/ComponentType"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/bricks.png</string>
+		</type>
+
+		<type uri="http://www.simantics.org/Structural-0.0/ConnectionRelation"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/connect.png</string>
+		</type>
+		
+        <type uri="http://www.simantics.org/Structural-0.0/Property"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/textfield.png</string>
+		</type>		
+
+	</target>
 	<target
 		interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
 		<type
@@ -24,7 +68,17 @@
 			class="org.simantics.structural.ui.modelBrowser.nodes.CompositeNode">
 			<this />
 		</type>
-		<type
			uri="http://www.simantics.org/Simulation-0.0/Experiment"
			class="org.simantics.structural.ui.modelBrowser.nodes.ExperimentNode">
			<this />
		</type>
		<type
			uri="http://www.simantics.org/Simulation-0.0/Run"
			class="org.simantics.structural.ui.modelBrowser.nodes.RunNode">
			<this />
		</type>
		<type
+		<type
+			uri="http://www.simantics.org/Simulation-0.0/Experiment"
+			class="org.simantics.structural.ui.modelBrowser.nodes.ExperimentNode">
+			<this />
+		</type>
+		<type
+			uri="http://www.simantics.org/Simulation-0.0/Run"
+			class="org.simantics.structural.ui.modelBrowser.nodes.RunNode">
+			<this />
+		</type>
+		<type
 			uri="http://www.simantics.org/Structural-0.0/Component"
 			class="org.simantics.structural.ui.modelBrowser.nodes.ComponentNode">
 			<this />
@@ -41,5 +95,13 @@
 			class="org.simantics.structural.ui.adapters.DiagramTemplate">
 			<this />
 		</type>
-	</target>

	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
		<resource
			uri="http://www.simantics.org/Project-0.0/ProjectBrowseContext/RunLabelRule"
			class="org.simantics.structural.ui.modelBrowser.contributions.RunLabelRule"
			constructor="get" />
	</target>
	
+	</target>
+
+	<target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
+		<resource
+			uri="http://www.simantics.org/Project-0.0/ProjectBrowseContext/RunLabelRule"
+			class="org.simantics.structural.ui.modelBrowser.contributions.RunLabelRule"
+			constructor="get" />
+	</target>
+	
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.structural2/adapters.xml b/bundles/org.simantics.structural2/adapters.xml
index dee2bfbf9..16bbf9591 100644
--- a/bundles/org.simantics.structural2/adapters.xml
+++ b/bundles/org.simantics.structural2/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -11,7 +12,8 @@
  -->
 
 <adapters>
-
	<target interface="org.simantics.structural2.modelingRules.IModelingRules">
+
+	<target interface="org.simantics.structural2.modelingRules.IModelingRules">
 		<baseType uri="http://www.simantics.org/Structural-0.0/ModelingRules" />
 		<type uri="http://www.simantics.org/Structural-0.0/SimpleModelingRules"
 			class="org.simantics.structural2.modelingRules.SimpleModelingRules">
@@ -25,5 +27,30 @@
 			<graph />
 		</resource>
 	</target>
-
	<target interface="org.simantics.db.layer0.variable.RVIResolver">
		<type uri="http://www.simantics.org/Structural-0.0/Component"
			class="org.simantics.structural2.StructuralRVIResolver" >
		</type>
		<type uri="http://www.simantics.org/Structural-0.0/Run"
			class="org.simantics.structural2.StructuralRVIResolver" >
		</type>
		<type uri="http://www.simantics.org/Structural-0.0/ComponentType"
			class="org.simantics.structural2.StructuralRVIResolver" >
		</type>
	</target>

	<target interface="org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory">
		<resource uri="http://www.simantics.org/Structural-0.0/ComponentType"
			class="org.simantics.structural2.adapter.ComponentTypeImportAdvisorFactory" >
		</resource>
	</target>
	
	<target interface="org.simantics.db.layer0.adapter.PasteHandler">
			<type
			uri="http://www.simantics.org/Structural-0.0/ComponentType"
			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
			<this />
		</type>
	</target>
+
+	<target interface="org.simantics.db.layer0.variable.RVIResolver">
+		<type uri="http://www.simantics.org/Structural-0.0/Component"
+			class="org.simantics.structural2.StructuralRVIResolver" >
+		</type>
+		<type uri="http://www.simantics.org/Structural-0.0/Run"
+			class="org.simantics.structural2.StructuralRVIResolver" >
+		</type>
+		<type uri="http://www.simantics.org/Structural-0.0/ComponentType"
+			class="org.simantics.structural2.StructuralRVIResolver" >
+		</type>
+	</target>
+
+	<target interface="org.simantics.db.layer0.adapter.impl.ImportAdvisorFactory">
+		<resource uri="http://www.simantics.org/Structural-0.0/ComponentType"
+			class="org.simantics.structural2.adapter.ComponentTypeImportAdvisorFactory" >
+		</resource>
+	</target>
+	
+	<target interface="org.simantics.db.layer0.adapter.PasteHandler">
+			<type
+			uri="http://www.simantics.org/Structural-0.0/ComponentType"
+			class="org.simantics.db.layer0.adapter.impl.DefaultPasteHandler">
+			<this />
+		</type>
+	</target>
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.ui/adapters.xml b/bundles/org.simantics.ui/adapters.xml
index d7d164c24..ddc74c490 100644
--- a/bundles/org.simantics.ui/adapters.xml
+++ b/bundles/org.simantics.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -24,8 +25,31 @@
 			<bundle />
 			<string>icons/etool16/folder.png</string>
 		</resource>
-
		<type uri="http://www.simantics.org/Simulation-0.0/Model"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/chart_organisation.png</string>
		</type>
-		<type uri="http://www.simantics.org/Simulation-0.0/Experiment"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/time.png</string>
		</type>

		<type uri="http://www.simantics.org/Simulation-0.0/Run"
			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
			<graph/>
			<this/>
			<bundle />
			<string>icons/chart_bar.png</string>
		</type>

		<resource uri="http://www.simantics.org/Layer0X-0.0/RelationView"
+
+		<type uri="http://www.simantics.org/Simulation-0.0/Model"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/chart_organisation.png</string>
+		</type>
+		<type uri="http://www.simantics.org/Simulation-0.0/Experiment"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/time.png</string>
+		</type>
+
+		<type uri="http://www.simantics.org/Simulation-0.0/Run"
+			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
+			<graph/>
+			<this/>
+			<bundle />
+			<string>icons/chart_bar.png</string>
+		</type>
+
+		<resource uri="http://www.simantics.org/Layer0X-0.0/RelationView"
 			class="org.simantics.ui.icons.GraphOrBundleImageDescriptorProvider">
 			<graph/>
 			<this/>
@@ -40,6 +64,22 @@
 			<string>icons/etool16/textfield.png</string>
 		</resource>
 
-	</target>
	
    <target interface="org.eclipse.jface.resource.ImageDescriptor">
        <baseType uri="http://www.simantics.org/Image2-0.0/Image" />
        <type
            uri="http://www.simantics.org/Image2-0.0/Image"
            class="org.simantics.ui.icons.GraphImageDescriptor">
            <graph/>
            <this/>
        </type>
    </target>
-
    <target interface="org.eclipse.swt.graphics.RGB">
        <baseType uri="http://www.simantics.org/Color-0.0/RGB" />
        <adapter
            uri="http://www.simantics.org/Color-0.0/RGB"
            adapterClass="org.simantics.ui.colors.RGBAdapter"/>
    </target>
+	</target>
+	
+    <target interface="org.eclipse.jface.resource.ImageDescriptor">
+        <baseType uri="http://www.simantics.org/Image2-0.0/Image" />
+        <type
+            uri="http://www.simantics.org/Image2-0.0/Image"
+            class="org.simantics.ui.icons.GraphImageDescriptor">
+            <graph/>
+            <this/>
+        </type>
+    </target>
+
+    <target interface="org.eclipse.swt.graphics.RGB">
+        <baseType uri="http://www.simantics.org/Color-0.0/RGB" />
+        <adapter
+            uri="http://www.simantics.org/Color-0.0/RGB"
+            adapterClass="org.simantics.ui.colors.RGBAdapter"/>
+    </target>
 </adapters>
\ No newline at end of file
diff --git a/bundles/org.simantics.views.swt/adapters.xml b/bundles/org.simantics.views.swt/adapters.xml
index c5aa85280..839e15bc1 100644
--- a/bundles/org.simantics.views.swt/adapters.xml
+++ b/bundles/org.simantics.views.swt/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -10,4 +11,104 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.browsing.ui.graph.impl.SessionContextInputSource">
		<resource
			uri="http://www.simantics.org/Views-0.0/WorkbenchSelectionInputSource"
			class="org.simantics.browsing.ui.graph.impl.WorkbenchSelectionInputSource">
		</resource>
	</target>

	<target interface="org.simantics.scenegraph.loader.ScenegraphLoader">
		<type uri="http://www.simantics.org/Views-0.0/Alternative" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTAlternative</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Composite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTComposite</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/ScrolledComposite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTScrolledComposite</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/SashForm" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTSashForm</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/TabFolder" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTTabFolder</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Combo" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTCombo</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/CCombo" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTCCombo</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Label" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTLabel</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Text" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTText</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/StyledText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTStyledText</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/WikiBrowser" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTWikiBrowser</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Browser" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTBrowser</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/TrackedText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTTrackedText</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/TrackedStyledText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTTrackedStyledText</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Button" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTButton</string>
		</type>
		<type uri="http://www.simantics.org/Views-0.0/Explorer" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
			<this/>
			<bundle />
			<string>org.simantics.views.swt.client.impl.SWTExplorer</string>
		</type>
	</target>

	<target interface="org.simantics.views.swt.ModelledWizardPage">
		<type
			uri="http://www.simantics.org/Views-0.0/Wizard/Page"
			class="org.simantics.views.swt.ModelledWizardPageImpl">
			<this/>
		</type>
	</target>

</adapters>
+<adapters>
+
+	<target interface="org.simantics.browsing.ui.graph.impl.SessionContextInputSource">
+		<resource
+			uri="http://www.simantics.org/Views-0.0/WorkbenchSelectionInputSource"
+			class="org.simantics.browsing.ui.graph.impl.WorkbenchSelectionInputSource">
+		</resource>
+	</target>
+
+	<target interface="org.simantics.scenegraph.loader.ScenegraphLoader">
+		<type uri="http://www.simantics.org/Views-0.0/Alternative" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTAlternative</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Composite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTComposite</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/ScrolledComposite" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTScrolledComposite</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/SashForm" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTSashForm</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/TabFolder" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTTabFolder</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Combo" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTCombo</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/CCombo" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTCCombo</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Label" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTLabel</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Text" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTText</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/StyledText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTStyledText</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/WikiBrowser" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTWikiBrowser</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Browser" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTBrowser</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/TrackedText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTTrackedText</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/TrackedStyledText" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTTrackedStyledText</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Button" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTButton</string>
+		</type>
+		<type uri="http://www.simantics.org/Views-0.0/Explorer" class="org.simantics.scenegraph.loader.StandardScenegraphLoader">
+			<this/>
+			<bundle />
+			<string>org.simantics.views.swt.client.impl.SWTExplorer</string>
+		</type>
+	</target>
+
+	<target interface="org.simantics.views.swt.ModelledWizardPage">
+		<type
+			uri="http://www.simantics.org/Views-0.0/Wizard/Page"
+			class="org.simantics.views.swt.ModelledWizardPageImpl">
+			<this/>
+		</type>
+	</target>
+
+</adapters>
diff --git a/bundles/org.simantics.views/adapters.xml b/bundles/org.simantics.views/adapters.xml
index 96cfae28c..fe43beb18 100644
--- a/bundles/org.simantics.views/adapters.xml
+++ b/bundles/org.simantics.views/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials
@@ -10,4 +11,6 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

</adapters>
+<adapters>
+
+</adapters>
diff --git a/bundles/org.simantics.wiki.ui/adapters.xml b/bundles/org.simantics.wiki.ui/adapters.xml
index 1b1fea718..57e6479ad 100644
--- a/bundles/org.simantics.wiki.ui/adapters.xml
+++ b/bundles/org.simantics.wiki.ui/adapters.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2007, 2010 Association for Decentralized Information Management
     in Industry THTH ry.
     All rights reserved. This program and the accompanying materials