Add code to generate match and results data