Change: move some core modules to DaoModules.
Add minor changes.