Added Enumerate methods to the enumerator (working on a simplification and more broader use for it)