Use updated UUIDFetcher and NameFetcher