Removed support for Enumerator::Generator, added support for Enumerator