Added form validator