Add ability to inject context using command args