Better validation for rows