Simplify fetchEnumerator and enumerate API