Use new IoC container and some modifications.