Adding MatchClassHint and MatchName