Updated the HTMLForm classes 2