Added validation for form