Added support for multi-tenancy