improvements for use in multi-tenant environments