More work on the service API