Updated files so they would work with Spark Core