Added mode and arch params.