Improve the match data JSON format