Update for new iterator protocol