Dependency Injection correction