#74 Simplify fetchEnumerator and enumerate API