All daos refactored except for the Universal ones.