poc - injector refactor