Dao infrastructure refactored.