Add html_body support