Changed the way how IOC is handled in the solution