More work on the DAO framework.