Added support for hidden fields