Update according to the current Dao.
Add minor changes