DAOFactory reworked