Port to newest version of SparkGS