Added persistence to the services