Update for Iterator API changes