Make the services independent and more easy to test