Changes for Spark Core Compatability