APOLLO-3179 Refactored inheritance of getIterator