DAO ifaces refactoring