Added more validation rules