Add support to x64 and x86