Add support for using Spark 1.1