Adding HTML output support