Adding more Dao stuff
merging