Switch to 64-bit IDs