Added stop support