Updated matcher method