Multitenancy support related changes