Changes to OrderServiceImpl