Added support for HTML content