Refactor daora