[IoC] Refactoring