Dao minor improvment