Added x64 support