Add support for more metadata.