Issue #28 - Support tenantId as well, besides tenantName