Update to html body support