DAO fixed, all transactions needs to be handled with transactions