diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 17c2c545..38c56bc8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: 🐞 Bug
 description: Report a bug or an issue you've found within the dbt package
 title: "[Bug] <title>"
-labels: ["bug", "triage"]
+labels: ["type:bug"]
 body:
   - type: markdown
     attributes:
@@ -35,6 +35,12 @@ body:
       description: A concise description of what you expected to happen.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Possible solution
+      description: Were you able to investigate and/or discover a potential fix to this bug in your investigation? If so, it would be much appreciated if you could submit code samples to show us how your fix resolved this issue. 
+    validations:
+      required: false
   - type: textarea
     attributes:
       label: dbt Project configurations
@@ -61,6 +67,19 @@ body:
         - other (mention it in "Additional Context")
     validations:
       required: true
+  - type: dropdown
+    id: orchestration_type
+    attributes:
+      label: How are you running this dbt package?
+      multiple: true
+      options:
+        - Fivetran Quickstart Data Model
+        - Fivetran Transformations
+        - dbt Core™
+        - dbt Cloud™
+        - other (mention it in "Additional Context")
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: dbt Version
@@ -83,6 +102,6 @@ body:
       description: Our team will assess this issue and let you know if we will add it to a future sprint. However, if you would like to expedite the solution, we encourage you to contribute to the package via a PR. Our team will then work with you to approve and merge your contributions as soon as possible.
       options:
         - label: Yes.
-        - label: Yes, but I will need assistance and will schedule time during our [office hours](https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours) for guidance
+        - label: Yes, but I will need assistance.
         - label: No.
           required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index dc85da95..496b3bd6 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,7 @@
 contact_links:
+  - name: Provide feedback to our dbt package team
+    url: https://www.surveymonkey.com/r/DQ7K7WW
+    about: Fill out our survey form to provide valuable feedback to the Fivetran team developing and maintaining the dbt packages.
   - name: Fivetran connector question
     url: https://support.fivetran.com/hc
     about: Have a question about your connector? Check out the Fivetran support portal for more details.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index a1d28bbb..529e9bc5 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,7 +1,7 @@
 name: 🎉 Feature
 description: Suggest a new feature for the Fivetran dbt package
 title: "[Feature] <title>"
-labels: ["enhancement"]
+labels: ["type:enhancement"]
 body:
   - type: markdown
     attributes:
@@ -20,6 +20,13 @@ body:
       description: A clear and concise description of what you want to happen and why you want the new feature.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: How would you implement this feature?
+      description: |
+        How would you build out this feature with your existing data? Any code examples you can provide to help accelerate development on this issue?
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Describe alternatives you've considered
@@ -34,7 +41,7 @@ body:
       description: Our team will assess this feature and let you know if we will add it to a future sprint. However, if you would like to expedite the feature, we encourage you to contribute to the package via a PR. Our team will then work with you to approve and merge your contributions as soon as possible.
       options:
         - label: Yes.
-        - label: Yes, but I will need assistance and will schedule time during your [office hours](https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours) for guidance.
+        - label: Yes, but I will need assistance.
         - label: No.
           required: false
   - type: textarea
diff --git a/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md
index 1e22b099..32206744 100644
--- a/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md
@@ -16,7 +16,6 @@ Please acknowledge that you have successfully performed the following commands l
 Before marking this PR as "ready for review" the following have been applied:
 - [ ] The appropriate issue has been linked, tagged, and properly assigned
 - [ ] All necessary documentation and version upgrades have been applied
-    <!--- Be sure to update the package version in the dbt_project.yml, integration_tests/dbt_project.yml, and README if necessary. -->
 - [ ] docs were regenerated (unless this PR does not include any code or yml updates)
 - [ ] BuildKite integration tests are passing
 - [ ] Detailed validation steps have been provided below
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b4e7e8e0..30849fd0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -19,7 +19,13 @@
 <!--- To select a checkbox you simply need to add an "x" with no spaces between the brackets (eg. [x] Yes). -->
 - [ ] Yes
 
