Few changes in DAO