Added validation on all fields