diff --git a/RELEASE.md b/RELEASE.md
index b342b58c5f..654527b6e7 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -2,13 +2,17 @@
 
 _What is being released?_
 
-This release updates the `DSL` dependency. 
+This release updates the `ingest-test-framework` dependency.
 
 Version updates include:
-- `DSL` 9.15.0: patch for supporting tabulation of types with circular dependencies. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.15.0
-- `DSL` 9.15.1: patch for missing generated Java files. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.15.1
-- `DSL` 9.15.2: patch for missing Java meta classes. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.15.2
+- `ingest-test-framework` 11.17.1: Add support for address/location references to be used on nested model types.
+
+FpML Java mapping code that sets address/location references have been updated accordingly.  There are no changes to the model. 
 
 _Review directions_
 
-The changes can be reviewed in PR: [#3097](https://github.com/finos/common-domain-model/pull/3097)
+The price referencing has been fixed in the following sample:
+
+- fpml-5-13 / products / interest-rate-derivatives / ird-ex37-zero-coupon-swap-known-amount-schedule.xml
+
+The changes can be reviewed in PR: [#3099](https://github.com/finos/common-domain-model/pull/3099)
diff --git a/pom.xml b/pom.xml
index b2273799ba..570d512196 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
 
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>10</stagingTimeoutInMinutes>
-        <rosetta.bundle.version>11.17.0</rosetta.bundle.version>
+        <rosetta.bundle.version>11.17.1</rosetta.bundle.version>
         <rosetta.code-gen.version>${rosetta.bundle.version}</rosetta.code-gen.version>
         <rosetta.dsl.version>9.15.2</rosetta.dsl.version>
 
diff --git a/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java b/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java
index 2c32a02c33..c6d92aa7cf 100644
--- a/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java
+++ b/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java
@@ -205,7 +205,7 @@ private Multimap<String, MappingConsumer<TradeStateBuilder>> buildCommonMappings
                     .setReference(reference);
             return Arrays.asList(
                     new PathValue<>(pq.getModelPath().append(Path.parse("price[0].value.amount")), value),
-                    new PathValue<>(irp.getModelPath().append(Path.parse("rateSpecification.fixedRate.rateSchedule.price")), reference));
+                    new PathValue<>(irp.getModelPath().append(Path.parse("rateSpecification.fixedRate.rateSchedule.price.reference")), reference));
         });
 
         commonMappings.put("Loan_Value", (indexes, value, tradeState) -> {
@@ -224,7 +224,7 @@ private Multimap<String, MappingConsumer<TradeStateBuilder>> buildCommonMappings
                     .setReference(reference);
             return Arrays.asList(
                     new PathValue<>(pq.getModelPath().append(Path.parse("quantity[0].value.amount")), value),
-                    new PathValue<>(irp.getModelPath().append(Path.parse("priceQuantity.quantitySchedule")), reference));
+                    new PathValue<>(irp.getModelPath().append(Path.parse("priceQuantity.quantitySchedule.reference")), reference));
         });
 
         commonMappings.put("Loan_Value_Currency", (indexes, value, tradeState) -> {
diff --git a/rosetta-source/src/main/java/cdm/product/common/settlement/processor/FloatingRateCalculationMappingProcessor.java b/rosetta-source/src/main/java/cdm/product/common/settlement/processor/FloatingRateCalculationMappingProcessor.java
index aa0aca132e..b82ed42d76 100644
--- a/rosetta-source/src/main/java/cdm/product/common/settlement/processor/FloatingRateCalculationMappingProcessor.java
+++ b/rosetta-source/src/main/java/cdm/product/common/settlement/processor/FloatingRateCalculationMappingProcessor.java
@@ -73,7 +73,7 @@ private void addPrice(Path subPath, PriceQuantityBuilder priceQuantityBuilder, M
         // price index must be incremented otherwise any references will break
         Path baseModelPath = toPath(getModelPath());
         Path amountModelPath = incrementPathElementIndex(baseModelPath, "price", emptyIfNull(priceQuantityBuilder.getPrice()).size());
-        updateMapping(mapping, amountModelPath);
+        addMapping(mapping.getXmlPath(), mapping.getXmlValue(), amountModelPath, mapping.getXmlValue());
         // add schedule (if exists)
         priceScheduleBuilder.setDatedValue(getSteps(mapping.getXmlPath().getParent(), amountModelPath.getParent()));
         // add to PriceQuantity
@@ -91,14 +91,6 @@ private UnitTypeBuilder toCurrencyUnitType(Path startsWithPath) {
                                 .build()));
     }
 
-    private void updateMapping(Mapping mapping, Path modelPath) {
-        mapping.setRosettaPath(modelPath);
-        // clear errors
-        mapping.setError(null);
-        mapping.setCondition(true);
-        mapping.setDuplicate(false);
-    }
-
     private List<DatedValue.DatedValueBuilder> getSteps(Path floorScheduleSynonymPath, Path priceScheduleModelPath) {
         List<DatedValue.DatedValueBuilder> steps = new ArrayList<>();
         int index = 0;
@@ -130,4 +122,8 @@ private Optional<DatedValue.DatedValueBuilder> getStep(Path floorScheduleSynonym
 
         return stepBuilder.hasData() ? Optional.of(stepBuilder) : Optional.empty();
     }
+
+    private void addMapping(Path xmlPath, Object xmlValue, Path modelPath, Object modelValue) {
+        getMappings().add(new Mapping(xmlPath, xmlValue, modelPath, modelValue, null, true, true, false));
+    }
 }
diff --git a/rosetta-source/src/main/java/cdm/product/common/settlement/processor/NumberOfOptionsMappingProcessor.java b/rosetta-source/src/main/java/cdm/product/common/settlement/processor/NumberOfOptionsMappingProcessor.java
index c305a44a7c..9b75fc0468 100644
--- a/rosetta-source/src/main/java/cdm/product/common/settlement/processor/NumberOfOptionsMappingProcessor.java
+++ b/rosetta-source/src/main/java/cdm/product/common/settlement/processor/NumberOfOptionsMappingProcessor.java
@@ -4,12 +4,9 @@
 import cdm.base.math.NonNegativeQuantitySchedule;
 import cdm.base.math.UnitType;
 import cdm.product.common.settlement.PriceQuantity;
-import com.regnosys.rosetta.common.translation.MappingContext;
-import com.regnosys.rosetta.common.translation.MappingProcessor;
-import com.regnosys.rosetta.common.translation.MappingProcessorUtils;
-import com.regnosys.rosetta.common.translation.Path;
-import com.regnosys.rosetta.common.util.PathUtils;
+import com.regnosys.rosetta.common.translation.*;
 import com.rosetta.model.lib.RosettaModelObjectBuilder;
+import com.rosetta.model.lib.meta.Reference;
 import com.rosetta.model.lib.path.RosettaPath;
 
 import java.math.BigDecimal;
@@ -29,61 +26,80 @@
 @SuppressWarnings("unused")
 public class NumberOfOptionsMappingProcessor extends MappingProcessor {
 
-	private static final Path EQUITY_UNDERLIER_PATH = Path.parse("underlyer.singleUnderlyer.equity.instrumentId");
-	private static final Path INDEX_UNDERLIER_PATH = Path.parse("underlyer.singleUnderlyer.index.instrumentId");
-
-	public NumberOfOptionsMappingProcessor(RosettaPath modelPath, List<Path> synonymPaths, MappingContext context) {
-		super(modelPath, synonymPaths, context);
-	}
-
-	@Override
-	public void map(Path synonymPath, List<? extends RosettaModelObjectBuilder> builder, RosettaModelObjectBuilder parent) {
-		NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantity = NonNegativeQuantitySchedule.builder();
-		setAmountAndUnit(synonymPath, quantity, builder.size());
-		setMultiplierAndUnit(synonymPath, quantity);
-
-		if (quantity.hasData()) {
-			((PriceQuantity.PriceQuantityBuilder) parent).addQuantity(toReferencableQuantityBuilder(quantity));
-		}
-	}
-
-	private void setAmountAndUnit(Path synonymPath, NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantity, int index) {
-		Path baseModelPath = toPath(getModelPath());
-		Path mappedModelPath = incrementPathElementIndex(baseModelPath, "quantity", index);
-
-		MappingProcessorUtils.setValueAndUpdateMappings(synonymPath,
-				(xmlValue) -> quantity
-						.setValue(new BigDecimal(xmlValue))
-						.setUnit(UnitType.builder().setFinancialUnit(FinancialUnitEnum.CONTRACT)),
-				getMappings(),
-				PathUtils.toRosettaPath(mappedModelPath));
-	}
-
-	private void setMultiplierAndUnit(Path synonymPath, NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantity) {
-		Path parentSynonymPath = synonymPath.getParent();
-
-
-		setValueAndUpdateMappings(parentSynonymPath.addElement("optionEntitlement"),
-				(xmlValue) -> quantity.getOrCreateMultiplier().setValue(new BigDecimal(xmlValue)));
-
-		// bond option multiplier unit
-		setValueAndUpdateMappings(parentSynonymPath.addElement("entitlementCurrency"),
-				(xmlValue) -> quantity.getOrCreateMultiplier().setUnit(UnitType.builder().setCurrencyValue(xmlValue)));
-		setValueAndUpdateMappings(parentSynonymPath.addElement("entitlementCurrency").addElement("currencyScheme"),
-				(xmlValue) -> quantity.getOrCreateMultiplier().getOrCreateUnit().getOrCreateCurrency().getOrCreateMeta().setScheme(xmlValue));
-		// equity multiplier unit
-		if (pathExists(EQUITY_UNDERLIER_PATH)) {
-			quantity.getOrCreateMultiplier().setUnit(UnitType.builder().setFinancialUnit(FinancialUnitEnum.SHARE));
-		}
-		// index multiplier unit
-		if (pathExists(INDEX_UNDERLIER_PATH)) {
-			quantity.getOrCreateMultiplier().setUnit(UnitType.builder().setFinancialUnit(FinancialUnitEnum.INDEX_UNIT));
-		}
-	}
-
-	private boolean pathExists(Path endsWith) {
-		return getMappings().stream()
-				.filter(m -> m.getXmlPath().endsWith(endsWith))
-				.anyMatch(m -> m.getXmlValue() != null);
-	}
+    private static final Path EQUITY_UNDERLIER_PATH = Path.parse("underlyer.singleUnderlyer.equity.instrumentId");
+    private static final Path INDEX_UNDERLIER_PATH = Path.parse("underlyer.singleUnderlyer.index.instrumentId");
+
+    public NumberOfOptionsMappingProcessor(RosettaPath modelPath, List<Path> synonymPaths, MappingContext context) {
+        super(modelPath, synonymPaths, context);
+    }
+
+    @Override
+    public void map(Path synonymPath, List<? extends RosettaModelObjectBuilder> builder, RosettaModelObjectBuilder parent) {
+        NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantity = NonNegativeQuantitySchedule.builder();
+        setAmountAndUnit(synonymPath, quantity, builder.size());
+        setMultiplierAndUnit(synonymPath, quantity);
+
+        if (quantity.hasData()) {
+            ((PriceQuantity.PriceQuantityBuilder) parent).addQuantity(toReferencableQuantityBuilder(quantity));
+        }
+    }
+
+    private void setAmountAndUnit(Path synonymPath, NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantityBuilder, int index) {
+        Path baseModelPath = toPath(getModelPath());
+        Path mappedModelPath = incrementPathElementIndex(baseModelPath, "quantity", index);
+
+        
+
+        MappingProcessorUtils.getNonNullMappedValue(synonymPath, getMappings()).ifPresent(xmlValue -> {
+            quantityBuilder
+                    .setValue(new BigDecimal(xmlValue))
+                    .setUnit(UnitType.builder().setFinancialUnit(FinancialUnitEnum.CONTRACT));
+            // add new mapping rather than updating, otherwise the referencing breaks
+            addMapping(synonymPath, xmlValue, mappedModelPath, xmlValue);
+            // clean up errors
+            updateReferenceMapping(synonymPath);
+        });
+    }
+
+    private void setMultiplierAndUnit(Path synonymPath, NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantity) {
+        Path parentSynonymPath = synonymPath.getParent();
+
+        setValueAndUpdateMappings(parentSynonymPath.addElement("optionEntitlement"),
+                (xmlValue) -> quantity.getOrCreateMultiplier().setValue(new BigDecimal(xmlValue)));
+
+        // bond option multiplier unit
+        setValueAndUpdateMappings(parentSynonymPath.addElement("entitlementCurrency"),
+                (xmlValue) -> quantity.getOrCreateMultiplier().setUnit(UnitType.builder().setCurrencyValue(xmlValue)));
+        setValueAndUpdateMappings(parentSynonymPath.addElement("entitlementCurrency").addElement("currencyScheme"),
+                (xmlValue) -> quantity.getOrCreateMultiplier().getOrCreateUnit().getOrCreateCurrency().getOrCreateMeta().setScheme(xmlValue));
+        // equity multiplier unit
+        if (pathExists(EQUITY_UNDERLIER_PATH)) {
+            quantity.getOrCreateMultiplier().setUnit(UnitType.builder().setFinancialUnit(FinancialUnitEnum.SHARE));
+        }
+        // index multiplier unit
+        if (pathExists(INDEX_UNDERLIER_PATH)) {
+            quantity.getOrCreateMultiplier().setUnit(UnitType.builder().setFinancialUnit(FinancialUnitEnum.INDEX_UNIT));
+        }
+    }
+
+    private boolean pathExists(Path endsWith) {
+        return getMappings().stream()
+                .filter(m -> m.getXmlPath().endsWith(endsWith))
+                .anyMatch(m -> m.getXmlValue() != null);
+    }
+
+    private void addMapping(Path xmlPath, Object xmlValue, Path modelPath, Object modelValue) {
+        getMappings().add(new Mapping(xmlPath, xmlValue, modelPath, modelValue, null, true, true, false));
+    }
+
+    private void updateReferenceMapping(Path synonymPath) {
+        getMappings().stream()
+                .filter(m -> m.getXmlPath().equals(synonymPath))
+                .filter(m -> m.getRosettaValue() instanceof Reference.ReferenceBuilder)
+                .filter(m -> m.getError() != null)
+                .forEach(m -> {
+                    m.setDuplicate(false);
+                    m.setError(null);
+                });
+    }
 }
diff --git a/rosetta-source/src/main/java/cdm/product/common/settlement/processor/TotalNotionalQuantityMappingProcessor.java b/rosetta-source/src/main/java/cdm/product/common/settlement/processor/TotalNotionalQuantityMappingProcessor.java
index bc7f325f28..f7466183d0 100644
--- a/rosetta-source/src/main/java/cdm/product/common/settlement/processor/TotalNotionalQuantityMappingProcessor.java
+++ b/rosetta-source/src/main/java/cdm/product/common/settlement/processor/TotalNotionalQuantityMappingProcessor.java
@@ -4,11 +4,7 @@
 import cdm.base.math.NonNegativeQuantitySchedule;
 import cdm.base.math.UnitType;
 import cdm.base.math.metafields.FieldWithMetaNonNegativeQuantitySchedule;
-import com.regnosys.rosetta.common.translation.MappingContext;
-import com.regnosys.rosetta.common.translation.MappingProcessor;
-import com.regnosys.rosetta.common.translation.MappingProcessorUtils;
-import com.regnosys.rosetta.common.translation.Path;
-import com.regnosys.rosetta.common.util.PathUtils;
+import com.regnosys.rosetta.common.translation.*;
 import com.rosetta.model.lib.RosettaModelObjectBuilder;
 import com.rosetta.model.lib.path.RosettaPath;
 
@@ -41,19 +37,20 @@ public void map(Path synonymPath, List<? extends RosettaModelObjectBuilder> buil
     }
 
     private Optional<NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder> getTotalNotionalQuantity(Path synonymPath, int index) {
-        NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantity = NonNegativeQuantitySchedule.builder();
+        NonNegativeQuantitySchedule.NonNegativeQuantityScheduleBuilder quantityBuilder = NonNegativeQuantitySchedule.builder();
 
         Path baseModelPath = toPath(getModelPath()).addElement("amount");
         Path mappedModelPath = incrementPathElementIndex(baseModelPath, "quantity", index);
 
-        MappingProcessorUtils.setValueAndUpdateMappings(synonymPath,
-                (xmlValue) -> quantity
-                        .setValue(new BigDecimal(xmlValue))
-                        .setUnit(UnitType.builder().setCapacityUnit(findCapacityUnitEnum(synonymPath.getParent()))),
-                getMappings(),
-                PathUtils.toRosettaPath(mappedModelPath));
-
-        return quantity.hasData() ? Optional.of(quantity) : Optional.empty();
+        MappingProcessorUtils.getNonNullMappedValue(synonymPath, getMappings()).ifPresent(xmlValue -> {
+            quantityBuilder
+                    .setValue(new BigDecimal(xmlValue))
+                    .setUnit(UnitType.builder().setCapacityUnit(findCapacityUnitEnum(synonymPath.getParent())));
+            // add new mapping rather than updating, otherwise the referencing breaks
+            addMapping(synonymPath, xmlValue, mappedModelPath, xmlValue);
+        });
+        
+        return quantityBuilder.hasData() ? Optional.of(quantityBuilder) : Optional.empty();
     }
 
     private CapacityUnitEnum findCapacityUnitEnum(Path legSynonymPath) {
@@ -67,4 +64,8 @@ private Optional<CapacityUnitEnum> getCapacityUnitEnum(Path quantityUnitPath) {
         return getNonNullMappedValue(quantityUnitPath, getMappings())
                 .flatMap(xmlValue -> getSynonymToEnumMap().getEnumValueOptional(CapacityUnitEnum.class, xmlValue));
     }
+
+    private void addMapping(Path xmlPath, Object xmlValue, Path modelPath, Object modelValue) {
+        getMappings().add(new Mapping(xmlPath, xmlValue, modelPath, modelValue, null, true, true, false));
+    }
 }
diff --git a/rosetta-source/src/main/resources/cdm-sample-files/fis/expectations.json b/rosetta-source/src/main/resources/cdm-sample-files/fis/expectations.json
index fb9df7bcb8..c98154a794 100644
--- a/rosetta-source/src/main/resources/cdm-sample-files/fis/expectations.json
+++ b/rosetta-source/src/main/resources/cdm-sample-files/fis/expectations.json
@@ -1,2 +1,2 @@
 [
-{"fileName":"cdm-sample-files/fis/isla1.xml","excludedPaths":0,"externalPaths":120,"outstandingMappings":10,"validationFailures":37,"qualificationExpectation":{"success":false,"qualifyResults":[{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":13}}]
\ No newline at end of file
+{"fileName":"cdm-sample-files/fis/isla1.xml","excludedPaths":0,"externalPaths":120,"outstandingMappings":19,"validationFailures":37,"qualificationExpectation":{"success":false,"qualifyResults":[{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"SecuritiesFinance","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":13}}]
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fis-aggregated-mapping-failure-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fis-aggregated-mapping-failure-report.csv
index eef230a3e1..7e74474794 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fis-aggregated-mapping-failure-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fis-aggregated-mapping-failure-report.csv
@@ -1,5 +1,7 @@
-Mapping Coverage,91.67
+Mapping Coverage,84.17
 
 Input Path,Failed Mapping Count
 Activity.Loan_Value_Currency,5
+Activity.Loan_Value,5
+Activity.Activity_Rate,4
 Activity.Own_Cpty_Stock_Clearer_LEI,5
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fis-failed-mappings-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fis-failed-mappings-report.csv
index b1b24d8e0a..1a0d6b4c3c 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fis-failed-mappings-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fis-failed-mappings-report.csv
@@ -1,11 +1,20 @@
 File Name,Result,Input Path,Indexless Input Path,Unmappable CDM Path Count,Unmappable CDM Paths,Reason For Failure
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(3).Own_Cpty_Stock_Clearer_LEI,Activity.Own_Cpty_Stock_Clearer_LEI,0,,Element with value KTKDELLEIDDDDDDDDDDD could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(1).Loan_Value,Activity.Loan_Value,0,,Element with value 40000000.00 could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(4).Activity_Rate,Activity.Activity_Rate,0,,Element with value 0.050000 could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(2).Loan_Value_Currency,Activity.Loan_Value_Currency,0,,Element with value USD could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(0).Own_Cpty_Stock_Clearer_LEI,Activity.Own_Cpty_Stock_Clearer_LEI,0,,Element with value KTKDELLEIDDDDDDDDDDD could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(4).Own_Cpty_Stock_Clearer_LEI,Activity.Own_Cpty_Stock_Clearer_LEI,0,,Element with value KTKDELLEIDDDDDDDDDDD could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(2).Loan_Value,Activity.Loan_Value,0,,Element with value 20000000.00 could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(1).Activity_Rate,Activity.Activity_Rate,0,,Element with value 0.050000 could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(1).Loan_Value_Currency,Activity.Loan_Value_Currency,0,,Element with value USD could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(1).Own_Cpty_Stock_Clearer_LEI,Activity.Own_Cpty_Stock_Clearer_LEI,0,,Element with value KTKDELLEIDDDDDDDDDDD could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(2).Activity_Rate,Activity.Activity_Rate,0,,Element with value 0.050000 could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(3).Loan_Value,Activity.Loan_Value,0,,Element with value 30000000.00 could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(0).Loan_Value_Currency,Activity.Loan_Value_Currency,0,,Element with value USD could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(4).Loan_Value_Currency,Activity.Loan_Value_Currency,0,,Element with value USD could not be mapped to a rosettaField
 cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(2).Own_Cpty_Stock_Clearer_LEI,Activity.Own_Cpty_Stock_Clearer_LEI,0,,Element with value KTKDELLEIDDDDDDDDDDD could not be mapped to a rosettaField
-cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(3).Loan_Value_Currency,Activity.Loan_Value_Currency,0,,Element with value USD could not be mapped to a rosettaField
\ No newline at end of file
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(4).Loan_Value,Activity.Loan_Value,0,,Element with value 10000000.00 could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(3).Loan_Value_Currency,Activity.Loan_Value_Currency,0,,Element with value USD could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(0).Loan_Value,Activity.Loan_Value,0,,Element with value 100000000.00 could not be mapped to a rosettaField
+cdm-sample-files/fis/isla1.xml,Fail_MappedNone,Activity(3).Activity_Rate,Activity.Activity_Rate,0,,Element with value 0.050000 could not be mapped to a rosettaField
\ No newline at end of file
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-commodity-derivatives-failed-mappings-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-commodity-derivatives-failed-mappings-report.csv
index 8bdbc1c6f1..4818291e2f 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-commodity-derivatives-failed-mappings-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-commodity-derivatives-failed-mappings-report.csv
@@ -810,32 +810,32 @@ cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex33-ph
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex33-physical-bullion-forward-average-price.xml,Fail_MappedNone,trade.commodityForward.bullionPhysicalLeg[id=bullionLeg].physicalQuantity[id=deliveryQuantity].quantityUnit,trade.commodityForward.bullionPhysicalLeg[id=bullionLeg].physicalQuantity[id=deliveryQuantity].quantityUnit,0,,Element with value ozt could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSource,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSource,0,,Element with value Gas-Daily could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.premium.premiumPerUnit.currency,trade.commodityOption.premium.premiumPerUnit.currency,0,,Element with value USD could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.marketDisruption.disruptionFallbacks,trade.commodityOption.marketDisruption.disruptionFallbacks,0,,Element with value AsSpecifiedInMasterAgreement could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.publication.rateSource,trade.commodityOption.commodity.publication.rateSource,0,,Element with value Gas-Daily could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.rounding.roundingDirection,trade.commodityOption.rounding.roundingDirection,0,,Element with value Nearest could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0].instrumentIdScheme,trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0].instrumentIdScheme,0,,Element with value http://www.companyA.com/coding-scheme/commodity-reference-price-1-0 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedMultiple,party(0)[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,party[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,2,TradeState.trade.party(0).partyId(0).identifierType=[LEI] TradeState.trade.party(0).partyId(0).identifier.meta.scheme=[http://www.fpml.org/coding-scheme/external/iso17442],Element mapped to multiple rosettaFields
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,0,,Element with value CommodityBusiness could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.publication.rateSourcePage,trade.commodityOption.commodity.publication.rateSourcePage,0,,Element with value Daily price survey ($/USMMBTU: Louisiana-Onshore South could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.premium.premiumPerUnit.amount,trade.commodityOption.premium.premiumPerUnit.amount,0,,Element with value 0.135 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.currency,trade.commodityOption.floatingStrikePricePerUnit.commodity.currency,0,,Element with value USD could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.unit,trade.commodityOption.commodity.unit,0,,Element with value USMMBTU could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,0,,Element with value exerciseDate could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityDetails,trade.commodityOption.commodity.commodityDetails,0,,Element with value Louisiana (Henry Hub) could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.publication.rateSourcePageHeading,trade.commodityOption.commodity.publication.rateSourcePageHeading,0,,Element with value Henry Hub could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.rounding.precision,trade.commodityOption.rounding.precision,0,,Element with value 4 could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityBase,trade.commodityOption.commodity.commodityBase,0,,Element with value Natural Gas could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,0,,Element with value Market Center Spot Gas could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,0,,Element with value First could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,0,,Element with value calculationPeriodsSchedule could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.marketDisruption.disruptionFallbacks,trade.commodityOption.marketDisruption.disruptionFallbacks,0,,Element with value AsSpecifiedInMasterAgreement could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.rounding.roundingDirection,trade.commodityOption.rounding.roundingDirection,0,,Element with value Nearest could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedMultiple,party(0)[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,party[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,2,TradeState.trade.party(0).partyId(0).identifierType=[LEI] TradeState.trade.party(0).partyId(0).identifier.meta.scheme=[http://www.fpml.org/coding-scheme/external/iso17442],Element mapped to multiple rosettaFields
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,0,,Element with value CommodityBusiness could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,0,,Element with value exerciseDate could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityDetails,trade.commodityOption.commodity.commodityDetails,0,,Element with value Louisiana (Henry Hub) could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedMultiple,party(1)[id=partyB].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,party[id=partyB].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,2,TradeState.trade.party(1).partyId(0).identifierType=[LEI] TradeState.trade.party(1).partyId(0).identifier.meta.scheme=[http://www.fpml.org/coding-scheme/external/iso17442],Element mapped to multiple rosettaFields
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0],trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0],0,,Element with value NATURAL GAS-S. LOUISIANA (HENRY HUB)-INSIDE FERC could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Success,trade.commodityOption.notionalQuantity.quantityUnit,trade.commodityOption.notionalQuantity.quantityUnit,1,TradeState.trade.tradableProduct.tradeLot(1).priceQuantity(0).quantity(0).value.unit.capacityUnit=[USMMBTU],Element mapped to already populated field
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,0,,Element with value calculationPeriodsSchedule could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.marketDisruption.marketDisruptionEvents,trade.commodityOption.marketDisruption.marketDisruptionEvents,0,,Element with value AsSpecifiedInMasterAgreement could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityBase,trade.commodityOption.commodity.commodityBase,0,,Element with value Natural Gas could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,0,,Element with value Market Center Spot Gas could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,0,,Element with value First could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePageHeading,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePageHeading,0,,Element with value Henry Hub could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.specifiedPrice,trade.commodityOption.floatingStrikePricePerUnit.commodity.specifiedPrice,0,,Element with value Midpoint could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.currency,trade.commodityOption.commodity.currency,0,,Element with value USD could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,0,,Element with value calculationPeriodsSchedule could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.unit,trade.commodityOption.floatingStrikePricePerUnit.commodity.unit,0,,Element with value USMMBTU could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePage,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePage,0,,Element with value Daily price survey ($/USMMBTU): Louisiana-Onshore South could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityBase,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityBase,0,,Element with value Natural Gas could not be mapped to a rosettaField
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-equity-options-failed-mappings-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-equity-options-failed-mappings-report.csv
index b1bbe80915..6e5aff18c3 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-equity-options-failed-mappings-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-10-incomplete-products-equity-options-failed-mappings-report.csv
@@ -1,40 +1,40 @@
 File Name,Result,Input Path,Indexless Input Path,Unmappable CDM Path Count,Unmappable CDM Paths,Reason For Failure
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,sequenceNumber,sequenceNumber,0,,Element with value 1 could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,0,,Element with value false could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.methodOfAdjustment,trade.equityOption.methodOfAdjustment,0,,Element with value CalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,0,,Element with value false could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityValuation.valuationTimeType,trade.equityOption.equityExercise.equityValuation.valuationTimeType,0,,Element with value Close could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.nonReliance,trade.equityOption.extraordinaryEvents.representations.nonReliance,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,0,,Element with value SpecificTime could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,0,,Element with value CancellationAndPayment could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],0,,Element with value EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.hedgingDisruption,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.hedgingDisruption,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,0,,Element with value http://www.MsgParty.com/partyId could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForOther,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForOther,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,sequenceNumber,sequenceNumber,0,,Element with value 1 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.dateAdjustments.businessDayConvention,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.dateAdjustments.businessDayConvention,0,,Element with value NONE could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.insolvencyFiling,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.insolvencyFiling,0,,Element with value false could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId],header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId],0,,Element with value msdw could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.agreementsRegardingHedging,trade.equityOption.extraordinaryEvents.representations.agreementsRegardingHedging,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityPremium.pricePerOption.currency,trade.equityOption.equityPremium.pricePerOption.currency,0,,Element with value EUR could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,0,,Element with value false could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.methodOfAdjustment,trade.equityOption.methodOfAdjustment,0,,Element with value CalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.creationTimestamp,header.creationTimestamp,0,,Element with value 2000-08-01T08:57:00Z could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.determiningPartyReference[href=party1].href,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.determiningPartyReference[href=party1].href,0,,Element with value party1 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC].messageIdScheme,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC].messageIdScheme,0,,Element with value http://www.msdw.com/messageId/OTC could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectingPartyReference[href=party1].href,trade.equityOption.equityExercise.settlementMethodElectingPartyReference[href=party1].href,0,,Element with value party1 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,0,,Element with value false could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForOther,trade.equityOption.extraordinaryEvents.mergerEvents.shareForOther,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityPremium.pricePerOption.amount,trade.equityOption.equityPremium.pricePerOption.amount,0,,Element with value 2.70 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityValuation.valuationTimeType,trade.equityOption.equityExercise.equityValuation.valuationTimeType,0,,Element with value Close could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,isCorrection,isCorrection,0,,Element with value false could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.nonReliance,trade.equityOption.extraordinaryEvents.representations.nonReliance,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.failureToDeliver,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.failureToDeliver,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.unadjustedDate,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.unadjustedDate,0,,Element with value 2004-09-27 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForCombined,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForCombined,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOffer,trade.equityOption.extraordinaryEvents.tenderOffer,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,0,,Element with value SpecificTime could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.additionalAcknowledgements,trade.equityOption.extraordinaryEvents.representations.additionalAcknowledgements,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForCombined,trade.equityOption.extraordinaryEvents.mergerEvents.shareForCombined,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,0,,Element with value CancellationAndPayment could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,correlationId[correlationIdScheme=http://www.example.com/conversationId].correlationIdScheme,correlationId[correlationIdScheme=http://www.example.com/conversationId].correlationIdScheme,0,,Element with value http://www.example.com/conversationId could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.compositionOfCombinedConsideration,trade.equityOption.extraordinaryEvents.compositionOfCombinedConsideration,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],0,,Element with value EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementPriceSource,trade.equityOption.equityExercise.settlementPriceSource,0,,Element with value OfficialClose could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,correlationId[correlationIdScheme=http://www.example.com/conversationId],correlationId[correlationIdScheme=http://www.example.com/conversationId],0,,Element with value CS/2000/08/01/EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,0,,Element with value http://www.MsgParty.com/partyId could not be mapped to a rosettaField
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-12-products-equity-failed-mappings-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-12-products-equity-failed-mappings-report.csv
index dddf12df6c..99c194a457 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-12-products-equity-failed-mappings-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-12-products-equity-failed-mappings-report.csv
@@ -1,40 +1,40 @@
 File Name,Result,Input Path,Indexless Input Path,Unmappable CDM Path Count,Unmappable CDM Paths,Reason For Failure
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,sequenceNumber,sequenceNumber,0,,Element with value 1 could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,0,,Element with value false could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.methodOfAdjustment,trade.equityOption.methodOfAdjustment,0,,Element with value CalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,0,,Element with value false could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityValuation.valuationTimeType,trade.equityOption.equityExercise.equityValuation.valuationTimeType,0,,Element with value Close could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.nonReliance,trade.equityOption.extraordinaryEvents.representations.nonReliance,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,0,,Element with value SpecificTime could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,0,,Element with value CancellationAndPayment could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],0,,Element with value EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.hedgingDisruption,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.hedgingDisruption,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,0,,Element with value http://www.MsgParty.com/partyId could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForOther,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForOther,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,sequenceNumber,sequenceNumber,0,,Element with value 1 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.dateAdjustments.businessDayConvention,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.dateAdjustments.businessDayConvention,0,,Element with value NONE could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.insolvencyFiling,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.insolvencyFiling,0,,Element with value false could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId],header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId],0,,Element with value msdw could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.agreementsRegardingHedging,trade.equityOption.extraordinaryEvents.representations.agreementsRegardingHedging,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityPremium.pricePerOption.currency,trade.equityOption.equityPremium.pricePerOption.currency,0,,Element with value EUR could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,0,,Element with value false could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.methodOfAdjustment,trade.equityOption.methodOfAdjustment,0,,Element with value CalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.creationTimestamp,header.creationTimestamp,0,,Element with value 2000-08-01T08:57:00Z could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.determiningPartyReference[href=party1].href,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.determiningPartyReference[href=party1].href,0,,Element with value party1 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC].messageIdScheme,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC].messageIdScheme,0,,Element with value http://www.msdw.com/messageId/OTC could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectingPartyReference[href=party1].href,trade.equityOption.equityExercise.settlementMethodElectingPartyReference[href=party1].href,0,,Element with value party1 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,0,,Element with value false could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForOther,trade.equityOption.extraordinaryEvents.mergerEvents.shareForOther,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityPremium.pricePerOption.amount,trade.equityOption.equityPremium.pricePerOption.amount,0,,Element with value 2.70 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityValuation.valuationTimeType,trade.equityOption.equityExercise.equityValuation.valuationTimeType,0,,Element with value Close could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,isCorrection,isCorrection,0,,Element with value false could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.nonReliance,trade.equityOption.extraordinaryEvents.representations.nonReliance,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.failureToDeliver,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.failureToDeliver,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.unadjustedDate,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.unadjustedDate,0,,Element with value 2004-09-27 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForCombined,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForCombined,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOffer,trade.equityOption.extraordinaryEvents.tenderOffer,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,0,,Element with value SpecificTime could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.additionalAcknowledgements,trade.equityOption.extraordinaryEvents.representations.additionalAcknowledgements,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForCombined,trade.equityOption.extraordinaryEvents.mergerEvents.shareForCombined,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,0,,Element with value CancellationAndPayment could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,correlationId[correlationIdScheme=http://www.example.com/conversationId].correlationIdScheme,correlationId[correlationIdScheme=http://www.example.com/conversationId].correlationIdScheme,0,,Element with value http://www.example.com/conversationId could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.compositionOfCombinedConsideration,trade.equityOption.extraordinaryEvents.compositionOfCombinedConsideration,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],0,,Element with value EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementPriceSource,trade.equityOption.equityExercise.settlementPriceSource,0,,Element with value OfficialClose could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,correlationId[correlationIdScheme=http://www.example.com/conversationId],correlationId[correlationIdScheme=http://www.example.com/conversationId],0,,Element with value CS/2000/08/01/EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-12/products/equity/eqd-ex04-european-call-index-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.indexDisclaimer,trade.equityOption.extraordinaryEvents.representations.indexDisclaimer,0,,Element with value true could not be mapped to a rosettaField
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-incomplete-products-equity-options-failed-mappings-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-incomplete-products-equity-options-failed-mappings-report.csv
index f960c8d5fa..cd784912a8 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-incomplete-products-equity-options-failed-mappings-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-incomplete-products-equity-options-failed-mappings-report.csv
@@ -39,42 +39,42 @@ cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex-27-equityOp
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex-27-equityOptionTransactionSupplement-EMEA-interdealer.xml,Fail_MappedNone,trade.equityOptionTransactionSupplement.extraordinaryEvents.additionalDisruptionEvents.maximumStockLoanRate,trade.equityOptionTransactionSupplement.extraordinaryEvents.additionalDisruptionEvents.maximumStockLoanRate,0,,Element with value 0.11 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex-27-equityOptionTransactionSupplement-EMEA-interdealer.xml,Fail_MappedNone,trade.equityOptionTransactionSupplement.equityExercise.settlementDate.relativeDate.period,trade.equityOptionTransactionSupplement.equityExercise.settlementDate.relativeDate.period,0,,Element with value D could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex-27-equityOptionTransactionSupplement-EMEA-interdealer.xml,Fail_MappedNone,trade.equityOptionTransactionSupplement.underlyer.singleUnderlyer.index.relatedExchangeId[exchangeIdScheme=http://www.example.com/exchangeId],trade.equityOptionTransactionSupplement.underlyer.singleUnderlyer.index.relatedExchangeId[exchangeIdScheme=http://www.example.com/exchangeId],0,,Element with value XWAR could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,sequenceNumber,sequenceNumber,0,,Element with value 1 could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,0,,Element with value false could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.methodOfAdjustment,trade.equityOption.methodOfAdjustment,0,,Element with value CalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,0,,Element with value false could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityValuation.valuationTimeType,trade.equityOption.equityExercise.equityValuation.valuationTimeType,0,,Element with value Close could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.nonReliance,trade.equityOption.extraordinaryEvents.representations.nonReliance,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,0,,Element with value SpecificTime could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,0,,Element with value CancellationAndPayment could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,0,,Element with value true could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],0,,Element with value EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.hedgingDisruption,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.hedgingDisruption,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId].messageAddressScheme,0,,Element with value http://www.MsgParty.com/partyId could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForOther,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForOther,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,sequenceNumber,sequenceNumber,0,,Element with value 1 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.dateAdjustments.businessDayConvention,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.dateAdjustments.businessDayConvention,0,,Element with value NONE could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.insolvencyFiling,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.insolvencyFiling,0,,Element with value false could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId],header.sentBy[messageAddressScheme=http://www.MsgParty.com/partyId],0,,Element with value msdw could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.agreementsRegardingHedging,trade.equityOption.extraordinaryEvents.representations.agreementsRegardingHedging,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityPremium.pricePerOption.currency,trade.equityOption.equityPremium.pricePerOption.currency,0,,Element with value EUR could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfHedging,0,,Element with value false could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.methodOfAdjustment,trade.equityOption.methodOfAdjustment,0,,Element with value CalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.creationTimestamp,header.creationTimestamp,0,,Element with value 2000-08-01T08:57:00Z could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,trade.equityOption.extraordinaryEvents.mergerEvents.shareForShare,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.determiningPartyReference[href=party1].href,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.determiningPartyReference[href=party1].href,0,,Element with value party1 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC].messageIdScheme,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC].messageIdScheme,0,,Element with value http://www.msdw.com/messageId/OTC could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectingPartyReference[href=party1].href,trade.equityOption.equityExercise.settlementMethodElectingPartyReference[href=party1].href,0,,Element with value party1 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.increasedCostOfStockBorrow,0,,Element with value false could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForOther,trade.equityOption.extraordinaryEvents.mergerEvents.shareForOther,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityPremium.pricePerOption.amount,trade.equityOption.equityPremium.pricePerOption.amount,0,,Element with value 2.70 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityValuation.valuationTimeType,trade.equityOption.equityExercise.equityValuation.valuationTimeType,0,,Element with value Close could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,isCorrection,isCorrection,0,,Element with value false could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.nonReliance,trade.equityOption.extraordinaryEvents.representations.nonReliance,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.failureToDeliver,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.failureToDeliver,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.unadjustedDate,trade.equityOption.equityExercise.settlementMethodElectionDate.adjustableDate.unadjustedDate,0,,Element with value 2004-09-27 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForCombined,trade.equityOption.extraordinaryEvents.tenderOfferEvents.shareForCombined,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.tenderOffer,trade.equityOption.extraordinaryEvents.tenderOffer,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,trade.equityOption.equityExercise.equityAmericanExercise.latestExerciseTimeType,0,,Element with value SpecificTime could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.additionalAcknowledgements,trade.equityOption.extraordinaryEvents.representations.additionalAcknowledgements,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.lossOfStockBorrow,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.mergerEvents.shareForCombined,trade.equityOption.extraordinaryEvents.mergerEvents.shareForCombined,0,,Element with value ModifiedCalculationAgent could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,trade.equityOption.extraordinaryEvents.nationalisationOrInsolvency,0,,Element with value CancellationAndPayment could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,trade.equityOption.extraordinaryEvents.additionalDisruptionEvents.changeInLaw,0,,Element with value true could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,correlationId[correlationIdScheme=http://www.example.com/conversationId].correlationIdScheme,correlationId[correlationIdScheme=http://www.example.com/conversationId].correlationIdScheme,0,,Element with value http://www.example.com/conversationId could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.compositionOfCombinedConsideration,trade.equityOption.extraordinaryEvents.compositionOfCombinedConsideration,0,,Element with value true could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],header.messageId[messageIdScheme=http://www.msdw.com/messageId/OTC],0,,Element with value EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,trade.equityOption.equityExercise.settlementPriceSource,trade.equityOption.equityExercise.settlementPriceSource,0,,Element with value OfficialClose could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.xml,Fail_MappedNone,correlationId[correlationIdScheme=http://www.example.com/conversationId],correlationId[correlationIdScheme=http://www.example.com/conversationId],0,,Element with value CS/2000/08/01/EquityShareOption456a789b could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/incomplete-products/equity-options/eqd-ex04-european-call-index-long-form.xml,Fail_MappedNone,trade.equityOption.extraordinaryEvents.representations.indexDisclaimer,trade.equityOption.extraordinaryEvents.representations.indexDisclaimer,0,,Element with value true could not be mapped to a rosettaField
diff --git a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-products-commodity-derivatives-failed-mappings-report.csv b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-products-commodity-derivatives-failed-mappings-report.csv
index 56f4688462..c61ec95acc 100644
--- a/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-products-commodity-derivatives-failed-mappings-report.csv
+++ b/rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-products-commodity-derivatives-failed-mappings-report.csv
@@ -23,32 +23,32 @@ cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex3-gas-swap-price
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex3-gas-swap-prices-last-three-days.xml,Fail_MappedNone,trade.commoditySwap.fixedLeg.notionalQuantity.quantityUnit,trade.commoditySwap.fixedLeg.notionalQuantity.quantityUnit,0,,Element with value MMBTU could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSource,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSource,0,,Element with value Gas-Daily could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.premium.premiumPerUnit.currency,trade.commodityOption.premium.premiumPerUnit.currency,0,,Element with value USD could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.marketDisruption.disruptionFallbacks,trade.commodityOption.marketDisruption.disruptionFallbacks,0,,Element with value AsSpecifiedInMasterAgreement could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.publication.rateSource,trade.commodityOption.commodity.publication.rateSource,0,,Element with value Gas-Daily could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.rounding.roundingDirection,trade.commodityOption.rounding.roundingDirection,0,,Element with value Nearest could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0].instrumentIdScheme,trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0].instrumentIdScheme,0,,Element with value http://www.companyA.com/coding-scheme/commodity-reference-price-1-0 could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedMultiple,party(0)[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,party[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,2,TradeState.trade.party(0).partyId(0).identifierType=[LEI] TradeState.trade.party(0).partyId(0).identifier.meta.scheme=[http://www.fpml.org/coding-scheme/external/iso17442],Element mapped to multiple rosettaFields
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,0,,Element with value CommodityBusiness could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.publication.rateSourcePage,trade.commodityOption.commodity.publication.rateSourcePage,0,,Element with value Daily price survey ($/MMBtu: Louisiana-Onshore South could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.premium.premiumPerUnit.amount,trade.commodityOption.premium.premiumPerUnit.amount,0,,Element with value 0.135 could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.currency,trade.commodityOption.floatingStrikePricePerUnit.commodity.currency,0,,Element with value USD could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.unit,trade.commodityOption.commodity.unit,0,,Element with value MMBTU could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,0,,Element with value exerciseDate could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityDetails,trade.commodityOption.commodity.commodityDetails,0,,Element with value Louisiana (Henry Hub) could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.publication.rateSourcePageHeading,trade.commodityOption.commodity.publication.rateSourcePageHeading,0,,Element with value Henry Hub could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.rounding.precision,trade.commodityOption.rounding.precision,0,,Element with value 4 could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityBase,trade.commodityOption.commodity.commodityBase,0,,Element with value Natural Gas could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,0,,Element with value Market Center Spot Gas could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,0,,Element with value First could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,0,,Element with value calculationPeriodsSchedule could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.marketDisruption.disruptionFallbacks,trade.commodityOption.marketDisruption.disruptionFallbacks,0,,Element with value AsSpecifiedInMasterAgreement could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.rounding.roundingDirection,trade.commodityOption.rounding.roundingDirection,0,,Element with value Nearest could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedMultiple,party(0)[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,party[id=partyA].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,2,TradeState.trade.party(0).partyId(0).identifierType=[LEI] TradeState.trade.party(0).partyId(0).identifier.meta.scheme=[http://www.fpml.org/coding-scheme/external/iso17442],Element mapped to multiple rosettaFields
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayType,0,,Element with value CommodityBusiness could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,trade.commodityOption.exercise.europeanExercise[id=exerciseDate].id,0,,Element with value exerciseDate could not be mapped to a rosettaField
+cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityDetails,trade.commodityOption.commodity.commodityDetails,0,,Element with value Louisiana (Henry Hub) could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedMultiple,party(1)[id=partyB].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,party[id=partyB].partyId[partyIdScheme=http://www.fpml.org/coding-scheme/external/iso17442].partyIdScheme,2,TradeState.trade.party(1).partyId(0).identifierType=[LEI] TradeState.trade.party(1).partyId(0).identifier.meta.scheme=[http://www.fpml.org/coding-scheme/external/iso17442],Element mapped to multiple rosettaFields
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0],trade.commodityOption.floatingStrikePricePerUnit.commodity.instrumentId[instrumentIdScheme=http://www.companyA.com/coding-scheme/commodity-reference-price-1-0],0,,Element with value NATURAL GAS-S. LOUISIANA (HENRY HUB)-INSIDE FERC could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.notionalQuantity.quantityUnit,trade.commodityOption.notionalQuantity.quantityUnit,0,,Element with value MMBTU could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,0,,Element with value calculationPeriodsSchedule could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.marketDisruption.marketDisruptionEvents,trade.commodityOption.marketDisruption.marketDisruptionEvents,0,,Element with value AsSpecifiedInMasterAgreement could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.commodityBase,trade.commodityOption.commodity.commodityBase,0,,Element with value Natural Gas could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityDetails,0,,Element with value Market Center Spot Gas could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,trade.commodityOption.floatingStrikePricePerUnit.pricingDates[id=pricingDates].dayDistribution,0,,Element with value First could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePageHeading,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePageHeading,0,,Element with value Henry Hub could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.specifiedPrice,trade.commodityOption.floatingStrikePricePerUnit.commodity.specifiedPrice,0,,Element with value Midpoint could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.commodity.currency,trade.commodityOption.commodity.currency,0,,Element with value USD could not be mapped to a rosettaField
-cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,trade.commodityOption.pricingDates.calculationPeriodsScheduleReference[href=calculationPeriodsSchedule].href,0,,Element with value calculationPeriodsSchedule could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.unit,trade.commodityOption.floatingStrikePricePerUnit.commodity.unit,0,,Element with value MMBTU could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePage,trade.commodityOption.floatingStrikePricePerUnit.commodity.publication.rateSourcePage,0,,Element with value Daily price survey ($/MMBtu): Louisiana-Onshore South could not be mapped to a rosettaField
 cdm-sample-files/fpml-5-13/products/commodity-derivatives/com-ex34-gas-put-option-european-floating-strike.xml,Fail_MappedNone,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityBase,trade.commodityOption.floatingStrikePricePerUnit.commodity.commodityBase,0,,Element with value Natural Gas could not be mapped to a rosettaField
diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/interest-rate-derivatives/ird-ex37-zero-coupon-swap-known-amount-schedule.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/interest-rate-derivatives/ird-ex37-zero-coupon-swap-known-amount-schedule.json
index 0d068dfdce..5dd299a3c5 100644
--- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/interest-rate-derivatives/ird-ex37-zero-coupon-swap-known-amount-schedule.json
+++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/interest-rate-derivatives/ird-ex37-zero-coupon-swap-known-amount-schedule.json
@@ -148,25 +148,14 @@
                   "receiver" : "Party2"
                 },
                 "priceQuantity" : {
-                  "quantitySchedule" : {
+                  "priceSchedule" : [ {
                     "address" : {
                       "scope" : "DOCUMENT",
                       "value" : "price-1"
                     }
-                  },
-                  "priceSchedule" : [ {
-                    "value" : {
-                      "value" : 7000000,
-                      "unit" : {
-                        "currency" : {
-                          "value" : "EUR"
-                        }
-                      },
-                      "priceType" : "InterestRate"
-                    }
                   } ],
                   "meta" : {
-                    "globalKey" : "991af0ea"
+                    "globalKey" : "0"
                   }
                 },
                 "calculationPeriodDates" : {
@@ -280,7 +269,7 @@
                   }
                 },
                 "meta" : {
-                  "globalKey" : "7a2c0ce6"
+                  "globalKey" : "c511e132"
                 }
               }, {
                 "payerReceiver" : {
@@ -513,16 +502,16 @@
                 }
               } ],
               "meta" : {
-                "globalKey" : "4bb738c0"
+                "globalKey" : "a3da950c"
               }
             }
           },
           "meta" : {
-            "globalKey" : "8ba4993b"
+            "globalKey" : "8374f8f1"
           }
         },
         "meta" : {
-          "globalKey" : "8ba4993b"
+          "globalKey" : "8374f8f1"
         }
       },
       "tradeLot" : [ {
@@ -742,10 +731,10 @@
       }
     },
     "meta" : {
-      "globalKey" : "12864f6c"
+      "globalKey" : "655893ca"
     }
   },
   "meta" : {
-    "globalKey" : "12864f6c"
+    "globalKey" : "655893ca"
   }
 }
\ No newline at end of file
diff --git a/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta b/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta
index 7dff0ddff0..83f0040643 100644
--- a/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta
+++ b/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta
@@ -2216,7 +2216,7 @@ synonym source FpML_5_Confirmation_To_TradeState extends FpML
         + futureValueNotional
             [value "futureValueNotional"]
         + priceSchedule
-            [value "knownAmountSchedule" path "calculationPeriodAmount"] // test
+            [meta "initialValue"]
 
     CreditDefaultPayout:
         [meta "id"]
diff --git a/tests/src/test/resources/logback-test.xml b/tests/src/test/resources/logback-test.xml
index ba41cd2a47..1b12641c5e 100644
--- a/tests/src/test/resources/logback-test.xml
+++ b/tests/src/test/resources/logback-test.xml
@@ -14,6 +14,8 @@
     <logger name="org.isda" level="DEBUG" />
     <logger name="com.regnosys.rosetta.translate.CompilerToClasses" level="DEBUG" />
     <logger name="com.regnosys.rosetta.common.translation.MappingProcessorStep" level="DEBUG" />
+    <logger name="com.regnosys.rosetta.translate.ParserParent" level="TRACE" />
+    <logger name="com.regnosys.rosetta.common.hashing.ReferenceResolverProcessStep" level="TRACE" />
     
     <!-- By default, the level of the root level is set to DEBUG -->
     <root level="INFO">