Updated based on 64-bit options