Refactored injectors