Fleshed out the service API