Add MatchConstraint class
Update match Qe building