Add support for envInject Step & Wrapper