Bug 518913 - [Designer] Create oxygen version

- Change target platform (still rely on MARTE build for neon)
- Remove XML palette entries in FCM profile
- Migrate UCM element types to new framework, update wizard templates for application and platform
- Remove deprectated class PapyrusExampleInstallerWizard from oepd.ui (the class had been moved to oep.uml.diagram.wizards)
- Add dependency to oep.uml.architecture to C++ test (otherwise base element types are not found)
- Adapt features in product definition for RCP to Papyrus 3.0

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: Iedf142ace00ccb51832ccaebcf5e27721e82ca31

63 files changed, 1150 insertions, 1267 deletions

diff --git a/components/org.eclipse.papyrus.designer.components.fcm.profile/plugin.xml b/components/org.eclipse.papyrus.designer.components.fcm.profile/plugin.xml
index 2cbfe0e7c..8930ccb08 100644
--- a/components/org.eclipse.papyrus.designer.components.fcm.profile/plugin.xml
+++ b/components/org.eclipse.papyrus.designer.components.fcm.profile/plugin.xml
@@ -46,35 +46,4 @@
 			provider="CEA LIST"/>
 	</extension>
 
-	<extension
-        	point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-		<paletteDefinition
-			ID="com.cea.profiles.fcm.compositePalette"
-			class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-			name="com.cea.profiles.fcm.compositePalette"
-			path="palettes/palette-composite.xml">
-			<Priority
-				name="Medium">
-			</Priority>
-			<editor
-				id="org.eclipse.papyrus.uml.diagram.composite">
-			</editor>
-		</paletteDefinition>
-	</extension>
-	
-	<extension
-			point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-		<paletteDefinition
-			ID="com.cea.profiles.fcm.classPalette"
-			class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-			name="com.cea.profiles.fcm.classPalette"
-			path="palettes/palette-classdep.xml">
-			<Priority
-				name="Medium">
-			</Priority>
-			<editor
-				id="org.eclipse.papyrus.uml.diagram.clazz">
-			</editor>
-		</paletteDefinition>
-	</extension>
 </plugin>
diff --git a/components/org.eclipse.papyrus.designer.components.modellibs.core/META-INF/MANIFEST.MF b/components/org.eclipse.papyrus.designer.components.modellibs.core/META-INF/MANIFEST.MF
index e97858282..dafde9abd 100644
--- a/components/org.eclipse.papyrus.designer.components.modellibs.core/META-INF/MANIFEST.MF
+++ b/components/org.eclipse.papyrus.designer.components.modellibs.core/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.core.resources,
  org.eclipse.papyrus.designer.languages.cpp.profile;bundle-version="0.7.4",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="2.0.0",
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
diff --git a/components/org.eclipse.papyrus.designer.components.modellibs.core/html/examples/hello-world.html b/components/org.eclipse.papyrus.designer.components.modellibs.core/html/examples/hello-world.html
index 7abfaebb3..e0d14493a 100644
--- a/components/org.eclipse.papyrus.designer.components.modellibs.core/html/examples/hello-world.html
+++ b/components/org.eclipse.papyrus.designer.components.modellibs.core/html/examples/hello-world.html
@@ -11,7 +11,7 @@
 
 <h1>Hello world example with SW Designer</h1>
 
-In the sequel, we outline a simple hello world example using qompass designer. Please note that the example
+In the sequel, we outline a simple hello world example using Papyrus SW designer. Please note that the example
 can be found via File->New->Example in the category SW Designer examples. There are also two cheat-sheets that explain how
 to create your own example from scratch.
 <p>
@@ -171,4 +171,4 @@ Try running again, it should print output to the screen.
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/components/org.eclipse.papyrus.designer.components.modellibs.core/plugin.xml b/components/org.eclipse.papyrus.designer.components.modellibs.core/plugin.xml
index e56943a17..777e6c274 100644
--- a/components/org.eclipse.papyrus.designer.components.modellibs.core/plugin.xml
+++ b/components/org.eclipse.papyrus.designer.components.modellibs.core/plugin.xml
@@ -100,7 +100,7 @@
       <wizard
             canFinishEarly="false"
 			category="org.eclipse.ui.Examples/org.eclipse.papyrus.examples"
-            class="org.eclipse.papyrus.uml.diagram.wizards.wizardstmp.PapyrusExampleInstallerWizard"
+            class="org.eclipse.papyrus.uml.diagram.wizards.wizards.PapyrusExampleInstallerWizard"
             finalPerspective="org.eclipse.papyrus.infra.core.perspective"
             icon="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/designer-16x16.gif"
             id="org.eclipse.papyrus.designer.examples.category.DesignerExamplesComponents.installer"
diff --git a/gui/org.eclipse.papyrus.designer.ui/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.designer.ui/META-INF/MANIFEST.MF
index 64c296021..d877ee8ba 100644
--- a/gui/org.eclipse.papyrus.designer.ui/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.designer.ui/META-INF/MANIFEST.MF
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
  org.eclipse.papyrus.designer.languages.common.extensionpoints;bundle-version="1.0.4",
  org.eclipse.emf.common.ui;bundle-version="2.11.0"
-Export-Package: org.eclipse.papyrus.designer.ui,
- org.eclipse.papyrus.uml.diagram.wizards.wizardstmp
+Export-Package: org.eclipse.papyrus.designer.ui
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.0.5.qualifier
diff --git a/gui/org.eclipse.papyrus.designer.ui/plugin.xml b/gui/org.eclipse.papyrus.designer.ui/plugin.xml
index 7c3cca95f..03427cfac 100644
--- a/gui/org.eclipse.papyrus.designer.ui/plugin.xml
+++ b/gui/org.eclipse.papyrus.designer.ui/plugin.xml
@@ -37,7 +37,7 @@
       <wizard
             canFinishEarly="false"
 			category="org.eclipse.ui.Examples/org.eclipse.papyrus.examples"
-            class="org.eclipse.papyrus.uml.diagram.wizards.wizardstmp.PapyrusExampleInstallerWizard"
+            class="org.eclipse.papyrus.uml.diagram.wizards.wizards.PapyrusExampleInstallerWizard"
             finalPerspective="org.eclipse.papyrus.infra.core.perspective"
             icon="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/designer-16x16.gif"
             id="org.eclipse.papyrus.designer.examples.category.DesignerExamplesDirect.installer"
