Updated for x64 support