IoC configuration improved.