Improve IOC