Add validation on fields