Added custom validation rules