Changes to allow better IOC