Added support for 64 bit arch