Dao refactored a little