Adds HtmlHandler and renames JsonHandler.