Re-introducing the tenant concept