Adding multi-tenancy