[10648] Implement additional validation rules