Fixed iterator types (it is a map now)