Updated Dependency Injection