Stop passing around the tenant everywhere and retrieve it from context
instead