Making iterator retrieval more centralized