Spark 1.6 to 2.0