Add Spark support for 4.5+