Moved to using a ServiceRegistry for the services of the application