RFACTORING DAO