changes for multitenant code