Finished reworking the service model