Some changes to the service API