Need to generalize Type I, add 'system' ID pass.