Reworked InjectorMacro