Refactor injectors (use resolvers)