diff --git a/.gitignore b/.gitignore
index c9bb642..358bdee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -352,4 +352,4 @@ MigrationBackup/
 project/project/
 project/target/
 target/
-
+.idea
diff --git a/build.sbt b/build.sbt
deleted file mode 100644
index 5425a00..0000000
--- a/build.sbt
+++ /dev/null
@@ -1,32 +0,0 @@
-name := "spark-mssql-connector"
-
-organization := "com.microsoft.sqlserver.jdbc.spark"
-
-version := "1.0.0"
-
-scalaVersion := "2.11.12"
-
-val sparkVersion = "2.4.6"
-
-javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
-
-libraryDependencies ++= Seq(
-  "org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
-  // Spark Testing Utilities
-  "org.apache.spark" %% "spark-core" % sparkVersion % "test" classifier
-      "tests",
-  "org.apache.spark" %% "spark-sql" % sparkVersion% "test" classifier
-      "tests",
-  "org.apache.spark" %% "spark-catalyst" % sparkVersion % "test" classifier
-      "tests",
-  "org.scalatest" %% "scalatest" % "3.0.5" % "test",
-  "com.novocode" % "junit-interface" % "0.11" % "test",
-
-  //SQLServer JDBC jars
-  "com.microsoft.sqlserver" % "mssql-jdbc" % "8.4.1.jre8"
-)
-
-scalacOptions := Seq("-unchecked", "-deprecation", "evicted")
-
-// Exclude scala-library from this fat jar. The scala library is already there in spark package.
-assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
diff --git a/pom.xml b/pom.xml
index f899490..d14c735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,6 @@
     </licenses>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <scala.binary.version>2.11</scala.binary.version>
-        <scala.version>2.11.12</scala.version>
-        <spark.version>2.4.6</spark.version>
     </properties>
     <dependencies>
         <dependency>
@@ -56,23 +53,12 @@
             <scope>test</scope>
             <classifier>tests</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_${scala.binary.version}</artifactId>
-            <version>3.0.5</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.novocode</groupId>
             <artifactId>junit-interface</artifactId>
             <version>0.11</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>8.4.1.jre8</version>
-        </dependency>
     </dependencies>
     <developers>
         <developer>
@@ -213,4 +199,48 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+    <profile>
+        <id>spark24</id>
+        <properties>
+            <scala.binary.version>2.11</scala.binary.version>
+            <scala.version>2.11.12</scala.version>
+            <spark.version>2.4.6</spark.version>
+        </properties>
+        <dependencies>
+            <dependency>
+                <groupId>org.scalatest</groupId>
+                <artifactId>scalatest_${scala.binary.version}</artifactId>
+                <version>3.0.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.microsoft.sqlserver</groupId>
+                <artifactId>mssql-jdbc</artifactId>
+                <version>8.4.1.jre8</version>
+            </dependency>
+        </dependencies>
+    </profile>
+    <profile>
+        <id>spark30</id>
+        <properties>
+            <scala.binary.version>2.12</scala.binary.version>
+            <scala.version>2.12.11</scala.version>
+            <spark.version>3.0.0</spark.version>
+        </properties>
+        <dependencies>
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_${scala.binary.version}</artifactId>
+            <version>3.0.8</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>8.4.1.jre8</version>
+        </dependency>
+        </dependencies>
+    </profile>
+    </profiles>
 </project>
diff --git a/src/test/scala/com/microsoft/sqlserver/jdbc/spark/bulkwrite/DataSourceTest.scala b/src/test/scala/com/microsoft/sqlserver/jdbc/spark/bulkwrite/DataSourceTest.scala
index 2d900bc..d033cfc 100644
--- a/src/test/scala/com/microsoft/sqlserver/jdbc/spark/bulkwrite/DataSourceTest.scala
+++ b/src/test/scala/com/microsoft/sqlserver/jdbc/spark/bulkwrite/DataSourceTest.scala
@@ -16,9 +16,9 @@ import java.sql.Connection
 
 import org.scalatest.Matchers
 import org.apache.spark.SparkFunSuite
-import org.apache.spark.sql.test.SharedSQLContext
+import org.apache.spark.sql.test.SharedSparkSession
 
-class DataSourceTest extends SparkFunSuite with Matchers with SharedSQLContext {
+class DataSourceTest extends SparkFunSuite with Matchers with SharedSparkSession {
 
   test("Schema validation between Spark DataFrame and SQL Server ResultSet") {}