Updated iterator