Add experimental form validation