Updated Dao classes.