Added new form validation