[#0] Refactor DAOS