Improvements in MatchDAOImpl