Add stop expr functionality to 2.0.0.tx