Changes for Spark 0.9.0