diff --git a/pom.xml b/pom.xml
index e5e660c..748e7f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.irvingc.spark</groupId>
-	<artifactId>dbscan-on-spark_2.10</artifactId>
-	<version>0.2.0-SNAPSHOT</version>
+	<artifactId>dbscan-on-spark_2.11</artifactId>
+	<version>0.3.0-SNAPSHOT</version>
 
 	<name>Distributed DBSCAN on Apache Spark</name>
 	<url>http://www.irvingc.com/dbscan-on-spark</url>
@@ -30,10 +30,10 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<scala.version>2.10.4</scala.version>
-		<scala.binary.version>2.10</scala.binary.version>
-		<scalatest.version>2.2.1</scalatest.version>
-		<spark.version>1.6.1</spark.version>
+		<scala.version>2.11.8</scala.version>
+		<scala.binary.version>2.11</scala.binary.version>
+		<scalatest.version>2.2.6</scalatest.version>
+		<spark.version>2.0.0</spark.version>
 	</properties>
 
 	<repositories>
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>com.meetup</groupId>
 			<artifactId>archery_${scala.binary.version}</artifactId>
-			<version>0.3.0</version>
+			<version>0.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.scalatest</groupId>
@@ -86,7 +86,7 @@
 			<plugin>
 				<groupId>net.alchim31.maven</groupId>
 				<artifactId>scala-maven-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 				<executions>
 					<execution>
 						<goals>
@@ -99,7 +99,7 @@
 			<plugin>
 				<groupId>org.scalastyle</groupId>
 				<artifactId>scalastyle-maven-plugin</artifactId>
-				<version>0.6.0</version>
+				<version>0.8.0</version>
 				<configuration>
 					<verbose>false</verbose>
 					<failOnViolation>true</failOnViolation>
diff --git a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/DBSCAN.scala b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/DBSCAN.scala
index 3d9c470..70acb5c 100644
--- a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/DBSCAN.scala
+++ b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/DBSCAN.scala
@@ -16,8 +16,7 @@
  */
 package org.apache.spark.mllib.clustering.dbscan
 
-import org.apache.spark.Logging
-import org.apache.spark.SparkContext.rddToPairRDDFunctions
+import org.apache.spark.internal.Logging
 import org.apache.spark.mllib.clustering.dbscan.DBSCANLabeledPoint.Flag
 import org.apache.spark.mllib.linalg.Vector
 import org.apache.spark.rdd.RDD
diff --git a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/EvenSplitPartitioner.scala b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/EvenSplitPartitioner.scala
index b2d5e7f..b9cda4e 100644
--- a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/EvenSplitPartitioner.scala
+++ b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/EvenSplitPartitioner.scala
@@ -16,9 +16,9 @@
  */
 package org.apache.spark.mllib.clustering.dbscan
 
-import scala.annotation.tailrec
+import org.apache.spark.internal.Logging
 
-import org.apache.spark.Logging
+import scala.annotation.tailrec
 
 /**
  * Helper methods for calling the partitioner
diff --git a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANArchery.scala b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANArchery.scala
index d479b80..ae9a4a9 100644
--- a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANArchery.scala
+++ b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANArchery.scala
@@ -16,15 +16,11 @@
  */
 package org.apache.spark.mllib.clustering.dbscan
 
-import scala.collection.mutable.Queue
-
-import org.apache.spark.Logging
+import archery.{Box, Entry, Point, RTree}
+import org.apache.spark.internal.Logging
 import org.apache.spark.mllib.clustering.dbscan.DBSCANLabeledPoint.Flag
 
-import archery.Box
-import archery.Entry
-import archery.Point
-import archery.RTree
+import scala.collection.mutable.Queue
 
 /**
  * An implementation of DBSCAN using an R-Tree to improve its running time
diff --git a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANNaive.scala b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANNaive.scala
index 1f067da..2115fb8 100644
--- a/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANNaive.scala
+++ b/src/main/scala/org/apache/spark/mllib/clustering/dbscan/LocalDBSCANNaive.scala
@@ -16,12 +16,12 @@
  */
 package org.apache.spark.mllib.clustering.dbscan
 
-import scala.collection.mutable.Queue
-
-import org.apache.spark.Logging
+import org.apache.spark.internal.Logging
 import org.apache.spark.mllib.clustering.dbscan.DBSCANLabeledPoint.Flag
 import org.apache.spark.mllib.linalg.Vectors
 
+import scala.collection.mutable.Queue
+
 /**
  * A naive implementation of DBSCAN. It has O(n2) complexity
  * but uses no extra memory. This implementation is not used
diff --git a/src/test/scala/org/apache/spark/mllib/clustering/dbscan/DBSCANSuite.scala b/src/test/scala/org/apache/spark/mllib/clustering/dbscan/DBSCANSuite.scala
index 271883b..16a8b8e 100644
--- a/src/test/scala/org/apache/spark/mllib/clustering/dbscan/DBSCANSuite.scala
+++ b/src/test/scala/org/apache/spark/mllib/clustering/dbscan/DBSCANSuite.scala
@@ -16,7 +16,6 @@
  */
 package org.apache.spark.mllib.clustering.dbscan
 
-import org.apache.spark.SparkContext.rddToPairRDDFunctions
 import org.apache.spark.mllib.linalg.Vectors
 import org.apache.spark.mllib.util.MLlibTestSparkContext
 import org.scalatest.Matchers