Add more exit points