Refactored DAOFactory implementations. refs #499