Updated to support 64-bit