Update WCLASS code for 64-bit