Added tenant_id for querying data.