diff --git a/gui/org.eclipse.papyrus.designer.ui/src/org/eclipse/papyrus/uml/diagram/wizards/wizardstmp/PapyrusExampleInstallerWizard.java b/gui/org.eclipse.papyrus.designer.ui/src/org/eclipse/papyrus/uml/diagram/wizards/wizardstmp/PapyrusExampleInstallerWizard.java
deleted file mode 100644
index 995009998..000000000
--- a/gui/org.eclipse.papyrus.designer.ui/src/org/eclipse/papyrus/uml/diagram/wizards/wizardstmp/PapyrusExampleInstallerWizard.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- * 
- * 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:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.wizards.wizardstmp;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.ui.CommonUIPlugin;
-import org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard;
-import org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.osgi.framework.Bundle;
-
-/**
- * This class extends the EMF ExampleInstallerWizard with respect to three aspects
- * 1. It supports the definition of example models for the same installers in multiple extension points. This is
- *    important, if sample models (of the same category) are provided by different plug-ins.
- * 2. It only copies the selected model
- * 3. It also opens the selected example model, if another editor is already open
- * 
- * @since 2.1
- * @deprecated: will soon be in Papyrus base (oep.uml.diagram.wizards)
- */
-@Deprecated
-public class PapyrusExampleInstallerWizard extends ExampleInstallerWizard {
-
-	@SuppressWarnings("nls")
-	@Override
-	/**
-	 * @see org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard#loadFromExtensionPoints()
-	 * 
-	 *      identical copy from superclass with one exception: do not stop after the processing of a single extension point
-	 */
-	protected void loadFromExtensionPoints() {
-		projectDescriptors = new ArrayList<ProjectDescriptor>();
-		filesToOpen = new ArrayList<FileToOpen>();
-
-		String wizardID = wizardConfigurationElement.getAttribute("id");
-
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CommonUIPlugin.INSTANCE.getSymbolicName(), "examples");
-		IConfigurationElement[] exampleElements = extensionPoint.getConfigurationElements();
-		for (int i = 0; i < exampleElements.length; i++) {
-			IConfigurationElement exampleElement = exampleElements[i];
-			if ("example".equals(exampleElement.getName()) && wizardID.equals(exampleElement.getAttribute("wizardID"))) {
-				IConfigurationElement[] projectDescriptorElements = exampleElement.getChildren("projectDescriptor");
-				for (int j = 0; j < projectDescriptorElements.length; j++) {
-					IConfigurationElement projectDescriptorElement = projectDescriptorElements[j];
-					String projectName = projectDescriptorElement.getAttribute("name");
-					if (projectName != null) {
-						String contentURI = projectDescriptorElement.getAttribute("contentURI");
-						if (contentURI != null) {
-							AbstractExampleInstallerWizard.ProjectDescriptor projectDescriptor = new AbstractExampleInstallerWizard.ProjectDescriptor();
-							projectDescriptor.setName(projectName);
-
-							URI uri = URI.createURI(contentURI);
-							if (uri.isRelative()) {
-								uri = URI.createPlatformPluginURI(projectDescriptorElement.getContributor().getName() + "/" + contentURI, true);
-							}
-							projectDescriptor.setContentURI(uri);
-
-							projectDescriptor.setDescription(projectDescriptorElement.getAttribute("description"));
-
-							projectDescriptors.add(projectDescriptor);
-						}
-					}
-				}
-
-				if (!projectDescriptors.isEmpty()) {
-					IConfigurationElement[] openElements = exampleElement.getChildren("fileToOpen");
-					for (int j = 0; j < openElements.length; j++) {
-						IConfigurationElement openElement = openElements[j];
-						String location = openElement.getAttribute("location");
-						if (location != null) {
-							AbstractExampleInstallerWizard.FileToOpen fileToOpen = new AbstractExampleInstallerWizard.FileToOpen();
-							fileToOpen.setLocation(location);
-							fileToOpen.setEditorID(openElement.getAttribute("editorID"));
-							filesToOpen.add(fileToOpen);
-						}
-					}
-
-					String imagePath = exampleElement.getAttribute("pageImage");
-					if (imagePath != null) {
-						imagePath = imagePath.replace('\\', '/');
-						if (!imagePath.startsWith("/")) {
-							imagePath = "/" + imagePath;
-						}
-
-						Bundle pluginBundle = Platform.getBundle(exampleElement.getDeclaringExtension().getContributor().getName());
-						try {
-							ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(pluginBundle.getEntry(imagePath));
-							setDefaultPageImageDescriptor(imageDescriptor);
-						} catch (Exception e) {
-							// Ignore
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	@Override
-	/**
-	 * @see org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard#openEditor(org.eclipse.core.resources.IFile, java.lang.String)
-	 *
-	 *      Only change compared to superclass: don't pass IWorkbenchPage.MATCH_ID
-	 */
-	protected void openEditor(IFile file, String editorID) throws PartInitException {
-		IEditorRegistry editorRegistry = getWorkbench().getEditorRegistry();
-		if (editorID == null || editorRegistry.findEditor(editorID) == null) {
-			editorID = getWorkbench().getEditorRegistry().getDefaultEditor(file.getFullPath().toString()).getId();
-		}
-
-		IWorkbenchPage page = getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		page.openEditor(new FileEditorInput(file), editorID, true);
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard#performFinish()
-	 *
-	 *      Only copy selected files
-	 */
-	@Override
-	public boolean performFinish() {
-		Control control = projectPage.getControl();
-		// get selection index from list. The following code depends on the super class implementation, but this is the only way
-		// to obtain the selection, since projectPage.projectList and projectPage.getSelectedProjectDescriptor are not accessible
-		if (control instanceof Composite) {
-			Control list = ((Composite) control).getChildren()[0];
-			if (list instanceof List) {
-				int index = ((List) list).getSelectionIndex();
-
-				// remove all but selected projects from list
-				FileToOpen fileToOpen = filesToOpen.get(index);
-				ProjectDescriptor projectToCreate = projectDescriptors.get(index);
-				projectDescriptors.clear();
-				filesToOpen.clear();
-				projectDescriptors.add(projectToCreate);
-				filesToOpen.add(fileToOpen);
-			}
-		}
-		return super.performFinish();
-	}
-}
diff --git a/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.tests/META-INF/MANIFEST.MF b/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.tests/META-INF/MANIFEST.MF
index 86dba585a..b73bdf79a 100644
--- a/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.tests/META-INF/MANIFEST.MF
+++ b/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.tests/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100",
  org.eclipse.uml2.uml.resources;bundle-version="5.2.0",
  org.eclipse.papyrus.designer.languages.cpp.library.ui;bundle-version="1.0.4",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.0.4"
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.0.4",
+ org.eclipse.papyrus.uml.architecture;bundle-version="1.0.0"
 Export-Package: org.eclipse.papyrus.designer.languages.cpp.codegen.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/pom.xml b/pom.xml
index 4cbb8f042..e9f1f530d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 		<component.package.rootname>org.eclipse.papyrus.designer</component.package.rootname>
 		<component.rcp.name>org.eclipse.papyrus.designer.rcp</component.rcp.name>
 		<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/designer/</component.apibaseline.url>
-		<eclipse.targetrelease>neon</eclipse.targetrelease>
+		<eclipse.targetrelease>oxygen</eclipse.targetrelease>
 		<target.version>1.0.5-SNAPSHOT</target.version>
 	</properties>
 
diff --git a/releng/org.eclipse.papyrus.designer.feature/feature.xml b/releng/org.eclipse.papyrus.designer.feature/feature.xml
index 57de72e8e..e9c54bcfd 100644
--- a/releng/org.eclipse.papyrus.designer.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.designer.feature/feature.xml
@@ -54,7 +54,7 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.papyrus.sdk.feature" version="2.0.0" match="compatible"/>
+      <import feature="org.eclipse.papyrus.sdk.feature" version="3.0.0" match="compatible"/>
    </requires>
 
 </feature>
diff --git a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
index 923823c73..4e2c31ae3 100644
--- a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
+++ b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
@@ -187,8 +187,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.papyrus.designer.feature"/>
       <feature id="org.eclipse.papyrus.designer.rcp.feature"/>
       <feature id="org.eclipse.rcp"/>
-      <feature id="org.eclipse.papyrus.customization.feature"/>
       <feature id="org.eclipse.papyrus.editor.feature"/>
+      <feature id="org.eclipse.papyrus.infra.architecture.feature"/>
       <feature id="org.eclipse.papyrus.infra.core.feature"/>
       <feature id="org.eclipse.papyrus.infra.feature"/>
       <feature id="org.eclipse.papyrus.infra.gmfdiag.feature"/>
@@ -217,6 +217,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.papyrus.emf.facet.feature"/>
       <feature id="org.eclipse.papyrus.infra.viewpoints.feature"/>
       <feature id="org.eclipse.papyrus.uml.decoratormodel.feature"/>
+      <feature id="org.eclipse.papyrus.uml.architecture.feature"/>
       <feature id="org.eclipse.papyrus.uml.assistants.feature"/>
    </features>
 
diff --git a/src/site/xdoc/developer/index.xml b/src/site/xdoc/developer/index.xml
index 0b3fadc42..c8f5de4d3 100644
--- a/src/site/xdoc/developer/index.xml
+++ b/src/site/xdoc/developer/index.xml
@@ -38,10 +38,11 @@
 			</subsection>
 			<subsection name="Target Environment">
 				<p>We have developed a target-platform-configuration artifact located at /org.eclipse.papyrus-designer/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/org.eclipse.papyrus.designer.targetplatform.neon.target</p>
+				<p>Another target-platform-configuration is located at /org.eclipse.papyrus-designer/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/org.eclipse.papyrus.designer.targetplatform.oxygen.target</p>
 				<p>Open it and click at the upper right corner to set it has the target platform.</p>
 			</subsection>
 		</section>
 
 	</body>
 
-</document>
\ No newline at end of file
+</document>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/org.eclipse.papyrus.designer.targetplatform.neon.target b/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/org.eclipse.papyrus.designer.targetplatform.neon.target
deleted file mode 100644
index 1278f8247..000000000
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/org.eclipse.papyrus.designer.targetplatform.neon.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Papyrus Neon Papyrus 2.0" sequenceNumber="1466666614">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/neon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.marte.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.marte.view.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.marte.textedit.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/marte/neon/"/>
-</location>
-<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-neon-developper-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-</locations>
-</target>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/.project b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/.project
index 59c159028..04b2dbe00 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/.project
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly</name>
+	<name>org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/.settings/org.eclipse.core.resources.prefs
index 99f26c020..99f26c020 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/.settings/org.eclipse.core.resources.prefs
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/.settings/org.eclipse.core.resources.prefs
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/.settings/org.eclipse.m2e.core.prefs b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/.settings/org.eclipse.m2e.core.prefs
index f897a7f1c..f897a7f1c 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/.settings/org.eclipse.m2e.core.prefs
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/.settings/org.eclipse.m2e.core.prefs
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly.target b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly.target
index 851f0d7b2..062429191 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly.target
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly.target
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Neon Nightly" sequenceNumber="1466666549">
+<target name="Papyrus oxygen Nightly" sequenceNumber="1466666549">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -12,21 +11,21 @@
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
+      <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-neon-papyrus-nighlty" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/"/>
+      <repository id="eclipse-oxygen-papyrus-nighlty" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.marte.core.feature.feature.group" version="0.0.0"/>
 	  <unit id="org.eclipse.papyrus.marte.view.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.marte.textedit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-neon-papyrus-extra-nighlty" location="https://hudson.eclipse.org/papyrus/view/Marte/job/papyrus-marte-neon/ws/releng/org.eclipse.papyrus.marte.p2/target/repository/"/>
+      <repository id="eclipse-neon-papyrus-extra-nightly" location="https://hudson.eclipse.org/papyrus/view/Marte/job/papyrus-marte-neon/ws/releng/org.eclipse.papyrus.marte.p2/target/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-neon-developper-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository/"/>
+      <repository id="papyrus-oxygen-developper-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
   </locations>
 </target>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/pom.xml b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/pom.xml
index 01843409b..0a52ac0da 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly/pom.xml
@@ -7,8 +7,8 @@
 		<artifactId>org.eclipse.papyrus.designer.targetplatform</artifactId>
 		<version>1.0.5-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly</artifactId>
+	<artifactId>org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly</name>
-	<description>This plug-in contains the target definition for Papyrus Designer in Neon with Papyrus nightly.</description>
-</project>
\ No newline at end of file
+	<name>org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly</name>
+	<description>This plug-in contains the target definition for Papyrus Designer in Oxygen with Papyrus nightly.</description>
+</project>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/.project b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/.project
index 8a6ac385b..0a5cf4d3e 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/.project
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.designer.targetplatform.neon</name>
+	<name>org.eclipse.papyrus.designer.targetplatform.oxygen</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/.settings/org.eclipse.core.resources.prefs
index 99f26c020..99f26c020 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/.settings/org.eclipse.core.resources.prefs
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/.settings/org.eclipse.core.resources.prefs
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/.settings/org.eclipse.m2e.core.prefs b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/.settings/org.eclipse.m2e.core.prefs
index f897a7f1c..f897a7f1c 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/.settings/org.eclipse.m2e.core.prefs
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/.settings/org.eclipse.m2e.core.prefs
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/org.eclipse.papyrus.designer.targetplatform.oxygen.target b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/org.eclipse.papyrus.designer.targetplatform.oxygen.target
new file mode 100644
index 000000000..f10c60199
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/org.eclipse.papyrus.designer.targetplatform.oxygen.target
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Papyrus oxygen Papyrus 3.0" sequenceNumber="1466666614">
+<locations>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
+		<repository location="http://download.eclipse.org/releases/oxygen/"/>
+	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<unit id="org.eclipse.papyrus.marte.core.feature.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.papyrus.marte.view.feature.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.papyrus.marte.textedit.feature.feature.group" version="0.0.0"/>
+		<repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/marte/neon/"/>
+	</location>
+	<location includeAllPlatforms="false" includeMode="planner" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+		<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+		<repository id="papyrus-oxygen-developer-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+	</location>
+	<location includeAllPlatforms="false" includeMode="planner" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+		<unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="0.0.0"/>
+		<repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases/"/>
+	</location>
+</locations>
+</target>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/pom.xml b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/pom.xml
index 9e45aaa42..fadbe2cf6 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.neon/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.oxygen/pom.xml
@@ -6,8 +6,8 @@
 		<groupId>org.eclipse.papyrus.designer</groupId>
 		<version>1.0.5-SNAPSHOT</version>
 	</parent>	
-	<artifactId>org.eclipse.papyrus.designer.targetplatform.neon</artifactId>
+	<artifactId>org.eclipse.papyrus.designer.targetplatform.oxygen</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>org.eclipse.papyrus.designer.targetplatform.neon</name>
-	<description>This plug-in contains the target definition for Papyrus Designer in Neon.</description>
-</project>
\ No newline at end of file
+	<name>org.eclipse.papyrus.designer.targetplatform.oxygen</name>
+	<description>This plug-in contains the target definition for Papyrus Designer in Oxygen.</description>
+</project>
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 401f71794..3d86303ad 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -11,28 +11,27 @@
 	<packaging>pom</packaging>
 	<name>Designer Target Platform</name>
 	<description>This module contains the different Eclipse target platform definitions.</description>
-
 	<profiles>
 		<profile>
-			<id>neon</id>
+			<id>oxygen</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<module>org.eclipse.papyrus.designer.targetplatform.neon</module>
+				<module>org.eclipse.papyrus.designer.targetplatform.oxygen</module>
 			</modules>
 		</profile>
 		<profile>
-			<id>neon-papyrusnightly</id>
+			<id>oxygen-papyrusnightly</id>
 			<activation>
 				<property>
 					<name>eclipse.targetrelease</name>
-					<value>neon-papyrusnightly</value>
+					<value>oxygen-papyrusnightly</value>
 				</property>
 			</activation>
 			<modules>
-				<module>org.eclipse.papyrus.designer.targetplatform.neon-papyrusnightly</module>
+				<module>org.eclipse.papyrus.designer.targetplatform.oxygen-papyrusnightly</module>
 			</modules>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/transformation/org.eclipse.papyrus.designer.transformation.library/META-INF/MANIFEST.MF b/transformation/org.eclipse.papyrus.designer.transformation.library/META-INF/MANIFEST.MF
index 685b9f060..a89c13232 100644
--- a/transformation/org.eclipse.papyrus.designer.transformation.library/META-INF/MANIFEST.MF
+++ b/transformation/org.eclipse.papyrus.designer.transformation.library/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.core.resources,
  org.eclipse.papyrus.designer.languages.cpp.profile;bundle-version="0.7.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="2.0.0",
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
diff --git a/transformation/org.eclipse.papyrus.designer.transformation.library/plugin.xml b/transformation/org.eclipse.papyrus.designer.transformation.library/plugin.xml
index 1bc162694..1649bb5b1 100644
--- a/transformation/org.eclipse.papyrus.designer.transformation.library/plugin.xml
+++ b/transformation/org.eclipse.papyrus.designer.transformation.library/plugin.xml
@@ -140,7 +140,7 @@
       <wizard
             canFinishEarly="false"
 			category="org.eclipse.ui.Examples/org.eclipse.papyrus.examples"
-            class="org.eclipse.papyrus.uml.diagram.wizards.wizardstmp.PapyrusExampleInstallerWizard"
+            class="org.eclipse.papyrus.uml.diagram.wizards.wizards.PapyrusExampleInstallerWizard"
             finalPerspective="org.eclipse.papyrus.infra.core.perspective"
             icon="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/designer-16x16.gif"
             id="org.eclipse.papyrus.designer.examples.category.DesignerExamplesWithM2Mtrafo.installer"
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.core/META-INF/MANIFEST.MF b/ucm/org.eclipse.papyrus.designer.ucm.core/META-INF/MANIFEST.MF
index 1d399463a..2a0bd4a88 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.core/META-INF/MANIFEST.MF
+++ b/ucm/org.eclipse.papyrus.designer.ucm.core/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Require-Bundle: org.eclipse.papyrus.infra.types;bundle-version="2.0.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0",
  org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="2.0.0",
  org.eclipse.uml2.uml;bundle-version="5.2.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
@@ -18,6 +17,7 @@ Require-Bundle: org.eclipse.papyrus.infra.types;bundle-version="2.0.0",
  org.eclipse.papyrus.designer.ucm.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.ucm.supplement.profile;bundle-version="0.7.0"
 Export-Package: org.eclipse.papyrus.designer.ucm.core,
+ org.eclipse.papyrus.designer.ucm.core.commands,
  org.eclipse.papyrus.designer.ucm.core.provider,
  org.eclipse.papyrus.designer.ucm.core.types,
  org.eclipse.papyrus.designer.ucm.core.types.advice,
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations b/ucm/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations
index 120f61ee1..b0d0a5cdb 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations
+++ b/ucm/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations
@@ -1,392 +1,373 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcB" identifier="org.eclipse.papyrus.designer.ucm.core.elementTypeSet" name="UCM" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PlJqjlj354Wnbt9JeO78zA" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentType" name="Component type">
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcB" identifier="org.eclipse.papyrus.designer.ucm.core.elementTypeSet" name="UCM" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PlJqjlj354Wnbt9JeO78zA" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentType" name="Component type" hint="UML::Class">
     <iconEntry xmi:id="_ZoA2sCjSEeWnbt9JeO78zA" iconPath="/resources/icons/ucm/ComponentType.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_aFigMCjSEeWnbt9JeO78zA" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ComponentTypeEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::ComponentType</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_J7_dIKaHEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation" name="Atomic component implementation">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_J7_dIKaHEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation" name="Atomic component implementation" hint="UML::Class">
     <iconEntry xmi:id="_J7_dIaaHEeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/AtomicComponentImplementation.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_J7_dIqaHEeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ComponentImplementationEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::AtomicComponentImplementation</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_KLxlkKaHEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation" name="Composite component implementation">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_KLxlkKaHEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation" name="Composite component implementation" hint="UML::Class">
     <iconEntry xmi:id="_KLxlkaaHEeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/CompositeComponentImplementation.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_KLxlkqaHEeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ComponentImplementationEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::CompositeComponentImplementation</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_cRZi0Ka2EeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ApplicationModule" name="Applcation module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_cRZi0Ka2EeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ApplicationModule" name="Applcation module" hint="UML::Package">
     <iconEntry xmi:id="_cRZi0aa2EeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/ApplicationModule.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_cRZi0qa2EeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_commons::ApplicationModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_pG3ZYKa2EeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentModule" name="Component module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_pG3ZYKa2EeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentModule" name="Component module" hint="UML::Package">
     <iconEntry xmi:id="_pG3ZYaa2EeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/ComponentModule.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_pG3ZYqa2EeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::ComponentModel</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ptPc4Ka2EeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ContractModule" name="Contract module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ptPc4Ka2EeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ContractModule" name="Contract module" hint="UML::Package">
     <iconEntry xmi:id="_ptPc4aa2EeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/ContractModule.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_ptPc4qa2EeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_contracts::ContractModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ZL5FQKbIEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.PlatformModule" name="Platform module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ZL5FQKbIEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.PlatformModule" name="Platform module" hint="UML::Package">
     <iconEntry xmi:id="_ZL5FQabIEeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/PlatformModule.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_ZL5FQqbIEeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_common::PlatformModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_AYkBwMKkEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule" name="Interaction definition module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_AYkBwMKkEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule" name="Interaction definition module" hint="UML::Package">
     <iconEntry xmi:id="_AYkBwcKkEeaZYOYMFPracQ" iconPath="/resources/icons/ucm/InteractionModule.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_AYkBwsKkEeaZYOYMFPracQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_AYkBw8KkEeaZYOYMFPracQ" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_interactions::InteractionDefinitionModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_5YxFALvHEeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.AllocationPlan" name="Allocation plan">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_5YxFALvHEeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.AllocationPlan" name="Allocation plan" hint="UML::Package">
     <iconEntry xmi:id="_5YxFAbvHEeagON7A6uz3tw" iconPath="/resources/icons/ext_ucm/AllocationPlan.png" bundleId="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_5YxsELvHEeagON7A6uz3tw" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCM_Supplement::ucm_deployment::AllocationPlan</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_OC0HoLvHEeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.TestCaseGroup" name="Test case group">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_OC0HoLvHEeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.TestCaseGroup" name="Test case group" hint="UML::Package">
     <iconEntry xmi:id="_OC0HobvHEeagON7A6uz3tw" iconPath="/resources/icons/ext_ucm/TestCaseGroup.png" bundleId="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_OC0HorvHEeagON7A6uz3tw" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCM_Supplement::ucm_test_cases::TestCaseGroup</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_T6e0wMJNEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.NonFunctionalAspectsModule" name="Non-functional aspects module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_T6e0wMJNEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.NonFunctionalAspectsModule" name="Non-functional aspects module" hint="UML::Package">
     <iconEntry xmi:id="_T6e0wcJNEeaZYOYMFPracQ" iconPath="/resources/icons/ucm/NonFunctionalAspectsModule.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_T6e0wsJNEeaZYOYMFPracQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_T6e0w8JNEeaZYOYMFPracQ" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_technicalpolicies::NonFunctionalAspectModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_zFX7wMJTEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.EnvironmentModule" name="Environment module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_zFX7wMJTEeaZYOYMFPracQ" description="" identifier="org.eclipse.papyrus.designer.ucm.core.EnvironmentModule" name="Environment module" hint="UML::Package">
     <iconEntry xmi:id="_zFYi0MJTEeaZYOYMFPracQ" iconPath="/resources/icons/ext_ucm/EnvironmentModule.png" bundleId="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_zFYi0cJTEeaZYOYMFPracQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_zFYi0sJTEeaZYOYMFPracQ" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCM_Supplement::ucm_environment::EnvironmentModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_J-zmcMKoEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.DeploymentModule" name="Deployment module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_J-zmcMKoEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.DeploymentModule" name="Deployment module" hint="UML::Package">
     <iconEntry xmi:id="_J-zmccKoEeaZYOYMFPracQ" iconPath="/resources/icons/ext_ucm/DeploymentModule.png" bundleId="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_J-zmcsKoEeaZYOYMFPracQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_J-zmc8KoEeaZYOYMFPracQ" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCM_Supplement::ucm_deployment::DeploymentModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EEve8MKsEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule" name="Resource definition module">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EEve8MKsEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule" name="Resource definition module" hint="UML::Package">
     <iconEntry xmi:id="_EEve8cKsEeaZYOYMFPracQ" iconPath="/resources/icons/ext_ucm/ResourceModule.png" bundleId="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_EEve8sKsEeaZYOYMFPracQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ModuleEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_EEve88KsEeaZYOYMFPracQ" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCM_Supplement::ucm_environment::ResourceDefinitionModule</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ATQgIKa6EeaAGI_5QNiFYQ" description="" identifier="org.eclipse.papyrus.designer.ucm.core.Port" name="Port">
-    <iconEntry xmi:id="_ATQgIaa6EeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/Port.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_ATQgIqa6EeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.PortEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_HPQyUO_fEeaaPuDhdgNw5w" matcherClassName="org.eclipse.papyrus.designer.ucm.core.types.matcher.PortMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_UH7sUKsfEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentTechnicalPolicy" name="Component technical policy">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_UH7sUKsfEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentTechnicalPolicy" name="Component technical policy" hint="UML::Class">
     <iconEntry xmi:id="_UH7sUasfEeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/TechnicalPolicy.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_UH7sUqsfEeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.TechnicalPolicyEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::ComponentTechnicalPolicy</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_UZsxwKsfEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentPortTechnicalPolicy" name="Component port technical policy">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_UZsxwKsfEeaAGI_5QNiFYQ" description="" identifier="org.eclipse.papyrus.designer.ucm.core.ComponentPortTechnicalPolicy" name="Component port technical policy">
     <iconEntry xmi:id="_UZsxwasfEeaAGI_5QNiFYQ" iconPath="/resources/icons/ucm/TechnicalPolicy.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_UZsxwqsfEeaAGI_5QNiFYQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.TechnicalPolicyEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::ComponentPortTechnicalPolicy</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PeEM8K2KEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.AffectPolicy" name="Affect policy">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PeEM8K2KEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.AffectPolicy" name="Affect policy" hint="UML::Class">
     <iconEntry xmi:id="_PeEM8a2KEea8u6I-XjDezQ" iconPath="/resources/icons/ucm/TechnicalPolicy.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_PeEM8q2KEea8u6I-XjDezQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.AffectPolicyEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_S_C10MEREeaLpumP_4vuow" identifier="org.eclipse.papyrus.designer.ucm.core.AffectPolicyDef" name="Affect policy definition">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_S_C10MEREeaLpumP_4vuow" identifier="org.eclipse.papyrus.designer.ucm.core.AffectPolicyDef" name="Affect policy definition" hint="UML::Class">
     <iconEntry xmi:id="_S_C10cEREeaLpumP_4vuow" iconPath="/resources/icons/ucm/TechnicalPolicy.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_S_C10sEREeaLpumP_4vuow" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.AffectPolicyDefEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_BiIVMK2YEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.Connection" name="Connection">
-    <iconEntry xmi:id="_BiI8QK2YEea8u6I-XjDezQ" iconPath="/resources/icons/ucm/Connection.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_BiI8Qa2YEea8u6I-XjDezQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ConnectionEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
-      <stereotypesQualifiedNames>UCMProfile::ucm_components::Connection</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_CKMawK2YEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.ConnectionLink" name="ConnectionLink">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_CKMawK2YEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.ConnectionLink" name="ConnectionLink" hint="UML::Connector">
     <iconEntry xmi:id="_CKMawa2YEea8u6I-XjDezQ" iconPath="/resources/icons/ucm/ConnectionLink.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_CKMawq2YEea8u6I-XjDezQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ConnectionLinkEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::ConnectionLink</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Connector"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__s3PYLu-EeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.Delegation" name="Delegation">
-    <iconEntry xmi:id="__s3PYbu-EeagON7A6uz3tw" iconPath="/resources/icons/ucm/ConnectionLink.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="__s3PYru-EeagON7A6uz3tw" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.DelegationEditHelperAdvice"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qfSAcK2eEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.AssemblyPart" name="Assembly part">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qfSAcK2eEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.designer.ucm.core.AssemblyPart" name="Assembly part" hint="UML::Propertyg">
     <iconEntry xmi:id="_qfSAca2eEea8u6I-XjDezQ" iconPath="/resources/icons/ucm/AssemblyPart.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_qfSAcq2eEea8u6I-XjDezQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.AssemblyPartEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_components::AssemblyPart</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_mlq3oLrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition" name="Connector definition">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_mlq3oLrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition" name="Connector definition" hint="Class">
     <iconEntry xmi:id="_mlq3obrxEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/ConnectorDefinition.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_mlq3orrxEeaKr_s25plyiQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ConnectorDefinitionEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_interactions::ConnectorDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_-9J_4LrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.ConnectorPort" name="Connector port">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_-9J_4LrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.ConnectorPort" name="Connector port" hint="UML::Property">
     <iconEntry xmi:id="_-9J_4brxEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/ConnectorPort.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_-9J_4rrxEeaKr_s25plyiQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ConnectorPortEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_interactions::ConnectorPort</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__THo0LrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.PortType" name="Port type">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__THo0LrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.PortType" name="Port type" hint="UML::Class">
     <iconEntry xmi:id="__THo0brxEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/PortType.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="__THo0rrxEeaKr_s25plyiQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.PortTypeEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_interactions::PortType</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__Z174LrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.PortElement" name="Port element">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__Z174LrxEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.PortElement" name="Port element" hint="UML::Property">
     <iconEntry xmi:id="__Z174brxEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/ConnectorDefinition.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="__Z174rrxEeaKr_s25plyiQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.PortElementEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_interactions::PortElement</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_cd32ULrzEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.TechnicalPolicyDefinition" name="Technical policy definition">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_cd32ULrzEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.TechnicalPolicyDefinition" name="Technical policy definition" hint="UML::Class">
     <iconEntry xmi:id="_cd32UbrzEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/TechnicalPolicy.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_cd32UrrzEeaKr_s25plyiQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.TechnicalPolicyDefinitionEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_technicalpolicies::TechnicalPolicyDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_cz6XwLrzEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.TechnicalAspect" name="Technical aspect">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_cz6XwLrzEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.TechnicalAspect" name="Technical aspect" hint="UML::Class">
     <iconEntry xmi:id="_cz6XwbrzEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/TechnicalAspect.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_cz6XwrrzEeaKr_s25plyiQ" description="Advice for CompositeComponentImplementation" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.TechnicalAspectEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_technicalpolicies::TechnicalAspect</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_c8Aj0LrzEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages" name="Programming languages">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_c8Aj0LrzEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages" name="Programming languages" hint="UML::Package">
     <iconEntry xmi:id="_c8Aj0brzEeaKr_s25plyiQ" iconPath="/resources/icons/ucm/ProgrammingLanguages.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_c8Aj0rrzEeaKr_s25plyiQ" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.ProgrammingLanguagesEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_technicalpolicies::ProgrammingLanguages</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_zr5SgMCNEeaLpumP_4vuow" identifier="org.eclipse.papyrus.designer.ucm.core.Language" name="Language">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_zr5SgMCNEeaLpumP_4vuow" identifier="org.eclipse.papyrus.designer.ucm.core.Language" name="Language" hint="UML::Class">
     <iconEntry xmi:id="_zr5SgcCNEeaLpumP_4vuow" iconPath="/resources/icons/ucm/Language.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_zr5SgsCNEeaLpumP_4vuow" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.LanguageEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_zr5Sg8CNEeaLpumP_4vuow" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_technicalpolicies::Language</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__WsRcLvGEeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.AppAssembly" name="Application assembly">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__WsRcLvGEeagON7A6uz3tw" identifier="org.eclipse.papyrus.designer.ucm.core.AppAssembly" name="Application assembly" hint="UML::Class">
     <iconEntry xmi:id="__WsRcbvGEeagON7A6uz3tw" iconPath="/resources/icons/ext_ucm/AppAssembly.png" bundleId="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="__WsRcrvGEeagON7A6uz3tw" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.AppAssemblyEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCM_Supplement::ucm_deployment::AppAssembly</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_NmJkgL5eEeaSV_z7ahpr-g" identifier="org.eclipse.papyrus.designer.ucm.core.InteractionPattern" name="Interaction Pattern">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_NmJkgL5eEeaSV_z7ahpr-g" identifier="org.eclipse.papyrus.designer.ucm.core.InteractionPattern" name="Interaction Pattern" hint="UML::Class">
     <iconEntry xmi:id="_NmJkgb5eEeaSV_z7ahpr-g" iconPath="/resources/icons/ucm/InteractionPattern.png" bundleId="org.eclipse.papyrus.designer.ucm.profile"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_NmJkgr5eEeaSV_z7ahpr-g" description="" editHelperAdviceClassName="org.eclipse.papyrus.designer.ucm.core.types.advice.InteractionPatternEditHelperAdvice"/>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_WkxooMBcEea0otz58s7TCw" profileUri="http://www.omg.org/ucm/0.9">
       <stereotypesQualifiedNames>UCMProfile::ucm_interactions::InteractionPattern</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" description="ComponentType" target="_PlJqjlj354Wnbt9JeO78zA">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" description="ComponentType" identifier="org.eclipse.papyrus.desinger.ucm.apply.ComponentType" target="_PlJqjlj354Wnbt9JeO78zA">
     <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UCMProfile::ucm_components::ComponentType" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_KvevkKaHEeaAGI_5QNiFYQ" description="AtomicImplementation" target="_J7_dIKaHEeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_KvevkKaHEeaAGI_5QNiFYQ" description="AtomicImplementation" identifier="org.eclipse.papyrus.desinger.ucm.apply.ComponentImpl" target="_J7_dIKaHEeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_KvevkaaHEeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_components::AtomicComponentImplementation" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_K8htEKaHEeaAGI_5QNiFYQ" description="CompositeImplementation" target="_KLxlkKaHEeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_K8htEKaHEeaAGI_5QNiFYQ" description="CompositeImplementation" identifier="org.eclipse.papyrus.desinger.ucm.apply.CompositeImpl" target="_KLxlkKaHEeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_K8htEaaHEeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_components::CompositeComponentImplementation" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ILUeAKa5EeaAGI_5QNiFYQ" description="ApplicationModule" target="_cRZi0Ka2EeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ILUeAKa5EeaAGI_5QNiFYQ" description="ApplicationModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.ApplicationModule" target="_cRZi0Ka2EeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_ILUeAaa5EeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_commons::ApplicationModule" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_IaGg4Ka5EeaAGI_5QNiFYQ" description="ComponentModule" target="_pG3ZYKa2EeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_IaGg4Ka5EeaAGI_5QNiFYQ" description="ComponentModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.ComponentModule" target="_pG3ZYKa2EeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_IaGg4aa5EeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_components::ComponentModule" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_IlHeEKa5EeaAGI_5QNiFYQ" description="ContractModule" target="_ptPc4Ka2EeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_IlHeEKa5EeaAGI_5QNiFYQ" description="ContractModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.ContractModule" target="_ptPc4Ka2EeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_IlHeEaa5EeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_contracts::ContractModule" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_sR7iAKbIEeaAGI_5QNiFYQ" description="PlatformModule" target="_ZL5FQKbIEeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_sR7iAKbIEeaAGI_5QNiFYQ" description="PlatformModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.PlatformModule" target="_ZL5FQKbIEeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_sR7iAabIEeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_common::PlatformModule" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ScN0cMKkEeaZYOYMFPracQ" description="InteractionDefinitionModule" target="_AYkBwMKkEeaZYOYMFPracQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ScN0cMKkEeaZYOYMFPracQ" description="InteractionDefinitionModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.IDModule" target="_AYkBwMKkEeaZYOYMFPracQ">
     <stereotypesToApply xmi:id="_ScN0ccKkEeaZYOYMFPracQ" stereotypeQualifiedName="UCMProfile::ucm_interactions::InteractionDefinitionModule" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_Da4KkMJUEeaZYOYMFPracQ" description="EnvironmentModule" target="_zFX7wMJTEeaZYOYMFPracQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_Da4KkMJUEeaZYOYMFPracQ" description="EnvironmentModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.EnvironmentModule" target="_zFX7wMJTEeaZYOYMFPracQ">
     <stereotypesToApply xmi:id="_Da4KkcJUEeaZYOYMFPracQ" stereotypeQualifiedName="UCM_Supplement::ucm_environment::EnvironmentModule" updateName="true">
       <requiredProfiles>UCM_Supplement</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TBvmkMKoEeaZYOYMFPracQ" description="DeploymentModule" target="_J-zmcMKoEeaZYOYMFPracQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TBvmkMKoEeaZYOYMFPracQ" description="DeploymentModule" identifier="org.eclipse.papyrus.desinger.ucm.apply.DeploymentModule" target="_J-zmcMKoEeaZYOYMFPracQ">
     <stereotypesToApply xmi:id="_TBvmkcKoEeaZYOYMFPracQ" stereotypeQualifiedName="UCM_Supplement::ucm_deployment::DeploymentModule" updateName="true">
       <requiredProfiles>UCM_Supplement</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JtGQ8KznEeaAGI_5QNiFYQ" description="Component technical policy" target="_UH7sUKsfEeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JtGQ8KznEeaAGI_5QNiFYQ" description="Component technical policy" identifier="org.eclipse.papyrus.desinger.ucm.apply.TechPolicy" target="_UH7sUKsfEeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_JtGQ8aznEeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_components::ComponentTechnicalPolicy" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_KQEbIKznEeaAGI_5QNiFYQ" description="Component Port technical policy" target="_UZsxwKsfEeaAGI_5QNiFYQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_KQEbIKznEeaAGI_5QNiFYQ" description="Component Port technical policy" identifier="org.eclipse.papyrus.desinger.ucm.apply.PortTechPolicy" target="_UZsxwKsfEeaAGI_5QNiFYQ">
     <stereotypesToApply xmi:id="_KQEbIaznEeaAGI_5QNiFYQ" stereotypeQualifiedName="UCMProfile::ucm_components::ComponentPortTechnicalPolicy" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_0JMIsK2YEea8u6I-XjDezQ" description="Connection" target="_BiIVMK2YEea8u6I-XjDezQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_0JMIsK2YEea8u6I-XjDezQ" description="Connection" identifier="org.eclipse.papyrus.desinger.ucm.apply.Connection">
     <stereotypesToApply xmi:id="_0JMIsa2YEea8u6I-XjDezQ" stereotypeQualifiedName="UCMProfile::ucm_components::Connection" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_0XdOMK2YEea8u6I-XjDezQ" description="ConnectionLink" target="_CKMawK2YEea8u6I-XjDezQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_0XdOMK2YEea8u6I-XjDezQ" description="ConnectionLink" identifier="org.eclipse.papyrus.desinger.ucm.apply.ConnectionLink" target="_CKMawK2YEea8u6I-XjDezQ">
     <stereotypesToApply xmi:id="_0XdOMa2YEea8u6I-XjDezQ" stereotypeQualifiedName="UCMProfile::ucm_components::ConnectionLink" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_w3sUAK2eEea8u6I-XjDezQ" description="Assembly part" target="_qfSAcK2eEea8u6I-XjDezQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_w3sUAK2eEea8u6I-XjDezQ" description="Assembly part" identifier="org.eclipse.papyrus.desinger.ucm.apply.ComponentType" target="_qfSAcK2eEea8u6I-XjDezQ">
     <stereotypesToApply xmi:id="_w3sUAa2eEea8u6I-XjDezQ" stereotypeQualifiedName="UCMProfile::ucm_components::AssemblyPart" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tR--oLrxEeaKr_s25plyiQ" description="Connector definition" target="_mlq3oLrxEeaKr_s25plyiQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tR--oLrxEeaKr_s25plyiQ" description="Connector definition" identifier="org.eclipse.papyrus.desinger.ucm.apply.ConnectorDefinition" target="_mlq3oLrxEeaKr_s25plyiQ">
     <stereotypesToApply xmi:id="_tR--obrxEeaKr_s25plyiQ" stereotypeQualifiedName="UCMProfile::ucm_interactions::ConnectorDefinition" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_an96ELryEeaKr_s25plyiQ" description="Connector port" target="_-9J_4LrxEeaKr_s25plyiQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_an96ELryEeaKr_s25plyiQ" description="Connector port" identifier="org.eclipse.papyrus.desinger.ucm.apply.ConnectorPort" target="_-9J_4LrxEeaKr_s25plyiQ">
     <stereotypesToApply xmi:id="_an96EbryEeaKr_s25plyiQ" stereotypeQualifiedName="UCMProfile::ucm_interactions::ConnectorPort" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ayV-ELryEeaKr_s25plyiQ" description="Port type" target="__THo0LrxEeaKr_s25plyiQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ayV-ELryEeaKr_s25plyiQ" description="Port type" identifier="org.eclipse.papyrus.desinger.ucm.apply.PortType" target="__THo0LrxEeaKr_s25plyiQ">
     <stereotypesToApply xmi:id="_ayV-EbryEeaKr_s25plyiQ" stereotypeQualifiedName="UCMProfile::ucm_interactions::PortType" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_r1QakLr0EeaKr_s25plyiQ" identifier="" description="Technical policy definition" target="_cd32ULrzEeaKr_s25plyiQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_r1QakLr0EeaKr_s25plyiQ" description="Technical policy definition" identifier="org.eclipse.papyrus.desinger.ucm.apply.TechPolicyDef" target="_cd32ULrzEeaKr_s25plyiQ">
     <stereotypesToApply xmi:id="_r1Qakbr0EeaKr_s25plyiQ" stereotypeQualifiedName="UCMProfile::ucm_technicalpolicies::TechnicalPolicyDefinition" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_sqgnkLr0EeaKr_s25plyiQ" description="Technical aspect" target="_cz6XwLrzEeaKr_s25plyiQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_sqgnkLr0EeaKr_s25plyiQ" description="Technical aspect" identifier="org.eclipse.papyrus.desinger.ucm.apply.TechnicalAspect" target="_cz6XwLrzEeaKr_s25plyiQ">
     <stereotypesToApply xmi:id="_sqgnkbr0EeaKr_s25plyiQ" stereotypeQualifiedName="UCMProfile::ucm_technicalpolicies::TechnicalAspect" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tAuIILr0EeaKr_s25plyiQ" description="Programming languages" target="_c8Aj0LrzEeaKr_s25plyiQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tAuIILr0EeaKr_s25plyiQ" description="Programming languages" identifier="org.eclipse.papyrus.desinger.ucm.apply.ProgrammingLanguagee" target="_c8Aj0LrzEeaKr_s25plyiQ">
     <stereotypesToApply xmi:id="_tAuIIbr0EeaKr_s25plyiQ" stereotypeQualifiedName="UCMProfile::ucm_technicalpolicies::ProgrammingLanguages" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TMZ3oLvHEeagON7A6uz3tw" description="Application assembly" target="__WsRcLvGEeagON7A6uz3tw">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TMZ3oLvHEeagON7A6uz3tw" description="Application assembly" identifier="org.eclipse.papyrus.desinger.ucm.apply.ApplicationAssembly" target="__WsRcLvGEeagON7A6uz3tw">
     <stereotypesToApply xmi:id="_TMZ3obvHEeagON7A6uz3tw" stereotypeQualifiedName="UCM_Supplement::ucm_deployment::AppAssembly" updateName="true">
       <requiredProfiles>UCM_Supplement</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TdQXELvHEeagON7A6uz3tw" description="Test case group" target="_OC0HoLvHEeagON7A6uz3tw">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TdQXELvHEeagON7A6uz3tw" description="Test case group" identifier="org.eclipse.papyrus.desinger.ucm.apply.TestCaseGroup" target="_OC0HoLvHEeagON7A6uz3tw">
     <stereotypesToApply xmi:id="_TdQXEbvHEeagON7A6uz3tw" stereotypeQualifiedName="UCM_Supplement::ucm_test_cases::TestCaseGroup" updateName="true">
       <requiredProfiles>UCM_Supplement</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TqTUkLvHEeagON7A6uz3tw" description="Allocation plan" target="_5YxFALvHEeagON7A6uz3tw">
-    <stereotypesToApply xmi:id="_TqTUkbvHEeagON7A6uz3tw" stereotypeQualifiedName="UCM_Supplement::ucm_deployment::AllocationPlan" updateName="true"/>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_TqTUkLvHEeagON7A6uz3tw" description="Allocation plan" identifier="org.eclipse.papyrus.desinger.ucm.apply.AllocationPlan" target="_5YxFALvHEeagON7A6uz3tw">
+    <stereotypesToApply xmi:id="_TqTUkbvHEeagON7A6uz3tw" stereotypeQualifiedName="UCM_Supplement::ucm_deployment::AllocationPlan" updateName="true">
+      <requiredProfiles>UCM_Supplement</requiredProfiles>
+    </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_cBxgkL5eEeaSV_z7ahpr-g" description="Interaction pattern" target="_NmJkgL5eEeaSV_z7ahpr-g">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_cBxgkL5eEeaSV_z7ahpr-g" description="Interaction pattern" identifier="org.eclipse.papyrus.desinger.ucm.apply.InteractionPattern" target="_NmJkgL5eEeaSV_z7ahpr-g">
     <stereotypesToApply xmi:id="_cBxgkb5eEeaSV_z7ahpr-g" stereotypeQualifiedName="UCMProfile::ucm_interactions::InteractionPattern" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_BfMDQMCOEeaLpumP_4vuow" description="Language" target="_zr5SgMCNEeaLpumP_4vuow">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_BfMDQMCOEeaLpumP_4vuow" description="Language" identifier="org.eclipse.papyrus.desinger.ucm.apply.Language" target="_zr5SgMCNEeaLpumP_4vuow">
     <stereotypesToApply xmi:id="_BfMDQcCOEeaLpumP_4vuow" stereotypeQualifiedName="UCMProfile::ucm_technicalpolicies::Language" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_thVTIMJNEeaZYOYMFPracQ" description="Non-functional aspects module" target="_T6e0wMJNEeaZYOYMFPracQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_thVTIMJNEeaZYOYMFPracQ" description="Non-functional aspects module" identifier="org.eclipse.papyrus.desinger.ucm.apply.NonFunctAspectsModule" target="_T6e0wMJNEeaZYOYMFPracQ">
     <stereotypesToApply xmi:id="_thVTIcJNEeaZYOYMFPracQ" stereotypeQualifiedName="UCMProfile::ucm_technicalpolicies::NonFunctionalAspectModule" updateName="true">
       <requiredProfiles>UCMProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_R2pIkMKsEeaZYOYMFPracQ" description="ResourceDefinitionModule" target="_EEve8MKsEeaZYOYMFPracQ">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_R2pIkMKsEeaZYOYMFPracQ" description="ResourceDefinitionModule" identifier="org.eclipse.papyrus.desinger.WResourceDefModule" target="_EEve8MKsEeaZYOYMFPracQ">
     <stereotypesToApply xmi:id="_R2pIkcKsEeaZYOYMFPracQ" stereotypeQualifiedName="UCM_Supplement::ucm_environment::ResourceDefinitionModule" updateName="true">
       <requiredProfiles>UCM_Supplement</requiredProfiles>
     </stereotypesToApply>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/commands/CreateUCMModelCommand.java b/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/commands/CreateUCMModelCommand.java
new file mode 100644
index 000000000..7a60a8853
--- /dev/null
+++ b/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/commands/CreateUCMModelCommand.java
@@ -0,0 +1,129 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and Thales
+ *
+ *
+ * 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:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr (based on similar file
+ *  							from Remi Schnekenburger)
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.designer.ucm.core.commands;
+
+import java.util.Collections;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.designer.ucm.core.Activator;
+import org.eclipse.papyrus.designer.ucm.profile.UCMProfile.util.UCMResource;
+import org.eclipse.papyrus.designer.ucm.supplement.profile.UCM_Supplement.util.UCMSuppResource;
+import org.eclipse.papyrus.designer.ucm.types.profile.UCMTypes.util.UCMTypesResource;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.UMLFactory;
+
+
+/**
+ * The Class CreateSysMLModelCommand.
+ */
+public class CreateUCMModelCommand implements IModelCreationCommand {
+
+	@Override
+	public void createModel(final ModelSet modelSet) {
+		runAsTransaction(modelSet);
+	}
+
+	protected void runAsTransaction(final ModelSet modelSet) {
+		// Get the UML element to which the newly created diagram will be
+		// attached.
+		// Create the diagram
+		final Resource modelResource = UmlUtils.getUmlResource(modelSet);
+		TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
+
+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "Initialize model", Collections.EMPTY_LIST) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				EObject model = getRootElement(modelResource);
+				attachModelToResource(model, modelResource);
+
+				initializeModel(model);
+				return CommandResult.newOKCommandResult();
+
+			}
+		};
+		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
+	}
+
+	protected EObject getRootElement(Resource modelResource) {
+		EObject rootElement = null;
+		if (modelResource != null && modelResource.getContents() != null && modelResource.getContents().size() > 0) {
+			Object root = modelResource.getContents().get(0);
+			if (root instanceof EObject) {
+				rootElement = (EObject) root;
+			}
+		} else {
+			rootElement = createRootElement();
+		}
+		return rootElement;
+	}
+
+	protected EObject createRootElement() {
+		return UMLFactory.eINSTANCE.createModel();
+	}
+
+	protected void attachModelToResource(EObject root, Resource resource) {
+		resource.getContents().add(root);
+	}
+
+	protected void initializeModel(EObject owner) {
+		((org.eclipse.uml2.uml.Package) owner).setName(getModelName());
+
+		// Retrieve UCM profile and apply with Sub-profiles
+		Profile profile = (Profile) PackageUtil.loadPackage(URI.createURI(UCMResource.PROFILE_PATH), owner.eResource().getResourceSet());
+		if (profile != null) {
+			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package) owner), profile, true);
+		} else {
+			Activator.log.error("Impossible to find UCM profile", null);
+		}
+		// Retrieve UCM profile and apply with Sub-profiles
+		profile = (Profile) PackageUtil.loadPackage(URI.createURI(UCMSuppResource.PROFILE_PATH), owner.eResource().getResourceSet());
+		if (profile != null) {
+			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package) owner), profile, true);
+		} else {
+			Activator.log.error("Impossible to find UCM supplement profile", null);
+		}
+		// Retrieve UCM profile and apply with Sub-profiles
+		profile = (Profile) PackageUtil.loadPackage(URI.createURI(UCMTypesResource.PROFILE_PATH), owner.eResource().getResourceSet());
+		if (profile != null) {
+			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package) owner), profile, true);
+		} else {
+			Activator.log.error("Impossible to find UCM types profile", null);
+		}
+	}
+
+	/**
+	 * Gets the model name.
+	 *
+	 * @return the model name
+	 */
+	protected String getModelName() {
+		return "UCMModel"; //$NON-NLS-1$
+	}
+}
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/types/ElementTypeUtils.java b/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/types/ElementTypeUtils.java
index e2bc8dadb..e7a9c654a 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/types/ElementTypeUtils.java
+++ b/ucm/org.eclipse.papyrus.designer.ucm.core/src/org/eclipse/papyrus/designer/ucm/core/types/ElementTypeUtils.java
@@ -126,7 +126,7 @@ public class ElementTypeUtils {
 	public static ICommand getConfigureAsCommand(IElementType type, EObject object) {
 		ICommand result;
 
-		IElementEditService edit = ElementEditServiceUtils.getCommandProvider(type);
+		IElementEditService edit = ElementEditServiceUtils.getCommandProvider(object);
 
 		if (edit == null) {
 			// Can't do it
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/META-INF/MANIFEST.MF b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/META-INF/MANIFEST.MF
index 19185f413..a940cd6bf 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/META-INF/MANIFEST.MF
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="2.0.0",
- com.google.guava;bundle-version="[11.0.0,16.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="2.0.0",
  org.eclipse.papyrus.uml.diagram.composite;bundle-version="2.0.0",
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="2.0.0",
  org.eclipse.papyrus.designer.ucm.core;bundle-version="0.7.0",
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/architecture/UCM.architecture b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/architecture/UCM.architecture
new file mode 100644
index 000000000..0f4b3c374
--- /dev/null
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/architecture/UCM.architecture
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmi:id="_CBeUoEMqEeeNE9tB5iN5zA" id="org.eclipse.papyrus.designer.ucm" name="UCM" description="Architecture domain for UCM">
+  <stakeholders xmi:id="_JbecIFjjEee4w6HDzCmkhg" id="org.eclipse.papyrus.ucm.stakeholder.ucmArchitect" name="UCM architect" concerns="_Ke2XAFWpEeeI4cf0sf4_zg _NC3y8FWpEeeI4cf0sf4_zg"/>
+  <concerns xmi:id="_Ke2XAFWpEeeI4cf0sf4_zg" id="org.eclipse.papyrus.designer.ucm.concerns.application" name="application" description="Application development" icon=""/>
+  <concerns xmi:id="_NC3y8FWpEeeI4cf0sf4_zg" id="org.eclipse.papyrus.designer.ucm.concerns.platform" name="platform" description="Platform development" icon=""/>
+  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_XiGkgEMqEeeNE9tB5iN5zA" id="org.eclipse.papyrus.ucm.architecture" name="UCM ADL" description="Extension for UCM (Unified Component Model)" extensionPrefix="" creationCommandClass="org.eclipse.papyrus.designer.ucm.core.commands.CreateUCMModelCommand">
+    <viewpoints xmi:id="_yw4C8EMqEeeNE9tB5iN5zA" id="org.eclipse.papyrus.designer.ucm.viewpoints.application" name="UCM application viewpoint" description="UCM application Viewpoint" icon="" concerns="_Ke2XAFWpEeeI4cf0sf4_zg" representationKinds="_d79eQHcZEeSndfsfQOfW2A _d79eQHcZEeSnWagfdgwW2B _zecocLiiEeaKr_s25plyiQ _z59fwLiiEeaKr_s25plyiQ _TuTAML3qEea-Cdq6DL1D-g _zx5I4LiiEeaKr_s25plyiQ _8pUzMLAIEeacWfm2fO2yZA"/>
+    <viewpoints xmi:id="_3p1_4FWoEeeI4cf0sf4_zg" id="org.eclipse.papyrus.designer.ucm.viewpoints.platform" name="UCM platform viewpoint" description="UCM platform viewpoint" concerns="_NC3y8FWpEeeI4cf0sf4_zg" representationKinds="_d79eQHcZEeSndfsfQOfW2A _d79eQHcZEeSnWagfdgwW2B _zecocLiiEeaKr_s25plyiQ _TuTAML3qEea-Cdq6DL1D-g _zx5I4LiiEeaKr_s25plyiQ _8pUzMLAIEeacWfm2fO2yZA _8Q5RsK8vEea4LORm7y2CsQ"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ubJcsKeUEeSUR5jX0TaAcB"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_sHw4IMQMEeS2vZeHP4gaVg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_d79eQHcZEeSndfsfQOfW2A" id="org.eclipse.papyrus.designer.ucm.diagram.component" name="UCM component diagram" description="UCM component diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMComponent.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg" implementationID="UCMComponentDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMComponentDiagramCommand">
+      <modelRules xmi:id="_IfzbAHk9EeSk0Zv84QxXew">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_0YJbEak7EeSk0Zv84QxXew">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" element="composite.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ComponentDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_d79eQHcZEeSnWagfdgwW2B" id="org.eclipse.papyrus.designer.ucm.diagram.composite" name="UCM composite diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMComposite.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg" implementationID="UCMCompositeDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMCompositeDiagramCommand">
+      <modelRules xmi:id="_IfzbAHk9EeSk0Zv84QxXew">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      </modelRules>
+      <owningRules xmi:id="_0YJbEak7EeSk0Zv84QxXew">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      </owningRules>
+      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" element="composite.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.CompositeDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_8pUzMLAIEeacWfm2fO2yZA" id="org.eclipse.papyrus.designer.ucm.diagram.module" name="UCM module diagram" description="" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMModule.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg _NC3y8FWpEeeI4cf0sf4_zg" implementationID="UCMModuleDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMModuleDiagramCommand">
+      <modelRules xmi:id="_8pUzMbAIEeacWfm2fO2yZA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_8pUzM7AIEeacWfm2fO2yZA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_8pUzNbAIEeacWfm2fO2yZA" permit="false" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ModuleDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_8Q5RsK8vEea4LORm7y2CsQ" id="org.eclipse.papyrus.designer.ucm.diagram.interaction" name="UCM interaction diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMInteraction.png" concerns="_NC3y8FWpEeeI4cf0sf4_zg" implementationID="UCMInteractionDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMInteractionDiagramCommand">
+      <modelRules xmi:id="_IfzbAHk9EeSk0Zv84QxXew">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_0YJbEak7EeSk0Zv84QxXew">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.InteractionDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zecocLiiEeaKr_s25plyiQ" id="org.eclipse.papyrus.designer.ucm.diagram.contract" name="UCM contract diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMContract.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg" implementationID="UCMContractDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMContractDiagramCommand">
+      <modelRules xmi:id="_zecocbiiEeaKr_s25plyiQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_zecoc7iiEeaKr_s25plyiQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_zecodbiiEeaKr_s25plyiQ" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ContractDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zx5I4LiiEeaKr_s25plyiQ" id="org.eclipse.papyrus.designer.ucm.diagram.techpolicies" name="UCM technical policies diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMTechPolicies.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg _NC3y8FWpEeeI4cf0sf4_zg" implementationID="UCMTechPoliciesDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMTechPoliciesDiagramCommand">
+      <modelRules xmi:id="_zx5I4biiEeaKr_s25plyiQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_zx5I47iiEeaKr_s25plyiQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_zx5I5biiEeaKr_s25plyiQ" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.TechPoliciesDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_z59fwLiiEeaKr_s25plyiQ" id="org.eclipse.papyrus.designer.ucm.diagram.deployment" name="UCM deployment diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMDeployment.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg" implementationID="UCMDeploymentDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMDeploymentDiagramCommand">
+      <modelRules xmi:id="_z59fwbiiEeaKr_s25plyiQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_z59fw7iiEeaKr_s25plyiQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_z59fxbiiEeaKr_s25plyiQ" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.DeploymentDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_Tgi4EL3qEea-Cdq6DL1D-g" id="org.eclipse.papyrus.designer.ucm.diagram.resources" name="UCM resources diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMResources.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg" implementationID="UCMResourcesDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMResourcesDiagramCommand">
+      <modelRules xmi:id="_Tgi4Eb3qEea-Cdq6DL1D-g">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_Tgi4E73qEea-Cdq6DL1D-g">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_Tgi4Fb3qEea-Cdq6DL1D-g" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ResourcesDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TuTAML3qEea-Cdq6DL1D-g" id="org.eclipse.papyrus.designer.ucm.diagram.environment" name="UCM environment diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMEnvironment.png" concerns="_Ke2XAFWpEeeI4cf0sf4_zg _NC3y8FWpEeeI4cf0sf4_zg" implementationID="UCMEnvironmentDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css" creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMEnvironmentDiagramCommand">
+      <modelRules xmi:id="_TuTAMb3qEea-Cdq6DL1D-g">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_TuTAM73qEea-Cdq6DL1D-g">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:id="_TuTANb3qEea-Cdq6DL1D-g" element="class.group.*"/>
+      <palettes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.EnvironmentDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+    <profiles href="http://www.omg.org/ucm/0.9#/"/>
+    <profiles href="http://www.omg.org/ucm/0.9#//ucm_commons"/>
+    <profiles href="http://www.omg.org/ucm/0.9#//ucm_components"/>
+    <profiles href="http://www.omg.org/ucm/0.9#//ucm_contracts"/>
+    <profiles href="http://www.omg.org/ucm/supplement/0.9#//ucm_deployment"/>
+    <profiles href="http://www.omg.org/ucm/supplement/0.9#//ucm_detailed_components"/>
+    <profiles href="http://www.omg.org/ucm/supplement/0.9#//ucm_environment"/>
+    <profiles href="http://www.omg.org/ucm/supplement/0.9#//ucm_extra_types"/>
+    <profiles href="http://www.omg.org/ucm/0.9#//ucm_interactions"/>
+    <profiles href="http://www.omg.org/ucm/0.9#//ucm_technicalpolicies"/>
+    <profiles href="http://www.omg.org/ucm/supplement/0.9#/"/>
+    <profiles href="http://www.omg.org/ucm/supplement/0.9#//ucm_test_cases"/>
+    <profiles href="http://www.omg.org/ucm/typespkg/0.9#//Types"/>
+    <profiles href="http://www.omg.org/ucm/typespkg/0.9#/"/>
+  </contexts>
+</architecture:ArchitectureDomain>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/build.properties b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/build.properties
index 0099e89ac..9c4f9d9af 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/build.properties
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/build.properties
@@ -2,7 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               configuration/,\
+               architecture/,\
                plugin.xml,\
                about.html,\
                plugin.properties,\
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration
deleted file mode 100644
index 262e640d5..000000000
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_oa8yUBP7EeSS0oyATXoJKB" defaultStakeholder="_stSKMBP7EeSS0oyATXohNB">
-  <stakeholders xmi:id="_stSKMBP7EeSS0oyATXohNB" name="UCM Modeler" viewpoints="s3T-cEBP7EeSS0oyATXohNA"/>
-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="s3T-cEBP7EeSS0oyATXohNA" name="UCM Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_d79eQHcZEeSndfsfQOfW2A" name="UCM component diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMComponent.png" implementationID="UCMComponentDiagram" categories="_vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ComponentDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_IfzbAHk9EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_qqlfQC5AEeWgJuAZQIK2Bg"/>
-      <owningRules xmi:id="_0YJbEak7EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_m1gfEHk9EeSk0Zv84QxXew"/>
-      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" element="composite.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_d79eQHcZEeSnWagfdgwW2B" name="UCM composite diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMComposite.png" implementationID="UCMCompositeDiagram" categories="_vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.CompositeDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_IfzbAHk9EeSk0Zv84QxXew" permit="false">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_qqlfQC5AEeWgJuAZQIK2Bg"/>
-      <owningRules xmi:id="_0YJbEak7EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </owningRules>
-      <childRules xmi:id="_m1gfEHk9EeSk0Zv84QxXew"/>
-      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" element="composite.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_8pUzMLAIEeacWfm2fO2yZA" name="UCM module diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMModule.png" implementationID="UCMModuleDiagram" categories="_vUL7ABP7EesdfdfATXohNA _-pCBYK9pEea4LORm7y2CsQ" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ModuleDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_8pUzMbAIEeacWfm2fO2yZA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_8pUzMrAIEeacWfm2fO2yZA"/>
-      <owningRules xmi:id="_8pUzM7AIEeacWfm2fO2yZA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_8pUzNLAIEeacWfm2fO2yZA"/>
-      <paletteRules xmi:id="_8pUzNbAIEeacWfm2fO2yZA" permit="false" element="class.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_8Q5RsK8vEea4LORm7y2CsQ" name="UCM interaction diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMInteraction.png" implementationID="UCMInteractionDiagram" categories="_-pCBYK9pEea4LORm7y2CsQ" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.InteractionDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_IfzbAHk9EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_qqlfQC5AEeWgJuAZQIK2Bg"/>
-      <owningRules xmi:id="_0YJbEak7EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_m1gfEHk9EeSk0Zv84QxXew"/>
-      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" element="class.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_zecocLiiEeaKr_s25plyiQ" name="UCM contract diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMContract.png" implementationID="UCMContractDiagram" categories="_-pCBYK9pEea4LORm7y2CsQ _vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ContractDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_zecocbiiEeaKr_s25plyiQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_zecocriiEeaKr_s25plyiQ"/>
-      <owningRules xmi:id="_zecoc7iiEeaKr_s25plyiQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_zecodLiiEeaKr_s25plyiQ"/>
-      <paletteRules xmi:id="_zecodbiiEeaKr_s25plyiQ" element="class.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_zx5I4LiiEeaKr_s25plyiQ" name="UCM technical policies diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMTechPolicies.png" implementationID="UCMTechPoliciesDiagram" categories="_-pCBYK9pEea4LORm7y2CsQ _vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.TechPoliciesDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_zx5I4biiEeaKr_s25plyiQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_zx5I4riiEeaKr_s25plyiQ"/>
-      <owningRules xmi:id="_zx5I47iiEeaKr_s25plyiQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_zx5I5LiiEeaKr_s25plyiQ"/>
-      <paletteRules xmi:id="_zx5I5biiEeaKr_s25plyiQ" element="class.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_z59fwLiiEeaKr_s25plyiQ" name="UCM deployment diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMDeployment.png" implementationID="UCMDeploymentDiagram" categories="_vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.DeploymentDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_z59fwbiiEeaKr_s25plyiQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_z59fwriiEeaKr_s25plyiQ"/>
-      <owningRules xmi:id="_z59fw7iiEeaKr_s25plyiQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_z59fxLiiEeaKr_s25plyiQ"/>
-      <paletteRules xmi:id="_z59fxbiiEeaKr_s25plyiQ" element="class.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_Tgi4EL3qEea-Cdq6DL1D-g" name="UCM resources diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMResources.png" implementationID="UCMResourcesDiagram" categories="_-pCBYK9pEea4LORm7y2CsQ _vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ResourcesDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_Tgi4Eb3qEea-Cdq6DL1D-g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_Tgi4Er3qEea-Cdq6DL1D-g"/>
-      <owningRules xmi:id="_Tgi4E73qEea-Cdq6DL1D-g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_Tgi4FL3qEea-Cdq6DL1D-g"/>
-      <paletteRules xmi:id="_Tgi4Fb3qEea-Cdq6DL1D-g" element="class.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_TuTAML3qEea-Cdq6DL1D-g" name="UCM environment diagram" icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMEnvironment.png" implementationID="UCMEnvironmentDiagram" categories="_-pCBYK9pEea4LORm7y2CsQ _vUL7ABP7EesdfdfATXohNA" customPalette="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.EnvironmentDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.designer.ucm.css/theme/ucm_theme.css">
-      <modelRules xmi:id="_TuTAMb3qEea-Cdq6DL1D-g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_TuTAMr3qEea-Cdq6DL1D-g"/>
-      <owningRules xmi:id="_TuTAM73qEea-Cdq6DL1D-g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_TuTANL3qEea-Cdq6DL1D-g"/>
-      <paletteRules xmi:id="_TuTANb3qEea-Cdq6DL1D-g" element="class.group.*"/>
-    </modelKinds>
-    <parent href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmktxhEeOqHvRyiN87hA"/>
-  </viewpoints>
-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-  <categories xmi:id="_vUL7ABP7EesdfdfATXohNA" name="UCM-Application"/>
-  <categories xmi:id="_-pCBYK9pEea4LORm7y2CsQ" name="UCM-Platform"/>
-</configuration:PapyrusConfiguration>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/plugin.xml b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/plugin.xml
index fc59f9bc5..596374262 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/plugin.xml
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/plugin.xml
@@ -2,11 +2,10 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <configuration
-            file="configuration/UCM.configuration"
-            priority="98">
-      </configuration>
+         point="org.eclipse.papyrus.infra.architecture.models">
+      <model
+            path="architecture/UCM.architecture">
+      </model>
    </extension>
      
    <extension
@@ -17,104 +16,4 @@
       </elementTypeSet>
    </extension>
 
-   <extension
-         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-      <creationCommand
-            creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMModuleDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.clazz.ClassDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMModule.png"
-			id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
-			language="uml"
-			label="UCM Module Diagram">
-      </creationCommand>
-   </extension>
-
-  <extension
-         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-      <creationCommand
-            creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMComponentDiagramCommand"
-            creationCondition="org.eclipse.papyrus.uml.diagram.composite.CompositeDiagramCreationCondition"
-            icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMComponent.png"
-            id="org.eclipse.papyrus.uml.diagram.composite.createCompositeDiagram"
-			language="UCM-Application"
-            label="UCM component diagram">
-      </creationCommand>
-   </extension>
-   
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMCompositeDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.composite.CompositeDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMComposite.png"
-			id="org.eclipse.papyrus.uml.diagram.composite.createCompositeDiagram"
-			language="UCM-Application"
-			label="UCM composite diagram">
-		</creationCommand>
-  	</extension>
-
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMInteractionDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.composite.CompositeDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMInteraction.png"
-			id="org.eclipse.papyrus.uml.diagram.composite.createCompositeDiagram"
-			language="UCM-Platform"
-			label="UCM interaction diagram">
-		</creationCommand>
-  	</extension>
-
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMTechPoliciesDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.clazz.ClassDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMTechPolicies.png"
-			id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
-			language="UCM-Application"
-			label="UCM technical policy diagram">
-		</creationCommand>
-  	</extension>
-      
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMDeploymentDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.clazz.ClassDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMDeployment.png"
-			id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
-			language="UCM-Application"
-			label="UCM deployment diagram">
-		</creationCommand>
-  	</extension>
-
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMContractDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.clazz.ClassDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMContract.png"
-			id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
-			language="uml"
-			label="UCM contract diagram">
-		</creationCommand>
-  	</extension>
-
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMResourcesDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.clazz.ClassDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMResources.png"
-			id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
-			language="uml"
-			label="UCM resource diagram">
-		</creationCommand>
-  	</extension>
-
-	<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-		<creationCommand
-			creationCommandClass="org.eclipse.papyrus.designer.ucm.diagrams.commands.CreateUCMEnvironmentDiagramCommand"
-			creationCondition="org.eclipse.papyrus.uml.diagram.clazz.ClassDiagramCreationCondition"
-			icon="platform:/plugin/org.eclipse.papyrus.designer.ucm.ui/icons/Diagram_UCMEnvironment.png"
-			id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
-			language="uml"
-			label="UCM environment diagram">
-		</creationCommand>
-  	</extension>
 </plugin>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations
index bbd24e42b..edc889a3b 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations
@@ -1,251 +1,250 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" description="UCM UI" identifier="org.eclipse.papyrus.designer.ucm.diagrams.ui.elementTypes" name="UCM UI diagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentType_Shape" name="Component type" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65DxMLCREeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentType_Shape_CN" name="Component type CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_5xE_oKaEEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AtomicComponentImplementation_Shape" name="Atomic component implementation" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_81fBoLCREeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AtomicComponentImplementation_Shape_CN" name="Atomic component implementation CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_6AulMKaEEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.CompositeComponentImplementation_Shape" name="Composite component implementation" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_AwHrMLCSEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.CompositeComponentImplementation_Shape_CN" name="Composite component implementation CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_J3kKIKbJEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ApplicationModule_Shape" name="Application module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ApplicationModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_DvsasLCSEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ApplicationModule_Shape_CN" name="Application module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ApplicationModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_YY6TsKbJEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentModule_Shape" name="Component module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_w83-cLCdEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentModule_Shape_CN" name="Component module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_YjiPUKbJEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ContractModule_Shape" name="Contract module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ContractModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_53B-YLCPEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ContractModule_Shape_CN" name="Contract module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ContractModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Yr_AsKbJEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PlatformModule_Shape" name="Platform module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.PlatformModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_0DPScLCdEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PlatformModule_Shape_CN" name="Platform module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.PlatformModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_37VpUMJMEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.NonFunctionalAspectsModule_Shape" name="Non-functional aspects module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.NonFunctionalAspectsModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_F3pMIMJNEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.NonFunctionalAspectsModule_Shape_CN" name="Non-functional aspects module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.NonFunctionalAspectsModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_hte_EMKkEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionDefinitionModule_Shape" name="Interaction definition module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ps-lMMKkEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionDefinitionModule_Shape_CN" name="Interaction definition module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_RGdw0MJUEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.EnvironmentModule_Shape" name="Environment module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.EnvironmentModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_d9gUsMJUEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.EnvironmentModule_Shape_CN" name="Environment module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.EnvironmentModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_hXMCIMKoEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.DeploymentModule_Shape" name="Deployment module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.DeploymentModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_nJh0MMKoEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.DeploymentModule_Shape_CN" name="Deployment module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.DeploymentModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EctdkMKtEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ResourceDefinitionModule_Shape" name="Resource definition module" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_LXdCIMKtEeaZYOYMFPracQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ResourceDefinitionModule_Shape_CN" name="Resource definition module CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_vc6z8KuBEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentTechnicalPolicy_Shape" name="Component technical policy" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentTechnicalPolicy</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_5aqDELCdEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentTechnicalPolicy_Shape_CN" name="Component technical policy CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentTechnicalPolicy</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_BtIb8KuCEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentPortTechnicalPolicy_Shape" name="Component port technical policy" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentPortTechnicalPolicy</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_93KDkLCdEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentPortTechnicalPolicy_Shape_CN" name="Component port technical policy CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ComponentPortTechnicalPolicy</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_LLLuIKbJEeaAGI_5QNiFYQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Port_Shape" name="Port" hint="Port_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Port</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_CmIUILCeEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Port_Shape_CN" name="Port CN" hint="Port_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Port</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_30LCIK2XEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Connection_Shape" name="Connection" hint="Property_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Connection</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ENM_oLCeEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Connection_Shape_CN" name="Connection CN" hint="Property_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Connection</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_mDJQgK2XEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectionLink_Edge" name="Connection Link" hint="Connector_Edge">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ConnectionLink</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Connector_Edge</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Y_8nwLvAEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Delegation_Edge" name="Delegation" hint="Connector_Edge">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Delegation</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Connector_Edge</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_B72OAK2eEea8u6I-XjDezQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AssemblyPart_Shape" name="Assembly part" hint="Property_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AssemblyPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_NZNcMLCeEeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AssemblyPart_Shape_CN" name="Assembly part CN" hint="Property_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AssemblyPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_a3_SkK_7EeacWfm2fO2yZA" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AffectPolicy_Edge" name="Assign policy" hint="Dependency_Edge">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AffectPolicy</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Dependency_Edge</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_z9OjkMEQEeaLpumP_4vuow" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AffectPolicyDef_Edge" name="Assign policy definition" hint="Realization_Edge">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AffectPolicyDef</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Realization_Edge</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EbzQgLsLEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorDefinition_Shape" name="Connector definition" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_NPPcELsLEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorDefinition_Shape_CN" name="Connector definition CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IC6agMCEEeaLpumP_4vuow" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionPattern_Shape" name="Interaction pattern" hint="Collaboration_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.InteractionPattern</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Collaboration_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_I5oAEMCEEeaLpumP_4vuow" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionPattern_Shape_CN" name="Interaction pattern CN" hint="Collaboration_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.InteractionPattern</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Collaboration_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_VPG1oLsLEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorPort_CA_Label" name="Connector port CA label" hint="Property_ClassAttributeLabel">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ConnectorPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_ClassAttributeLabel</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_hNvK0LsLEeaKr_s25plyiQ" description="" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorPort_Shape" name="Connector port" hint="Property_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ConnectorPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_RNyUQLsWEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortType_Shape" name="Port type" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.PortType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_eS37MLsWEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortType_Shape_CN" name="Port type CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.PortType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IYw-4LsXEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortElement_CA_Label" name="Port element CA label" hint="Property_ClassAttributeLabel">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.PortElement</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_ClassAttributeLabel</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_V_RQ0LsXEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortElement_Shape" name="Port element CN" hint="Property_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.PortElement</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_X-IUwLsYEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalPolicyDefinition_Shape" name="Technical policy definition" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.TechnicalPolicyDefinition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_kY7okLsYEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalPolicyDefinition_Shape_CN" name="Technical policy definition CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.TechnicalPolicyDefinition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_uZd5YLsYEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalAspect_Shape" name="Technical aspect" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.TechnicalAspect</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_6uQr0LsYEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalAspect_Shape_CN" name="Technical aspect CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.TechnicalAspect</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Au6msLsZEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ProgrammingLanguages_Shape" name="Programming languages" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gsk38LsZEeaKr_s25plyiQ" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ProgrammingLanguages_Shape_CN" name="Programming languages CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_S5mJALvKEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape" name="Allocation plan" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AllocationPlan</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_b9hAkLvKEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape_CN" name="Allocation plan CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AllocationPlan</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_hPIEILvKEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape" name="Test case group" hint="Package_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.TestCaseGroup</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_oxPKsLvKEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape_CN" name="Test case group CN" hint="Package_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.TestCaseGroup</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_uhSdwLvKEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AppAssembly_Shape" name="Application assembly" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AppAssembly</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_01lGULvKEeagON7A6uz3tw" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AppAssembly_Shape_CN" name="Application assembly CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.AppAssembly</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_TAsnoMCNEeaLpumP_4vuow" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Language_Shape" name="Language" hint="Class_Shape">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Language</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_mdbGEMCNEeaLpumP_4vuow" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Language_Shape_CN" name="Language CN" hint="Class_Shape_CN">
-    <specializedTypesID>org.eclipse.papyrus.designer.ucm.core.Language</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
-  </elementTypeConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="UCM UI" identifier="org.eclipse.papyrus.designer.ucm.diagrams.ui.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UCM UI diagram" xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" xmi:version="2.0">
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentType_Shape" name="Component type" xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_PlJqjlj354Wnbt9JeO78zA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentType_Shape_CN" name="Component type CN" xmi:id="_65DxMLCREeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_PlJqjlj354Wnbt9JeO78zA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AtomicComponentImplementation_Shape" name="Atomic component implementation" xmi:id="_5xE_oKaEEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_J7_dIKaHEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AtomicComponentImplementation_Shape_CN" name="Atomic component implementation CN" xmi:id="_81fBoLCREeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_J7_dIKaHEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.CompositeComponentImplementation_Shape" name="Composite component implementation" xmi:id="_6AulMKaEEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_KLxlkKaHEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.CompositeComponentImplementation_Shape_CN" name="Composite component implementation CN" xmi:id="_AwHrMLCSEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_KLxlkKaHEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ApplicationModule_Shape" name="Application module" xmi:id="_J3kKIKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cRZi0Ka2EeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ApplicationModule_Shape_CN" name="Application module CN" xmi:id="_DvsasLCSEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cRZi0Ka2EeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentModule_Shape" name="Component module" xmi:id="_YY6TsKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_pG3ZYKa2EeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentModule_Shape_CN" name="Component module CN" xmi:id="_w83-cLCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_pG3ZYKa2EeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ContractModule_Shape" name="Contract module" xmi:id="_YjiPUKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ptPc4Ka2EeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ContractModule_Shape_CN" name="Contract module CN" xmi:id="_53B-YLCPEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ptPc4Ka2EeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PlatformModule_Shape" name="Platform module" xmi:id="_Yr_AsKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ZL5FQKbIEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PlatformModule_Shape_CN" name="Platform module CN" xmi:id="_0DPScLCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ZL5FQKbIEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.NonFunctionalAspectsModule_Shape" name="Non-functional aspects module" xmi:id="_37VpUMJMEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_T6e0wMJNEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.NonFunctionalAspectsModule_Shape_CN" name="Non-functional aspects module CN" xmi:id="_F3pMIMJNEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_T6e0wMJNEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionDefinitionModule_Shape" name="Interaction definition module" xmi:id="_hte_EMKkEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_AYkBwMKkEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionDefinitionModule_Shape_CN" name="Interaction definition module CN" xmi:id="_ps-lMMKkEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_AYkBwMKkEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.EnvironmentModule_Shape" name="Environment module" xmi:id="_RGdw0MJUEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_zFX7wMJTEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.EnvironmentModule_Shape_CN" name="Environment module CN" xmi:id="_d9gUsMJUEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_zFX7wMJTEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.DeploymentModule_Shape" name="Deployment module" xmi:id="_hXMCIMKoEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_J-zmcMKoEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.DeploymentModule_Shape_CN" name="Deployment module CN" xmi:id="_nJh0MMKoEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_J-zmcMKoEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ResourceDefinitionModule_Shape" name="Resource definition module" xmi:id="_EctdkMKtEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_EEve8MKsEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ResourceDefinitionModule_Shape_CN" name="Resource definition module CN" xmi:id="_LXdCIMKtEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_EEve8MKsEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentTechnicalPolicy_Shape" name="Component technical policy" xmi:id="_vc6z8KuBEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_UH7sUKsfEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentTechnicalPolicy_Shape_CN" name="Component technical policy CN" xmi:id="_5aqDELCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_UH7sUKsfEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentPortTechnicalPolicy_Shape" name="Component port technical policy" xmi:id="_BtIb8KuCEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_UZsxwKsfEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ComponentPortTechnicalPolicy_Shape_CN" name="Component port technical policy CN" xmi:id="_93KDkLCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_UZsxwKsfEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Port_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Port_Shape" name="Port" xmi:id="_LLLuIKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Port_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Port_Shape_CN" name="Port CN" xmi:id="_CmIUILCeEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Connection_Shape" name="Connection" xmi:id="_30LCIK2XEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Connection_Shape_CN" name="Connection CN" xmi:id="_ENM_oLCeEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Connector_Edge" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectionLink_Edge" name="Connection Link" xmi:id="_mDJQgK2XEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_CKMawK2YEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Connector_Edge" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Delegation_Edge" name="Delegation" xmi:id="_Y_8nwLvAEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AssemblyPart_Shape" name="Assembly part" xmi:id="_B72OAK2eEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_qfSAcK2eEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AssemblyPart_Shape_CN" name="Assembly part CN" xmi:id="_NZNcMLCeEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_qfSAcK2eEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Dependency_Edge" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AffectPolicy_Edge" name="Assign policy" xmi:id="_a3_SkK_7EeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_PeEM8K2KEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Realization_Edge" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AffectPolicyDef_Edge" name="Assign policy definition" xmi:id="_z9OjkMEQEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_S_C10MEREeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorDefinition_Shape" name="Connector definition" xmi:id="_EbzQgLsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_mlq3oLrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorDefinition_Shape_CN" name="Connector definition CN" xmi:id="_NPPcELsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_mlq3oLrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Collaboration_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionPattern_Shape" name="Interaction pattern" xmi:id="_IC6agMCEEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_NmJkgL5eEeaSV_z7ahpr-g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Collaboration_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.InteractionPattern_Shape_CN" name="Interaction pattern CN" xmi:id="_I5oAEMCEEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_NmJkgL5eEeaSV_z7ahpr-g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_ClassAttributeLabel" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorPort_CA_Label" name="Connector port CA label" xmi:id="_VPG1oLsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_-9J_4LrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations description="" hint="Property_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorPort_Shape" name="Connector port" xmi:id="_hNvK0LsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_-9J_4LrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortType_Shape" name="Port type" xmi:id="_RNyUQLsWEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__THo0LrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortType_Shape_CN" name="Port type CN" xmi:id="_eS37MLsWEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__THo0LrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_ClassAttributeLabel" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortElement_CA_Label" name="Port element CA label" xmi:id="_IYw-4LsXEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__Z174LrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Property_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.PortElement_Shape" name="Port element CN" xmi:id="_V_RQ0LsXEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__Z174LrxEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalPolicyDefinition_Shape" name="Technical policy definition" xmi:id="_X-IUwLsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cd32ULrzEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalPolicyDefinition_Shape_CN" name="Technical policy definition CN" xmi:id="_kY7okLsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cd32ULrzEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalAspect_Shape" name="Technical aspect" xmi:id="_uZd5YLsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cz6XwLrzEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalAspect_Shape_CN" name="Technical aspect CN" xmi:id="_6uQr0LsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cz6XwLrzEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ProgrammingLanguages_Shape" name="Programming languages" xmi:id="_Au6msLsZEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_c8Aj0LrzEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.ProgrammingLanguages_Shape_CN" name="Programming languages CN" xmi:id="_Gsk38LsZEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_c8Aj0LrzEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape" name="Allocation plan" xmi:id="_S5mJALvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_5YxFALvHEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape_CN" name="Allocation plan CN" xmi:id="_b9hAkLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_5YxFALvHEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape" name="Test case group" xmi:id="_hPIEILvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_OC0HoLvHEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape_CN" name="Test case group CN" xmi:id="_oxPKsLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_OC0HoLvHEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AppAssembly_Shape" name="Application assembly" xmi:id="_uhSdwLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__WsRcLvGEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.AppAssembly_Shape_CN" name="Application assembly CN" xmi:id="_01lGULvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__WsRcLvGEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Language_Shape" name="Language" xmi:id="_TAsnoMCNEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_zr5SgMCNEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+  <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrus.ucm.diagrams.ui.Language_Shape_CN" name="Language CN" xmi:id="_mdbGEMCNEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    
+    
+  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_zr5SgMCNEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ComponentDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ComponentDiagram.paletteconfiguration
index 03c0e3331..cf7f6514f 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ComponentDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ComponentDiagram.paletteconfiguration
@@ -1,73 +1,51 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCM Component" label="UCM Component">
-  <drawerConfigurations id="UCM types" label="types" description="UCM types">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCM Component" label="UCM Component">
+  <drawerConfigurations description="UCM types" id="UCM types" label="types">
   
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    		id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentType"
-    		label="Component type"
-  	  		description="Create a component type">
-			<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/ComponentType.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentType_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentType_Shape_CN"/>
+	<ownedConfigurations description="Create a component type" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentType" label="Component type" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="resources/icons/ucm/ComponentType.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_sHyGQcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_65DxMLCREeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-   			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Port"
-    		label="Port"
-			description="Create a port">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/Port.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Port_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Port_Shape_CN"/>
+	<ownedConfigurations description="Create a port" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Port" label="Port" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/Port.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_LLLuIKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_CmIUILCeEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
     
   </drawerConfigurations>
 
-  <drawerConfigurations id="UCM implementations" label="implementations" description="UCM implementations">
+  <drawerConfigurations description="UCM implementations" id="UCM implementations" label="implementations">
 
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation"
-    	label="Atomic component implementation"
-    	description="Create an atomic implementation">
-      <icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/AtomicComponentImplementation.png"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AtomicComponentImplementation_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AtomicComponentImplementation_Shape_CN"/>
+    <ownedConfigurations description="Create an atomic implementation" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation" label="Atomic component implementation" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="resources/icons/ucm/AtomicComponentImplementation.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_5xE_oKaEEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_81fBoLCREeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
     </ownedConfigurations>
 
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation"
-    	label="Composite component implementation"
-    	description="Create a composite implementation">
-      <icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/CompositeComponentImplementation.png"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.CompositeComponentImplementation_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.CompositeComponentImplementation_Shape_CN"/>
+    <ownedConfigurations description="Create a composite implementation" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation" label="Composite component implementation" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="resources/icons/ucm/CompositeComponentImplementation.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_6AulMKaEEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_AwHrMLCSEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
     </ownedConfigurations>
 
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentTechnicalPolicyImplementation"
-    	label="Component technical policy"
-    	description="Create a technical policy">
-      <icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/TechnicalPolicy.png"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentTechnicalPolicy_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentTechnicalPolicy_Shape_CN"/>
+    <ownedConfigurations description="Create a technical policy" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentTechnicalPolicyImplementation" label="Component technical policy" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="resources/icons/ucm/TechnicalPolicy.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_vc6z8KuBEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_5aqDELCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
     </ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-		id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentPortTechnicalPolicyImplementation"
-			label="Component port technical policy"
-			description="Create a port technical policy">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/TechnicalPolicy.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentPortTechnicalPolicy_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentPortTechnicalPolicy_Shape_CN"/>
+	<ownedConfigurations description="Create a port technical policy" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentPortTechnicalPolicyImplementation" label="Component port technical policy" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/TechnicalPolicy.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_BtIb8KuCEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_93KDkLCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
     
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AffectPolicy"
-			kind="ConnectionTool"
-			label="Assign policy" description="Assign a policy">
-		<icon pluginID="org.eclipse.papyrus.uml.icons" iconPath="resource/gif/Dependency.gif"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AffectPolicy_Edge"/>
+	<ownedConfigurations description="Assign a policy" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AffectPolicy" kind="ConnectionTool" label="Assign policy" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resource/gif/Dependency.gif" pluginID="org.eclipse.papyrus.uml.icons"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_a3_SkK_7EeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.CompositeDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.CompositeDiagram.paletteconfiguration
index f70997163..35e0dfbff 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.CompositeDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.CompositeDiagram.paletteconfiguration
@@ -1,43 +1,28 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMComposite" label="UCM Composite">
-  <drawerConfigurations id="UCM types" label="UCM parts" description="UCM parts">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMComposite" label="UCM Composite">
+  <drawerConfigurations description="UCM parts" id="UCM types" label="UCM parts">
   
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-		id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AssemblyPart"
-	   	label="Assembly Part"
-		description="Create an assembly part">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/AssemblyPart.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AssemblyPart_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AssemblyPart_Shape_CN"/>
+	<ownedConfigurations description="Create an assembly part" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AssemblyPart" label="Assembly Part" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/AssemblyPart.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_B72OAK2eEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_NZNcMLCeEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-		id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Connection"
-	   	label="Connection"
-		description="Create a connection">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/Connection.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Connection_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Connection_Shape_CN"/>
+	<ownedConfigurations description="Create a connection" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Connection" label="Connection" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/Connection.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_30LCIK2XEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_ENM_oLCeEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 	
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-		id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ConnectionLink"
-		kind="ConnectionTool"
-	   	label="Connection Link"
-		description="Create a connection link">
-		<icon pluginID="org.eclipse.papyrus.uml.resources/icons" iconPath="resource/gif/Connector.gif"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ConnectionLink_Edge"/>
+	<ownedConfigurations description="Create a connection link" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ConnectionLink" kind="ConnectionTool" label="Connection Link" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resource/gif/Connector.gif" pluginID="org.eclipse.papyrus.uml.resources/icons"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_mDJQgK2XEea8u6I-XjDezQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 	
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-		id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Delegation"
-		kind="ConnectionTool"
-	   	label="Delegation"
-		description="Create a delegation link">
-		<icon pluginID="org.eclipse.papyrus.uml.resources/icons" iconPath="resource/gif/Connector.gif"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Delegation_Edge"/>
+	<ownedConfigurations description="Create a delegation link" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Delegation" kind="ConnectionTool" label="Delegation" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resource/gif/Connector.gif" pluginID="org.eclipse.papyrus.uml.resources/icons"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_Y_8nwLvAEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
   </drawerConfigurations>
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ContractDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ContractDiagram.paletteconfiguration
index da7549d65..fa0b56f89 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ContractDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ContractDiagram.paletteconfiguration
@@ -1,25 +1,18 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMContract" label="UCM Contract">
-  <drawerConfigurations id="UCM types" label="contracts" description="UCM contracts">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMContract" label="UCM Contract">
+  <drawerConfigurations description="UCM contracts" id="UCM types" label="contracts">
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.DataType"
-    	label="data type"
-    	description="Create a data type">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.common" iconPath="icons/DataType.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.umldi.DataType_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.umldi.DataType_Shape_CN"/>
+	<ownedConfigurations description="Create a data type" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.DataType" label="data type" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="icons/DataType.gif" pluginID="org.eclipse.papyrus.uml.diagram.common"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Interface"
-    	label="interface"
-    	description="Create an interface">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.common" iconPath="icons/Interface.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.umldi.Interface_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.umldi.Interface_Shape_CN"/>
+	<ownedConfigurations description="Create an interface" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Interface" label="interface" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="icons/Interface.gif" pluginID="org.eclipse.papyrus.uml.diagram.common"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_Shape" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_Shape_CN" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
  	</ownedConfigurations>
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.DeploymentDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.DeploymentDiagram.paletteconfiguration
index 55be0f562..9f03779f7 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.DeploymentDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.DeploymentDiagram.paletteconfiguration
@@ -1,40 +1,30 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMDeployment" label="UCM Deployment">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMDeployment" label="UCM Deployment">
 
-  <drawerConfigurations id="UCM deployment" label="deployment" description="UCM deployment">
+  <drawerConfigurations description="UCM deployment" id="UCM deployment" label="deployment">
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AppAssembly"
-			label="Application assembly"
-			description="Create an application assembly">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/AppAssembly.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AppAssembly_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AppAssembly_Shape_CN"/>
+	<ownedConfigurations description="Create an application assembly" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AppAssembly" label="Application assembly" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/AppAssembly.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_uhSdwLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_01lGULvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
     
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TestCaseGroup"
-			label="Test case group"
-			description="Create a test case group">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/TestCaseGroup.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape_CN"/>
+	<ownedConfigurations description="Create a test case group" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TestCaseGroup" label="Test case group" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/TestCaseGroup.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_hPIEILvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_oxPKsLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AllocationPlan"
-				label="Allocation plan"
-		description="Create an allocation plan">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/AllocationPlan.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape_CN"/>
+	<ownedConfigurations description="Create an allocation plan" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AllocationPlan" label="Allocation plan" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/AllocationPlan.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_S5mJALvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_b9hAkLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
     
   </drawerConfigurations>
 
-  <drawerConfigurations id="UCM instances" label="instances" description="UCM instances">
+  <drawerConfigurations description="UCM instances" id="UCM instances" label="instances">
 
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.EnvironmentDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.EnvironmentDiagram.paletteconfiguration
index 2c5e2b83d..0bbf2f791 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.EnvironmentDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.EnvironmentDiagram.paletteconfiguration
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMEnvironment" label="UCM Environment">
-  <drawerConfigurations id="UCMEnvironment" label="Environment" description="UCM environment">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMEnvironment" label="UCM Environment">
+  <drawerConfigurations description="UCM environment" id="UCMEnvironment" label="Environment">
 
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.InteractionDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.InteractionDiagram.paletteconfiguration
index b819a1404..1e8e256c0 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.InteractionDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.InteractionDiagram.paletteconfiguration
@@ -1,48 +1,37 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMInteraction" label="UCM Interaction">
-  <drawerConfigurations id="UCM interactions" label="interactions" description="UCM Connector definition">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMInteraction" label="UCM Interaction">
+  <drawerConfigurations description="UCM Connector definition" id="UCM interactions" label="interactions">
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition"
-			label="Connector definition" description="Create a connector definition">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/ConnectorDefinition.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorDefinition_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorDefinition_Shape_CN"/>
+	<ownedConfigurations description="Create a connector definition" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition" label="Connector definition" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/ConnectorDefinition.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_EbzQgLsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_NPPcELsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.InteractionPattern"
-			label="Interaction pattern" description="Create an interaction pattern">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/InteractionPattern.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.InteractionPattern_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.InteractionPattern_Shape_CN"/>
+	<ownedConfigurations description="Create an interaction pattern" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.InteractionPattern" label="Interaction pattern" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/InteractionPattern.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_IC6agMCEEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_I5oAEMCEEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ConnectorPort"
-			label="Connector port" description="Create a connector port">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/CommunicationPort.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorPort_CA_Label"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ConnectorPort_Shape"/>
+	<ownedConfigurations description="Create a connector port" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ConnectorPort" label="Connector port" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/CommunicationPort.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_VPG1oLsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_hNvK0LsLEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.PortType"
-			label="Port type" description="Create a port type">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/PortType.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.PortType_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.PortType_Shape_CN"/>
+	<ownedConfigurations description="Create a port type" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.PortType" label="Port type" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/PortType.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_RNyUQLsWEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_eS37MLsWEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.PortElement"
-			label="Port element" description="Create a port element">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/Port.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.PortElement_CA_Label"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.PortElement_Shape"/>
+	<ownedConfigurations description="Create a port element" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.PortElement" label="Port element" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/Port.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_IYw-4LsXEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_V_RQ0LsXEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ModuleDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ModuleDiagram.paletteconfiguration
index b3f856ce7..ab2c594a1 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ModuleDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ModuleDiagram.paletteconfiguration
@@ -1,107 +1,73 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMModule" label="UCM Module">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMModule" label="UCM Module">
   
-  <drawerConfigurations id="UCM packages" label="Modules" description="UCM modules">
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ApplicationModule"
-			label="Application module"
-			description="Create an application module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/ApplicationModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ApplicationModule_Shape"/>
-    	<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ApplicationModule_Shape_CN"/>
+  <drawerConfigurations description="UCM modules" id="UCM packages" label="Modules">
+	<ownedConfigurations description="Create an application module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ApplicationModule" label="Application module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/ApplicationModule.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_J3kKIKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+    	<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_DvsasLCSEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentModule"
-			label="Component module"
-			description="Create a component module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/ComponentModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ComponentModule_Shape_CN"/>
+	<ownedConfigurations description="Create a component module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ComponentModule" label="Component module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/ComponentModule.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_YY6TsKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_w83-cLCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ContractModule"
- 			label="Contract module"
-			description="Create a contract module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/ContractModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ContractModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ContractModule_Shape_CN"/>
+	<ownedConfigurations description="Create a contract module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ContractModule" label="Contract module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/ContractModule.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_YjiPUKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_53B-YLCPEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.PlatformModule"
-			label="Platform module"
-			description="Create a platform module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/PlatformModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.PlatformModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.PlatformModule_Shape_CN"/>
+	<ownedConfigurations description="Create a platform module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.PlatformModule" label="Platform module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/PlatformModule.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_Yr_AsKbJEeaAGI_5QNiFYQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_0DPScLCdEeacWfm2fO2yZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AllocationPlan"
-			label="Allocation Plan"
-			description="Create an allocation plan">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/AllocationPlan.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AllocationPlan_Shape_CN"/>
+	<ownedConfigurations description="Create an allocation plan" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AllocationPlan" label="Allocation Plan" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/AllocationPlan.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_S5mJALvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_b9hAkLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.NonFunctionalAspectsModule"
-			label="Non-functional aspects"
-			description="Create a non-functional aspects module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/PolicyModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.NonFunctionalAspectsModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.NonFunctionalAspectsModule_Shape_CN"/>
+	<ownedConfigurations description="Create a non-functional aspects module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.NonFunctionalAspectsModule" label="Non-functional aspects" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/PolicyModule.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_37VpUMJMEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_F3pMIMJNEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.EnvironmentModule"
-			label="Environment module"
-			description="Create an environment module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/EnvironmentModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.EnvironmentModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.EnvironmentModule_Shape_CN"/>
+	<ownedConfigurations description="Create an environment module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.EnvironmentModule" label="Environment module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/EnvironmentModule.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_RGdw0MJUEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_d9gUsMJUEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule"
-			label="Resource definition module"
-			description="Create a resource definition module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/ResourceModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ResourceDefinitionModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ResourceDefinitionModule_Shape_CN"/>
+	<ownedConfigurations description="Create a resource definition module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule" label="Resource definition module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ext_ucm/ResourceModule.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_EctdkMKtEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_LXdCIMKtEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule"
-			label="Interaction definition module"
-			description="Create an interaction definition module">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/InteractionModule.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.InteractionDefinitionModule_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.InteractionDefinitionModule_Shape_CN"/>
+	<ownedConfigurations description="Create an interaction definition module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule" label="Interaction definition module" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/InteractionModule.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_hte_EMKkEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_ps-lMMKkEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-     <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TestCaseGroup"
-    	label="Test case group"
-    	description="Create a test case group">
-      <icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/TestCaseGroup.png"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TestCaseGroup_Shape_CN"/>
+     <ownedConfigurations description="Create a test case group" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TestCaseGroup" label="Test case group" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="resources/icons/ext_ucm/TestCaseGroup.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_hPIEILvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_oxPKsLvKEeagON7A6uz3tw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 	
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-    	id="palettemodel.org.eclipse.papyrus.designer.ucm.core.DeploymentModule"
-    	label="Deployment module"
-    	description="Create a deployment module">
-      <icon pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile" iconPath="resources/icons/ext_ucm/DeploymentModule.png"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.DeploymentModule_Shape"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.DeploymentModule_Shape_CN"/>
+	<ownedConfigurations description="Create a deployment module" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.DeploymentModule" label="Deployment module" xsi:type="paletteconfiguration:ToolConfiguration">
+      <icon iconPath="resources/icons/ext_ucm/DeploymentModule.png" pluginID="org.eclipse.papyrus.designer.ucm.supplement.profile"/>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_hXMCIMKoEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+      <elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_nJh0MMKoEeaZYOYMFPracQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ResourcesDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ResourcesDiagram.paletteconfiguration
index dd072dcad..310a7348d 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ResourcesDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.ResourcesDiagram.paletteconfiguration
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMResources" label="UCM Resources">
-  <drawerConfigurations id="UCMResources" label="resources" description="UCM resources">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMResources" label="UCM Resources">
+  <drawerConfigurations description="UCM resources" id="UCMResources" label="resources">
 
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.TechPoliciesDiagram.paletteconfiguration b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.TechPoliciesDiagram.paletteconfiguration
index 1ca41be11..66d79826e 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.TechPoliciesDiagram.paletteconfiguration
+++ b/ucm/org.eclipse.papyrus.designer.ucm.diagrams/resources/palettes/UCM.TechPoliciesDiagram.paletteconfiguration
@@ -1,48 +1,36 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="UCMTechPolicies" label="UCM technical policies">
-  <drawerConfigurations id="UCMTechPolicies" label="technical policies" description="UCM technical policies">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="UCMTechPolicies" label="UCM technical policies">
+  <drawerConfigurations description="UCM technical policies" id="UCMTechPolicies" label="technical policies">
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TechnicalPolicy"
-			label="Technical policy definition" description="Create a technical policy definition">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/TechnicalPolicy.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalPolicyDefinition_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalPolicyDefinition_Shape_CN"/>
+	<ownedConfigurations description="Create a technical policy definition" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TechnicalPolicy" label="Technical policy definition" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/TechnicalPolicy.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_X-IUwLsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_kY7okLsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TechnicalAspect"
-			label="Technical aspect" description="Create a technical aspect">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/TechnicalAspect.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalAspect_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.TechnicalAspect_Shape_CN"/>
+	<ownedConfigurations description="Create a technical aspect" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.TechnicalAspect" label="Technical aspect" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/TechnicalAspect.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_uZd5YLsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_6uQr0LsYEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 	
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Language"
-			label="Language" description="Create a new programming language">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/Language.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Language_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.Language_Shape_CN"/>
+	<ownedConfigurations description="Create a new programming language" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.Language" label="Language" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/Language.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_TAsnoMCNEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_mdbGEMCNEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages"
-			label="Programming languages" description="Create new programming languages folder">
-		<icon pluginID="org.eclipse.papyrus.designer.ucm.profile" iconPath="resources/icons/ucm/ProgrammingLanguages.png"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ProgrammingLanguages_Shape"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.ProgrammingLanguages_Shape_CN"/>
+	<ownedConfigurations description="Create new programming languages folder" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages" label="Programming languages" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resources/icons/ucm/ProgrammingLanguages.png" pluginID="org.eclipse.papyrus.designer.ucm.profile"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_Au6msLsZEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_Gsk38LsZEeaKr_s25plyiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 	</ownedConfigurations>
 
-	<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AffectPolicyDef"
-			kind="ConnectionTool"
-			label="Assign policy definition" description="Assign a policy definition">
-		<icon pluginID="org.eclipse.papyrus.uml.icons" iconPath="resource/gif/Realization.gif"/>
-		<elementDescriptors elementTypeId="org.eclipse.papyrus.ucm.diagrams.ui.AffectPolicyDef_Edge"/>
+	<ownedConfigurations description="Assign a policy definition" id="palettemodel.org.eclipse.papyrus.designer.ucm.core.AffectPolicyDef" kind="ConnectionTool" label="Assign policy definition" xsi:type="paletteconfiguration:ToolConfiguration">
+		<icon iconPath="resource/gif/Realization.gif" pluginID="org.eclipse.papyrus.uml.icons"/>
+		<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/resources/elementtypes/UCM.UI.elementtypesconfigurations#_z9OjkMEQEeaLpumP_4vuow" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
     </ownedConfigurations>
 
   </drawerConfigurations>
 
   <requiredProfiles>UCMProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.modelexplorer/newchildmenu/newChildMenu.creationmenumodel b/ucm/org.eclipse.papyrus.designer.ucm.modelexplorer/newchildmenu/newChildMenu.creationmenumodel
index d4d93c55f..e4f00d0f3 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.modelexplorer/newchildmenu/newChildMenu.creationmenumodel
+++ b/ucm/org.eclipse.papyrus.designer.ucm.modelexplorer/newchildmenu/newChildMenu.creationmenumodel
@@ -1,29 +1,75 @@
 <?xml version="1.0" encoding="ASCII"?>
-<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xmlns:umlfilters="http://www.eclipse.org/Papyrus/2014/uml/filters" label="New UCM Child">
+<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xmlns:umlfilters="http://www.eclipse.org/Papyrus/2014/uml/filters" label="New UCM Child">
   <filter xsi:type="filters:CompoundFilter" filter="//@filter/@ownedFilter.0">
     <ownedFilter xsi:type="umlfilters:ProfileApplied" name="isUCMApplied" profileQualifiedName="UCMProfile" profileURI="pathmap://UCM_PROFILE/ucm.profile.uml#_rZqWgNvTEeWGg4v4Bs5PXQ"/>
   </filter>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Component type" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ComponentType"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Atomic component implementation" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.AtomicComponentImplementation"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Composite component implementation" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.CompositeComponentImplementation"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Assembly part" icon="" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.AssemblyPart"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Connection" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.Connection"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="PortElement" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.ui.PortElement"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Port" icon="" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.Port" role=""/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Application module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ApplicationModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Component module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ComponentModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Contract module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ContractModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Platform module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.PlatformModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deployment module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.DeploymentModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Interaction definition module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.InteractionDefinitionModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Environment module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.EnvironmentModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Resource definition module" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ResourceDefinitionModule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Allocation plan" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.AllocationPlan"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Connector definition" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ConnectorDefinition"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Technical aspect" icon="" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.TechnicalAspect"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Technical policy definition" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.TechnicalPolicyDefinition"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Application assembly" icon="" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.AppAssembly"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Test case group" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.TestCaseGroup"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Programming languages" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.ProgrammingLanguages"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Language" elementTypeIdRef="org.eclipse.papyrus.designer.ucm.core.Language"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Component type">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_PlJqjlj354Wnbt9JeO78zA"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Atomic component implementation">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_J7_dIKaHEeaAGI_5QNiFYQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Composite component implementation">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_KLxlkKaHEeaAGI_5QNiFYQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Assembly part">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_qfSAcK2eEea8u6I-XjDezQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Connection">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_CKMawK2YEea8u6I-XjDezQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="PortElement" icon="">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__Z174LrxEeaKr_s25plyiQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Port">
+    <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Application module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cRZi0Ka2EeaAGI_5QNiFYQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Component module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_pG3ZYKa2EeaAGI_5QNiFYQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Contract module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ptPc4Ka2EeaAGI_5QNiFYQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Platform module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_ZL5FQKbIEeaAGI_5QNiFYQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deployment module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_J-zmcMKoEeaZYOYMFPracQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Interaction definition module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_AYkBwMKkEeaZYOYMFPracQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Environment module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_zFX7wMJTEeaZYOYMFPracQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Resource definition module">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_EEve8MKsEeaZYOYMFPracQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Allocation plan">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_5YxFALvHEeagON7A6uz3tw"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Connector definition">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_mlq3oLrxEeaKr_s25plyiQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Technical aspect" icon="">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cz6XwLrzEeaKr_s25plyiQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Technical policy definition">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_cd32ULrzEeaKr_s25plyiQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Application assembly" icon="">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#__WsRcLvGEeagON7A6uz3tw"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Test case group" icon="">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_OC0HoLvHEeagON7A6uz3tw"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Programming languages">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_c8Aj0LrzEeaKr_s25plyiQ"/>
+  </menu>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Language">
+    <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.designer.ucm.core/elementtypes/ucm.elementtypesconfigurations#_zr5SgMCNEeaLpumP_4vuow"/>
+  </menu>
 </ElementCreationMenuModel:Folder>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.profile/.classpath b/ucm/org.eclipse.papyrus.designer.ucm.profile/.classpath
index 858bac421..8dd013afc 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.profile/.classpath
+++ b/ucm/org.eclipse.papyrus.designer.ucm.profile/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.profile/build.properties b/ucm/org.eclipse.papyrus.designer.ucm.profile/build.properties
index 0d0cc7125..1eee8983a 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.profile/build.properties
+++ b/ucm/org.eclipse.papyrus.designer.ucm.profile/build.properties
@@ -8,5 +8,6 @@ bin.includes = .,\
                resources/,\
                about.html
 jars.compile.order = .
-source.. = src-gen/
+source.. = src-gen/,\
+           src/
 output.. = bin/
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.profile/src/org/eclipse/papyrus/designer/ucm/profile/UCMProfile/util/UCMResource.java b/ucm/org.eclipse.papyrus.designer.ucm.profile/src/org/eclipse/papyrus/designer/ucm/profile/UCMProfile/util/UCMResource.java
new file mode 100644
index 000000000..f1b7f203a
--- /dev/null
+++ b/ucm/org.eclipse.papyrus.designer.ucm.profile/src/org/eclipse/papyrus/designer/ucm/profile/UCMProfile/util/UCMResource.java
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * 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:
+ *  Ansgar Radermacher (inspired from SysML variant of this file)
+ *  	- Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.designer.ucm.profile.UCMProfile.util;
+
+/**
+ * Utility class to get informations on UCM resources
+ *
+ */
+public final class UCMResource {
+
+	public static final String PROFILES_PATHMAP = "pathmap://UCM_PROFILE/"; //$NON-NLS-1$	
+	
+	public static final String PROFILE_PATH = PROFILES_PATHMAP + "ucm.profile.uml"; //$NON-NLS-1$
+
+	public static final String PROFILE_URI = "http://www.omg.org/ucm/0.9"; //$NON-NLS-1$
+}
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/.classpath b/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/.classpath
index 858bac421..8dd013afc 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/.classpath
+++ b/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/build.properties b/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/build.properties
index fe135be04..abf73b40b 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/build.properties
+++ b/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/build.properties
@@ -8,6 +8,7 @@ bin.includes = .,\
                resources/,\
                about.html
 jars.compile.order = .
-source.. = src-gen/
+source.. = src-gen/,\
+           src/
 output.. = bin/
 src.includes = about.html
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/src/org/eclipse/papyrus/designer/ucm/supplement/profile/UCM_Supplement/util/UCMSuppResource.java b/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/src/org/eclipse/papyrus/designer/ucm/supplement/profile/UCM_Supplement/util/UCMSuppResource.java
new file mode 100644
index 000000000..03701949e
--- /dev/null
+++ b/ucm/org.eclipse.papyrus.designer.ucm.supplement.profile/src/org/eclipse/papyrus/designer/ucm/supplement/profile/UCM_Supplement/util/UCMSuppResource.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * 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:
+ *  Ansgar Radermacher (inspired from SysML variant of this file)
+ *  	- Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.designer.ucm.supplement.profile.UCM_Supplement.util;
+
+/**
+ * Utility class to get informations on UCM resources
+ *
+ */
+public final class UCMSuppResource {
+
+	public static final String PROFILES_PATHMAP = "pathmap://UCM_SUPP_PROFILE/"; //$NON-NLS-1$	
+	
+	public static final String PROFILE_PATH = PROFILES_PATHMAP + "ucm_supplement.profile.uml"; //$NON-NLS-1$
+
+	/**
+	 * supplement profile containing the sub-profiles, deployment, detailedcomp, environment, extratypes and testcases
+	 */
+	public static final String PROFILE_URI = "http://www.omg.org/ucm/supplement/0.9"; //$NON-NLS-1$
+}
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.types.profile/.classpath b/ucm/org.eclipse.papyrus.designer.ucm.types.profile/.classpath
index 858bac421..8dd013afc 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.types.profile/.classpath
+++ b/ucm/org.eclipse.papyrus.designer.ucm.types.profile/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.types.profile/build.properties b/ucm/org.eclipse.papyrus.designer.ucm.types.profile/build.properties
index 0d0cc7125..1eee8983a 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.types.profile/build.properties
+++ b/ucm/org.eclipse.papyrus.designer.ucm.types.profile/build.properties
@@ -8,5 +8,6 @@ bin.includes = .,\
                resources/,\
                about.html
 jars.compile.order = .
-source.. = src-gen/
+source.. = src-gen/,\
+           src/
 output.. = bin/
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.types.profile/src/org/eclipse/papyrus/designer/ucm/types/profile/UCMTypes/util/UCMTypesResource.java b/ucm/org.eclipse.papyrus.designer.ucm.types.profile/src/org/eclipse/papyrus/designer/ucm/types/profile/UCMTypes/util/UCMTypesResource.java
new file mode 100644
index 000000000..6d5b64f8d
--- /dev/null
+++ b/ucm/org.eclipse.papyrus.designer.ucm.types.profile/src/org/eclipse/papyrus/designer/ucm/types/profile/UCMTypes/util/UCMTypesResource.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * 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:
+ *  Ansgar Radermacher (inspired from SysML variant of this file)
+ *  	- Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.designer.ucm.types.profile.UCMTypes.util;
+
+/**
+ * Utility class to get informations on UCM resources
+ *
+ */
+public final class UCMTypesResource {
+
+	public static final String PROFILES_PATHMAP = "pathmap://UCM_TYPES_PROFILE/"; //$NON-NLS-1$	
+	
+	public static final String PROFILE_PATH = PROFILES_PATHMAP + "ucm_types.profile.uml"; //$NON-NLS-1$
+
+	/**
+	 * types profile
+	 */
+	public static final String PROFILE_URI = "http://www.omg.org/ucm/types/0.9"; //$NON-NLS-1$
+}
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.di b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.di
index bf9abab34..4986f5ce2 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.di
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.di
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.ucm.architecture"/>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.notation b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.notation
index be9e54196..86f420bd7 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.notation
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_QrrRYLIxEeaNi6dQbArxCg" type="PapyrusUMLClassDiagram" name="modules" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_ShMok7IxEeaNi6dQbArxCg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ShMolLIxEeaNi6dQbArxCg"/>
@@ -69,12 +69,11 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ko08VbIxEeaNi6dQbArxCg" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_QrrRYbIxEeaNi6dQbArxCg" name="diagram_compatibility_version" stringValue="1.2.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_QrrRYrIxEeaNi6dQbArxCg"/>
-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_QrrRY7IxEeaNi6dQbArxCg">
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_-KYh418CEeeNYtD4bzme8w" diagramKindId="org.eclipse.papyrus.designer.ucm.diagram.module">
       <owner xmi:type="uml:Model" href="ucm-application.uml#_M6LNQN2REeK2yvTixhtyWQ"/>
-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration#_8pUzMLAIEeacWfm2fO2yZA"/>
     </styles>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_QrrRYbIxEeaNi6dQbArxCg" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_QrrRYrIxEeaNi6dQbArxCg"/>
     <element xmi:type="uml:Model" href="ucm-application.uml#_M6LNQN2REeK2yvTixhtyWQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_ShNPobIxEeaNi6dQbArxCg" type="StereotypeCommentLink" source="_ShHJALIxEeaNi6dQbArxCg" target="_ShMok7IxEeaNi6dQbArxCg">
       <styles xmi:type="notation:FontStyle" xmi:id="_ShNPorIxEeaNi6dQbArxCg"/>
@@ -132,12 +131,11 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nWgqkbIxEeaNi6dQbArxCg" id="(0.49956933677863913,0.0)"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_ePQcELI6EeaNi6dQbArxCg" type="CompositeStructure" name="components" measurementUnit="Pixel">
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ePQcEbI6EeaNi6dQbArxCg" name="diagram_compatibility_version" stringValue="1.2.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_ePQcErI6EeaNi6dQbArxCg"/>
-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ePQcE7I6EeaNi6dQbArxCg">
+  <notation:Diagram xmi:id="_-KYh4F8CEeeNYtD4bzme8w" type="CompositeStructure" name="components" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_-KYh4V8CEeeNYtD4bzme8w" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_-KYh4l8CEeeNYtD4bzme8w"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_-KYh418CEeeNYtD4bzme8w" diagramKindId="org.eclipse.papyrus.designer.ucm.diagram.component">
       <owner xmi:type="uml:Package" href="ucm-application.uml#_N9yWYKUNEeaBwKloE0E3_w"/>
-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration#_d79eQHcZEeSndfsfQOfW2A"/>
     </styles>
     <element xmi:type="uml:Package" href="ucm-application.uml#_N9yWYKUNEeaBwKloE0E3_w"/>
   </notation:Diagram>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.uml b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.uml
index a32d4cbeb..55a180a95 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.uml
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-application.uml
@@ -6,50 +6,92 @@
     <packagedElement xmi:type="uml:Dependency" xmi:id="_nVVl4LIxEeaNi6dQbArxCg" client="_M6LNQN2REeK2yvTixhtyWQ">
       <supplier xmi:type="uml:Model" href="pathmap://UCM_LIBRARY/ucmstandard.uml#__N2fwLFYEeaM0KkcZIyGsA"/>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_zlpacKULEeaXsbg9f-pImA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zlrPoKULEeaXsbg9f-pImA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hN16EF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hN3IMF8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_rZqWgNvTEeWGg4v4Bs5PXQ"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hN3vQF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hN3vQV8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#//ucm_components"/>
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_thtBENvTEeWGg4v4Bs5PXQ"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_zlx9UKULEeaXsbg9f-pImA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zlx9UaULEeaXsbg9f-pImA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hN4WUF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hN4WUV8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#//ucm_interactions"/>
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_7zDYENvZEeWGg4v4Bs5PXQ"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_zlzLcKULEeaXsbg9f-pImA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zlzLcaULEeaXsbg9f-pImA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hN49YF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hN49YV8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#//ucm_technicalpolicies"/>
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_dEIhwNvbEeWGg4v4Bs5PXQ"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_PrTdwKUxEeaBwKloE0E3_w">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrUr4KUxEeaBwKloE0E3_w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hN5kcF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hN5kcV8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#//ucm_contracts"/>
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_Ses3UNvfEeWGg4v4Bs5PXQ"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_TNrYUKUxEeaBwKloE0E3_w">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TNr_YKUxEeaBwKloE0E3_w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hN6LgF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hN6ykF8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#//ucm_commons"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_m3TlgI-UEeaJw_-5rf6q3Q"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_iwf_oF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwhNwF8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/typespkg/0.9#//Types"/>
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_TYPES_PROFILE/ucm_types.profile.uml#_dZKm0BBCEeadyesW8v6O0Q"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hgv_cKWsEeamx4SN3GP6VA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hg4iUKWsEeamx4SN3GP6VA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#/"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_iwh00F8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwib4F8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/typespkg/0.9#/"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_rZqWgNvTEeWGg4v4Bs5PXQ"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_TYPES_PROFILE/ucm_types.profile.uml#_pG7gYBBAEeadyesW8v6O0Q"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_r-JKsKbFEeahAe6OWwnwNA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r-NcIKbFEeahAe6OWwnwNA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/0.9#//ucm_commons"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_lKU9wF8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lKVk0F8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#/"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_PROFILE/ucm.profile.uml#_m3TlgI-UEeaJw_-5rf6q3Q"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_2__qUIViEeaHtaLPHUIwTg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_lKWL4F8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lKWL4V8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_deployment"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_VBRFkIVjEeaHtaLPHUIwTg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_lKWy8F8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lKWy8V8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_detailed_components"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_VBXMMIVjEeaHtaLPHUIwTg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_lKWy8l8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lKXaAF8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_environment"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_VBdS0IVjEeaHtaLPHUIwTg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_lKXaAV8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lKYBEF8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_test_cases"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_zpEswLJPEeaduvwnGOKNuA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_lKYBEV8CEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lKYoIF8CEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_extra_types"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_0TpKUAsQEee54Zc7XcY5ag"/>
     </profileApplication>
   </uml:Model>
-  <UCMProfile.ucm_components:ComponentModule xmi:id="_RPTKcKUNEeaBwKloE0E3_w" base_Package="_N9yWYKUNEeaBwKloE0E3_w"/>
-  <UCMProfile.ucm_contracts:ContractModule xmi:id="_SnJ48KUzEeaBwKloE0E3_w" base_Package="_f11WAKUNEeaBwKloE0E3_w"/>
-  <UCMProfile.ucm_commons:ApplicationModule xmi:id="_6yiz4KdZEeaP9PXfXYr5Pw" base_Package="_M6LNQN2REeK2yvTixhtyWQ"/>
+  <UCMProfile.ucm_commons:ApplicationModule xmi:id="_nW7_QF8CEeeNYtD4bzme8w" base_Package="_M6LNQN2REeK2yvTixhtyWQ"/>
+  <UCMProfile.ucm_components:ComponentModule xmi:id="_omRgMF8CEeeNYtD4bzme8w" base_Package="_N9yWYKUNEeaBwKloE0E3_w"/>
+  <UCMProfile.ucm_contracts:ContractModule xmi:id="_p6-CQF8CEeeNYtD4bzme8w" base_Package="_f11WAKUNEeaBwKloE0E3_w"/>
 </xmi:XMI>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.di b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.di
index 93047affd..e38120475 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.di
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.di
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <pageList/>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="papyrus.welcome:dynamic#/"/>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+    <pageList/>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="papyrus.welcome:dynamic#/"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="ucm-platform.notation#_lKyq0LI6EeaNi6dQbArxCg"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="ucm-platform.notation#_awN9EF8HEeexL7I8l3OGxg"/>
+          </children>
         </children>
-        <children>
-          <emfPageIdentifier href="ucm-platform.notation#_lKyq0LI6EeaNi6dQbArxCg"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ucm-platform.notation#_iaW1QMC5EeaZ1oXgxscphw"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.ucm.architecture"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.designer.ucm.viewpoints.platform</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.notation b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.notation
index 8390a327d..36c06e259 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.notation
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_lKyq0LI6EeaNi6dQbArxCg" type="PapyrusUMLClassDiagram" name="Modules" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_lsYU8LI6EeaNi6dQbArxCg" type="Model_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_lsY8ALI6EeaNi6dQbArxCg" type="Model_NameLabel"/>
@@ -69,11 +69,10 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3D5aZbI6EeaNi6dQbArxCg" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_lKyq0bI6EeaNi6dQbArxCg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_lKyq0bI6EeaNi6dQbArxCg" name="diagram_compatibility_version" stringValue="1.3.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_lKyq0rI6EeaNi6dQbArxCg"/>
-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_lKyq07I6EeaNi6dQbArxCg">
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_wJy0o18FEeeNYtD4bzme8w" diagramKindId="org.eclipse.papyrus.designer.ucm.diagram.module">
       <owner xmi:type="uml:Model" href="ucm-platform.uml#_M6LNQN2REeK2yvTixhtyWQ"/>
-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration#_8pUzMLAIEeacWfm2fO2yZA"/>
     </styles>
     <element xmi:type="uml:Model" href="ucm-platform.uml#_M6LNQN2REeK2yvTixhtyWQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_lseblLI6EeaNi6dQbArxCg" type="StereotypeCommentLink" source="_lsYU8LI6EeaNi6dQbArxCg" target="_lsebkLI6EeaNi6dQbArxCg">
@@ -130,46 +129,24 @@
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5H9j4bI6EeaNi6dQbArxCg" id="(0.49953746530989823,0.22)"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_iaW1QMC5EeaZ1oXgxscphw" type="CompositeStructure" name="interactions" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_ich_gMC5EeaZ1oXgxscphw" type="Class_Shape">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ii-lwMC5EeaZ1oXgxscphw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ii_M0MC5EeaZ1oXgxscphw" key="mutable" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_icjNoMC5EeaZ1oXgxscphw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_icjNocC5EeaZ1oXgxscphw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_icjNosC5EeaZ1oXgxscphw" y="5"/>
+  <notation:Diagram xmi:id="_awN9EF8HEeexL7I8l3OGxg" type="CompositeStructure" name="interactions" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_exKC8F8HEeexL7I8l3OGxg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_exPigF8HEeexL7I8l3OGxg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_exPigV8HEeexL7I8l3OGxg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_exPigl8HEeexL7I8l3OGxg" y="15"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_icjNo8C5EeaZ1oXgxscphw" type="Class_StructureCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_icjNpMC5EeaZ1oXgxscphw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_icjNpcC5EeaZ1oXgxscphw"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_exQJkF8HEeexL7I8l3OGxg" type="Class_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_exQJkV8HEeexL7I8l3OGxg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exQJkl8HEeexL7I8l3OGxg"/>
       </children>
       <element xmi:type="uml:Class" href="ucm-platform.uml#_dBn2AMC5EeaZ1oXgxscphw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ich_gcC5EeaZ1oXgxscphw" x="89" y="64" width="179" height="83"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exKC8V8HEeexL7I8l3OGxg" x="80" y="60" width="274" height="92"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_idBHs8C5EeaZ1oXgxscphw" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_idBHtMC5EeaZ1oXgxscphw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_idBHtsC5EeaZ1oXgxscphw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="ucm-platform.uml#_dBn2AMC5EeaZ1oXgxscphw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idBHtcC5EeaZ1oXgxscphw" x="200"/>
-    </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_iaW1QcC5EeaZ1oXgxscphw" name="diagram_compatibility_version" stringValue="1.2.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_iaW1QsC5EeaZ1oXgxscphw"/>
-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iaW1Q8C5EeaZ1oXgxscphw">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_awN9EV8HEeexL7I8l3OGxg" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_awN9El8HEeexL7I8l3OGxg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_awN9E18HEeexL7I8l3OGxg" diagramKindId="org.eclipse.papyrus.designer.ucm.diagram.interaction">
       <owner xmi:type="uml:Package" href="ucm-platform.uml#_i9u7EKUNEeaBwKloE0E3_w"/>
-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.designer.ucm.diagrams/configuration/UCM.configuration#_8Q5RsK8vEea4LORm7y2CsQ"/>
     </styles>
     <element xmi:type="uml:Package" href="ucm-platform.uml#_i9u7EKUNEeaBwKloE0E3_w"/>
-    <edges xmi:type="notation:Connector" xmi:id="_idBuwMC5EeaZ1oXgxscphw" type="StereotypeCommentLink" source="_ich_gMC5EeaZ1oXgxscphw" target="_idBHs8C5EeaZ1oXgxscphw">
-      <styles xmi:type="notation:FontStyle" xmi:id="_idBuwcC5EeaZ1oXgxscphw"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_idBuxcC5EeaZ1oXgxscphw" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="ucm-platform.uml#_dBn2AMC5EeaZ1oXgxscphw"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_idBuwsC5EeaZ1oXgxscphw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_idBuw8C5EeaZ1oXgxscphw"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_idBuxMC5EeaZ1oXgxscphw"/>
-    </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.uml b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.uml
index 8864c702c..f52d53344 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.uml
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/resources/templates/ucm-platform.uml
@@ -57,10 +57,45 @@
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_VBdS0IVjEeaHtaLPHUIwTg"/>
     </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_bc02UF8FEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bc1dYF8FEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_2__qUIViEeaHtaLPHUIwTg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_bc4gsF8FEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bc6V4F8FEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_detailed_components"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_VBXMMIVjEeaHtaLPHUIwTg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_bc8LEF8FEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bc8LEV8FEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_test_cases"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_zpEswLJPEeaduvwnGOKNuA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_bc8yIF8FEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bc9ZMF8FEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/supplement/0.9#//ucm_extra_types"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_SUPP_PROFILE/ucm_supplement.profile.uml#_0TpKUAsQEee54Zc7XcY5ag"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_e0-d4F8FEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e0-d4V8FEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/typespkg/0.9#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_TYPES_PROFILE/ucm_types.profile.uml#_pG7gYBBAEeadyesW8v6O0Q"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_e0_sAF8FEeeNYtD4bzme8w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e0_sAV8FEeeNYtD4bzme8w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.omg.org/ucm/typespkg/0.9#//Types"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UCM_TYPES_PROFILE/ucm_types.profile.uml#_dZKm0BBCEeadyesW8v6O0Q"/>
+    </profileApplication>
   </uml:Model>
   <UCMProfile.ucm_contracts:ContractModule xmi:id="_JxFiEKUxEeaBwKloE0E3_w" base_Package="_0hAPoKUwEeaBwKloE0E3_w"/>
   <UCMProfile.ucm_commons:PlatformModule xmi:id="_CG5LQKdaEeaP9PXfXYr5Pw" base_Package="_M6LNQN2REeK2yvTixhtyWQ"/>
   <UCMProfile.ucm_interactions:InteractionDefinitionModule xmi:id="_-ukb8L3_Eea5FJSlmdDSlQ" base_Package="_i9u7EKUNEeaBwKloE0E3_w"/>
   <UCMProfile.ucm_technicalpolicies:NonfunctionalAspectModule xmi:id="_Ct4KIL4AEea5FJSlmdDSlQ" base_Package="_BQOgYL4AEea5FJSlmdDSlQ"/>
-  <UCMProfile.ucm_interactions:ConnectorDefinition xmi:id="_dIkykMC5EeaZ1oXgxscphw" base_Class="_dBn2AMC5EeaZ1oXgxscphw"/>
 </xmi:XMI>
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMModelWizard.java b/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMModelWizard.java
index 7ac9a9d73..0041434ac 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMModelWizard.java
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMModelWizard.java
@@ -37,14 +37,6 @@ public class NewUCMModelWizard extends CreateModelWizard {
 		return PAPYRUS_UCM;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String[] getDiagramCategoryIds() {
-		return new String[] {};
-	}
-
 	@Override
 	public boolean isPapyrusRootWizard() {
 		return false;
diff --git a/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMProjectWizard.java b/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMProjectWizard.java
index 6edf31c7f..a6e055822 100644
--- a/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMProjectWizard.java
+++ b/ucm/org.eclipse.papyrus.designer.ucm.wizards/src/org/omg/ucm/tooling/wizards/ui/NewUCMProjectWizard.java
@@ -14,7 +14,6 @@
 package org.omg.ucm.tooling.wizards.ui;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
@@ -46,28 +45,11 @@ public class NewUCMProjectWizard extends NewPapyrusProjectWizard {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {
-		// here UML RT is the only available category
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
 	protected void saveDiagramCategorySettings() {
 		// do nothing
 		// here UML RT is the only available category
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String[] getDiagramCategoryIds() {
-		return new String[] {};
-	}
-
 	@Override
 	public boolean isPapyrusRootWizard() {
 		return false;