Added matching capabilities