Small additions for Multitenancy plan