Minor tweaks and add array setter injector