Enhance stop to support more events