Added counting enumerator