Adding support for Spark