Improve API of the Iterator