Added validation on matching required fields