init and add Tenant support