Add support for metadata.size