Updated validation rules