Add support for 64 bit