edited service and added to spark-base