Added entry IoC support