Changed IOC usage to be in line with the "Hollywood Principle" instead of as a Service Locator.