Update to scan implementation