Add support for 'step' and 'next' commands