Refactored IoC configuration
Refactored IoC configuration