Refactoring from inject to requires