Updated to fix issues with the service