Added first field validation