Added support for different stepping modes