Added additional changes for Multi-Tenancy