Update for compatibility with HtmlBuilder