Added support for x86_64