Add support for returning HTML