Improve the validate with fields