Did some more on EventDao.