Add MatchModel and adapt DbHelper