Spark changes to fit library standards