Updates scan and match to fit new header pattern.