Refactored DAO