Refactored for InjectionResolver