Updated for ARMv8 support