Updated CustomerServiceImpl