Adjusted validation rules