Added validation rules