Added support for HTML field