Refactored DAO classes