better support for multitenancy