Added support for stop