diff --git a/core/libs/soot-infoflow-trunk-jar-with-dependencies.jar b/core/libs/soot-infoflow-trunk-jar-with-dependencies.jar
deleted file mode 100644
index 6b3826c..0000000
Binary files a/core/libs/soot-infoflow-trunk-jar-with-dependencies.jar and /dev/null differ
diff --git a/core/libs/soot-infoflow-trunk.jar b/core/libs/soot-infoflow-trunk.jar
deleted file mode 100644
index 343671d..0000000
Binary files a/core/libs/soot-infoflow-trunk.jar and /dev/null differ
diff --git a/core/pom.xml b/core/pom.xml
index c7a47b7..8dec72e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
 	<name>core</name>
 	<version>1.0.0</version>
 	<description>Dynamic slicing core</description>
-	
+
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -19,8 +19,8 @@
 		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
 		<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
 	</properties>
-	
-   
+
+
 	<build>
 		<finalName>core</finalName>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -123,25 +123,18 @@
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>localrepository</id>
-			<url>file://${project.basedir}/libs</url>
-		</repository>
-	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>guru.nidi</groupId>
 			<artifactId>graphviz-java</artifactId>
 			<version>0.18.1</version>
 		</dependency>
-		<dependency>
-			<groupId>de.tud.sse</groupId>
-			<artifactId>soot-infoflow</artifactId>
-			<version>2.9.0-SNAPSHOT</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/libs/soot-infoflow-trunk-jar-with-dependencies.jar</systemPath>
-		</dependency>
+        <!-- https://mvnrepository.com/artifact/de.fraunhofer.sit.sse.flowdroid/soot-infoflow -->
+        <dependency>
+            <groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
+            <artifactId>soot-infoflow</artifactId>
+            <version>2.10.0</version>
+        </dependency>
 	<!-- https://mvnrepository.com/artifact/org.hamcrest/java-hamcrest -->
 		<dependency>
 			<groupId>org.hamcrest</groupId>
@@ -183,7 +176,7 @@
 			<artifactId>commons-cli</artifactId>
 			<version>1.4</version>
 		</dependency>
-		
+
 		<!-- We need this dependency to have output on the command
 		line for the JAR with dependencies -->
         <dependency>
diff --git a/core/src/main/java/ca/ubc/ece/resess/slicer/dynamic/core/sootcallgraphs/ThreadCalls.java b/core/src/main/java/ca/ubc/ece/resess/slicer/dynamic/core/sootcallgraphs/ThreadCalls.java
index 0d53440..3fee158 100644
--- a/core/src/main/java/ca/ubc/ece/resess/slicer/dynamic/core/sootcallgraphs/ThreadCalls.java
+++ b/core/src/main/java/ca/ubc/ece/resess/slicer/dynamic/core/sootcallgraphs/ThreadCalls.java
@@ -30,6 +30,7 @@
 import soot.Body;
 import soot.Kind;
 import soot.Local;
+import soot.MethodSubSignature;
 import soot.PhaseOptions;
 import soot.RefType;
 import soot.Scene;
@@ -153,7 +154,7 @@ private void addVirtualCallSite(Stmt s, SootMethod m, Local receiver, InstanceIn
       }
       receivers.add(receiver);
     }
-    sites.add(new VirtualCallSite(s, m, iie, subSig, kind));
+    sites.add(new VirtualCallSite(s, m, iie, new MethodSubSignature(subSig), kind));
   }
 
   private void processNewMethod(SootMethod m) {