Added functionality for all tenants