Added stop contexts