Decoupling from a service locator

Matthias Noback