scanner: Update for new scanner