Iterator implementation changes