diff --git a/pom.xml b/pom.xml
index 007cea102930abef4a921ddc0d977b76dc812334..791e099b58e8ec00637cc3715cc8d61e63351561 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,18 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc-emadl-generator</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.0-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-    <emadl.version>0.2.6</emadl.version>
-    <CNNTrain.version>0.2.6</CNNTrain.version>
+    <emadl.version>0.2.7-SNAPSHOT</emadl.version>
+    <CNNTrain.version>0.3.0-SNAPSHOT</CNNTrain.version>
     <cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version>
     <cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version>
-    <cnnarch-gluon-generator.version>0.1.6</cnnarch-gluon-generator.version>
+    <cnnarch-gluon-generator.version>0.2.0-SNAPSHOT</cnnarch-gluon-generator.version>
     <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
 
         <!-- .. Libraries .................................................. -->
diff --git a/src/test/resources/models/Alexnet.emadl b/src/test/resources/models/Alexnet.emadl
index 2ebdf8a1269a3876efdbfc621a2df266a2a08065..10a9ea975c6d9c012051ef763fc3a7e3dbd5a85d 100644
--- a/src/test/resources/models/Alexnet.emadl
+++ b/src/test/resources/models/Alexnet.emadl
@@ -41,7 +41,7 @@ component Alexnet{
         fc(->=2) ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/InstanceTest/NetworkB.emadl b/src/test/resources/models/InstanceTest/NetworkB.emadl
index fe4d4049ab19067c863bbb7081bc059d8c98bb94..5f43423d316764253b6b5b2d68ce42aca8e1a334 100644
--- a/src/test/resources/models/InstanceTest/NetworkB.emadl
+++ b/src/test/resources/models/InstanceTest/NetworkB.emadl
@@ -18,7 +18,7 @@ component NetworkB<Z classes = 10> (Z convChannels){
         Dropout() ->
         FullyConnected(units=classes) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/InvalidLayerInput.emadl b/src/test/resources/models/InvalidLayerInput.emadl
index 39dfc4632401a6797194b93f7ffa62f45a8851f4..176a0568490e144bd17a332dc0bebed0edc5e44e 100644
--- a/src/test/resources/models/InvalidLayerInput.emadl
+++ b/src/test/resources/models/InvalidLayerInput.emadl
@@ -27,6 +27,6 @@ component InvalidLayerInput{
         fc() ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/MultipleOutputs.emadl b/src/test/resources/models/MultipleOutputs.emadl
index 5a9091790f9df4c00a2f5c160bc3221192f4bed3..3d0c00d3dc046ade5ef11146980fa926b9770981 100644
--- a/src/test/resources/models/MultipleOutputs.emadl
+++ b/src/test/resources/models/MultipleOutputs.emadl
@@ -24,6 +24,6 @@ component MultipleOutputs{
             [1] ->
             Softmax() ->
             pred[1]
-        )
+        );
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ResNeXt50.emadl b/src/test/resources/models/ResNeXt50.emadl
index 83fa12223b1ee13fd50b9ded93bb95fedccebb50..a0666ab8e7d33724c0fd825855c5a63d50b9fadd 100644
--- a/src/test/resources/models/ResNeXt50.emadl
+++ b/src/test/resources/models/ResNeXt50.emadl
@@ -40,6 +40,6 @@ component ResNeXt50{
         GlobalPooling(pool_type="avg") ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ResNet152.emadl b/src/test/resources/models/ResNet152.emadl
index 571e6f86294646796cf71f8066d13d194b88ca0c..6769eae43a12c5b10a769ff0f26de2b31476714c 100644
--- a/src/test/resources/models/ResNet152.emadl
+++ b/src/test/resources/models/ResNet152.emadl
@@ -34,6 +34,6 @@ component ResNet152{
         GlobalPooling(pool_type="avg") ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ResNet34.emadl b/src/test/resources/models/ResNet34.emadl
index ae5e6093e81e52781be454052d4373dc0a28dfa1..3e76dba1dff93f3f35d497c8571de2e95ceaf88f 100644
--- a/src/test/resources/models/ResNet34.emadl
+++ b/src/test/resources/models/ResNet34.emadl
@@ -32,6 +32,6 @@ component ResNet34{
         GlobalPooling(pool_type="avg") ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ThreeInputCNN_M14.emadl b/src/test/resources/models/ThreeInputCNN_M14.emadl
index 5328d09c5a11146455887a8e1faf6b12c40d49e3..add46cd384e9a6d1c8666264e7622cd194518946 100644
--- a/src/test/resources/models/ThreeInputCNN_M14.emadl
+++ b/src/test/resources/models/ThreeInputCNN_M14.emadl
@@ -24,7 +24,7 @@ component ThreeInputCNN_M14{
         Relu() ->
         FullyConnected(units=10) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/VGG16.emadl b/src/test/resources/models/VGG16.emadl
index f9007ecb5870f01d455794e24e74239d0457527b..dad51c5c6297a23a398c68ac95e567cfa17b1c32 100644
--- a/src/test/resources/models/VGG16.emadl
+++ b/src/test/resources/models/VGG16.emadl
@@ -29,6 +29,6 @@ component VGG16{
         fc() ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/cNNCalculator/Network.emadl b/src/test/resources/models/cNNCalculator/Network.emadl
index 7ee371c0222f3129be6d01a81ba3cb80dc3c33ce..aba73c0deb1f9058fa0fba29a497d83aa0898268 100644
--- a/src/test/resources/models/cNNCalculator/Network.emadl
+++ b/src/test/resources/models/cNNCalculator/Network.emadl
@@ -14,7 +14,7 @@ component Network{
         Relu() ->
         FullyConnected(units=10) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
diff --git a/src/test/resources/models/cifar10/CifarNetwork.emadl b/src/test/resources/models/cifar10/CifarNetwork.emadl
index 0719c3aa4de7807f26a0012518336dc3fb5e6258..66ca64426bd71ee3a04f537830628add29703e56 100644
--- a/src/test/resources/models/cifar10/CifarNetwork.emadl
+++ b/src/test/resources/models/cifar10/CifarNetwork.emadl
@@ -34,7 +34,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
         Dropout()->
         FullyConnected(units=classes) ->
         Softmax() ->
-        softmax
+        softmax;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl b/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl
index 43333f58f6d233e491eb1ebb6101db30d5c8e35c..2d50ee9e8136add141349522a4852011c695c972 100644
--- a/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl
+++ b/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl
@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
         Dropout()->
         FullyConnected(units=classes) ->
         Softmax() ->
-        softmax
+        softmax;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/mnist/LeNetNetwork.emadl b/src/test/resources/models/mnist/LeNetNetwork.emadl
index d6fe1847edc90d8299977a2c565087616b2dded4..3b9c0ee86a86ff1c3d07f196c100652fad0a1137 100644
--- a/src/test/resources/models/mnist/LeNetNetwork.emadl
+++ b/src/test/resources/models/mnist/LeNetNetwork.emadl
@@ -14,7 +14,7 @@ component LeNetNetwork<Z(2:oo) classes = 10>{
         Relu() ->
         FullyConnected(units=classes) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
diff --git a/src/test/resources/models/simpleCifar10/CifarNetwork.emadl b/src/test/resources/models/simpleCifar10/CifarNetwork.emadl
index 63dabff31f43d2939eba323662be2e2c3ee764e9..bb755c2cd2104c17aab1b83595d1951588614fa6 100644
--- a/src/test/resources/models/simpleCifar10/CifarNetwork.emadl
+++ b/src/test/resources/models/simpleCifar10/CifarNetwork.emadl
@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
         Dropout()->
         FullyConnected(units=classes) ->
         Softmax() ->
-        softmax
+        softmax;
 
     }
 }
\ No newline at end of file