Updated module to support 64-bit