Added multiple arch support