Updated masked handling in Match interface and MatchBuilder