Refactor: bring dao to current.