TenantBeans improvement