Add 64bit support