added Dao's and queries