Add 32 / 64 bit versions