adding tenant mgt features