Modified iterator and classes using it for issue #7