Updates to WebForms module