Fixed ioc and handlers