Adapted to FileLookupFactory removal