MetadataResolver updates