Adding conditional validation for several of the fields