Refactoring: services are now accessible through a service singleton