Add support for non-x86