Added multiple field validation