Updated 64-bit support