Add MatchField class