-**Provide an emoji that best describes your current mood**
+**Typically there are additional maintenance changes required before this will be ready for an upcoming release. Are you comfortable with the Fivetran team making a few commits directly to your branch?**
+<!--- If you select Yes this will help expedite your PR in case there are small changes required before approval. We encourage you not to use this branch in a production environment as we may make additional updates.  -->
+<!--- If you select No, we will not make any changes directly to your branch and will either communicate any planned changes via the PR thread or will merge your PR into a separate branch so we may make changes without modifying your branch.. -->
+- [ ] Yes
+- [ ] No
+
+**If you had to summarize this PR in an emoji, which would it be?**
 <!--- For a complete list of markdown compatible emojis check our this git repo (https://gist.github.com/rxaviers/7360908)  --> 
 :dancer:
 
diff --git a/.quickstart/quickstart.yml b/.quickstart/quickstart.yml
index c6dc259d..176cc1c7 100644
--- a/.quickstart/quickstart.yml
+++ b/.quickstart/quickstart.yml
@@ -21,4 +21,17 @@ destination_configurations:
   databricks:
     dispatch:
       - macro_namespace: dbt_utils
-        search_order: [ 'spark_utils', 'dbt_utils' ]
\ No newline at end of file
+        search_order: [ 'spark_utils', 'dbt_utils' ]
+public_models: [
+  "stripe__customer_overview",
+  "stripe__balance_transactions",
+  "stripe__invoice_details",
+  "stripe__subscription_details",
+  "stripe__invoice_line_item_details",
+  "stripe__daily_overview",
+  "stripe__activity_itemized_2",
+  "stripe__balance_change_from_activity_itemized_3",
+  "stripe__ending_balance_reconciliation_itemized_4",
+  "stripe__payout_itemized_3",
+  "stripe__line_item_enhanced"
+]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1be900..23fa94ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# dbt_stripe v0.15.0
+[PR #88](https://github.com/fivetran/dbt_stripe/pull/88) includes the following updates:
+
+## 🚨 Breaking Changes 🚨
+- Updated `stripe__balance_transactions` to correctly handle multiple disputes on the same transaction.
+- Renamed the columns `dispute_id` and `dispute_reason` to `dispute_ids` and `dispute_reasons` in the following models:
+  - `stripe__balance_transactions`
+  - `stripe__activity_itemized_2`
+  - `stripe__balance_change_from_activity_itemized_3`
+  - `stripe__ending_balance_reconciliation_itemized_4`
+
 # dbt_stripe v0.14.0
 [PR #82](https://github.com/fivetran/dbt_stripe/pull/82) includes the following updates:
 
diff --git a/README.md b/README.md
index 3f6c6cca..43dfe4ab 100644
--- a/README.md
+++ b/README.md
@@ -12,53 +12,53 @@
         href="https://fivetran.com/docs/transformations/dbt/quickstart">
         <img src="https://img.shields.io/badge/Fivetran_Quickstart_Compatible%3F-yes-green.svg" /></a>
 </p>
- 
+
 # Stripe Transformation dbt Package ([Docs](https://fivetran.github.io/dbt_stripe/))
-# 📣 What does this dbt package do?
+## What does this dbt package do?
 - Produces modeled tables that leverage Stripe data from [Fivetran's connector](https://fivetran.com/docs/applications/stripe) in the format described by [this ERD](https://fivetran.com/docs/applications/stripe#schemainformation) and build off the output of our [stripe source package](https://github.com/fivetran/dbt_stripe_source).
-- Enables you to better understand your Stripe transactions. The package achieves this by performing the following: 
+- Enables you to better understand your Stripe transactions. The package achieves this by performing the following:
     - Enhance the balance transaction entries with useful fields from related tables. 
     - Generate a metrics tables allow you to better understand your account activity over time or at a customer level. These time-based metrics are available on a daily, weekly, monthly, and quarterly level.
 - Generates a comprehensive data dictionary of your source and modeled Stripe data through the [dbt docs site](https://fivetran.github.io/dbt_stripe/).
 
 <!--section="stripe_transformation_model"-->
-The following table provides a detailed list of all models materialized within this package by default. 
-> TIP: See more details about these models in the package's [dbt docs site](https://fivetran.github.io/dbt_stripe/#!/overview?g_v=1).
+The following table provides a detailed list of all tables materialized within this package by default.
+> TIP: See more details about these tables in the package's [dbt docs site](https://fivetran.github.io/dbt_stripe/#!/overview?g_v=1).
 
-| **model**                          | **description**                                                                                                                                                                                                                              |
+| **Table**                          | **Description**                                                                                                                                                                                                                              |
 |--------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [stripe__balance_transactions](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__balance_transactions)    | Each record represents a change to your account balance, enriched with data about the transaction.                                                                                                                                       |
-| [stripe__invoice_details](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__invoice_details)      | Each record represents an invoice, enriched with details about the associated charge, customer, and subscription data.                                                                                         
-| [stripe__invoice_line_item_details](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__invoice_line_item_details)      | Each record represents an invoice line item, enriched with details about the associated charge, customer, subscription, and pricing data.  
-| [stripe__daily_overview](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__daily_overview)      | Each record represents, per day, a summary of daily totals and rolling totals by transaction type (balances, payments, refunds, payouts, and other transactions). You may use this model to roll up into weekly, quarterly, monthly, and other time grains. You may also use this model to create a MRR report.                                                  |
+| [stripe__invoice_details](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__invoice_details)      | Each record represents an invoice, enriched with details about the associated charge, customer, and subscription data.
+| [stripe__invoice_line_item_details](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__invoice_line_item_details)      | Each record represents an invoice line item, enriched with details about the associated charge, customer, subscription, and pricing data.
+| [stripe__daily_overview](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__daily_overview)      | Each record represents, per day, a summary of daily totals and rolling totals by transaction type (balances, payments, refunds, payouts, and other transactions). You may use this table to roll up into weekly, quarterly, monthly, and other time grains. You may also use this table to create a MRR report.                                                  |
 | [stripe__subscription_details](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__subscription_details)    | Each record represents a subscription, enriched with customer details and payment aggregations.                                                                                                                                          |
 | [stripe__customer_overview](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__customer_overview)       | Each record represents a customer, enriched with metrics about their associated transactions.  Transactions with no associated customer will have a customer description of "No associated customer".                                                                                                                                               |
 | [stripe__activity_itemized_2](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__activity_itemized_2)       |  This report displays balance transactions alongside associated customer, charge, refund, fee, and invoice details, useful for Interchange Plus (IC+) pricing users.                                                                                                                                             |
 | [stripe__balance_change_from_activity_itemized_3](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__balance_change_from_activity_itemized_3)       | This report functions like a bank statement for reconciling your Stripe balance, especially beneficial for treating Stripe as a bank account for accounting purposes. It offers a detailed breakdown of transactions affecting your balance.                                                                                                                                               |
 | [stripe__ending_balance_reconciliation_itemized_4](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__ending_balance_reconciliation_itemized_4)       | This reports models after Stripe's payout reconciliation reports, helping match bank account payouts with related transactions. It provides details for automatic payouts and transactions that hadn't settled as of the report's end date. This report is only available for users with automatic payouts enabled and optimized for those who prefer to reconcile the transactions included in each payout as a settlement batch.                                                                                                                                               |
-| [stripe__payout_itemized_3](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__payout_itemized_3)       | This report represents payouts with information on expected arrival dates and status, akin to a bank statement for reconciling your Stripe balance, particularly useful for accounting purposes.                                                                                                                                             
-| [stripe__line_item_enhanced](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__line_item_enhanced)       | This model constructs a comprehensive, denormalized analytical table that enables reporting on key revenue, subscription, customer, and product metrics from your billing platform. It’s designed to align with the schema of the `*__line_item_enhanced` model found in Stripe, Recharge, Recurly, Shopify, and Zuora, offering standardized reporting across various billing platforms. To see the kinds of insights this model can generate, explore example visualizations in the [Fivetran Billing Model Streamlit App](https://fivetran-billing-model.streamlit.app/). Visit the app for more details.  |
+| [stripe__payout_itemized_3](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__payout_itemized_3)       | This report represents payouts with information on expected arrival dates and status, akin to a bank statement for reconciling your Stripe balance, particularly useful for accounting purposes.
+| [stripe__line_item_enhanced](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__line_item_enhanced)       | This table is a comprehensive, denormalized analytical table that enables reporting on key revenue, subscription, customer, and product metrics from your billing platform. It’s designed to align with the schema of the `*__line_item_enhanced` table found in Stripe, Recharge, Recurly, Shopify, and Zuora, offering standardized reporting across various billing platforms. To see the kinds of insights this table can generate, explore example visualizations in the [Fivetran Billing Model Streamlit App](https://fivetran-billing-model.streamlit.app/). Visit the app for more details.  |
 
-## Example Visualizations
-Curious what these models can do? Check out example visualizations from the [stripe__line_item_enhanced](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__line_item_enhanced) model in the [Fivetran Billing Model Streamlit App](https://fivetran-billing-model.streamlit.app/), and see how you can use these models in your own reporting. Below is a screenshot of an example report—explore the app for more.
+### Example Visualizations
+Curious what these tables can do? Check out example visualizations from the [stripe__line_item_enhanced](https://fivetran.github.io/dbt_stripe/#!/model/model.stripe.stripe__line_item_enhanced) table in the [Fivetran Billing Model Streamlit App](https://fivetran-billing-model.streamlit.app/), and see how you can use these tables in your own reporting. Below is a screenshot of an example report—explore the app for more.
 
 <p align="center">
-  <a href="https://fivetran-billing-model.streamlit.app/">
+<a href="https://fivetran-billing-model.streamlit.app/">
     <img src="https://raw.githubusercontent.com/fivetran/dbt_stripe/main/images/streamlit_example.png" alt="Streamlit Billing Model App" width="75%">
-  </a>
+</a>
 </p>
 
 <!--section-end-->
 
-# 🎯 How do I use the dbt package?
+## How do I use the dbt package?
 
-## Step 1: Prerequisites
+### Step 1: Prerequisites
 To use this dbt package, you must have the following:
 
 - At least one Fivetran Stripe connector syncing data into your destination.
 - A **BigQuery**, **Snowflake**, **Redshift**, **Databricks**, or **PostgreSQL** destination.
 
-### Databricks Dispatch Configuration
+#### Databricks Dispatch Configuration
 If you are using a Databricks destination with this package you will need to add the below (or a variation of the below) dispatch configuration within your `dbt_project.yml`. This is required in order for the package to accurately search for macros within the `dbt-labs/spark_utils` then the `dbt-labs/dbt_utils` packages respectively.
 ```yml
 dispatch:
@@ -66,7 +66,7 @@ dispatch:
     search_order: ['spark_utils', 'dbt_utils']
 ```
 
-## Step 2: Install the package
+### Step 2: Install the package
 Include the following stripe package version in your `packages.yml` file:
 > TIP: Check [dbt Hub](https://hub.getdbt.com/) for the latest installation instructions or [read the dbt docs](https://docs.getdbt.com/docs/package-management) for more information on installing packages.
 ```yaml
@@ -74,9 +74,9 @@ packages:
   - package: fivetran/stripe
     version: [">=0.14.0", "<0.15.0"]
 ```
-Do **NOT** include the `stripe_source` package in this file. The transformation package itself has a dependency on it and will install the source package as well. 
+Do **NOT** include the `stripe_source` package in this file. The transformation package itself has a dependency on it and will install the source package as well.
 
-## Step 3: Define database and schema variables
+### Step 3: Define database and schema variables
 By default, this package runs using your destination and the `stripe` schema. If this is not where your stripe data is (for example, if your stripe schema is named `stripe_fivetran`), add the following configuration to your root `dbt_project.yml` file:
 
 ```yml
@@ -85,7 +85,7 @@ vars:
     stripe_schema: your_schema_name 
 ```
 
-## Step 4: Disable models for non-existent sources
+### Step 4: Disable models for non-existent sources
 This package takes into consideration that not every Stripe account utilizes the `invoice`, `invoice_line_item`, `payment_method`, `payment_method_card`, `plan`, `price`, `subscription`, or `credit_note` features, and allows you to disable the corresponding functionality. By default, all variables' values are assumed to be `true` with the exception of `credit_note`. Add variables for only the tables you want to disable or enable respectively:
 
 ```yml
@@ -98,10 +98,10 @@ vars:
     stripe__using_subscriptions:   False  #Disable if you are not using the subscription and plan/price tables.
     stripe__using_credit_notes:    True   #Enable if you are using the credit note tables.
 ```
-## (Optional) Step 5: Additional configurations
+### (Optional) Step 5: Additional configurations
 <details open><summary>Expand to view configurations</summary>
 
-### Enabling Standardized Billing Model
+#### Enabling Standardized Billing Model
 This package contains the `stripe__line_item_enhanced` model which constructs a comprehensive, denormalized analytical table that enables reporting on key revenue, subscription, customer, and product metrics from your billing platform. It’s designed to align with the schema of the `*__line_item_enhanced` model found in Recurly, Recharge, Stripe, Shopify, and Zuora, offering standardized reporting across various billing platforms. To see the kinds of insights this model can generate, explore example visualizations in the [Fivetran Billing Model Streamlit App](https://fivetran-billing-model.streamlit.app/). For the time being, this model is disabled by default. If you would like to enable this model you will need to adjust the `stripe__standardized_billing_model_enabled` variable to be `true` within your `dbt_project.yml`:
 
 ```yml
@@ -109,7 +109,7 @@ vars:
   stripe__standardized_billing_model_enabled: true # false by default.
 ```
 
-### Unioning Multiple Stripe Connectors
+#### Unioning Multiple Stripe Connectors
 If you have multiple Stripe connectors you would like to use this package on simultaneously, we have added the ability to do so. Data from disparate connectors will be unioned together and be passed downstream to the end models. The `source_relation` column will specify where each record comes from. To use this functionality, you will need to either set the `stripe_union_schemas` or `stripe_union_databases` variables. Please also make sure the single-source `stripe_database` and `stripe_schema` variables are removed.
 
 ```yml
@@ -122,9 +122,9 @@ vars:
     stripe_union_schemas: ['stripe_us','stripe_mx'] # use this if the data is in different schemas/datasets of the same database/project
     stripe_union_databases: ['stripe_db_1','stripe_db_2'] # use this if the data is in different databases/projects but uses the same schema name
 ```
-### Leveraging Plan vs Price Sources
+#### Leveraging Plan vs Price Sources
 
-Customers using Fivetran with the newer [Stripe Price API](https://stripe.com/docs/billing/migration/migrating-prices) will have a `price` table, and possibly a `plan` table if that was used previously. Therefore to accommodate two different source tables we added logic to check if there exists a `price` table by default. If not, it will leverage the `plan` table. However if you wish to use the `plan` table instead, you may set `stripe__using_price` to `false` in your `dbt_project.yml` to override the macro. 
+Customers using Fivetran with the newer [Stripe Price API](https://stripe.com/docs/billing/migration/migrating-prices) will have a `price` table, and possibly a `plan` table if that was used previously. Therefore to accommodate two different source tables we added logic to check if there exists a `price` table by default. If not, it will leverage the `plan` table. However if you wish to use the `plan` table instead, you may set `stripe__using_price` to `false` in your `dbt_project.yml` to override the macro.
 
 ```yml
 # dbt_project.yml
@@ -136,7 +136,7 @@ vars:
   stripe__using_price: false #  True by default. If true, will look `price ` table. If false, will look for the `plan` table. 
 ```
 
-### Leveraging Subscription Vs Subscription History Sources
+#### Leveraging Subscription Vs Subscription History Sources
 For Stripe connectors set up after February 09, 2022 the `subscription` table has been replaced with the new `subscription_history` table. By default this package will look for your subscription data within the `subscription_history` source table. However, if you have an older connector then you must configure the `stripe__using_subscription_history` to `false` in order to have the package use the `subscription` source rather than the `subscription_history` table.
 > **Please note that if you have `stripe__using_subscription_history` enabled then the package will filter for only active records.**
 ```yml
@@ -144,7 +144,7 @@ vars:
     stripe__using_subscription_history: False  # True by default. Set to False if your connector syncs the `subscription` table instead. 
 ```
 
-### Setting your timezone
+#### Setting your timezone
 This packages leaves all timestamp columns in the UTC timezone. However, there are certain instances, such in the daily overview model, that timestamps have to be converted to dates. As a result, the timezone used for the timestamp becomes relevant.  By default, this package will use the UTC timezone when converting to date, but if you want to set the timezone to the time in your Stripe reports, add the following configuration to your root `dbt_project.yml`:
 
 ```yml
@@ -152,7 +152,7 @@ vars:
   stripe_timezone: "America/New_York" # Replace with your timezone
 ```
 
-### Running on Live vs Test Customers
+#### Running on Live vs Test Customers
 By default, this package will run on non-test data (`where livemode = true`) from the source Stripe tables. However, you may want to include and focus on test data when testing out the package or developing your analyses. To run on only test data, add the following configuration to your root `dbt_project.yml` file:
 
 ```yml
@@ -160,7 +160,7 @@ vars:
     stripe_source:
         stripe__using_livemode: false  # Default = true
 ```
-### Including sub Invoice Line Items
+#### Including sub Invoice Line Items
 By default, this package will filter out any records from the `invoice_line_item` source table which include the string `sub_`. This is due to a legacy Stripe issue where `sub_` records were found to be duplicated. However, if you highly utilize these records you may wish they be included in the final output of the `stg_stripe__invoice_line_item` model. To do, so you may include the below variable configuration in your root `dbt_project.yml`:
 ```yml
 vars:
@@ -169,7 +169,7 @@ vars:
 ```
 
 
-### Pivoting out Metadata Properties
+#### Pivoting out Metadata Properties
 Oftentimes you may have custom fields within your source tables that is stored as a JSON object that you wish to pass through. By leveraging the `metadata` variable, this package will pivot out fields into their own columns within the respective staging models from the `dbt_stripe_source` package. The metadata variables accept dictionaries in addition to strings.
 
 Additionally, you may `alias` your field if you happen to be using a reserved word as a metadata field, any otherwise incompatible name, or just wish to rename your field. Below are examples of how you would add the respective fields.
@@ -220,7 +220,7 @@ vars:
     stripe__subscription_metadata: ['the', 'list', 'of', 'property', 'fields'] # Note: this is case-SENSITIVE and must match the casing of the property as it appears in the JSON
 ```
 
-### Change the build schema
+#### Change the build schema
 By default, this package builds the stripe staging models within a schema titled (`<target_schema>` + `_stg_stripe`) in your destination. If this is not where you would like your stripe staging data to be written to, add the following configuration to your root `dbt_project.yml` file:
 
 ```yml
@@ -229,7 +229,7 @@ models:
       +schema: my_new_schema_name # leave blank for just the target_schema
 ```
     
-### Change the source table references
+#### Change the source table references
 If an individual source table has a different name than the package expects, add the table name as it appears in your destination to the respective variable:
 > IMPORTANT: See this project's [`dbt_project.yml`](https://github.com/fivetran/dbt_stripe_source/blob/main/dbt_project.yml) variable declarations to see the expected names.
     
@@ -240,15 +240,15 @@ vars:
 
 </details>
 
-## (Optional) Step 6: Orchestrate your models with Fivetran Transformations for dbt Core™
+### (Optional) Step 6: Orchestrate your models with Fivetran Transformations for dbt Core™
 <details><summary>Expand for details</summary>
 <br>
     
 Fivetran offers the ability for you to orchestrate your dbt project through [Fivetran Transformations for dbt Core™](https://fivetran.com/docs/transformations/dbt). Learn how to set up your project for orchestration through Fivetran in our [Transformations for dbt Core setup guides](https://fivetran.com/docs/transformations/dbt#setupguide).
 </details>
 
-# 🔍 Does this package have dependencies?
-This dbt package is dependent on the following dbt packages. Please be aware that these dependencies are installed by default within this package. For more information on the following packages, refer to the [dbt hub](https://hub.getdbt.com/) site.
+## Does this package have dependencies?
+This dbt package is dependent on the following dbt packages. These dependencies are installed by default within this package. For more information on the following packages, refer to the [dbt hub](https://hub.getdbt.com/) site.
 > IMPORTANT: If you have any of these dependent packages in your own `packages.yml` file, we highly recommend that you remove them from your root `packages.yml` to avoid package version conflicts.
     
 ```yml
@@ -265,16 +265,15 @@ packages:
     - package: dbt-labs/spark_utils
       version: [">=0.3.0", "<0.4.0"]
 ```
-# 🙌 How is this package maintained and can I contribute?
-## Package Maintenance
+## How is this package maintained and can I contribute?
+### Package Maintenance
 The Fivetran team maintaining this package _only_ maintains the latest version of the package. We highly recommend you stay consistent with the [latest version](https://hub.getdbt.com/fivetran/stripe/latest/) of the package and refer to the [CHANGELOG](https://github.com/fivetran/dbt_stripe/blob/main/CHANGELOG.md) and release notes for more information on changes across versions.
 
-## Contributions
-A small team of analytics engineers at Fivetran develops these dbt packages. However, the packages are made better by community contributions! 
+### Contributions
+A small team of analytics engineers at Fivetran develops these dbt packages. However, the packages are made better by community contributions.
 
-We highly encourage and welcome contributions to this package. Check out [this dbt Discourse article](https://discourse.getdbt.com/t/contributing-to-a-dbt-package/657) on the best workflow for contributing to a package!
+We highly encourage and welcome contributions to this package. Check out [this dbt Discourse article](https://discourse.getdbt.com/t/contributing-to-a-dbt-package/657) on the best workflow for contributing to a package.
 
-# 🏪 Are there any resources available?
-- If you have questions or want to reach out for help, please refer to the [GitHub Issue](https://github.com/fivetran/dbt_stripe/issues/new/choose) section to find the right avenue of support for you.
+## Are there any resources available?
+- If you have questions or want to reach out for help, see the [GitHub Issue](https://github.com/fivetran/dbt_stripe/issues/new/choose) section to find the right avenue of support for you.
 - If you would like to provide feedback to the dbt package team at Fivetran or would like to request a new dbt package, fill out our [Feedback Form](https://www.surveymonkey.com/r/DQ7K7WW).
-- Have questions or want to be part of the community discourse? Create a post in the [Fivetran community](https://community.fivetran.com/t5/user-group-for-dbt/gh-p/dbt-user-group) and our team along with the community can join in on the discussion!
diff --git a/dbt_project.yml b/dbt_project.yml
index ac7dba28..26baca1f 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -1,7 +1,7 @@
 config-version: 2
 name: 'stripe'
 
-version: '0.14.0'
+version: '0.15.0'
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 models:
   stripe:
diff --git a/models/stripe.yml b/models/stripe.yml
index 236b141c..19578b0c 100644
--- a/models/stripe.yml
+++ b/models/stripe.yml
@@ -162,10 +162,10 @@ models:
       description: The ID of the subscription is associated with this record.
     - name: charge_statement_descriptor
       description: Extra information about a source. This will appear on your customer’s statement every time you charge the source.
-    - name: dispute_id
-      description: Unique identifier for the object.
-    - name: dispute_reason
-      description: Reason given by cardholder for dispute. Possible values are bank_cannot_process, check_returned, credit_not_processed, customer_initiated, debit_not_authorized, duplicate, fraudulent, general, incorrect_account_details, insufficient_funds, product_not_received, product_unacceptable, subscription_canceled, or unrecognized. 
+    - name: dispute_ids
+      description: Unique identifiers for the object.
+    - name: dispute_reasons
+      description: Reasons given by cardholder for dispute. Possible values are bank_cannot_process, check_returned, credit_not_processed, customer_initiated, debit_not_authorized, duplicate, fraudulent, general, incorrect_account_details, insufficient_funds, product_not_received, product_unacceptable, subscription_canceled, or unrecognized. 
     - name: refund_id
       description: ID of the refund associated with this record.
     - name: transfer_id
@@ -585,8 +585,8 @@ models:
         description: The unique ID of the related Payment Intent, if any.
       - name: refund_id	
         description: The unique ID of the related refund, if any.
-      - name: dispute_id	
-        description: The unique ID of the related dispute, if any.
+      - name: dispute_ids	
+        description: The unique IDs of the related disputes, if any.
       - name: invoice_id		
         description: Unique ID for the invoice associated with this balance transaction. Available for charges, refunds, and disputes made in connection with a Stripe Billing invoice.
       - name: invoice_number		
@@ -792,8 +792,8 @@ models:
         description: Two-letter ISO code representing the country of the card.
       - name: statement_descriptor		
         description: The dynamic statement descriptor or suffix specified when the related charge was created.
-      - name: dispute_reason		
-        description: Reason given by cardholder for dispute. Read more about dispute reasons.
+      - name: dispute_reasons		
+        description: Reasons given by cardholder for disputes. Read more about dispute reasons.
       - name: connected_account_id		
         description: For Stripe Connect activity related to a connected account, the unique ID for the account.
       - name: connected_account_country		
@@ -917,8 +917,8 @@ models:
         description: Two-letter ISO code representing the country of the card.
       - name: statement_descriptor
         description: The dynamic statement descriptor or suffix specified when the related charge was created.
-      - name: dispute_reason
-        description: Reason given by cardholder for dispute. Read more about dispute reasons.
+      - name: dispute_reasons
+        description: Reasons given by cardholder for disputes. Read more about dispute reasons.
       - name: connected_account_id
         description: For Stripe Connect activity related to a connected account, the unique ID for the account.
       - name: connected_account_country
diff --git a/models/stripe__balance_transactions.sql b/models/stripe__balance_transactions.sql
index 61ef3bed..10f306b8 100644
--- a/models/stripe__balance_transactions.sql
+++ b/models/stripe__balance_transactions.sql
@@ -74,6 +74,18 @@ with balance_transaction as (
     select *
     from {{ var('transfer') }}
 
+), dispute_summary as (
+    /* Althrough rare, payments can be disputed multiple times. 
+    Hence, we need to aggregate the disputes to get the total disputed amount.
+    */
+    select
+        charge_id,
+        source_relation,
+        string_agg(dispute_id) as dispute_ids,
+        string_agg(dispute_reason) as dispute_reasons,
+        sum(dispute_amount) as dispute_amount
+    from dispute
+    group by 1,2
 )
 
 select
@@ -99,7 +111,7 @@ select
     case
         when balance_transaction.type in ('charge', 'payment') then charge.amount 
         when balance_transaction.type in ('refund', 'payment_refund') then refund.amount
-        when dispute_id is not null then dispute.dispute_amount
+        when dispute_ids is not null then dispute_summary.dispute_amount
         else null
     end as customer_facing_amount,
     case 
@@ -153,7 +165,7 @@ select
     cards.card_address_state,
     cards.card_address_postal_code,
     cards.card_address_country,
-    coalesce(charge.charge_id, refund.charge_id, dispute.charge_id) as charge_id,
+    coalesce(charge.charge_id, refund.charge_id, dispute_summary.charge_id) as charge_id,
     charge.created_at as charge_created_at,
     payment_intent.payment_intent_id,
 
@@ -176,8 +188,8 @@ select
     cards.funding as card_funding,
     cards.country as card_country,
     charge.statement_descriptor as charge_statement_descriptor ,
-    dispute.dispute_id,
-    dispute.dispute_reason,
+    dispute_summary.dispute_ids,
+    dispute_summary.dispute_reasons,
     refund.refund_id,
     refund.reason as refund_reason,
     transfers.transfer_id,
@@ -240,7 +252,7 @@ left join transfers
 left join charge as refund_charge 
     on refund.charge_id = refund_charge.charge_id
     and refund.source_relation = refund_charge.source_relation
-left join dispute
-    on charge.charge_id = dispute.charge_id
-    and charge.source_relation = dispute.source_relation
+left join dispute_summary
+    on charge.charge_id = dispute_summary.charge_id
+    and charge.source_relation = dispute_summary.source_relation
 
diff --git a/models/stripe_financial_reports/stripe__activity_itemized_2.sql b/models/stripe_financial_reports/stripe__activity_itemized_2.sql
index b1e63e9e..654c3770 100644
--- a/models/stripe_financial_reports/stripe__activity_itemized_2.sql
+++ b/models/stripe_financial_reports/stripe__activity_itemized_2.sql
@@ -14,7 +14,7 @@ select
     charge_id,
     payment_intent_id,
     refund_id,
-    dispute_id,
+    dispute_ids,
 
     {% if var('stripe__using_invoices', True) %}
     invoice_id,
diff --git a/models/stripe_financial_reports/stripe__balance_change_from_activity_itemized_3.sql b/models/stripe_financial_reports/stripe__balance_change_from_activity_itemized_3.sql
index 15d647ee..bd807e35 100644
--- a/models/stripe_financial_reports/stripe__balance_change_from_activity_itemized_3.sql
+++ b/models/stripe_financial_reports/stripe__balance_change_from_activity_itemized_3.sql
@@ -70,7 +70,7 @@ select
     card_funding,
     card_country,
     charge_statement_descriptor as statement_descriptor,
-    dispute_reason,
+    dispute_reasons,
     connected_account_id,
     connected_account_country,
     connected_account_direct_charge_id,
diff --git a/models/stripe_financial_reports/stripe__ending_balance_reconciliation_itemized_4.sql b/models/stripe_financial_reports/stripe__ending_balance_reconciliation_itemized_4.sql
index bd3a18a5..873df13b 100644
--- a/models/stripe_financial_reports/stripe__ending_balance_reconciliation_itemized_4.sql
+++ b/models/stripe_financial_reports/stripe__ending_balance_reconciliation_itemized_4.sql
@@ -70,7 +70,7 @@ select
     card_funding,
     card_country,
     charge_statement_descriptor as statement_descriptor,
-    dispute_reason,
+    dispute_reasons,
     connected_account_id, 
     connected_account_country,
     connected_account_direct_charge_id,