Add support for metadata