Modified API for matches