Last modification on DAO classes after test fails :)