comment added to multi-tenant support