Migrate to IocContainer