DAO implementation updates