Migrated to Spark-0.9