Added missing validation rules