Spark Integration: Addressed PR1 comments