Updated form validation