some tweaks. added IOC support