Fix implementation of DAOs