Add support for substeps