Updated code to reflect the changes made to the services.