Added template option
Added step id option