Added some validation rules