Form data validator changes