improve Dependency Injection in more classes