Refactoring DAO impl classes