Added a few validation rules