Just rewriting a new Service class