Injection timeout + refactoring