I wonder if we should even have the MetadataUpdater anymore...