added more validation rules