Adding html viewer support