add class_name
fix scoped_by_tenant?