Updated dependency injection.