Add bailout support