update to support multitentnt use case