Switched from the service locator pattern to singleton pattern