Update according to the current Dao.
Add better handling of documentations.