Updated the HTMLForm classes