More iterator design changes