Add support for metadata and product info tags