Refactor of MatchManager once again