Working on the service API