Revert "Revert "Core DAO""

This reverts commit f6929ccf798517c5447580a843465bb2f87030c4.