Added support to service tenant name