Dao for new entities
Lot of updates of dao