CustomerService updated with basic implementation