Added validation rules to models