Do we need also here replace iterator with enumerator?