Add exit support