Added additional validation fields