There are going to be cross tenant apis and we would need to have some support for those in clients, currently created with one tenant in mind.