Added support for multistep jobs