Added multitenancy option