Add support for metadata fields