Spark Core adaptions