Shouldn't this use ``MetadataMap``?