Add 32- and 64-bit raptor2