Adjusted db structure for matches