Added support for 64bit devices