Add Enumerator Class, with an EnumeratorIterator