Updated iterator library