Adding support for 64 bit