Refactor injections