Make it more generic, add X86_64 target