Added support for html type