diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2739a74f7c967be6fb2c7a53f5276e1c736de990..32fa37bb8d39d6347a829c69066ec801f8c2a273 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ CompileJobLinux:
     expire_in: 1 day
   script:
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml -U
-  - cat target/site/jacoco/index.html
+#  - cat target/site/jacoco/index.html
 
 DeployJobLinux:
   stage: linuxDeploy
diff --git a/pom.xml b/pom.xml
index 8d8cbdc41883cea4378d6400c9941f0689e72701..26eaa8705283a4a7c0d585ab2dd5d7f6715be912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>embedded-montiarc-math-middleware-generator</artifactId>
-    <version>0.0.33-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
 
 
     <!-- == PROJECT DEPENDENCIES ============================================= -->
@@ -19,15 +19,12 @@
 
         <!-- .. SE-Libraries .................................................. -->
         <se-commons.version>1.7.7</se-commons.version>
-        
-        <embedded-montiarc.version>0.2.12-SNAPSHOT</embedded-montiarc.version>
-        <Embedded-montiarc-math-generator.version>0.4.0-SNAPSHOT</Embedded-montiarc-math-generator.version>
-        <Embedded-montiarc-math-roscpp-generator.version>0.1.8-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
-        <EMADL2CPP.version>0.4.3-SNAPSHOT</EMADL2CPP.version>
-        <EMADL.version>0.2.12-SNAPSHOT</EMADL.version>
-        <SOMEIP.version>1.3-SNAPSHOT</SOMEIP.version>
-        <MQTT.version>1.5-SNAPSHOT</MQTT.version>
-        <embedded-montiarc-component-clustering.version>0.0.2-SNAPSHOT</embedded-montiarc-component-clustering.version>
+
+        <Embedded-montiarc-math-roscpp-generator.version>0.1.9-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
+        <EMADL2CPP.version>0.4.7</EMADL2CPP.version>
+        <SOMEIP.version>1.4-SNAPSHOT</SOMEIP.version>
+        <MQTT.version>1.6-SNAPSHOT</MQTT.version>
+        <embedded-montiarc-component-clustering.version>0.0.3-SNAPSHOT</embedded-montiarc-component-clustering.version>
 
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
@@ -56,12 +53,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc</artifactId>
-            <version>${embedded-montiarc.version}</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -75,12 +66,6 @@
             <version>1.2.17</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jgrapht</groupId>
-            <artifactId>jgrapht-core</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-
         <dependency>
             <groupId>de.se_rwth.commons</groupId>
             <artifactId>se-commons-logging</artifactId>
@@ -97,12 +82,6 @@
             <version>${guava.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-math-generator</artifactId>
-            <version>${Embedded-montiarc-math-generator.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-math-roscpp-generator</artifactId>
@@ -129,11 +108,7 @@
         </dependency>
 
         <!-- EMADL Dependencies -->
-        <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-deeplearning</artifactId>
-            <version>${EMADL.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-emadl-generator</artifactId>
diff --git a/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java b/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java
index 5b4ae53c1f9565fdc8a8c7100d389c6215fda8bb..9d38e79b7ff9df623626490e01ef8ea5cd9885a0 100644
--- a/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java
+++ b/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java
@@ -13,7 +13,7 @@ import de.monticore.symboltable.Symbol;
 import de.monticore.symboltable.resolving.ResolvingFilter;
 import de.se_rwth.commons.logging.Log;
 import org.jgrapht.Graph;
-import org.jgrapht.alg.ConnectivityInspector;
+import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.SimpleGraph;