Prepare to migrate to Spark

Follow