Refactoring in DAOFactory.
Refactoring in DAOFactory.