DAO and DAOImpl changed