Add support for nesting steps