Added 64bit support in the scan