Updated matcher