Added 'arch' for specific arch support