Add 64-bit support