remove MatchSystem and use new MatchCollection