MetadataFinder becomes MetadataLoader