Changes for Spark 1.0