TenantJob improvement