diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d86414ff30637194b46e2189689be4ea06a0765c..3fb1547f4e58095de1d70a43eb4460b8cae6177e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
   # `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
@@ -9,30 +9,23 @@ variables:
 # Cache downloaded dependencies and plugins between builds.
 cache:
   paths:
-    - /root/.m2/repository/
+    - .m2/repository/
 # This will only validate and compile stuff and run e.g. maven-enforcer-plugin. 
 # Because some enforcer rules might check dependency convergence and class duplications
 # we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
-validate:
+validate: &validate
   stage: build
   script:
     - 'mvn $MAVEN_CLI_OPTS test-compile'
+  only:
+    - master
   image: maven:3.3.9-jdk-8
 # For merge requests do not `deploy` but only run `verify`.
 # See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-verify:
+verify: &verify
   stage: test
   script:
     - 'mvn $MAVEN_CLI_OPTS verify'
-  except:
-    - master
-  image: maven:3.3.9-jdk-8
-# For `master` branch run `mvn deploy` automatically.
-# Here you need to decide whether you want to use JDK7 or 8.
-deploy:
-  stage: deploy
-  script:
-    - 'mvn $MAVEN_CLI_OPTS deploy'
   only:
     - master
-  image: maven:3.3.9-jdk-8
\ No newline at end of file
+  image: maven:3.3.9-jdk-8
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..7a531392842ef1351f9f7eb9bb286bd3d936bc5c
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
diff --git a/pom.xml b/pom.xml
index d1759ab6df67581e2e265cb328ddc7a15ab660dd..6f2cae1e2dc157c8ea960e8e7e0d6a6e87804d42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.7.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -39,7 +39,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.0.4</version>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -52,7 +52,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
+				<version>2.10.4</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -71,7 +71,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>2.10</version>
+				<version>3.0.0</version>
 			</extension>
 		</extensions>
 	</build>
@@ -82,14 +82,19 @@
 		<repository>
 			<id>simonstrator</id>
 			<url>https://dev.kom.e-technik.tu-darmstadt.de/mvn/</url>
+			<snapshots>
+	            <updatePolicy>always</updatePolicy>
+	        </snapshots>
+	        <releases>
+	            <updatePolicy>always</updatePolicy>
+	        </releases>
 		</repository>
 
 		<!-- local kom repository -->
-		<repository>
+		<!-- <repository>
 			<id>maven.kom</id>
-			<!-- <url>file://D:/simcfgm2</url> -->
 			<url>http://www.kom.tu-darmstadt.de/~stingl/PeerfactSim.KOM-Libraries/maven2/</url>
-		</repository>
+		</repository> -->
 
 		<!-- jgrapht can be found there -->
 		<repository>
@@ -109,14 +114,6 @@
 
 	<dependencies>
 
-		<!-- Meta: to remove unused dependencies :) -->
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-dependency-plugin</artifactId>
-			<version>2.9</version>
-		</dependency>
-
-
 		<!-- XML -->
 		<dependency>
 			<groupId>dom4j</groupId>
@@ -165,6 +162,13 @@
 			<artifactId>log4j</artifactId>
 			<version>1.2.16</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-api</artifactId>
+		    <version>1.7.25</version>
+		</dependency>
+		
 
 		<!-- Parsing, Bytecode, ... -->
 		<!-- Unused <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> 
@@ -223,7 +227,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>10.0.1</version>
+			<version>18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
@@ -363,6 +367,13 @@
 			<artifactId>simonstrator-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
+		<!-- Traci as a Service -->
+		<dependency>
+			<groupId>maki</groupId>
+			<artifactId>simonstrator-traci</artifactId>
+			<version>0.1-SNAPSHOT</version>
+		</dependency>
 
 	</dependencies>
 </project>
diff --git a/src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java b/src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java
index 5d603e47451b601d7dcd1f21831003b3049414a3..c1b45c8531e4886c683c1f3fb1558d6f5c9a9a97 100755
--- a/src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -44,7 +45,6 @@ import de.tudresden.ws.container.SumoLink;
 import de.tudresden.ws.container.SumoLinkList;
 import de.tudresden.ws.container.SumoPosition2D;
 import de.tudresden.ws.container.SumoStringList;
-import edu.emory.mathcs.backport.java.util.Collections;
 import it.polito.appeal.traci.SumoTraciConnection;
 
 /**
diff --git a/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedCacheDecisionStrategy.java b/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedCacheDecisionStrategy.java
index 012090d3f3b73158eda0a4f544a4efb1b5a2d6ee..cfb3fb7ad389a95130d90285fa7f9bb0d28c08f5 100755
--- a/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedCacheDecisionStrategy.java
+++ b/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedCacheDecisionStrategy.java
@@ -20,6 +20,7 @@
 
 package de.tud.kom.p2psim.impl.vehicular.caching.decision;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -35,7 +36,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.vehicular.caching.decision
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.AvailableInformationAttributes;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.PointInformation;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.RoadInformation;
-import edu.emory.mathcs.backport.java.util.Arrays;
 
 public class TTLbasedCacheDecisionStrategy implements CacheDecisionStrategy {
 	private static final long SCALING = Time.SECOND;
diff --git a/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedVectoralCacheDecisionStrategy.java b/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedVectoralCacheDecisionStrategy.java
index 9cf6547750de2057d9b78a4f882f7e9acab4f4fb..bdfb68149aa8cb8067332acb14323c58d755e123 100755
--- a/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedVectoralCacheDecisionStrategy.java
+++ b/src/de/tud/kom/p2psim/impl/vehicular/caching/decision/TTLbasedVectoralCacheDecisionStrategy.java
@@ -22,6 +22,7 @@ package de.tud.kom.p2psim.impl.vehicular.caching.decision;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +37,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.Avai
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.PointInformation;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.RoadInformation;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.RoadNetworkEdge;
-import edu.emory.mathcs.backport.java.util.Collections;
 
 public class TTLbasedVectoralCacheDecisionStrategy implements CacheDecisionStrategy {
 	private static final long SCALING = Time.SECOND;