+ small changes in DaoService