Continuing the IOC refactor