Modifing Service class