Moved the field validation