Change some DAO implementations