Added support for multiple tenants for step1