Added support for form rendering