diff --git a/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore b/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore
index 78a316b38a56887262991b00be9e611939d0612a..17c161e61d9586519da87fb0a32a551d3e769bae 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore
+++ b/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.fortiss.org/af3/platform/raspberry"
     nsPrefix="org-fortiss-af3-platform-raspberry">
-  <eClassifiers xsi:type="ecore:EClass" name="RaspberryPi" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CanBus" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//TransmissionUnit"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CanConnector" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RaspberryPi" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericExecutionUnit"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CanBus" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericTransmissionUnit"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CanConnector" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericTransceiver"/>
 </ecore:EPackage>
diff --git a/org.fortiss.af3.platform.raspberry/trunk/plugin.xml b/org.fortiss.af3.platform.raspberry/trunk/plugin.xml
index 7ac665a7efa79e9db8a3307cc562fa8284426e19..52892d063e10e25a815272b25768bf91b52f57e3 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/plugin.xml
+++ b/org.fortiss.af3.platform.raspberry/trunk/plugin.xml
@@ -20,7 +20,7 @@
    <extension
          point="org.fortiss.tooling.kernel.modelElementCompositor">
       <modelElementCompositor
-            compositor="org.fortiss.af3.platform.raspberry.compose.RaspberryPiCompositor.java">
+            compositor="org.fortiss.af3.platform.raspberry.compose.RaspberryPiCompositor">
          <modelElementClass
                modelElementClass="org.fortiss.af3.platform.raspberry.model.RaspberryPi">
          </modelElementClass>
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
index 5d1f3d8405969c1dfa65386a6440e15985ce2e89..1a3e29f9e4b11570d859c2680bc83951576eef95 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java
@@ -39,11 +39,13 @@ public class CanBusCompositor extends
 	@Override
 	protected boolean isCorrectElementClass(IPlatformArchitectureElement container,
 			EObject contained) {
+		final boolean instanceOfAny = isInstanceOfAny(contained, CanConnector.class);
 		if(container != null) {
-			return isInstanceOfAny(container, CanBus.class) &&
-					isInstanceOfAny(contained, CanConnector.class);
+			final boolean instanceOfAny2 = isInstanceOfAny(container, CanBus.class);
+			return instanceOfAny2 &&
+					instanceOfAny;
 		}
-		return isInstanceOfAny(contained, CanConnector.class);
+		return instanceOfAny;
 	}
 
 }
diff --git a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
index 0cd01d340a2eea70059ead201819640adc255645..c11f507c2fabf0af43d1f012158cf563f2ec9f69 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
+++ b/org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java
@@ -39,11 +39,13 @@ public class RaspberryPiCompositor extends
 	@Override
 	protected boolean isCorrectElementClass(IPlatformArchitectureElement container,
 			EObject contained) {
+		final boolean instanceOfAny2 = isInstanceOfAny(contained, CanConnector.class);
 		if(container != null) {
-			return isInstanceOfAny(container, RaspberryPi.class) &&
-					isInstanceOfAny(contained, CanConnector.class);
+			final boolean instanceOfAny = isInstanceOfAny(container, RaspberryPi.class);
+			return instanceOfAny &&
+					instanceOfAny2;
 		}
-		return isInstanceOfAny(contained, CanConnector.class);
+		return instanceOfAny2;
 	}
 
 }