Add functionality to establish connection only with the tenant name.