DAO implementation modifications 2.0