Change the DAO structure