#9 DAO improvings