Moved iterator to separate class.