Add support for looping steps