Add 16 and 64 bit varieties