Updated CustomerService class.