updated DAOGenerator