Add both x86 and x64 support