Continued work on multi tenancy feature