diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
index d7f70d5afe1f61d994885f258f80eb5f9776194c..1bde11317b84cefc4da7f82d7da59ef152c702b8 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
@@ -123,7 +123,7 @@ public class CustomContractEditorTab extends ContractEditorTab {
 
 		if (selectedUmlElement instanceof Property) {
 			if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
-				Class umlClass = entityUtil.getUmlType((Property) selectedUmlElement);
+				Element umlClass = entityUtil.getUmlType((Property) selectedUmlElement);
 
 				if (!contractEntityUtil.isContract(umlClass)) {
 					return umlClass;
@@ -157,7 +157,7 @@ public class CustomContractEditorTab extends ContractEditorTab {
 			}
 
 			if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
-				Class classType = entityUtil.getUmlType((Property) selectedUmlElement);
+				Element classType = entityUtil.getUmlType((Property) selectedUmlElement);
 				if (contractEntityUtil.isContract(classType)) {
 					return classType;
 				}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
index 339a9bbf784b699eb8e6857b1306ea5681a8ad2b..44583f856f71e99174d3e6512913da7310a0727d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
@@ -69,7 +69,7 @@ public class CustomContractEditorView extends ContractEditorView {
 
 		if (selectedUmlElement instanceof Property) {
 			if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
-				Class classType = entityUtil.getUmlType((Property) selectedUmlElement);
+				Element classType = entityUtil.getUmlType((Property) selectedUmlElement);
 				if (!contractEntityUtil.isContract(classType)) {
 					return classType;
 				}
@@ -95,7 +95,7 @@ public class CustomContractEditorView extends ContractEditorView {
 			}
 
 			if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
-				Class classType = entityUtil.getUmlType((Property) selectedUmlElement);
+				Element classType = entityUtil.getUmlType((Property) selectedUmlElement);
 				if (contractEntityUtil.isContract(classType)) {
 					return classType;
 				}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
index f6aa93afca699efffa9f1a1eb014336d6948f6ec..0060200b5d2a53b7d68a2450ef074cfa778dc40d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
@@ -35,7 +35,7 @@ public class CHESSComponentNode extends ComponentNode {
 	public void createChildren(Object associatedObject, List<TreeNode> children) {
 		for (Property umlProperty : ((Class) entityUtil.getUmlType((Property) associatedObject)).getAttributes()) {
 			if (contractEntityUtil.isContractProperty(umlProperty)) {
-				children.add(new ContractNode(this, entityUtil.getUmlType(umlProperty).getName()));
+				children.add(new ContractNode(this, ((Class)entityUtil.getUmlType(umlProperty)).getName()));
 			} else if (entityUtil.isComponentInstance(umlProperty)) {
 				children.add(new CHESSComponentNode(this, umlProperty));
 			}
@@ -45,7 +45,7 @@ public class CHESSComponentNode extends ComponentNode {
 
 	@Override
 	public String getName(Object associatedObject) {
-		String typeName = entityUtil.getUmlType((Property) associatedObject).getName();
+		String typeName = ((Class)entityUtil.getUmlType((Property) associatedObject)).getName();
 		String propertyName = ((Property) associatedObject).getName();
 		return propertyName + ":" + typeName;
 		}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
index 164f8b8902d394c958641a15d12d948edbbf3aaa..8aeca4dbf5798ebb50c8b47953d880ae215cfe52 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
@@ -40,7 +40,7 @@ public class CHESSSystemNode extends SystemNode {
 		for (Property umlProperty : ((Class) system).getAttributes()) {
 
 			if (contractEntityUtil.isContractProperty(umlProperty)) {
-				children.add(new ContractNode(this, entityUtil.getUmlType(umlProperty).getName()));
+				children.add(new ContractNode(this, ((Class)entityUtil.getUmlType(umlProperty)).getName()));
 			} else if (entityUtil.isComponentInstance(umlProperty)) {
 				children.add(new CHESSComponentNode(this, umlProperty));
 			}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF
index 64485164960321795568515a76b5d8b4bcf6bfd3..e9c2fa7f0d9e0944e41ab42e892047def2b0d696 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
  org.eclipse.papyrus.views.properties;bundle-version="2.0.0",
- org.eclipse.papyrus.customization.properties;bundle-version="2.0.0"
+ org.eclipse.papyrus.customization.properties;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.tools
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j;version="1.2.15",
  org.polarsys.chess.core.util.uml