Eliminated dependency on NCDirEnumerator