Add 32 bit support