improved injector, avoid builtin name
refactoring + addition