Some improvements in MatchDAOImpl