Add exit control