Added matching capability