Updated the services implementations