Add support for 64 bits