DAO methods refactor