Added x86 support