Fix dependency injection