Update so that validation rules work