Added support for x86