Finished implementing the service