Add abort option for scans