Updated iterator with new methods