Add arch support