Updated Service class