diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java
index 1be491d06c5a33a84176b1f82d9723c4f7e44343..b4a1fbeed1d8ac97e3dac1bfb1b4d60b56903b5e 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java
@@ -15,16 +15,16 @@ import java.nio.file.Path;
  */
 public abstract class AbstractLiveContestDriver {
 
-  private static String ChangePath;
-  private static String RunIndex;
-  private static int Sequences;
-  private static String Tool;
-  private static String ChangeSet;
-  private static String Query;
+  private String ChangePath;
+  private String RunIndex;
+  private int Sequences;
+  private String Tool;
+  private String ChangeSet;
+  private String Query;
 
-  private static long stopwatch;
+  private long stopwatch;
 
-  private static Solution solution;
+  private Solution solution;
   private boolean traceEvents;
   private Path pathOfEventFile;
 
@@ -70,19 +70,19 @@ public abstract class AbstractLiveContestDriver {
     }
   }
 
-  static String getChangePath() {
+  String getChangePath() {
     return ChangePath;
   }
 
-  static Solution getSolution() {
+  Solution getSolution() {
     return solution;
   }
 
-  static String getChangeSet() {
+  String getChangeSet() {
     return ChangeSet;
   }
 
-  static String getQuery() {
+  String getQuery() {
     return Query;
   }
 
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
index 6e3ec873acd619d49978b74bc29a68899c4cbd48..a4af67f63cad2507cfc5bca737565dff8b6f92a1 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
@@ -30,15 +30,16 @@ import java.util.Map;
 public class LiveContestDriverEMF extends AbstractLiveContestDriver {
 
   public static void main(String[] args) throws IOException {
-//    Path filename = Paths.get(String.format("events-emf-%s-%s.csv", getChangeSet(), getQuery()));
-//    new LiveContestDriverEMF().enableTracing(filename).mainImpl();
-    new LiveContestDriverEMF().mainImpl();
+    LiveContestDriverEMF driver = new LiveContestDriverEMF();
+//    Path filename = Paths.get(String.format("events-emf-%s-%s.csv", driver.getChangeSet(), driver.getQuery()));
+//    driver.enableTracing(filename).mainImpl();
+    driver.mainImpl();
   }
 
-  private static ResourceSet repository;
-  private static Translator translator;
+  private ResourceSet repository;
+  private Translator translator;
 
-  private static Object loadFile(String path) throws IOException {
+  private Object loadFile(String path) throws IOException {
     repository.getURIConverter().getURIMap().put(URI.createFileURI(path), URI.createFileURI(getChangePath() + "/" + path));
     Resource mRes = repository.createResource(URI.createFileURI(getChangePath() + "/" + path));
     System.out.println(mRes);
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
index a21fd1889e8a845af38219c2e8240f4251d42a93..a98355a7fb1fd29535892eaa7f5a39e6078c402e 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
@@ -20,8 +20,9 @@ import java.nio.file.Paths;
  */
 public class LiveContestDriverXml extends AbstractLiveContestDriver {
   public static void main(String[] args) {
-    Path filename = Paths.get(String.format("events-xml-%s-%s.csv", getChangeSet(), getQuery()));
-    new LiveContestDriverXml().enableTracing(filename).mainImpl();
+    LiveContestDriverXml driver = new LiveContestDriverXml();
+    Path filename = Paths.get(String.format("events-xml-%s-%s.csv", driver.getChangeSet(), driver.getQuery()));
+    driver.enableTracing(filename).mainImpl();
   }
 
   @Override