Done with multitenancy. Missing some details