Updated iterator format for new implementation