I don't think the primary/secondary approach works here, as the global one requires the host to be sent over and the tenant one doesn't. My preference would be to use the structure outlined above.