Optimisations in MatchController