Add ioc support