DAO classes refactored