Added tenantAPI functionality