Updated some code of the services code