Further work on MatchManager