Fields validation added