Added validation fields