Adding support for html tags